diff -Nru heartbeat-2.1.3/aclocal.m4 heartbeat-2.1.4/aclocal.m4
--- heartbeat-2.1.3/aclocal.m4	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/aclocal.m4	2008-08-18 23:37:31.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  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,14 +11,17 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-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])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 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)
@@ -287,9 +291,80 @@
 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*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -614,7 +689,11 @@
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -707,7 +786,7 @@
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -978,7 +1057,7 @@
     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"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@
 	    [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_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1303,7 +1382,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1836,6 +1915,13 @@
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 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"
@@ -2335,7 +2421,7 @@
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2771,7 +2857,7 @@
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2828,6 +2914,7 @@
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2937,7 +3024,7 @@
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     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.
@@ -2950,7 +3037,7 @@
       # 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*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -3096,51 +3183,23 @@
     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 "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _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${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed '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${_lt_dar_export_syms}${_lt_dsymutil}"
       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*)
@@ -3391,7 +3450,7 @@
 	_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*)
+      pgCC* | pgcpp*)
         # 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'
@@ -3826,7 +3885,8 @@
 # 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],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 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
@@ -3951,6 +4011,11 @@
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
@@ -4007,7 +4072,6 @@
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4092,7 +4156,7 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4269,6 +4333,7 @@
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4331,7 +4396,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, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4568,6 +4633,10 @@
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $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)
@@ -4917,7 +4986,7 @@
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4974,7 +5043,8 @@
       # 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'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -5011,7 +5081,7 @@
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -5107,7 +5177,7 @@
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5258,7 +5328,8 @@
       # 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'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5328,7 +5399,8 @@
     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'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5465,7 +5537,7 @@
 #
 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_cv_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
      "" | " "*) ;;
@@ -5489,7 +5561,7 @@
 #
 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_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5505,7 +5577,7 @@
 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*)
+  aix[[4-9]]*)
     # 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
@@ -5527,6 +5599,7 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5557,12 +5630,14 @@
   # 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_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # 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.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5612,7 +5687,7 @@
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5832,7 +5907,7 @@
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       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.
@@ -5852,7 +5927,7 @@
 	# 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*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -6012,11 +6087,10 @@
       _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}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -6597,7 +6671,7 @@
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6612,7 +6686,7 @@
 [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], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6628,8 +6702,10 @@
 # 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_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6901,7 +6977,7 @@
   # 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
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6961,13 +7037,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 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 12
+# serial 13
 
 # 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.
@@ -7072,16 +7148,17 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -7538,7 +7615,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/bootstrap /tmp/RRBT9Z8NmI/heartbeat-2.1.4/bootstrap
--- heartbeat-2.1.3/bootstrap	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/bootstrap	2008-08-18 13:32:19.000000000 +0100
@@ -233,9 +233,9 @@
 LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
 
 if
-  [ $LT_majvers -lt 1 -o $LT_minnum -lt 4 ]
+  [ $LT_majvers -lt 1 ] || [ $LT_majvers = 1 -a $LT_minnum -lt 4 ]
 then
-  echo "Minimum version of ol is 1.4.  You have $LT_version installed."
+  echo "Minimum version of libtool is 1.4.  You have $LT_version installed."
   exit 1
 fi
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cim/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cim/Makefile.in
--- heartbeat-2.1.3/cim/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/cim/Makefile.in	2008-08-18 23:37:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -63,7 +63,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -202,7 +202,7 @@
 am_simpletest_OBJECTS = simple_test.$(OBJEXT)
 simpletest_OBJECTS = $(am_simpletest_OBJECTS)
 simpletest_DEPENDENCIES = libHAClusterInfo.la
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -305,6 +305,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -322,24 +323,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -401,12 +390,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -707,8 +697,8 @@
 	@list='$(cimproviders_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(cimprovidersdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cimprovidersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(cimprovidersdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -716,8 +706,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(cimproviders_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(cimprovidersdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(cimprovidersdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(cimprovidersdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(cimprovidersdir)/$$p"; \
 	done
 
 clean-cimprovidersLTLIBRARIES:
@@ -924,8 +914,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -950,8 +940,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -961,13 +951,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cim/mof/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cim/mof/Makefile.am
--- heartbeat-2.1.3/cim/mof/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/cim/mof/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -22,7 +22,7 @@
 
 mof_DATA    = LinuxHA.mof LinuxHA.reg 
 mof_SCRIPTS = register_providers.sh unregister_providers.sh do_register.sh
-mofdir      = @HA_NOARCHDATAHBDIR@/heartbeat/cim
+mofdir      = @HA_NOARCHDATAHBDIR@/cim
 
 DIST_LIST   = $(mof_DATA) $(mof_SCRIPTS)
 EXTRA_DIST  = $(DIST_LIST)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cim/mof/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cim/mof/Makefile.in
--- heartbeat-2.1.3/cim/mof/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/cim/mof/Makefile.in	2008-08-18 23:37:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -62,7 +62,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = register_providers.sh unregister_providers.sh
@@ -111,6 +111,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -128,24 +129,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -207,12 +196,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -350,7 +340,7 @@
 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
+mofdir = @HA_NOARCHDATAHBDIR@/cim
 DIST_LIST = $(mof_DATA) $(mof_SCRIPTS)
 EXTRA_DIST = $(DIST_LIST)
 all: all-am
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cim/mof/register_providers.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cim/mof/register_providers.sh
--- heartbeat-2.1.3/cim/mof/register_providers.sh	2007-12-21 20:45:50.000000000 +0000
+++ heartbeat-2.1.4/cim/mof/register_providers.sh	2008-08-18 23:39:00.000000000 +0100
@@ -8,7 +8,7 @@
 #
 #
 
-sh /usr/share/heartbeat/heartbeat/cim/do_register.sh -t  \
--r /usr/share/heartbeat/heartbeat/cim/LinuxHA.reg \
--m /usr/share/heartbeat/heartbeat/cim/LinuxHA.mof
+sh /usr/local/share/heartbeat/heartbeat/cim/do_register.sh -t  \
+-r /usr/local/share/heartbeat/heartbeat/cim/LinuxHA.reg \
+-m /usr/local/share/heartbeat/heartbeat/cim/LinuxHA.mof
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cim/mof/unregister_providers.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cim/mof/unregister_providers.sh
--- heartbeat-2.1.3/cim/mof/unregister_providers.sh	2007-12-21 20:45:50.000000000 +0000
+++ heartbeat-2.1.4/cim/mof/unregister_providers.sh	2008-08-18 23:39:00.000000000 +0100
@@ -8,7 +8,7 @@
 #
 #
 
-sh /usr/share/heartbeat/heartbeat/cim/do_register.sh -u -t  \
--r /usr/share/heartbeat/heartbeat/cim/LinuxHA.reg \
--m /usr/share/heartbeat/heartbeat/cim/LinuxHA.mof
+sh /usr/local/share/heartbeat/heartbeat/cim/do_register.sh -u -t  \
+-r /usr/local/share/heartbeat/heartbeat/cim/LinuxHA.reg \
+-m /usr/local/share/heartbeat/heartbeat/cim/LinuxHA.mof
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/compile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/compile
--- heartbeat-2.1.3/compile	2007-12-21 20:44:19.000000000 +0000
+++ heartbeat-2.1.4/compile	1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-   case "$1" in
-    -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we do something ugly here.
-       ofile=$2
-       shift
-       case "$ofile" in
-	*.o | *.obj)
-	   ;;
-	*)
-	   args="$args -o $ofile"
-	   ofile=
-	   ;;
-       esac
-       ;;
-    *.c)
-       cfile=$1
-       args="$args $1"
-       ;;
-    *)
-       args="$args $1"
-       ;;
-   esac
-   shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-   # If no `-o' option was seen then we might have been invoked from a
-   # pattern rule where we don't need one.  That is ok -- this is a
-   # normal compilation that the losing compiler can handle.  If no
-   # `.c' file was seen then we are probably linking.  That is also
-   # ok.
-   exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-   if mkdir $lockdir > /dev/null 2>&1; then
-      break
-   fi
-   sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-   mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/config/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/config/Makefile.in
--- heartbeat-2.1.3/config/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/config/Makefile.in	2008-08-18 23:37:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -55,7 +55,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -93,6 +93,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -110,24 +111,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -189,12 +178,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/config.guess /tmp/RRBT9Z8NmI/heartbeat-2.1.4/config.guess
--- heartbeat-2.1.3/config.guess	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/config.guess	2008-07-08 00:41:25.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-07-22'
+timestamp='2008-01-23'
 
 # 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
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -532,7 +532,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -799,6 +799,9 @@
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/config.sub /tmp/RRBT9Z8NmI/heartbeat-2.1.4/config.sub
--- heartbeat-2.1.3/config.sub	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/config.sub	2008-07-08 00:41:25.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2007-06-28'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -369,10 +369,14 @@
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -668,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -813,6 +833,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1021,6 +1049,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/configure /tmp/RRBT9Z8NmI/heartbeat-2.1.4/configure
--- heartbeat-2.1.3/configure	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/configure	2008-12-29 22:12:09.000000000 +0000
@@ -907,6 +907,8 @@
 ECHO
 AR
 RANLIB
+DSYMUTIL
+NMEDIT
 CPP
 CXX
 CXXFLAGS
@@ -945,7 +947,6 @@
 MD5
 TEST
 PKGCONFIG
-MKTEMP
 NONROOT_CHOWN_TRUE
 NONROOT_CHOWN_FALSE
 DLOPEN_FORCE_FLAGS
@@ -1011,18 +1012,6 @@
 HB_INITSTOPPRI
 UCDSNMPDEVEL
 LIBOBJS
-HA_HAVE_ALPHASORT
-HA_HAVE_INET_PTON
-HA_HAVE_SCANDIR
-HA_HAVE_SETENV
-HA_HAVE_STRERROR
-HA_HAVE_UNSETENV
-HA_HAVE_STRNLEN
-HA_HAVE_STRNDUP
-HA_HAVE_DAEMON
-HA_HAVE_UUID_PARSE
-HAVE_STRLCPY
-HAVE_DECL_GETOPT
 HBAAPI_BUILD_TRUE
 HBAAPI_BUILD_FALSE
 BUILD_ZLIB_COMPRESS_MODULE_TRUE
@@ -1044,11 +1033,14 @@
 LRM_ENABLED
 LRM_BUILD_TRUE
 LRM_BUILD_FALSE
+USE_PAM_COMMON_TRUE
+USE_PAM_COMMON_FALSE
 LIBGNUTLS_CONFIG
 GNUTLSHEAD
 GNUTLSLIBS
 PYTHON_INCLUDES
 RPM_ENABLE_MGMT_CONFIG
+MGMT_DIR
 RPM_ENABLE_OPENHPI
 MGMT_BUILD_TRUE
 MGMT_BUILD_FALSE
@@ -1716,7 +1708,7 @@
   --enable-snmp-subagent Enable building of our SNMP subagent (lots of dependencies).
                           default=try
   --enable-ipmilan       enable IPMILan Stonith Plugin
-                          default=no
+                          default=yes
   --enable-bundled-ltdl  Configure, build and install the standalone ltdl library bundled with Heartbeat default=no
   --enable-crm  Compile the Version 2 Cluster Resource Manager.  default=yes
   --enable-lrm  Compile the new Local Resource Manager.  default=yes
@@ -2341,7 +2333,7 @@
 
 
 if test -z "$HAPKGVERSION" ; then
-   HAPKGVERSION="2.1.3"
+   HAPKGVERSION="2.1.4"
 fi
 am__api_version='1.10'
 
@@ -5607,7 +5599,7 @@
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5822,7 +5814,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5825 "configure"' > conftest.$ac_ext
+  echo '#line 5817 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5994,7 +5986,11 @@
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -7591,7 +7587,6 @@
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -7906,7 +7901,7 @@
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -8466,6 +8461,318 @@
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=yes
 enable_win32_dll=no
 
@@ -8531,7 +8838,7 @@
 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*
+$rm -r conftest*
 
 
 
@@ -8559,11 +8866,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:8562: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8869: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8566: \$? = $ac_status" >&5
+   echo "$as_me:8873: \$? = $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.
@@ -8833,10 +9140,10 @@
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -8849,27 +9156,27 @@
    -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:8852: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9159: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8856: \$? = $ac_status" >&5
+   echo "$as_me:9163: \$? = $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.
      $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
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8896,10 +9203,10 @@
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -8912,20 +9219,20 @@
        $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
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -8953,11 +9260,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:8956: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8960: \$? = $ac_status" >&5
+   echo "$as_me:9267: \$? = $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
@@ -9037,12 +9344,13 @@
   # 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'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # 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.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -9101,7 +9409,7 @@
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -9321,7 +9629,7 @@
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       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.
@@ -9341,7 +9649,7 @@
 	# 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*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -9613,11 +9921,10 @@
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -10137,7 +10444,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10671,6 +10978,21 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 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"
@@ -10990,7 +11312,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -11266,7 +11588,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -11315,7 +11637,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11318 "configure"
+#line 11640 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11415,7 +11737,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11418 "configure"
+#line 11740 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11542,7 +11864,7 @@
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -11598,6 +11920,7 @@
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -11658,7 +11981,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, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -11894,6 +12217,10 @@
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -12142,6 +12469,7 @@
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -12179,7 +12507,7 @@
 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*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -12386,7 +12714,7 @@
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     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.
@@ -12399,7 +12727,7 @@
       # 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*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -12657,51 +12985,23 @@
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$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${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed '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${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$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
-        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
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='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
-            archive_expsym_cmds_CXX='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
-            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}'
       else
       case $cc_basename in
         xlc*)
@@ -12952,7 +13252,7 @@
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	archive_expsym_cmds_CXX='$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'
@@ -13359,7 +13659,6 @@
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -13461,6 +13760,11 @@
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
 interix[3-9]*)
@@ -13516,7 +13820,6 @@
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -13592,7 +13895,7 @@
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -13688,7 +13991,7 @@
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -13819,10 +14122,10 @@
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -13835,27 +14138,27 @@
    -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:13838: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14141: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13842: \$? = $ac_status" >&5
+   echo "$as_me:14145: \$? = $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.
      $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
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -13882,10 +14185,10 @@
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13898,20 +14201,20 @@
        $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
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -13939,11 +14242,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:13942: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14245: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13946: \$? = $ac_status" >&5
+   echo "$as_me:14249: \$? = $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
@@ -13996,7 +14299,7 @@
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # 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
@@ -14018,6 +14321,7 @@
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
@@ -14119,7 +14423,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -14652,6 +14956,21 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 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"
@@ -14735,6 +15054,7 @@
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -14983,6 +15303,10 @@
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -15197,7 +15521,7 @@
 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*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -15235,7 +15559,7 @@
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -15500,10 +15824,10 @@
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
@@ -15516,27 +15840,27 @@
    -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:15519: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15843: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15523: \$? = $ac_status" >&5
+   echo "$as_me:15847: \$? = $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.
      $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
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -15563,10 +15887,10 @@
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -15579,20 +15903,20 @@
        $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
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -15620,11 +15944,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:15623: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15947: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15627: \$? = $ac_status" >&5
+   echo "$as_me:15951: \$? = $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
@@ -15704,12 +16028,13 @@
   # 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'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # 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.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -15768,7 +16093,7 @@
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -15988,7 +16313,7 @@
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       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.
@@ -16008,7 +16333,7 @@
 	# 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*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -16260,11 +16585,10 @@
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -16733,7 +17057,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17266,6 +17590,21 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 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"
@@ -17349,6 +17688,7 @@
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -17597,6 +17937,10 @@
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -17771,7 +18115,7 @@
 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*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -17820,11 +18164,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:17823: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17827: \$? = $ac_status" >&5
+   echo "$as_me:18171: \$? = $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.
@@ -17884,7 +18228,7 @@
       # 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'
+
       ;;
 
     darwin* | rhapsody*)
@@ -17954,7 +18298,7 @@
     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'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -18094,10 +18438,10 @@
 
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
@@ -18110,27 +18454,27 @@
    -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:18113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18457: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18117: \$? = $ac_status" >&5
+   echo "$as_me:18461: \$? = $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.
      $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
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -18157,10 +18501,10 @@
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -18173,20 +18517,20 @@
        $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
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -18214,11 +18558,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:18217: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18561: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18221: \$? = $ac_status" >&5
+   echo "$as_me:18565: \$? = $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
@@ -18298,12 +18642,13 @@
   # 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'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # 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.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -18362,7 +18707,7 @@
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -18582,7 +18927,7 @@
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       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.
@@ -18602,7 +18947,7 @@
 	# 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*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -18874,11 +19219,10 @@
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
@@ -19347,7 +19691,7 @@
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -19880,6 +20224,21 @@
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 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"
@@ -19963,6 +20322,7 @@
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -20211,6 +20571,10 @@
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -20384,7 +20748,7 @@
 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*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -20444,6 +20808,7 @@
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -20692,6 +21057,10 @@
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -22656,51 +23025,6 @@
 done
 
 
-for ac_prog in mktemp
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MKTEMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MKTEMP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKTEMP=$ac_cv_path_MKTEMP
-if test -n "$MKTEMP"; then
-  { echo "$as_me:$LINENO: result: $MKTEMP" >&5
-echo "${ECHO_T}$MKTEMP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$MKTEMP" && break
-done
-
 
 if test -n "$WHOAMI"; then
   IAM=`$WHOAMI`
@@ -22708,12 +23032,8 @@
 { echo "$as_me:$LINENO: checking if chown works for non-root" >&5
 echo $ECHO_N "checking if chown works for non-root... $ECHO_C" >&6; }
 
-if test -n "$MKTEMP"; then
-  F=`$MKTEMP "./.chown-testXXXXX"`
-else
-  F="./.chown-test.$$"
-  touch $F
-fi
+F="./.chown-test.$$"
+touch $F
 
 if
   case "$IAM" in
@@ -30414,7 +30734,7 @@
 
 done
 
- if test "$ac_cv_header_netinet_icmp6_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
@@ -31201,9 +31521,12 @@
 _ACEOF
 
 
+if test "x${enable_ipmilan}" = "x"; then
+	enable_ipmilan="yes"
+fi
 if test "x${enable_ipmilan}" = "xyes" -o "x${enable_ipmilan}" = "xtry"; then
-	{ echo "$as_me:$LINENO: checking For libOpenIPMI version 2 or greater" >&5
-echo $ECHO_N "checking For libOpenIPMI version 2 or greater... $ECHO_C" >&6; }
+	{ echo "$as_me:$LINENO: checking For libOpenIPMI version 1.4 or greater" >&5
+echo $ECHO_N "checking For libOpenIPMI version 1.4 or greater... $ECHO_C" >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -31214,7 +31537,7 @@
 int
 main ()
 {
- #if (OPENIPMI_VERSION_MAJOR < 2 )
+ #if (OPENIPMI_VERSION_MAJOR == 1) && (OPENIPMI_VERSION_MINOR < 4)
 			 #error "Too Old"
 			 #endif
   ;
@@ -36678,20 +37001,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_func in fcntl
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39342,7 +39651,6 @@
 	enable_crm="no"
      fi
           enable_mgmt=no
-     enable_dopd=no
      enable_cim_provider=no
 fi
 
@@ -39695,6 +40003,56 @@
 done
 
 
+as_ac_File=`echo "ac_cv_file_$sysconfdir/pam.d/common-account" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $sysconfdir/pam.d/common-account" >&5
+echo $ECHO_N "checking for $sysconfdir/pam.d/common-account... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$sysconfdir/pam.d/common-account"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+as_ac_File=`echo "ac_cv_file_$sysconfdir/pam.d/common-auth" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $sysconfdir/pam.d/common-auth" >&5
+echo $ECHO_N "checking for $sysconfdir/pam.d/common-auth... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$sysconfdir/pam.d/common-auth"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+ if test -f $sysconfdir/pam.d/common-account -a \
+				    -f /etc/pam.d/common-auth; then
+  USE_PAM_COMMON_TRUE=
+  USE_PAM_COMMON_FALSE='#'
+else
+  USE_PAM_COMMON_TRUE='#'
+  USE_PAM_COMMON_FALSE=
+fi
+
+
 for ac_prog in libgnutls-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -39930,11 +40288,14 @@
 
 if test "x${enable_mgmt}" != "xno"; then
   RPM_ENABLE_MGMT_CONFIG=1
+  MGMT_DIR=mgmt
 else
   RPM_ENABLE_MGMT_CONFIG=0
+  MGMT_DIR=""
 fi
 
 
+
 if test "x${enable_openhpi}" != "xno"; then
   RPM_ENABLE_OPENHPI=1
 else
@@ -40353,7 +40714,25 @@
 
 
 
-ac_config_files="$ac_config_files heartbeat.spec Makefile README logd/Makefile config/Makefile cts/Makefile cts/CM_fs.py cts/CM_hb.py cts/CTS.py cts/CTSaudits.py cts/CTSlab.py cts/CTStests.py cts/CM_LinuxHAv2.py cts/CTSproxy.py cts/extracttests.py cts/getpeinputs.sh cts/OCFIPraTest.py cts/CIB.py cts/LSBDummy crm/Makefile crm/cib/Makefile crm/crmd/Makefile crm/pengine/Makefile crm/tengine/Makefile crm/admin/Makefile crm/admin/crm_primitive.py crm/admin/crm_sh crm/admin/crm_utils.py crm/admin/crm_commands.py debian/Makefile doc/Makefile doc/startstop doc/cibadmin.8 doc/crm_resource.8 contrib/Makefile contrib/ipfail/Makefile contrib/mlock/Makefile contrib/drbd-outdate-peer/Makefile include/Makefile include/clplumbing/Makefile include/crm/Makefile include/crm/common/Makefile include/crm/pengine/Makefile include/lrm/Makefile include/mgmt/Makefile include/ocf/Makefile include/pils/Makefile include/pils/plugin.h include/saf/Makefile include/stonith/Makefile include/fencing/Makefile replace/Makefile lib/Makefile lib/apphb/Makefile lib/clplumbing/Makefile lib/hbclient/Makefile lib/crm/Makefile lib/crm/common/Makefile lib/crm/cib/Makefile lib/crm/pengine/Makefile lib/crm/transition/Makefile lib/lrm/Makefile lib/mgmt/Makefile lib/pils/Makefile lib/plugins/Makefile lib/plugins/InterfaceMgr/Makefile lib/plugins/HBauth/Makefile lib/plugins/HBcomm/Makefile lib/plugins/lrm/Makefile lib/plugins/stonith/Makefile lib/plugins/stonith/ribcl.py lib/plugins/stonith/external/Makefile lib/plugins/stonith/external/ibmrsa lib/plugins/stonith/external/riloe lib/plugins/stonith/external/ssh lib/plugins/AppHBNotification/Makefile lib/plugins/HBcompress/Makefile lib/plugins/quorum/Makefile lib/plugins/quorumd/Makefile lib/plugins/tiebreaker/Makefile lib/recoverymgr/Makefile lib/stonith/Makefile lib/fencing/Makefile lrm/Makefile lrm/lrmd/Makefile lrm/admin/Makefile lrm/test/regression.sh lrm/test/LRMBasicSanityCheck lrm/test/Makefile lrm/test/lrmregtest lrm/test/lrmregtest-lsb lrm/test/lrmregtest-heartbeat lrm/test/testcases/Makefile mgmt/Makefile mgmt/daemon/Makefile mgmt/client/Makefile mgmt/client/haclient.py mgmt/client/mgmtcmd.py heartbeat/Makefile heartbeat/shellfuncs heartbeat/rc.d/Makefile heartbeat/rc.d/ask_resources heartbeat/rc.d/hb_takeover heartbeat/init.d/Makefile heartbeat/init.d/heartbeat heartbeat/lib/Makefile heartbeat/lib/BasicSanityCheck heartbeat/lib/ha_config heartbeat/lib/ha_propagate heartbeat/lib/hb_standby heartbeat/lib/mach_down heartbeat/lib/req_resource heartbeat/lib/ResourceManager heartbeat/lib/TestHeartbeatComm heartbeat/lib/hb_takeover heartbeat/lib/hb_addnode heartbeat/lib/hb_delnode heartbeat/lib/hb_setweight heartbeat/lib/hb_setsite heartbeat/libnet_util/Makefile heartbeat/logrotate.d/Makefile ldirectord/Makefile ldirectord/ldirectord ldirectord/init.d/Makefile ldirectord/init.d/ldirectord ldirectord/init.d/ldirectord.debian ldirectord/init.d/ldirectord.debian.default ldirectord/logrotate.d/Makefile ldirectord/OCF/Makefile ldirectord/OCF/ldirectord membership/Makefile membership/ccm/Makefile membership/quorumd/Makefile pkg/Makefile pkg/InfoFiles/pkginfo pkg/InfoFiles/preinstall pkg/InfoFiles/postinstall port/Makefile port/portMakefile port/heartbeat/pkg-deinstall port/heartbeat/pkg-descr port/heartbeat/pkg-install port/heartbeat/pkg-plist snmp_subagent/Makefile snmp_subagent/SNMPAgentSanityCheck cim/Makefile cim/mof/Makefile cim/mof/register_providers.sh cim/mof/unregister_providers.sh tsa_plugin/Makefile tsa_plugin/testrun.sh tsa_plugin/linuxha-adapter telecom/Makefile telecom/apphbd/Makefile telecom/recoverymgrd/Makefile fencing/Makefile fencing/stonithd/Makefile fencing/test/Makefile fencing/test/STONITHDBasicSanityCheck tools/Makefile tools/ciblint tools/haresources2cib.py tools/hb_report tools/ocf-tester resources/Makefile resources/OCF/Makefile resources/OCF/.ocf-binaries resources/OCF/.ocf-directories resources/OCF/.ocf-shellfuncs resources/OCF/ocf-returncodes resources/OCF/ocf-shellfuncs resources/heartbeat/Makefile resources/heartbeat/apache resources/heartbeat/AudibleAlarm resources/heartbeat/Delay resources/heartbeat/db2 resources/heartbeat/Filesystem resources/heartbeat/hto-mapfuncs resources/heartbeat/ICP resources/heartbeat/ids resources/heartbeat/IPaddr resources/heartbeat/IPaddr2 resources/heartbeat/IPsrcaddr resources/heartbeat/IPv6addr resources/heartbeat/LinuxSCSI resources/heartbeat/LVM resources/heartbeat/LVSSyncDaemonSwap resources/heartbeat/MailTo resources/heartbeat/OCF resources/heartbeat/portblock resources/heartbeat/Raid1 resources/heartbeat/ServeRAID resources/heartbeat/SendArp resources/heartbeat/WAS resources/heartbeat/WinPopup resources/heartbeat/Xinetd"
+ac_config_files="$ac_config_files heartbeat.spec Makefile README logd/Makefile config/Makefile cts/Makefile cts/CM_fs.py cts/CM_hb.py cts/CTS.py cts/CTSaudits.py cts/CTSlab.py cts/CTStests.py cts/CM_LinuxHAv2.py cts/CTSproxy.py cts/extracttests.py cts/getpeinputs.sh cts/OCFIPraTest.py cts/CIB.py cts/LSBDummy debian/Makefile doc/Makefile doc/startstop doc/cibadmin.8 doc/crm_resource.8 contrib/Makefile contrib/ipfail/Makefile contrib/mlock/Makefile contrib/drbd-outdate-peer/Makefile include/Makefile include/clplumbing/Makefile include/lrm/Makefile include/ocf/Makefile include/pils/Makefile include/pils/plugin.h include/saf/Makefile include/stonith/Makefile include/fencing/Makefile replace/Makefile lib/Makefile lib/apphb/Makefile lib/clplumbing/Makefile lib/hbclient/Makefile lib/lrm/Makefile lib/pils/Makefile lib/plugins/Makefile lib/plugins/InterfaceMgr/Makefile lib/plugins/HBauth/Makefile lib/plugins/HBcomm/Makefile lib/plugins/lrm/Makefile lib/plugins/stonith/Makefile lib/plugins/stonith/ribcl.py lib/plugins/stonith/external/Makefile lib/plugins/stonith/external/ibmrsa lib/plugins/stonith/external/riloe lib/plugins/stonith/external/ssh lib/plugins/stonith/external/hmchttp lib/plugins/stonith/external/xen0-ha lib/plugins/AppHBNotification/Makefile lib/plugins/HBcompress/Makefile lib/plugins/quorum/Makefile lib/plugins/quorumd/Makefile lib/plugins/tiebreaker/Makefile lib/recoverymgr/Makefile lib/stonith/Makefile lib/fencing/Makefile lrm/Makefile lrm/lrmd/Makefile lrm/admin/Makefile lrm/test/regression.sh lrm/test/LRMBasicSanityCheck lrm/test/Makefile lrm/test/lrmregtest lrm/test/lrmregtest-lsb lrm/test/lrmregtest-heartbeat lrm/test/testcases/Makefile heartbeat/Makefile heartbeat/shellfuncs heartbeat/rc.d/Makefile heartbeat/rc.d/ask_resources heartbeat/rc.d/hb_takeover heartbeat/init.d/Makefile heartbeat/init.d/heartbeat heartbeat/lib/Makefile heartbeat/lib/BasicSanityCheck heartbeat/lib/ha_config heartbeat/lib/ha_propagate heartbeat/lib/hb_standby heartbeat/lib/mach_down heartbeat/lib/req_resource heartbeat/lib/ResourceManager heartbeat/lib/TestHeartbeatComm heartbeat/lib/hb_takeover heartbeat/lib/hb_addnode heartbeat/lib/hb_delnode heartbeat/lib/hb_setweight heartbeat/lib/hb_setsite heartbeat/libnet_util/Makefile heartbeat/logrotate.d/Makefile ldirectord/Makefile ldirectord/ldirectord ldirectord/init.d/Makefile ldirectord/init.d/ldirectord ldirectord/init.d/ldirectord.debian ldirectord/init.d/ldirectord.debian.default ldirectord/logrotate.d/Makefile ldirectord/OCF/Makefile ldirectord/OCF/ldirectord membership/Makefile membership/ccm/Makefile membership/quorumd/Makefile pkg/Makefile pkg/InfoFiles/pkginfo pkg/InfoFiles/preinstall pkg/InfoFiles/postinstall port/Makefile port/portMakefile port/heartbeat/pkg-deinstall port/heartbeat/pkg-descr port/heartbeat/pkg-install port/heartbeat/pkg-plist telecom/Makefile telecom/apphbd/Makefile telecom/recoverymgrd/Makefile fencing/Makefile fencing/stonithd/Makefile fencing/test/Makefile fencing/test/STONITHDBasicSanityCheck tools/Makefile tools/ciblint tools/haresources2cib.py tools/hb_report tools/ocf-tester resources/Makefile resources/OCF/Makefile resources/OCF/.ocf-binaries resources/OCF/.ocf-directories resources/OCF/.ocf-shellfuncs resources/OCF/ocf-returncodes resources/OCF/ocf-shellfuncs resources/heartbeat/Makefile resources/heartbeat/apache resources/heartbeat/AudibleAlarm resources/heartbeat/Delay resources/heartbeat/db2 resources/heartbeat/Filesystem resources/heartbeat/hto-mapfuncs resources/heartbeat/ICP resources/heartbeat/ids resources/heartbeat/IPaddr resources/heartbeat/IPaddr2 resources/heartbeat/IPsrcaddr resources/heartbeat/IPv6addr resources/heartbeat/LinuxSCSI resources/heartbeat/LVM resources/heartbeat/LVSSyncDaemonSwap resources/heartbeat/MailTo resources/heartbeat/OCF resources/heartbeat/portblock resources/heartbeat/Raid1 resources/heartbeat/ServeRAID resources/heartbeat/SendArp resources/heartbeat/WAS resources/heartbeat/WinPopup resources/heartbeat/Xinetd"
+
+
+
+if test "x${enable_crm}" = "xyes"; then
+ac_config_files="$ac_config_files crm/Makefile crm/cib/Makefile crm/crmd/Makefile crm/pengine/Makefile crm/tengine/Makefile crm/admin/Makefile crm/admin/crm_primitive.py crm/admin/crm_sh crm/admin/crm_utils.py crm/admin/crm_commands.py include/crm/Makefile include/crm/common/Makefile include/crm/pengine/Makefile lib/crm/Makefile lib/crm/common/Makefile lib/crm/cib/Makefile lib/crm/pengine/Makefile lib/crm/transition/Makefile"
+
+fi
+
+ac_config_files="$ac_config_files include/mgmt/Makefile lib/mgmt/Makefile mgmt/Makefile mgmt/daemon/Makefile mgmt/client/Makefile mgmt/client/haclient.py mgmt/client/mgmtcmd.py"
+
+
+ac_config_files="$ac_config_files snmp_subagent/Makefile snmp_subagent/SNMPAgentSanityCheck"
+
+
+ac_config_files="$ac_config_files cim/Makefile cim/mof/Makefile cim/mof/register_providers.sh cim/mof/unregister_providers.sh"
+
+
+ac_config_files="$ac_config_files tsa_plugin/Makefile tsa_plugin/testrun.sh tsa_plugin/linuxha-adapter"
 
 
 cat >confcache <<\_ACEOF
@@ -40599,6 +40978,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${USE_PAM_COMMON_TRUE}" && test -z "${USE_PAM_COMMON_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"USE_PAM_COMMON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_PAM_COMMON\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${MGMT_BUILD_TRUE}" && test -z "${MGMT_BUILD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"MGMT_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -41116,16 +41502,6 @@
     "cts/OCFIPraTest.py") CONFIG_FILES="$CONFIG_FILES cts/OCFIPraTest.py" ;;
     "cts/CIB.py") CONFIG_FILES="$CONFIG_FILES cts/CIB.py" ;;
     "cts/LSBDummy") CONFIG_FILES="$CONFIG_FILES cts/LSBDummy" ;;
-    "crm/Makefile") CONFIG_FILES="$CONFIG_FILES crm/Makefile" ;;
-    "crm/cib/Makefile") CONFIG_FILES="$CONFIG_FILES crm/cib/Makefile" ;;
-    "crm/crmd/Makefile") CONFIG_FILES="$CONFIG_FILES crm/crmd/Makefile" ;;
-    "crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES crm/pengine/Makefile" ;;
-    "crm/tengine/Makefile") CONFIG_FILES="$CONFIG_FILES crm/tengine/Makefile" ;;
-    "crm/admin/Makefile") CONFIG_FILES="$CONFIG_FILES crm/admin/Makefile" ;;
-    "crm/admin/crm_primitive.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_primitive.py" ;;
-    "crm/admin/crm_sh") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_sh" ;;
-    "crm/admin/crm_utils.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_utils.py" ;;
-    "crm/admin/crm_commands.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_commands.py" ;;
     "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/startstop") CONFIG_FILES="$CONFIG_FILES doc/startstop" ;;
@@ -41137,11 +41513,7 @@
     "contrib/drbd-outdate-peer/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/drbd-outdate-peer/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/clplumbing/Makefile") CONFIG_FILES="$CONFIG_FILES include/clplumbing/Makefile" ;;
-    "include/crm/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/Makefile" ;;
-    "include/crm/common/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/common/Makefile" ;;
-    "include/crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/pengine/Makefile" ;;
     "include/lrm/Makefile") CONFIG_FILES="$CONFIG_FILES include/lrm/Makefile" ;;
-    "include/mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES include/mgmt/Makefile" ;;
     "include/ocf/Makefile") CONFIG_FILES="$CONFIG_FILES include/ocf/Makefile" ;;
     "include/pils/Makefile") CONFIG_FILES="$CONFIG_FILES include/pils/Makefile" ;;
     "include/pils/plugin.h") CONFIG_FILES="$CONFIG_FILES include/pils/plugin.h" ;;
@@ -41153,13 +41525,7 @@
     "lib/apphb/Makefile") CONFIG_FILES="$CONFIG_FILES lib/apphb/Makefile" ;;
     "lib/clplumbing/Makefile") CONFIG_FILES="$CONFIG_FILES lib/clplumbing/Makefile" ;;
     "lib/hbclient/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hbclient/Makefile" ;;
-    "lib/crm/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/Makefile" ;;
-    "lib/crm/common/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/common/Makefile" ;;
-    "lib/crm/cib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/cib/Makefile" ;;
-    "lib/crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/pengine/Makefile" ;;
-    "lib/crm/transition/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/transition/Makefile" ;;
     "lib/lrm/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lrm/Makefile" ;;
-    "lib/mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mgmt/Makefile" ;;
     "lib/pils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/pils/Makefile" ;;
     "lib/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES lib/plugins/Makefile" ;;
     "lib/plugins/InterfaceMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/plugins/InterfaceMgr/Makefile" ;;
@@ -41172,6 +41538,8 @@
     "lib/plugins/stonith/external/ibmrsa") CONFIG_FILES="$CONFIG_FILES lib/plugins/stonith/external/ibmrsa" ;;
     "lib/plugins/stonith/external/riloe") CONFIG_FILES="$CONFIG_FILES lib/plugins/stonith/external/riloe" ;;
     "lib/plugins/stonith/external/ssh") CONFIG_FILES="$CONFIG_FILES lib/plugins/stonith/external/ssh" ;;
+    "lib/plugins/stonith/external/hmchttp") CONFIG_FILES="$CONFIG_FILES lib/plugins/stonith/external/hmchttp" ;;
+    "lib/plugins/stonith/external/xen0-ha") CONFIG_FILES="$CONFIG_FILES lib/plugins/stonith/external/xen0-ha" ;;
     "lib/plugins/AppHBNotification/Makefile") CONFIG_FILES="$CONFIG_FILES lib/plugins/AppHBNotification/Makefile" ;;
     "lib/plugins/HBcompress/Makefile") CONFIG_FILES="$CONFIG_FILES lib/plugins/HBcompress/Makefile" ;;
     "lib/plugins/quorum/Makefile") CONFIG_FILES="$CONFIG_FILES lib/plugins/quorum/Makefile" ;;
@@ -41190,11 +41558,6 @@
     "lrm/test/lrmregtest-lsb") CONFIG_FILES="$CONFIG_FILES lrm/test/lrmregtest-lsb" ;;
     "lrm/test/lrmregtest-heartbeat") CONFIG_FILES="$CONFIG_FILES lrm/test/lrmregtest-heartbeat" ;;
     "lrm/test/testcases/Makefile") CONFIG_FILES="$CONFIG_FILES lrm/test/testcases/Makefile" ;;
-    "mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/Makefile" ;;
-    "mgmt/daemon/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/daemon/Makefile" ;;
-    "mgmt/client/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/client/Makefile" ;;
-    "mgmt/client/haclient.py") CONFIG_FILES="$CONFIG_FILES mgmt/client/haclient.py" ;;
-    "mgmt/client/mgmtcmd.py") CONFIG_FILES="$CONFIG_FILES mgmt/client/mgmtcmd.py" ;;
     "heartbeat/Makefile") CONFIG_FILES="$CONFIG_FILES heartbeat/Makefile" ;;
     "heartbeat/shellfuncs") CONFIG_FILES="$CONFIG_FILES heartbeat/shellfuncs" ;;
     "heartbeat/rc.d/Makefile") CONFIG_FILES="$CONFIG_FILES heartbeat/rc.d/Makefile" ;;
@@ -41240,15 +41603,6 @@
     "port/heartbeat/pkg-descr") CONFIG_FILES="$CONFIG_FILES port/heartbeat/pkg-descr" ;;
     "port/heartbeat/pkg-install") CONFIG_FILES="$CONFIG_FILES port/heartbeat/pkg-install" ;;
     "port/heartbeat/pkg-plist") CONFIG_FILES="$CONFIG_FILES port/heartbeat/pkg-plist" ;;
-    "snmp_subagent/Makefile") CONFIG_FILES="$CONFIG_FILES snmp_subagent/Makefile" ;;
-    "snmp_subagent/SNMPAgentSanityCheck") CONFIG_FILES="$CONFIG_FILES snmp_subagent/SNMPAgentSanityCheck" ;;
-    "cim/Makefile") CONFIG_FILES="$CONFIG_FILES cim/Makefile" ;;
-    "cim/mof/Makefile") CONFIG_FILES="$CONFIG_FILES cim/mof/Makefile" ;;
-    "cim/mof/register_providers.sh") CONFIG_FILES="$CONFIG_FILES cim/mof/register_providers.sh" ;;
-    "cim/mof/unregister_providers.sh") CONFIG_FILES="$CONFIG_FILES cim/mof/unregister_providers.sh" ;;
-    "tsa_plugin/Makefile") CONFIG_FILES="$CONFIG_FILES tsa_plugin/Makefile" ;;
-    "tsa_plugin/testrun.sh") CONFIG_FILES="$CONFIG_FILES tsa_plugin/testrun.sh" ;;
-    "tsa_plugin/linuxha-adapter") CONFIG_FILES="$CONFIG_FILES tsa_plugin/linuxha-adapter" ;;
     "telecom/Makefile") CONFIG_FILES="$CONFIG_FILES telecom/Makefile" ;;
     "telecom/apphbd/Makefile") CONFIG_FILES="$CONFIG_FILES telecom/apphbd/Makefile" ;;
     "telecom/recoverymgrd/Makefile") CONFIG_FILES="$CONFIG_FILES telecom/recoverymgrd/Makefile" ;;
@@ -41293,6 +41647,40 @@
     "resources/heartbeat/WAS") CONFIG_FILES="$CONFIG_FILES resources/heartbeat/WAS" ;;
     "resources/heartbeat/WinPopup") CONFIG_FILES="$CONFIG_FILES resources/heartbeat/WinPopup" ;;
     "resources/heartbeat/Xinetd") CONFIG_FILES="$CONFIG_FILES resources/heartbeat/Xinetd" ;;
+    "crm/Makefile") CONFIG_FILES="$CONFIG_FILES crm/Makefile" ;;
+    "crm/cib/Makefile") CONFIG_FILES="$CONFIG_FILES crm/cib/Makefile" ;;
+    "crm/crmd/Makefile") CONFIG_FILES="$CONFIG_FILES crm/crmd/Makefile" ;;
+    "crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES crm/pengine/Makefile" ;;
+    "crm/tengine/Makefile") CONFIG_FILES="$CONFIG_FILES crm/tengine/Makefile" ;;
+    "crm/admin/Makefile") CONFIG_FILES="$CONFIG_FILES crm/admin/Makefile" ;;
+    "crm/admin/crm_primitive.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_primitive.py" ;;
+    "crm/admin/crm_sh") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_sh" ;;
+    "crm/admin/crm_utils.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_utils.py" ;;
+    "crm/admin/crm_commands.py") CONFIG_FILES="$CONFIG_FILES crm/admin/crm_commands.py" ;;
+    "include/crm/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/Makefile" ;;
+    "include/crm/common/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/common/Makefile" ;;
+    "include/crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES include/crm/pengine/Makefile" ;;
+    "lib/crm/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/Makefile" ;;
+    "lib/crm/common/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/common/Makefile" ;;
+    "lib/crm/cib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/cib/Makefile" ;;
+    "lib/crm/pengine/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/pengine/Makefile" ;;
+    "lib/crm/transition/Makefile") CONFIG_FILES="$CONFIG_FILES lib/crm/transition/Makefile" ;;
+    "include/mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES include/mgmt/Makefile" ;;
+    "lib/mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mgmt/Makefile" ;;
+    "mgmt/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/Makefile" ;;
+    "mgmt/daemon/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/daemon/Makefile" ;;
+    "mgmt/client/Makefile") CONFIG_FILES="$CONFIG_FILES mgmt/client/Makefile" ;;
+    "mgmt/client/haclient.py") CONFIG_FILES="$CONFIG_FILES mgmt/client/haclient.py" ;;
+    "mgmt/client/mgmtcmd.py") CONFIG_FILES="$CONFIG_FILES mgmt/client/mgmtcmd.py" ;;
+    "snmp_subagent/Makefile") CONFIG_FILES="$CONFIG_FILES snmp_subagent/Makefile" ;;
+    "snmp_subagent/SNMPAgentSanityCheck") CONFIG_FILES="$CONFIG_FILES snmp_subagent/SNMPAgentSanityCheck" ;;
+    "cim/Makefile") CONFIG_FILES="$CONFIG_FILES cim/Makefile" ;;
+    "cim/mof/Makefile") CONFIG_FILES="$CONFIG_FILES cim/mof/Makefile" ;;
+    "cim/mof/register_providers.sh") CONFIG_FILES="$CONFIG_FILES cim/mof/register_providers.sh" ;;
+    "cim/mof/unregister_providers.sh") CONFIG_FILES="$CONFIG_FILES cim/mof/unregister_providers.sh" ;;
+    "tsa_plugin/Makefile") CONFIG_FILES="$CONFIG_FILES tsa_plugin/Makefile" ;;
+    "tsa_plugin/testrun.sh") CONFIG_FILES="$CONFIG_FILES tsa_plugin/testrun.sh" ;;
+    "tsa_plugin/linuxha-adapter") CONFIG_FILES="$CONFIG_FILES tsa_plugin/linuxha-adapter" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -41535,6 +41923,8 @@
 ECHO!$ECHO$ac_delim
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
@@ -41573,7 +41963,6 @@
 MD5!$MD5$ac_delim
 TEST!$TEST$ac_delim
 PKGCONFIG!$PKGCONFIG$ac_delim
-MKTEMP!$MKTEMP$ac_delim
 NONROOT_CHOWN_TRUE!$NONROOT_CHOWN_TRUE$ac_delim
 NONROOT_CHOWN_FALSE!$NONROOT_CHOWN_FALSE$ac_delim
 DLOPEN_FORCE_FLAGS!$DLOPEN_FORCE_FLAGS$ac_delim
@@ -41589,7 +41978,6 @@
 USE_IPV6ADDR_TRUE!$USE_IPV6ADDR_TRUE$ac_delim
 USE_IPV6ADDR_FALSE!$USE_IPV6ADDR_FALSE$ac_delim
 USE_VACM_TRUE!$USE_VACM_TRUE$ac_delim
-USE_VACM_FALSE!$USE_VACM_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41631,6 +42019,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+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
@@ -41680,18 +42069,6 @@
 HB_INITSTOPPRI!$HB_INITSTOPPRI$ac_delim
 UCDSNMPDEVEL!$UCDSNMPDEVEL$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
-HA_HAVE_ALPHASORT!$HA_HAVE_ALPHASORT$ac_delim
-HA_HAVE_INET_PTON!$HA_HAVE_INET_PTON$ac_delim
-HA_HAVE_SCANDIR!$HA_HAVE_SCANDIR$ac_delim
-HA_HAVE_SETENV!$HA_HAVE_SETENV$ac_delim
-HA_HAVE_STRERROR!$HA_HAVE_STRERROR$ac_delim
-HA_HAVE_UNSETENV!$HA_HAVE_UNSETENV$ac_delim
-HA_HAVE_STRNLEN!$HA_HAVE_STRNLEN$ac_delim
-HA_HAVE_STRNDUP!$HA_HAVE_STRNDUP$ac_delim
-HA_HAVE_DAEMON!$HA_HAVE_DAEMON$ac_delim
-HA_HAVE_UUID_PARSE!$HA_HAVE_UUID_PARSE$ac_delim
-HAVE_STRLCPY!$HAVE_STRLCPY$ac_delim
-HAVE_DECL_GETOPT!$HAVE_DECL_GETOPT$ac_delim
 HBAAPI_BUILD_TRUE!$HBAAPI_BUILD_TRUE$ac_delim
 HBAAPI_BUILD_FALSE!$HBAAPI_BUILD_FALSE$ac_delim
 BUILD_ZLIB_COMPRESS_MODULE_TRUE!$BUILD_ZLIB_COMPRESS_MODULE_TRUE$ac_delim
@@ -41713,11 +42090,14 @@
 LRM_ENABLED!$LRM_ENABLED$ac_delim
 LRM_BUILD_TRUE!$LRM_BUILD_TRUE$ac_delim
 LRM_BUILD_FALSE!$LRM_BUILD_FALSE$ac_delim
+USE_PAM_COMMON_TRUE!$USE_PAM_COMMON_TRUE$ac_delim
+USE_PAM_COMMON_FALSE!$USE_PAM_COMMON_FALSE$ac_delim
 LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
 GNUTLSHEAD!$GNUTLSHEAD$ac_delim
 GNUTLSLIBS!$GNUTLSLIBS$ac_delim
 PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
 RPM_ENABLE_MGMT_CONFIG!$RPM_ENABLE_MGMT_CONFIG$ac_delim
+MGMT_DIR!$MGMT_DIR$ac_delim
 RPM_ENABLE_OPENHPI!$RPM_ENABLE_OPENHPI$ac_delim
 MGMT_BUILD_TRUE!$MGMT_BUILD_TRUE$ac_delim
 MGMT_BUILD_FALSE!$MGMT_BUILD_FALSE$ac_delim
@@ -41728,6 +42108,14 @@
 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
+LRM_PLUGIN_DIR!$LRM_PLUGIN_DIR$ac_delim
+HB_RA_DIR!$HB_RA_DIR$ac_delim
+OCF_ROOT_DIR!$OCF_ROOT_DIR$ac_delim
+OCF_RA_DIR!$OCF_RA_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41769,14 +42157,6 @@
 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
-OCF_RA_DIR!$OCF_RA_DIR$ac_delim
 LSB_RA_DIR!$LSB_RA_DIR$ac_delim
 STONITH_RA_DIR!$STONITH_RA_DIR$ac_delim
 VALGRIND_BIN!$VALGRIND_BIN$ac_delim
@@ -41789,7 +42169,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -42190,21 +42570,22 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -42241,7 +42622,7 @@
   # 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
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -42583,8 +42964,8 @@
 echo "${ECHO_T}" >&6; }
 { echo "$as_me:$LINENO: result: $PACKAGE configuration:" >&5
 echo "${ECHO_T}$PACKAGE configuration:" >&6; }
-{ echo "$as_me:$LINENO: result:   Version              = \"$VERSION\"" >&5
-echo "${ECHO_T}  Version              = \"$VERSION\"" >&6; }
+{ echo "$as_me:$LINENO: result:   Version                  = \"$VERSION\"" >&5
+echo "${ECHO_T}  Version                  = \"$VERSION\"" >&6; }
 
 { echo "$as_me:$LINENO: result:   Executables              = \"$my_sbindir\"" >&5
 echo "${ECHO_T}  Executables              = \"$my_sbindir\"" >&6; }
@@ -42615,8 +42996,8 @@
 { echo "$as_me:$LINENO: result:   HA user user id          = \"${HA_CCMUID}\"" >&5
 echo "${ECHO_T}  HA user user id          = \"${HA_CCMUID}\"" >&6; }
 
-{ echo "$as_me:$LINENO: result:   Build snmp subagent  = \"${enable_snmp_subagent}\"" >&5
-echo "${ECHO_T}  Build snmp subagent  = \"${enable_snmp_subagent}\"" >&6; }
+{ echo "$as_me:$LINENO: result:   Build snmp subagent      = \"${enable_snmp_subagent}\"" >&5
+echo "${ECHO_T}  Build snmp subagent      = \"${enable_snmp_subagent}\"" >&6; }
 if test "x${enable_snmp_subagent}" = "xyes"; then
     { echo "$as_me:$LINENO: result:   SNMP MIB directory       = \"${MIBS_DIR}\"" >&5
 echo "${ECHO_T}  SNMP MIB directory       = \"${MIBS_DIR}\"" >&6; }
@@ -42628,10 +43009,10 @@
 { echo "$as_me:$LINENO: result:   ucd_snmp_devel name      = \"${UCDSNMPDEVEL}\"" >&5
 echo "${ECHO_T}  ucd_snmp_devel name      = \"${UCDSNMPDEVEL}\"" >&6; }
 
-{ echo "$as_me:$LINENO: result:   Build CRM            = \"${enable_crm}\"" >&5
-echo "${ECHO_T}  Build CRM            = \"${enable_crm}\"" >&6; }
-{ echo "$as_me:$LINENO: result:   Build LRM            = \"${enable_lrm}\"" >&5
-echo "${ECHO_T}  Build LRM            = \"${enable_lrm}\"" >&6; }
+{ echo "$as_me:$LINENO: result:   Build CRM                = \"${enable_crm}\"" >&5
+echo "${ECHO_T}  Build CRM                = \"${enable_crm}\"" >&6; }
+{ echo "$as_me:$LINENO: result:   Build LRM                = \"${enable_lrm}\"" >&5
+echo "${ECHO_T}  Build LRM                = \"${enable_lrm}\"" >&6; }
 { echo "$as_me:$LINENO: result:   Build Ldirectord         = \"${enable_ldirectord}\"" >&5
 echo "${ECHO_T}  Build Ldirectord         = \"${enable_ldirectord}\"" >&6; }
 { echo "$as_me:$LINENO: result:   Build IPMILan Plugin     = \"${enable_ipmilan}\"" >&5
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/configure.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/configure.in
--- heartbeat-2.1.3/configure.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/configure.in	2008-12-29 22:12:09.000000000 +0000
@@ -39,7 +39,7 @@
 )
 
 if test -z "$HAPKGVERSION" ; then
-   HAPKGVERSION="2.1.3"
+   HAPKGVERSION="2.1.4"
 fi
 AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)
 
@@ -579,20 +579,14 @@
 dnl ************************************************************************
 dnl Check whether non-root user can chown.
 dnl ************************************************************************
-AC_PATH_PROGS(MKTEMP, mktemp)
 
 if test -n "$WHOAMI"; then
   IAM=`$WHOAMI`
 fi
 AC_MSG_CHECKING(if chown works for non-root)
 
-dnl Prefer "mktemp" command.  But some OSes lack it; they can "touch".
-if test -n "$MKTEMP"; then
-  F=`$MKTEMP "./.chown-testXXXXX"`
-else
-  F="./.chown-test.$$"
-  touch $F
-fi
+F="./.chown-test.$$"
+touch $F
 
 if
   case "$IAM" in
@@ -1101,7 +1095,7 @@
 dnl ************************************************************************
 dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
 AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
-AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes -a $new_libnet = yes )
+AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes -a "$new_libnet" = yes )
 AC_CHECK_HEADERS(libxml/xpath.h)
 
 dnl
@@ -1325,10 +1319,13 @@
 dnl OpenIMPI checks
 dnl
 
+if test "x${enable_ipmilan}" = "x"; then
+	enable_ipmilan="yes"
+fi
 if test "x${enable_ipmilan}" = "xyes" -o "x${enable_ipmilan}" = "xtry"; then
-	AC_MSG_CHECKING(For libOpenIPMI version 2 or greater)
+	AC_MSG_CHECKING(For libOpenIPMI version 1.4 or greater)
 	AC_TRY_COMPILE([#include <OpenIPMI/ipmiif.h>],
-		       [ #if (OPENIPMI_VERSION_MAJOR < 2 )
+		       [ #if (OPENIPMI_VERSION_MAJOR == 1) && (OPENIPMI_VERSION_MINOR < 4) 
 			 #error "Too Old"
 			 #endif ],
 		       AC_MSG_RESULT("yes"); enable_ipmilan="yes",
@@ -1782,7 +1779,7 @@
 
 AC_ARG_ENABLE([ipmilan],
 [  --enable-ipmilan       enable IPMILan Stonith Plugin
-                          [default=no]])
+                          [default=yes]])
 
 
 CC_WARNINGS=""
@@ -2273,20 +2270,6 @@
 AC_CHECK_FUNCS(getopt, 
 	AC_DEFINE(HAVE_DECL_GETOPT,  1, [Have getopt function]))
 
-
-AC_SUBST(HA_HAVE_ALPHASORT)
-AC_SUBST(HA_HAVE_INET_PTON)
-AC_SUBST(HA_HAVE_SCANDIR)
-AC_SUBST(HA_HAVE_SETENV)
-AC_SUBST(HA_HAVE_STRERROR)
-AC_SUBST(HA_HAVE_UNSETENV)
-AC_SUBST(HA_HAVE_STRNLEN)
-AC_SUBST(HA_HAVE_STRNDUP)
-AC_SUBST(HA_HAVE_DAEMON)
-AC_SUBST(HA_HAVE_UUID_PARSE)
-AC_SUBST(HAVE_STRLCPY)
-AC_SUBST(HAVE_DECL_GETOPT)
-
 AC_CHECK_FUNCS(fcntl)
 AC_CHECK_FUNCS(flock)
 AC_CHECK_FUNCS(inet_aton)
@@ -2516,7 +2499,6 @@
      fi
      dnl None of the following items build without the CRM available
      enable_mgmt=no
-     enable_dopd=no
      enable_cim_provider=no
 fi
 AC_SUBST(CRM_DIR)
@@ -2566,6 +2548,13 @@
 AC_CHECK_HEADERS(gnutls/gnutls.h)
 AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
 
+dnl ************************************************************************
+dnl * Check for (debian style?) $sysconfdir/pam.d/common-{account,auth}
+AC_CHECK_FILE($sysconfdir/pam.d/common-account)
+AC_CHECK_FILE($sysconfdir/pam.d/common-auth)
+AM_CONDITIONAL(USE_PAM_COMMON, test -f $sysconfdir/pam.d/common-account -a \
+				    -f /etc/pam.d/common-auth)
+
 dnl GNUTLS library: Attempt to determine by 'libgnutls-config' program.
 dnl If no 'libgnutls-config', try traditional autoconf means.
 AC_PATH_PROGS(LIBGNUTLS_CONFIG, libgnutls-config)
@@ -2632,10 +2621,13 @@
 
 if test "x${enable_mgmt}" != "xno"; then
   RPM_ENABLE_MGMT_CONFIG=1
+  MGMT_DIR=mgmt
 else
   RPM_ENABLE_MGMT_CONFIG=0
+  MGMT_DIR=""
 fi
 AC_SUBST(RPM_ENABLE_MGMT_CONFIG)
+AC_SUBST(MGMT_DIR)
 
 if test "x${enable_openhpi}" != "xno"; then
   RPM_ENABLE_OPENHPI=1
@@ -2912,16 +2904,6 @@
 	cts/OCFIPraTest.py              	                \
 	cts/CIB.py						\
 	cts/LSBDummy						\
-crm/Makefile							\
-	crm/cib/Makefile					\
-	crm/crmd/Makefile					\
-	crm/pengine/Makefile					\
-	crm/tengine/Makefile					\
-	crm/admin/Makefile					\
-	        crm/admin/crm_primitive.py			\
-	        crm/admin/crm_sh				\
-		crm/admin/crm_utils.py                          \
-		crm/admin/crm_commands.py			\
 debian/Makefile							\
 doc/Makefile							\
 	doc/startstop						\
@@ -2933,11 +2915,7 @@
 	contrib/drbd-outdate-peer/Makefile			\
 include/Makefile						\
         include/clplumbing/Makefile				\
-	include/crm/Makefile					\
-		include/crm/common/Makefile			\
-		include/crm/pengine/Makefile			\
 	include/lrm/Makefile					\
-	include/mgmt/Makefile					\
         include/ocf/Makefile					\
         include/pils/Makefile					\
         include/pils/plugin.h					\
@@ -2949,13 +2927,7 @@
 	lib/apphb/Makefile					\
 	lib/clplumbing/Makefile					\
 	lib/hbclient/Makefile					\
-	lib/crm/Makefile					\
-	lib/crm/common/Makefile					\
-	lib/crm/cib/Makefile					\
-	lib/crm/pengine/Makefile				\
-	lib/crm/transition/Makefile				\
 	lib/lrm/Makefile					\
-	lib/mgmt/Makefile					\
 	lib/pils/Makefile					\
 	lib/plugins/Makefile					\
 		lib/plugins/InterfaceMgr/Makefile		\
@@ -2968,6 +2940,8 @@
 		lib/plugins/stonith/external/ibmrsa		\
 		lib/plugins/stonith/external/riloe		\
 		lib/plugins/stonith/external/ssh		\
+		lib/plugins/stonith/external/hmchttp		\
+		lib/plugins/stonith/external/xen0-ha		\
 		lib/plugins/AppHBNotification/Makefile		\
 		lib/plugins/HBcompress/Makefile			\
 		lib/plugins/quorum/Makefile			\
@@ -2986,11 +2960,6 @@
 	lrm/test/lrmregtest-lsb					\
 	lrm/test/lrmregtest-heartbeat					\
 	lrm/test/testcases/Makefile					\
-mgmt/Makefile							\
-	mgmt/daemon/Makefile					\
-	mgmt/client/Makefile					\
-		mgmt/client/haclient.py				\
-		mgmt/client/mgmtcmd.py				\
 heartbeat/Makefile						\
 	heartbeat/shellfuncs					\
 	heartbeat/rc.d/Makefile					\
@@ -3036,15 +3005,6 @@
 		port/heartbeat/pkg-descr			\
 		port/heartbeat/pkg-install			\
 		port/heartbeat/pkg-plist			\
-snmp_subagent/Makefile						\
-	snmp_subagent/SNMPAgentSanityCheck			\
-cim/Makefile		        				\
-        cim/mof/Makefile                                        \
-        cim/mof/register_providers.sh                           \
-        cim/mof/unregister_providers.sh                         \
-tsa_plugin/Makefile						\
-tsa_plugin/testrun.sh						\
-tsa_plugin/linuxha-adapter					\
 telecom/Makefile						\
 	telecom/apphbd/Makefile					\
 	telecom/recoverymgrd/Makefile				\
@@ -3091,6 +3051,58 @@
 	resources/heartbeat/Xinetd				\
 		)
 
+
+if test "x${enable_crm}" = "xyes"; then
+AC_CONFIG_FILES(					\
+crm/Makefile						\
+	crm/cib/Makefile				\
+	crm/crmd/Makefile				\
+	crm/pengine/Makefile				\
+	crm/tengine/Makefile				\
+	crm/admin/Makefile				\
+	        crm/admin/crm_primitive.py		\
+	        crm/admin/crm_sh			\
+		crm/admin/crm_utils.py                  \
+		crm/admin/crm_commands.py		\
+include/crm/Makefile					\
+	include/crm/common/Makefile			\
+	include/crm/pengine/Makefile			\
+lib/crm/Makefile					\
+	lib/crm/common/Makefile				\
+	lib/crm/cib/Makefile				\
+	lib/crm/pengine/Makefile			\
+	lib/crm/transition/Makefile			\
+	)
+fi
+
+AC_CONFIG_FILES(		  				\
+include/mgmt/Makefile						\
+lib/mgmt/Makefile						\
+mgmt/Makefile							\
+	mgmt/daemon/Makefile					\
+	mgmt/client/Makefile					\
+		mgmt/client/haclient.py				\
+		mgmt/client/mgmtcmd.py				\
+	)
+
+AC_CONFIG_FILES(		  				\
+snmp_subagent/Makefile						\
+	snmp_subagent/SNMPAgentSanityCheck			\
+	)
+
+AC_CONFIG_FILES(		  				\
+cim/Makefile		        				\
+        cim/mof/Makefile                                        \
+        cim/mof/register_providers.sh                           \
+        cim/mof/unregister_providers.sh                         \
+	)
+
+AC_CONFIG_FILES(		  				\
+	tsa_plugin/Makefile					\
+	tsa_plugin/testrun.sh					\
+	tsa_plugin/linuxha-adapter				\
+	)
+
 dnl Now process the entire list of files added by previous 
 dnl  calls to AC_CONFIG_FILES()
 AC_OUTPUT()
@@ -3114,7 +3126,7 @@
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE configuration:])
-AC_MSG_RESULT([  Version              = "$VERSION"])
+AC_MSG_RESULT([  Version                  = "$VERSION"])
 
 AC_MSG_RESULT([  Executables              = "$my_sbindir"])
 AC_MSG_RESULT([  Man pages                = "$my_mandir"])
@@ -3132,7 +3144,7 @@
 AC_MSG_RESULT([  HA user name             = "${HA_CCMUSER}"])
 AC_MSG_RESULT([  HA user user id          = "${HA_CCMUID}"])
 
-AC_MSG_RESULT([  Build snmp subagent  = "${enable_snmp_subagent}"])
+AC_MSG_RESULT([  Build snmp subagent      = "${enable_snmp_subagent}"])
 if test "x${enable_snmp_subagent}" = "xyes"; then
     AC_MSG_RESULT([  SNMP MIB directory       = "${MIBS_DIR}"])
     AC_MSG_RESULT([  SNMP agent libraries     = "${SNMPAGENTLIB}"])
@@ -3140,8 +3152,8 @@
 AC_MSG_RESULT([  SNMP libraries           = "${SNMPLIB}"])
 AC_MSG_RESULT([  ucd_snmp_devel name      = "${UCDSNMPDEVEL}"])
 
-AC_MSG_RESULT([  Build CRM            = "${enable_crm}"])
-AC_MSG_RESULT([  Build LRM            = "${enable_lrm}"])
+AC_MSG_RESULT([  Build CRM                = "${enable_crm}"])
+AC_MSG_RESULT([  Build LRM                = "${enable_lrm}"])
 AC_MSG_RESULT([  Build Ldirectord         = "${enable_ldirectord}"])
 AC_MSG_RESULT([  Build IPMILan Plugin     = "${enable_ipmilan}"])
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/drbd-outdate-peer/dopd.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/drbd-outdate-peer/dopd.c
--- heartbeat-2.1.3/contrib/drbd-outdate-peer/dopd.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/contrib/drbd-outdate-peer/dopd.c	2008-08-18 13:32:19.000000000 +0100
@@ -202,14 +202,17 @@
 }
 
 /* check_drbd_peer()
- * walk the nodes and return TRUE if peer is not this node and it exists.
+ * walk the nodes and return
+ *  FALSE if peer is not found, not a "normal" node, or "dead"
+ *    (no point in trying to reach those nodes).
+ *  TRUE if peer is found to be alive and "normal".
  */
 gboolean
 check_drbd_peer(const char *drbd_peer)
 {
 	const char *node;
 	gboolean found = FALSE;
-	if (!strcmp(drbd_peer, node_name)) {
+	if (!strcasecmp(drbd_peer, node_name)) {
 		cl_log(LOG_WARNING, "drbd peer node %s is me!\n", drbd_peer);
 		return FALSE;
 	}
@@ -306,9 +309,9 @@
 			} else
 				pthread_mutex_unlock(&conn_mutex);
 		} else {
-			/* wrong peer was specified,
-			   send return code 20 to the client */
-			send_to_client(curr_client, "20");
+			/* peer "dead" or not in node list.
+			 * return "peer could not be reached" */
+			send_to_client(curr_client, "5");
 		}
 
 		ha_msg_del(msg);
@@ -347,7 +350,6 @@
 				client->id, client->source);
 		G_main_del_IPC_Channel(client->source);
 		client->source = NULL;
-		//cl_free(client->drbd_res);
 	}
 	cl_free(client->id);
 	cl_free(client);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/drbd-outdate-peer/drbd-peer-outdater.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/drbd-outdate-peer/drbd-peer-outdater.c
--- heartbeat-2.1.3/contrib/drbd-outdate-peer/drbd-peer-outdater.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/contrib/drbd-outdate-peer/drbd-peer-outdater.c	2008-08-18 13:32:19.000000000 +0100
@@ -76,7 +76,7 @@
 
 	msg = msgfromIPC_noauth(server);
 	if (!msg) {
-		fprintf(stderr, "no message from server or other "
+		cl_log(LOG_WARNING, "no message from server or other "
 				"instance is running\n");
 		if (client->mainloop != NULL &&
 		    g_main_is_running(client->mainloop))
@@ -92,7 +92,7 @@
 	errno = 0;
 	rc = strtol(rc_string, &ep, 10);
 	if (errno != 0 || *ep != EOS) {
-		fprintf(stderr, "unknown message: %s from server", rc_string);
+		cl_log(LOG_WARNING, "unknown message: %s from server", rc_string);
 		client->rc = 20; /* "officially undefined", unspecified error */
 		ha_msg_del(msg);
 		if (client->mainloop != NULL &&
@@ -124,7 +124,7 @@
 outdater_timeout_dispatch(gpointer user_data)
 {
 	dop_client_t *client = (dop_client_t *)user_data;
-	fprintf(stderr, "error: could not connect to dopd after %i seconds"
+	cl_log(LOG_WARNING, "error: could not connect to dopd after %i seconds"
 			": timeout reached\n", client->timeout);
 	if (client->mainloop != NULL && g_main_is_running(client->mainloop))
 		g_main_quit(client->mainloop);
@@ -255,7 +255,7 @@
 					 (gpointer)new_client, &ipc_server);
 
 	if (ipc_server == NULL) {
-		fprintf(stderr, "Could not connect to "T_OUTDATER" channel\n");
+		cl_log(LOG_WARNING, "Could not connect to "T_OUTDATER" channel\n");
 		dop_exit(new_client); /* unreachable */
 	}
 
@@ -267,7 +267,7 @@
 	ha_msg_add(update, F_OUTDATER_RES, drbd_resource);
 
 	if (msg2ipcchan(update, ipc_server) != HA_OK) {
-		fprintf(stderr, "Could not send message\n");
+		cl_log(LOG_WARNING, "Could not send message\n");
 		dop_exit(new_client);
 	}
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/drbd-outdate-peer/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/drbd-outdate-peer/Makefile.in
--- heartbeat-2.1.3/contrib/drbd-outdate-peer/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/contrib/drbd-outdate-peer/Makefile.in	2008-08-18 23:37:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -57,7 +57,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -105,6 +105,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -122,24 +123,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -201,12 +190,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -418,8 +408,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -485,8 +475,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -498,8 +488,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -509,13 +499,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/ipfail/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/ipfail/Makefile.in
--- heartbeat-2.1.3/contrib/ipfail/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/contrib/ipfail/Makefile.in	2008-08-18 23:37:51.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -53,7 +53,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -101,6 +101,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -118,24 +119,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -197,12 +186,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -413,8 +403,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -476,8 +466,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -489,8 +479,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -500,13 +490,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/Makefile.in
--- heartbeat-2.1.3/contrib/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/contrib/Makefile.in	2008-08-18 23:37:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -461,8 +451,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -487,8 +477,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -498,13 +488,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/contrib/mlock/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/contrib/mlock/Makefile.in
--- heartbeat-2.1.3/contrib/mlock/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/contrib/mlock/Makefile.in	2008-08-18 23:37:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -52,7 +52,7 @@
 am__DEPENDENCIES_1 =
 mlock_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/replace/libreplace.la
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -100,6 +100,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -117,24 +118,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -196,12 +185,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -407,8 +397,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -470,8 +460,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -483,8 +473,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -494,13 +484,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/ccm_epoche.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/ccm_epoche.c
--- heartbeat-2.1.3/crm/admin/ccm_epoche.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/ccm_epoche.c	2008-08-18 13:32:19.000000000 +0100
@@ -37,7 +37,6 @@
 #include <crm/crm.h>
 
 
-const char* crm_system_name = "ccm_tool";
 oc_ev_t *ccm_token = NULL;
 int command = 0;
 
@@ -60,7 +59,7 @@
 	fd_set rset;	
 	oc_ev_t *ccm_token = NULL;
 	
-	crm_log_init(crm_system_name, LOG_INFO, FALSE, FALSE, 0, NULL);
+	crm_log_init("ccm_tool", LOG_WARNING, FALSE, FALSE, 0, NULL);
 
 	while ((flag = getopt(argc, argv, OPTARGS)) != EOF) {
 		switch(flag) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/cibadmin.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/cibadmin.c
--- heartbeat-2.1.3/crm/admin/cibadmin.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/cibadmin.c	2008-08-18 13:32:19.000000000 +0100
@@ -52,7 +52,6 @@
 int message_timeout_ms = 30*1000;
 
 GMainLoop *mainloop = NULL;
-const char *crm_system_name = "cibadmin";
 IPC_Channel *crmd_channel = NULL;
 
 const char *host = NULL;
@@ -88,6 +87,7 @@
 int operation_status = 0;
 cib_t *the_cib = NULL;
 
+gboolean force_flag = FALSE;
 #define OPTARGS	"V?o:QDUCEX:t:Srwlsh:MmBfbdRx:pP5"
 
 int
@@ -97,6 +97,7 @@
 	int flag;
 	char *admin_input_xml = NULL;
 	char *admin_input_file = NULL;
+	gboolean dangerous_cmd = FALSE;
 	gboolean admin_input_stdin = FALSE;
 	crm_data_t *output = NULL;
 	crm_data_t *input = NULL;
@@ -122,6 +123,7 @@
 		{"md5-sum",	 0, 0, '5'},
 		
 		{"force-quorum",0, 0, 'f'},
+		{"force",	0, 0, 'f'},
 		{"local",	0, 0, 'l'},
 		{"sync-call",	0, 0, 's'},
 		{"no-bcast",	0, 0, 'b'},
@@ -184,6 +186,7 @@
 				
 			case 'E':
 				cib_action = CIB_OP_ERASE;
+				dangerous_cmd = TRUE;
 				break;
 			case 'Q':
 				cib_action = CIB_OP_QUERY;
@@ -221,9 +224,11 @@
 				cib_action = CIB_OP_BUMP;
 				break;
 			case 'r':
+				dangerous_cmd = TRUE;
 				cib_action = CIB_OP_SLAVE;
 				break;
 			case 'w':
+				dangerous_cmd = TRUE;
 				cib_action = CIB_OP_MASTER;
 				command_options |= cib_scope_local;
 				break;
@@ -257,6 +262,7 @@
 				command_options |= cib_scope_local;
 				break;
 			case 'b':
+				dangerous_cmd = TRUE;
 				command_options |= cib_inhibit_bcast;
 				command_options |= cib_scope_local;
 				break;
@@ -264,6 +270,7 @@
 				command_options |= cib_sync_call;
 				break;
 			case 'f':
+				force_flag = TRUE;
 				command_options |= cib_quorum_override;
 				break;
 			default:
@@ -280,19 +287,25 @@
 		while (optind < argc)
 			printf("%s ", argv[optind++]);
 		printf("\n");
+		usage(crm_system_name, LSB_EXIT_EINVAL);
 	}
 
-	if (optind > argc) {
-		++argerr;
-	}
-
-	if(cib_action == NULL) {
-		usage(crm_system_name, cib_operation);
+	if (optind > argc || cib_action == NULL) {
+	    ++argerr;
 	}
 	
 	if (argerr) {
 		usage(crm_system_name, LSB_EXIT_GENERIC);
 	}
+
+	if(dangerous_cmd && force_flag == FALSE) {
+	    fprintf(stderr, "The supplied command is considered dangerous."
+		    "  To prevent accidental destruction of the cluster,"
+		    " the --force flag is required in order to proceed.\n");
+	    fflush(stderr);
+	    usage(crm_system_name, LSB_EXIT_GENERIC);
+	    
+	}
 	
 	if(admin_input_file != NULL) {
 		FILE *xml_strm = fopen(admin_input_file, "r");
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crmadmin.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crmadmin.c
--- heartbeat-2.1.3/crm/admin/crmadmin.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crmadmin.c	2008-08-18 13:32:19.000000000 +0100
@@ -59,7 +59,7 @@
 void usage(const char *cmd, int exit_status);
 ll_cluster_t *do_init(void);
 int do_work(ll_cluster_t * hb_cluster);
-void crmd_ipc_connection_destroy(gpointer user_data);
+void crmadmin_ipc_connection_destroy(gpointer user_data);
 
 gboolean admin_msg_callback(IPC_Channel * source_data, void *private_data);
 char *pluralSection(const char *a_section);
@@ -102,7 +102,6 @@
 
 int operation_status = 0;
 const char *sys_to = NULL;
-const char *crm_system_name = NULL;
 
 #define OPTARGS	"V?K:S:HE:Dd:i:RNqt:Bv"
 
@@ -143,13 +142,10 @@
 	};
 #endif
 
-	crm_system_name = basename(argv[0]);
-
+	crm_log_init(basename(argv[0]), LOG_ERR, FALSE, TRUE, argc, argv);
 	if(argc < 2) {
 		usage(crm_system_name, LSB_EXIT_EINVAL);
 	}
-
-	crm_log_init(crm_system_name, LOG_ERR, FALSE, TRUE, argc, argv);
 	
 	while (1) {
 #ifdef HAVE_GETOPT_H
@@ -164,11 +160,6 @@
 		switch(flag) {
 #ifdef HAVE_GETOPT_H
 			case 0:
-				printf("option %s", long_options[option_index].name);
-				if (optarg)
-					printf(" with arg %s", optarg);
-				printf("\n");
-			
 				if (strcasecmp("reference",
 					   long_options[option_index].name) == 0) {
 					this_msg_reference =
@@ -454,9 +445,14 @@
 }
 
 void
-crmd_ipc_connection_destroy(gpointer user_data)
+crmadmin_ipc_connection_destroy(gpointer user_data)
 {
-	crm_debug("Connection to CRMd was terminated");
+    crm_err("Connection to CRMd was terminated");
+    if(mainloop) {
+	g_main_quit(mainloop);
+    } else {
+	exit(1);
+    }
 }
 
 
@@ -485,7 +481,7 @@
 		send_hello_message(
 			crmd_channel, admin_uuid, crm_system_name,"0", "1");
 
-		set_IPC_Channel_dnotify(src, crmd_ipc_connection_destroy);
+		set_IPC_Channel_dnotify(src, crmadmin_ipc_connection_destroy);
 		
 		return hb_cluster;
 	} 
@@ -608,8 +604,7 @@
 		crm_debug_2(
 		       "Recieved expected number (%d) of messages from Heartbeat."
 		       "  Exiting normally.", expected_responses);
-		g_main_quit(mainloop);
-		return !hack_return_good;
+		exit(0);
 	}
 
 	message_timer_id = Gmain_timeout_add(
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_attribute.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_attribute.c
--- heartbeat-2.1.3/crm/admin/crm_attribute.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crm_attribute.c	2008-08-18 13:32:19.000000000 +0100
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
+#include <time.h>
 
 #include <heartbeat.h>
 #include <hb_api.h>
@@ -62,7 +63,6 @@
 const char *rsc_id     = NULL;
 const char *dest_uname = NULL;
 const char *attr_value = NULL;
-const char *crm_system_name = "crm_master";
 
 #define OPTARGS	"V?GDQU:u:s:n:v:l:t:i:!r:"
 
@@ -101,8 +101,7 @@
 	};
 #endif
 
-	crm_system_name = basename(argv[0]);
-	crm_log_init(crm_system_name, LOG_ERR, FALSE, FALSE, argc, argv);
+	crm_log_init(basename(argv[0]), LOG_ERR, FALSE, FALSE, argc, argv);
 	
 	if(argc < 2) {
 		usage(crm_system_name, LSB_EXIT_EINVAL);
@@ -134,6 +133,7 @@
 				break;
 			case 'D':
 				DO_DELETE = TRUE;
+				DO_WRITE = FALSE;
 				break;
 			case 'U':
 				crm_debug_2("Option %c => %s", flag, optarg);
@@ -280,6 +280,13 @@
 			fprintf(stderr,"Please specify a node with -U or -u\n");
 			return 1;	
 		}
+		
+		if(DO_WRITE && char2score(attr_value) <= 0) {
+		    if(safe_str_neq(attr_value, "0")) {
+			fprintf(stderr,"%s is an inappropriate value for a failcount.\n", attr_value);
+			return 1;
+		    }
+                }
 	
 		set_name = NULL;
 		attr_name = crm_concat("fail-count", rsc_id, '-');
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_mon.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_mon.c
--- heartbeat-2.1.3/crm/admin/crm_mon.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crm_mon.c	2008-08-18 13:32:19.000000000 +0100
@@ -54,9 +54,7 @@
 
 
 /* GMainLoop *mainloop = NULL; */
-const char *crm_system_name = "crm_mon";
-
-#define OPTARGS	"V?i:nrh:cdp:s1wX:"
+#define OPTARGS	"V?i:nrh:cdp:s1wX:oft"
 
 
 void usage(const char *cmd, int exit_status);
@@ -70,6 +68,7 @@
 void make_daemon(gboolean daemonize, const char *pidfile);
 gboolean mon_timer_popped(gpointer data);
 void mon_update(const HA_Message*, int, int, crm_data_t*,void*);
+void clean_up(int rc);
 
 char *xml_file = NULL;
 char *as_html_file = NULL;
@@ -87,10 +86,40 @@
 int failed_connections = 0;
 gboolean one_shot = FALSE;
 gboolean has_warnings = FALSE;
+gboolean print_failcount = FALSE;
+gboolean print_operations = FALSE;
+gboolean print_timing = FALSE;
+
+/*
+ * Non-mainloop signal handler.
+ */
+static void
+mon_shutdown_wrapper(int nsig)
+{
+    clean_up(LSB_EXIT_OK);
+}
+
+/*
+ * Mainloop signal handler.
+ */
+static gboolean
+mon_shutdown(int nsig, gpointer unused)
+{
+    clean_up(-1);
+    if (mainloop && g_main_is_running(mainloop)) {
+	g_main_quit(mainloop);
+	
+    } else {
+	exit(LSB_EXIT_OK);
+    }
+    return FALSE;
+}
 
 #if CURSES_ENABLED
 #  define print_as(fmt...) if(as_console) {	\
 		printw(fmt);			\
+		clrtoeol();			\
+		refresh();			\
 	} else {				\
 		fprintf(stdout, fmt);		\
 	}
@@ -113,6 +142,9 @@
 		{"interval", 1, 0, 'i'},
 		{"group-by-node", 0, 0, 'n'},
 		{"inactive", 0, 0, 'r'},
+		{"failcounts", 0, 0, 'f'},		
+		{"operations", 0, 0, 'o'},		
+		{"timing-details", 0, 0, 't'},		
 		{"as-html", 1, 0, 'h'},		
 		{"web-cgi", 0, 0, 'w'},
 		{"simple-status", 0, 0, 's'},
@@ -126,8 +158,7 @@
 	};
 #endif
 	pid_file = crm_strdup("/tmp/ClusterMon.pid");
-	crm_system_name = basename(argv[0]);
-	crm_log_init(crm_system_name, LOG_ERR-1, FALSE, FALSE, 0, NULL);
+	crm_log_init(basename(argv[0]), LOG_ERR-1, FALSE, FALSE, 0, NULL);
 
 	if (strcmp(crm_system_name, "crm_mon.cgi")==0) {
 		web_cgi = TRUE;
@@ -161,7 +192,18 @@
 			case 'd':
 				daemonize = TRUE;
 				break;
+			case 't':
+				print_timing = TRUE;
+				print_operations = TRUE;
+				break;
+			case 'o':
+				print_operations = TRUE;
+				break;
+			case 'f':
+				print_failcount = TRUE;
+				break;
 			case 'p':
+				crm_free(pid_file);
 				pid_file = crm_strdup(optarg);
 				break;
 			case 'X':
@@ -190,6 +232,9 @@
 			case '1':
 				one_shot = TRUE;
 				break;
+			case '?':
+				usage(crm_system_name, LSB_EXIT_OK);
+				break;
 			default:
 				printf("Argument code 0%o (%c) is not (?yet?) supported\n", flag, flag);
 				++argerr;
@@ -207,6 +252,10 @@
 		usage(crm_system_name, LSB_EXIT_GENERIC);
 	}
 
+	/* Set signal callback function. */
+	signal(SIGTERM, mon_shutdown_wrapper);
+	signal(SIGINT, mon_shutdown_wrapper);
+
 	if(as_html_file == NULL && !web_cgi && !simple_status) {
 #if CURSES_ENABLED
 		as_console = TRUE;
@@ -263,7 +312,13 @@
 	}
 
 	mon_timer_popped(NULL);
+
+	G_main_add_SignalHandler(
+		G_PRIORITY_HIGH, SIGTERM, mon_shutdown, NULL, NULL);
+	G_main_add_SignalHandler(
+		G_PRIORITY_HIGH, SIGINT, mon_shutdown, NULL, NULL);
 	g_main_run(mainloop);
+	g_main_destroy(mainloop);
 	return_to_orig_privs();
 	
 	crm_info("Exiting %s", crm_system_name);	
@@ -324,7 +379,8 @@
 
 		} else if (simple_status || one_shot) {
 			fprintf(stdout, "Critical: Unable to connect to the CIB\n");
-			exit(2);
+			clean_up(LSB_EXIT_GENERIC);
+
 		} else {
 			failed_connections++;
 			CRM_DEV_ASSERT(cib_conn->cmds->signoff(cib_conn) == cib_ok);
@@ -363,30 +419,34 @@
 		CRM_DEV_ASSERT(safe_str_eq(crm_element_name(cib), XML_TAG_CIB));
 #endif		
 		if(as_html_file || web_cgi) {
-			print_html_status(cib, as_html_file, web_cgi);
+			if (print_html_status(cib, as_html_file, web_cgi) != 0) {
+				fprintf(stderr, "Critical: Unable to output html file\n");
+				clean_up(LSB_EXIT_GENERIC);
+			}
 		} else if (simple_status) {
 			print_simple_status(cib);
 			if (has_warnings) {
-				exit(1); 
+				clean_up(LSB_EXIT_GENERIC);
 			}
 		} else {
 			print_status(cib);
 		}
 		if(one_shot) {
-			exit(LSB_EXIT_OK);
+			clean_up(LSB_EXIT_OK);
 		}
 		
 			
 	} else if(simple_status) {
-		fprintf(stderr, "Critical: query failed: %s", cib_error2string(rc));
-		exit(2);
+		fprintf(stderr, "Critical: query failed: %s\n", cib_error2string(rc));
+		clean_up(LSB_EXIT_GENERIC);
+		
 	} else if(one_shot) {
-		fprintf(stderr, "Query failed: %s", cib_error2string(rc));
-		exit(LSB_EXIT_OK);
+		fprintf(stderr, "Query failed: %s\n", cib_error2string(rc));
+		clean_up(LSB_EXIT_OK);
 
 	} else {
 		CRM_DEV_ASSERT(cib_conn->cmds->signoff(cib_conn) == cib_ok);
-		crm_err("Query failed: %s", cib_error2string(rc));
+		print_as("Query failed: %s", cib_error2string(rc));
 		prefix = "Query failed! ";
 		
 	}
@@ -397,6 +457,7 @@
 wait_for_refresh(int offset, const char *prefix, int msec) 
 {
 	int lpc = msec / 1000;
+	struct timespec sleept = {1 , 0};
 
 	if(as_console == FALSE) {
 		timer_id = Gmain_timeout_add(msec, mon_timer_popped, NULL);
@@ -417,7 +478,9 @@
 			timer_id = Gmain_timeout_add(
 				1000, mon_timer_popped, NULL);
 		} else {
-			sleep(1);
+			if (nanosleep(&sleept, NULL) != 0) {
+				return;
+			}
 		}
 	}
 }
@@ -432,6 +495,198 @@
 		has_warnings = TRUE;			\
 	} while(0)
 
+static int get_failcount(node_t *node, resource_t *rsc, int *last_failure, pe_working_set_t *data_set) 
+{
+    int fail_count = 0;
+    resource_t *failed = rsc;
+    char *fail_attr = crm_concat("fail-count", rsc->id, '-');
+    const char *value = g_hash_table_lookup(node->details->attrs, fail_attr);
+
+    *last_failure = 0;
+    if(is_not_set(rsc->flags, pe_rsc_unique)) {
+	failed = uber_parent(rsc);
+    }
+    
+    if(value != NULL) {
+	fail_count = char2score(value);
+	crm_info("%s has failed %d times on %s",
+		 rsc->id, fail_count, node->details->uname);
+    }
+    crm_free(fail_attr);
+    return fail_count;
+}
+
+static void get_ping_score(node_t *node, pe_working_set_t *data_set) 
+{
+    const char *attr = "pingd";
+    const char *value = NULL;
+    value = g_hash_table_lookup(node->details->attrs, attr);
+    
+    if(value != NULL) {
+	print_as(" %s=%s", attr, value);
+    }
+}
+
+static void print_date(time_t time) 
+{
+    int lpc = 0;
+    char date_str[26];
+    asctime_r(localtime(&time), date_str);
+    for(; lpc < 26; lpc++) {
+	if(date_str[lpc] == '\n') {
+	    date_str[lpc] = 0;
+	}
+    }
+    print_as("'%s'", date_str);
+}
+
+static void print_rsc_summary(pe_working_set_t *data_set, node_t *node, resource_t *rsc, gboolean all)
+{
+    gboolean printed = FALSE;
+    time_t last_failure = 0;
+    int failcount = get_failcount(node, rsc, (int*)&last_failure, data_set);	
+
+    if(all || failcount || last_failure > 0) {
+	printed = TRUE;
+	print_as("   %s: ", rsc->id);
+    }
+
+    if(failcount > 0) {
+	printed = TRUE;
+	print_as(" fail-count=%d", failcount);
+    }
+    
+    if(last_failure > 0) {
+	printed = TRUE;
+	print_as(" last-failure=");
+	print_date(last_failure);
+    }
+
+    if(printed) {
+	print_as("\n");
+    }
+}
+
+
+static void print_rsc_history(pe_working_set_t *data_set, node_t *node, crm_data_t *rsc_entry)
+{
+    GListPtr op_list = NULL;
+    gboolean print_name = TRUE;
+    GListPtr sorted_op_list = NULL;
+    const char *rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);
+    resource_t *rsc = pe_find_resource(data_set->resources, rsc_id);
+
+    xml_child_iter_filter(
+	rsc_entry, rsc_op, XML_LRM_TAG_RSC_OP,
+	op_list = g_list_append(op_list, rsc_op);
+	);
+    
+    sorted_op_list = g_list_sort(op_list, sort_op_by_callid);
+    
+    slist_iter(xml_op, crm_data_t, sorted_op_list, lpc,
+	       const char *value = NULL;
+	       const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
+	       const char *op_rc = crm_element_value(xml_op, XML_LRM_ATTR_RC);
+	       const char *interval = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
+	       int rc = crm_parse_int(op_rc, "0");
+	       
+	       if(safe_str_eq(task, CRMD_ACTION_STATUS)
+		  && safe_str_eq(interval, "0")) {
+		   task = "probe";
+	       }
+	       
+	       if(rc == 7 && safe_str_eq(task, "probe")) {
+		   continue;
+		   
+	       } else if(safe_str_eq(task, CRMD_ACTION_NOTIFY)) {
+		   continue;
+	       }
+	       
+	       if(print_name) {
+		   print_name = FALSE;
+		   print_rsc_summary(data_set, node, rsc, TRUE);
+	       }
+	       
+	       print_as("    + %s:", task);
+	       if(safe_str_neq(interval, "0")) {
+		   print_as(" interval=%sms", interval);
+	       }
+
+	       if(print_timing) {
+		   int int_value;
+		   value = crm_element_value(xml_op, "last_rc_change");
+		   if(value) {
+		       int_value = crm_parse_int(value, NULL);
+		       print_as(" last-rc-change=");
+		       print_date(int_value);
+		   }
+		   
+		   value = crm_element_value(xml_op, "last_run");
+		   if(value) {
+		       int_value = crm_parse_int(value, NULL);
+		       print_as(" last-run=");
+		       print_date(int_value);
+		   }
+		   
+		   value = crm_element_value(xml_op, "exec_time");
+		   if(value) {
+		       int_value = crm_parse_int(value, NULL);
+		       print_as(" exec-time=");
+		       print_date(int_value);
+		   }
+		   
+		   value = crm_element_value(xml_op, "queue_time");
+		   if(value) {
+		       int_value = crm_parse_int(value, NULL);
+		       print_as(" queue-time=");
+		       print_date(int_value);
+		   }
+	       }
+	       
+	       print_as(" rc=%s (%s)\n", op_rc, execra_code2string(rc));
+	       
+	);
+    
+    /* no need to free the contents */
+    g_list_free(sorted_op_list);
+}
+
+static void print_node_summary(pe_working_set_t *data_set, gboolean operations)
+{
+    crm_data_t *lrm_rsc = NULL;
+    crm_data_t *cib_status = get_object_root(XML_CIB_TAG_STATUS, data_set->input);
+
+    if(operations) {
+	print_as("\nOperations:\n");
+    } else {
+	print_as("\nFailcount summary:\n");
+    }
+    
+    xml_child_iter_filter(
+	cib_status, node_state, XML_CIB_TAG_STATE,
+	node_t *node = pe_find_node_id(data_set->nodes, ID(node_state));
+	print_as("* Node %s: ", crm_element_value(node_state, XML_ATTR_UNAME));
+	get_ping_score(node, data_set); 
+	print_as("\n");
+	
+	lrm_rsc = find_xml_node(node_state, XML_CIB_TAG_LRM, FALSE);
+	lrm_rsc = find_xml_node(lrm_rsc, XML_LRM_TAG_RESOURCES, FALSE);
+	
+	xml_child_iter_filter(
+	    lrm_rsc, rsc_entry, XML_LRM_TAG_RESOURCE,
+
+	    if(operations) {
+		print_rsc_history(data_set, node, rsc_entry);
+
+	    } else {
+		const char *rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);
+		resource_t *rsc = pe_find_resource(data_set->resources, rsc_id);
+		print_rsc_summary(data_set, node, rsc, FALSE);
+	    }
+	    );
+	);
+}
+
 int
 print_simple_status(crm_data_t *cib) 
 {
@@ -451,7 +706,7 @@
 	}
 
 	slist_iter(node, node_t, data_set.nodes, lpc2,
-		   if(node->details->standby) {
+		   if(node->details->standby && node->details->online) {
 			   nodes_standby++;
 		   } else if(node->details->online) {
 			   nodes_online++;
@@ -529,10 +784,14 @@
 
 	slist_iter(node, node_t, data_set.nodes, lpc2,
 		   const char *node_mode = "OFFLINE";
-		   if(node->details->standby) {
-			   node_mode = "standby";
+		   if(node->details->standby && node->details->online) {
+		       node_mode = "standby";
+
+		   } else if(node->details->standby) {
+		       node_mode = "OFFLINE (standby)";
+
 		   } else if(node->details->online) {
-			   node_mode = "online";
+		       node_mode = "online";
 		   }
 		   
 		   print_as("Node: %s (%s): %s\n",
@@ -573,6 +832,10 @@
 			);
 	}
 
+	if(print_operations || print_failcount) {
+	    print_node_summary(&data_set, print_operations);
+	}
+	
 	if(xml_has_children(data_set.failed)) {
 		print_as("\nFailed actions:\n");
 		xml_child_iter(data_set.failed, xml_op, 
@@ -614,8 +877,8 @@
 	} else {
 		filename_tmp = crm_concat(filename, "tmp", '.');
 		stream = fopen(filename_tmp, "w");
-		cl_perror("Cannot open %s for writing", filename_tmp);
 		if(stream == NULL) {
+			cl_perror("Cannot open %s for writing", filename_tmp);
 			crm_free(filename_tmp);
 			return -1;
 		}	
@@ -692,16 +955,22 @@
 	fprintf(stream, "<ul>\n");
 	slist_iter(node, node_t, data_set.nodes, lpc2,
 		   fprintf(stream, "<li>");
-		   fprintf(stream, "Node: %s (%s): %s",
-			     node->details->uname, node->details->id,
-			     node->details->online?"<font color=\"green\">online</font>\n":"<font color=\"orange\"><b>OFFLINE</b></font>\n");
+		   if(node->details->standby && node->details->online) {
+			fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"orange\">standby</font>\n");
+		   } else if(node->details->standby) {
+			fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"red\">OFFLINE (standby)</font>\n");
+		   } else if(node->details->online) {
+			fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"green\">online</font>\n");
+		   } else {
+			 fprintf(stream, "Node: %s (%s): %s",node->details->uname, node->details->id,"<font color=\"red\">OFFLINE</font>\n");
+		   }
 		   if(group_by_node) {
 			   fprintf(stream, "<ul>\n");
 			   slist_iter(rsc, resource_t,
 				      node->details->running_rsc, lpc2,
 				      fprintf(stream, "<li>");
 				      rsc->fns->print(rsc, NULL,
-						      pe_print_html, stream);
+						      pe_print_html|pe_print_rsconly, stream);
 				      fprintf(stream, "</li>\n");
 				   );
 			   fprintf(stream, "</ul>\n");
@@ -752,6 +1021,7 @@
 		clrtoeol();
 	}
 	move(0, 0);
+	refresh();
 #endif
 }
 
@@ -767,8 +1037,10 @@
 	fprintf(stream, "\t--%s (-%c) \t: This text\n", "help", '?');
 	fprintf(stream, "\t--%s (-%c) \t: Increase the debug output\n", "verbose", 'V');
 	fprintf(stream, "\t--%s (-%c) <seconds>\t: Update frequency\n", "interval", 'i');
-	fprintf(stream, "\t--%s (-%c) \t:Group resources by node\n", "group-by-node", 'n');
-	fprintf(stream, "\t--%s (-%c) \t:Display inactive resources\n", "inactive", 'r');
+	fprintf(stream, "\t--%s (-%c) \t: Group resources by node\n", "group-by-node", 'n');
+	fprintf(stream, "\t--%s (-%c) \t: Display inactive resources\n", "inactive", 'r');
+	fprintf(stream, "\t--%s (-%c) \t: Display resource fail counts\n", "failcount", 'f');
+	fprintf(stream, "\t--%s (-%c) \t: Display resource operation history\n", "operations", 'o');
 	fprintf(stream, "\t--%s (-%c) \t: Display cluster status on the console\n", "as-console", 'c');
 	fprintf(stream, "\t--%s (-%c) \t: Display the cluster status once as "
 		"a simple one line output (suitable for nagios)\n", "simple-status", 's');
@@ -781,7 +1053,7 @@
 
 	fflush(stream);
 
-	exit(exit_status);
+	clean_up(exit_status);
 }
 
 void
@@ -799,16 +1071,16 @@
 		fprintf(stderr, "%s: could not start daemon\n",
 			crm_system_name);
 		perror("fork");
-		exit(LSB_EXIT_GENERIC);
+		clean_up(LSB_EXIT_GENERIC);
 	} else if (pid > 0) {
-		exit(LSB_EXIT_OK);
+		clean_up(LSB_EXIT_OK);
 	}
 	
 	if (cl_lock_pidfile(pidfile) < 0 ){
 		pid = cl_read_pidfile(pidfile);
 		fprintf(stderr, "%s: already running [pid %ld].\n",
 			crm_system_name, pid);
-		exit(LSB_EXIT_OK);
+		clean_up(LSB_EXIT_OK);
 	}
 	
 	umask(022);
@@ -819,3 +1091,33 @@
 	close(FD_STDERR);
 	(void)open(devnull, O_WRONLY);		/* Stderr: fd 2 */
 }
+
+/*
+ * De-init ncurses, signoff from the CIB and deallocate memory.
+ */
+void clean_up(int rc)
+{
+#if CURSES_ENABLED
+    if(as_console) {
+	as_console = FALSE;
+	echo();
+	nocbreak();
+	endwin();
+    }
+#endif
+    
+    if (cib_conn != NULL) {
+	cib_conn->cmds->signoff(cib_conn);
+	cib_delete(cib_conn);
+	cib_conn = NULL;
+    }
+
+    crm_free(as_html_file);
+    crm_free(xml_file);
+    crm_free(pid_file);
+
+    if(rc >= 0) {
+	exit(rc);
+    }
+    return;
+}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_resource.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_resource.c
--- heartbeat-2.1.3/crm/admin/crm_resource.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crm_resource.c	2008-08-18 13:32:19.000000000 +0100
@@ -57,7 +57,6 @@
 char *host_id = NULL;
 const char *rsc_id = NULL;
 const char *host_uname = NULL;
-const char *crm_system_name = NULL;
 const char *prop_name = NULL;
 const char *prop_value = NULL;
 const char *rsc_type = NULL;
@@ -672,7 +671,7 @@
 				" with cibadmin\n", rsc_id, existing_node);
 			CMD_ERR("\tThis will be the case even if %s is"
 				" the last node in the cluster\n", existing_node);
-			CMD_ERR("\tThis messgae can be disabled with -Q\n");
+			CMD_ERR("\tThis message can be disabled with -Q\n");
 		}
 		
 		crm_xml_add(dont_run, "rsc", rsc_id);
@@ -822,6 +821,7 @@
 		{"property-value",  1, 0, 'v'},
 		{"get-property",    1, 0, 'G'},
 		{"set-property",    1, 0, 'S'},
+		{"set-name",        1, 0, 's'},
 		{"resource-type",   1, 0, 't'},
 
 		{"xml-file", 0, 0, 'X'},		
@@ -830,13 +830,11 @@
 	};
 #endif
 
-	crm_system_name = basename(argv[0]);
-	
 	if(argc < 2) {
 		usage(crm_system_name, LSB_EXIT_EINVAL);
 	}
 	
-	crm_log_init(crm_system_name, LOG_WARNING, FALSE, FALSE, argc, argv);
+	crm_log_init(basename(argv[0]), LOG_WARNING, FALSE, FALSE, argc, argv);
 
 	while (1) {
 #ifdef HAVE_GETOPT_H
@@ -952,10 +950,11 @@
 		}
 	}
 
-	if (optind < argc) {
+	if (optind < argc && argv[optind] != NULL) {
 		CMD_ERR("non-option ARGV-elements: ");
-		while (optind < argc) {
+		while (optind < argc && argv[optind] != NULL) {
 			CMD_ERR("%s ", argv[optind++]);
+			++argerr;
 		}
 		CMD_ERR("\n");
 	}
@@ -1051,7 +1050,6 @@
 		set_IPC_Channel_dnotify(src, resource_ipc_connection_destroy);
 	}
 
-	crm_warn("here i am - 3");
 	if(rsc_cmd == 'L') {
 		rc = cib_ok;
 		do_find_resource_list(&data_set, FALSE);
@@ -1199,7 +1197,7 @@
 			CMD_ERR("Must supply a resource id with -r\n");
 			return cib_NOTEXISTS;
 		} 
-		rc = delete_resource_attr(rsc_id, prop_id, prop_set, prop_name,
+		rc = delete_resource_attr(rsc_id, prop_set, prop_id, prop_name,
 					  cib_conn, &data_set);
 
 	} else if(rsc_cmd == 'P') {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_sh
--- heartbeat-2.1.3/crm/admin/crm_sh	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/admin/crm_sh	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,361 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2006 Andrew Beekhof
+#                    All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+#######################################################################
+
+import os
+import sys
+import readline
+import traceback
+from popen2 import Popen3
+
+# Module copied from Mercurial
+
+sys.path.append("/usr/lib/heartbeat")
+import crm_utils as utl
+import crm_commands as crm 
+
+
+class ParseError(Exception):
+    """Exception raised on errors in parsing the command line."""
+class QuotingError(Exception):
+    """Exception raised on errors in parsing the command line."""
+class UnknownCommand(Exception):
+    """Exception raised if command is not in the command table."""
+class AmbiguousCommand(Exception):
+    """Exception raised if command shortcut matches more than one command."""
+
+table = {
+    "^help": (
+	crm.help, None, [('v', 'verbose', None, 'extra information')],
+	"[-v]"),
+    "^up":        (crm.up, None, [], None, "Move up a level in the heirarchy"),
+    "^crm":       (crm.cd_, ["crm"], [], None),
+    "^nodes":     (crm.cd_, ["crm"], [], None),
+    "^resources": (crm.cd_, ["crm"], [], None),
+    "^config":    (crm.cd_, ["crm"], [], None),
+    "^list": (
+	crm.do_list, ["nodes", "resources"], [('t', 'topic', "", '')],
+	None),
+    "^status": (
+	crm.do_status, ["nodes", "resources"], [],
+	"[list of objects]"),
+    "^debug": (crm.toggle_flag, None, [('f', 'flag', 'debug', '')], None, "Toggle debugging information"),
+    "^exit": (crm.exit, None, [], "exit"),
+    "^debugstate": (
+	crm.debugstate, None, [], 
+	None,
+	"Dump information about the internal state of the program"),
+    }
+
+global_opt_table = [
+    ('q', 'quiet', None, 'suppress output'),
+    ('v', 'verbose', None, 'enable additional output'),
+    ('', 'debug', None, 'enable debugging output'),
+    ('', 'devlog', None, 'enable developmental debugging output'),
+    ('', 'debugger', None, 'start debugger'),
+    ('', 'lsprof', None, 'print improved command execution profile'),
+    ('', 'traceback', None, 'print traceback on exception'),
+    ('', 'time', None, 'time how long the command takes'),
+    ('', 'profile', None, 'print command execution profile'),
+    ('', 'version', None, 'output version information and exit'),
+    ('i', 'interactive', None, 'run in interactive mode'),
+    ('h', 'help', None, 'display help and exit'),
+    ]
+
+def help_(text):
+    utl.log_dev("Looking up help text for: %s" % text)
+    if text == "short":
+	utl.log_info("cluster.py [global options] [topic [topic...]] [command]")
+	return
+    if text:
+	choice = findpossible(text, None, False)
+	for key in choice.keys():
+	    alias, e = choice[key]
+	    text = alias[0]
+	    utl.log_dev("Help text for: %s" % text)
+	    if e:
+		sub_cmd=""
+		if len(e) > 4:
+		    utl.log_info("\n"+e[4]+"\n")
+		possible = findpossible("", text).keys()
+		utl.log_dev("Possible sub-commands: "+repr(possible))
+		possible.remove("up")
+		possible.remove("help")
+		possible.remove("exit")
+		if text in possible:
+		    possible.remove(text)
+		if possible:
+			sub_cmd=' ('+'|'.join(possible)+')'
+		if e[3]:
+		    utl.log_info("Usage: %s %s%s" % (text, e[3], sub_cmd))
+		else:
+		    utl.log_info("Usage: %s%s" % (text, sub_cmd))
+	if choice:
+	    return;
+    utl.log_err("No help text available for: %s" % text)
+
+
+# Stolen from Mercurial commands.py
+
+def findpossible(cmd, topic=None, filter=True):
+    """
+    Return cmd -> (aliases, command table entry)
+    for each matching command.
+    Return debug commands (or their aliases) only if no normal command matches.
+    """
+    if not topic:
+	topic = utl.crm_topic
+	utl.log_dev("Searching in default topic: %s" % topic)
+	
+    utl.log_dev("Looking for completions of %s in %s" % (cmd, topic))
+    choice = {}
+    debugchoice = {}
+    topicchoice = {}
+    for e in table.keys():
+	t = table[e]
+	#utl.log_dev("Processing: %s / %s" % (e, repr(t)))
+	aliases = e.lstrip("^").split("|")
+	found = None
+	if "^%s"%topic == e and t[0] == crm.cd_:
+	    #utl.log_dev("Found: topic")
+	    topicchoice[topic] = (aliases, table[e])
+	if filter and t[1] and topic not in t[1]:
+	    #utl.log_dev("Skip: filter")
+	    continue
+	elif cmd in aliases:
+	    #utl.log_dev("Found: alias")
+	    found = cmd
+	else:
+	    for a in aliases:
+		if a.startswith(cmd):
+		    #utl.log_dev("Found: alias prefix")
+		    found = a
+		    break
+        if found is not None:
+            if aliases[0].startswith("debug"):
+                debugchoice[found] = (aliases, table[e])
+            else:
+                choice[found] = (aliases, table[e])
+
+    if not choice and debugchoice:
+        choice = debugchoice
+
+    if not choice and topicchoice:
+        choice = topicchoice
+
+    return choice
+
+def findcmd(cmd):
+    """Return (aliases, command table entry) for command string."""
+    choice = findpossible(cmd)
+
+    if choice.has_key(cmd):
+	#utl.log_dev("Choice has: %s" % cmd)
+        return choice[cmd]
+
+    if len(choice) > 1:
+        clist = choice.keys()
+        clist.sort()
+        raise AmbiguousCommand(cmd, clist)
+
+    if choice:
+	#utl.log_dev("Returning first: %s" % (repr(choice.values()[0])))
+        return choice.values()[0]
+
+    raise UnknownCommand(cmd)
+
+def find_completer(start, i):
+    choice = findpossible(start)
+    if not choice:
+	return None
+    elif len(choice.keys()) < i:
+	return None
+    return choice.keys()[i]
+
+def parse(args):
+    options = {}
+    cmdoptions = {}
+    
+    try:
+	args = utl.fancyopts(args, global_opt_table, options)
+    except utl.getopt.GetoptError, inst:
+	raise ParseError(None, inst)
+
+    if args:
+	cmd, args = args[0], args[1:]
+	utl.log_dev("Initial Command: %s" % cmd)
+	aliases, i = findcmd(cmd)
+	cmd = aliases[0]
+	utl.log_dev("Found Command: %s" % cmd)
+	defaults = []
+	if defaults:
+	    args = defaults.split() + args
+	c = list(i[2])
+    else:
+	cmd = None
+	c = []
+
+    # combine global options into local
+    for o in global_opt_table:
+	c.append((o[0], o[1], options[o[1]], o[3]))
+	
+    try:
+	args = utl.fancyopts(args, c, cmdoptions)
+    except utl.getopt.GetoptError, inst:
+	raise ParseError(cmd, inst)
+
+    # separate global options back out
+    for o in global_opt_table:
+	n = o[1]
+	options[n] = cmdoptions[n]
+	del cmdoptions[n]
+
+    utl.log_dev("args: %s\ncmdoptions: %s" 
+	      % (repr(args), repr(cmdoptions)))
+    return (cmd, cmd and i[0] or None, args, options, cmdoptions)
+
+def main_loop(args):
+    cmd = None
+    if not args:
+	return 0
+
+    try:
+	cmd, func, cmd_args, ignore, cmd_options = parse(args)
+
+	if func == crm.cd_:
+	    cmd_options["topic"] = cmd
+
+	utl.log_dev("Func Command: %s" % cmd)
+	utl.log_dev("Func Args: %s" % repr(cmd_args))
+	utl.log_dev("Func Opts: %s" % repr(cmd_options))
+	    
+	if not cmd:
+	    utl.log_dev(repr(args))
+	    return 0
+	d = lambda: func(*cmd_args, **cmd_options)
+	return d()
+
+    except crm.HelpRequest, inst:
+	help_(inst.args[0])
+	return 0
+
+    except crm.ReparseRequest:
+	return main_loop(cmd_args)
+
+    except ParseError, inst:
+	if inst.args[0]:
+	    utl.log_err("%s: %s\n" % (inst.args[0], inst.args[1]))
+	    help_(inst.args[0])
+	else:
+	    utl.log_err("%s\n" % inst.args[1])
+	    help_('short')
+
+    except AmbiguousCommand, inst:
+	utl.log_info("%s: command '%s' is ambiguous:\n    %s\n" 
+		 % (" ".join(utl.topic_stack), inst.args[0], " ".join(inst.args[1])))
+
+    except UnknownCommand, inst:
+	utl.log_err("%s: unknown command '%s'\n" % (" ".join(utl.topic_stack), inst.args[0]))
+	help_(utl.crm_topic)
+
+    except IOError, inst:
+	if hasattr(inst, "code"):
+	    utl.log_err("abort: %s\n" % inst)
+	elif hasattr(inst, "reason"):
+	    utl.log_err("abort: error: %s\n" % inst.reason[1])
+	elif hasattr(inst, "args"):
+	    utl.log_err("broken pipe\n")
+	elif getattr(inst, "strerror", None):
+	    if getattr(inst, "filename", None):
+		utl.log_err("abort: %s - %s\n" % (inst.strerror, inst.filename))
+	    else:
+		utl.log_err("abort: %s\n" % inst.strerror)
+	else:
+	    raise
+    except OSError, inst:
+	if hasattr(inst, "filename"):
+	    utl.log_err("abort: %s: %s\n" % (inst.strerror, inst.filename))
+	else:
+	    utl.log_err("abort: %s\n" % inst.strerror)
+	    
+    except TypeError, inst:
+	# was this an argument error?
+	tb = traceback.extract_tb(sys.exc_info()[2])
+	if len(tb) > 2: # no
+	    raise
+	utl.log_err((inst, "\n"))
+	utl.log_err(("%s: invalid arguments\n" % cmd))
+	help_(cmd)
+	raise
+    except SystemExit, inst:
+	# Exit gracefully 
+	utl.exit_(inst.code)
+
+    except:
+	utl.log_err("** unknown exception encountered, details follow\n")
+	raise
+	
+    return -1
+
+args = sys.argv[1:]
+utl.init_readline(find_completer)
+try:
+    cmd, f_ignore, a_ignore, utl.global_opts, o_ignore = parse(args)
+except:
+    pass
+
+if len(sys.argv) == 1:
+    utl.global_opts["interactive"] = 1
+elif not utl.global_opts.has_key("interactive"):
+    utl.global_opts["interactive"] = 0
+
+while True:
+    rc = 0
+    if args:
+	utl.set_topic(utl.topic_stack[-1])
+	rc = main_loop(args)
+	utl.log_debug("rc: %s" % (repr(rc)))
+
+    if not utl.global_opts["interactive"]:
+	utl.exit_(rc)
+
+    try:
+	text = raw_input(" ".join(utl.topic_stack) +" # ")
+	args = utl.create_argv(text)
+
+    except QuotingError, inst:
+        if inst.args[1]:
+            utl.log_err("%s.  Found tokens: %s\n" % (inst.args[0], inst.args[1]))
+        else:
+            utl.log_err("%s\n" % inst.args[0])
+
+    except KeyboardInterrupt:
+        pass
+
+    except EOFError:
+        utl.exit_(0)
+
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_uuid.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_uuid.c
--- heartbeat-2.1.3/crm/admin/crm_uuid.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crm_uuid.c	2008-08-18 13:32:19.000000000 +0100
@@ -35,6 +35,7 @@
 #include <hb_api.h>
 #include <clplumbing/cl_malloc.h>
 #include <clplumbing/uids.h>
+#include <clplumbing/lsb_exitcodes.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
@@ -43,15 +44,16 @@
 #define UUID_LEN 16
 #define UUID_FILE HA_VARLIBDIR"/"PACKAGE"/hb_uuid"
 
-#define OPTARGS	"rw:"
+#define OPTARGS	"?rw:"
 
 int read_local_hb_uuid(void);
 int write_local_hb_uuid(const char *buffer);
 
-static void usage(void) 
+static void usage(int rc) 
 {
-	fprintf(stderr, "crm_uuid [-r|-w new_ascii_value]\n");
-	exit(1);
+	FILE *stream = rc != 0 ? stderr : stdout;
+	fprintf(stream, "crm_uuid [-r|-w new_ascii_value]\n");
+	exit(rc);
 }
 
 int
@@ -82,8 +84,11 @@
 			case 'w':
 				rc = write_local_hb_uuid(optarg);
 				break;
+			case '?':
+				usage(LSB_EXIT_OK);
+				break;
 			default:
-				usage();
+				usage(LSB_EXIT_GENERIC);
 				break;
 		}
 	}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/crm_verify.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/crm_verify.c
--- heartbeat-2.1.3/crm/admin/crm_verify.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/crm_verify.c	2008-08-18 13:32:19.000000000 +0100
@@ -47,7 +47,6 @@
 
 gboolean USE_LIVE_CIB = FALSE;
 char *cib_save = NULL;
-const char *crm_system_name = NULL;
 void usage(const char *cmd, int exit_status);
 extern gboolean stage0(pe_working_set_t *data_set);
 extern void cleanup_alloc_calculations(pe_working_set_t *data_set);
@@ -71,8 +70,6 @@
 	const char *xml_file = NULL;
 	const char *xml_string = NULL;
 	
-	crm_system_name = basename(argv[0]);
-	
 	g_log_set_handler(NULL,
 			  G_LOG_LEVEL_ERROR      | G_LOG_LEVEL_CRITICAL
 			  | G_LOG_LEVEL_WARNING  | G_LOG_LEVEL_MESSAGE
@@ -82,12 +79,8 @@
 
 	/* and for good measure... - this enum is a bit field (!) */
 	g_log_set_always_fatal((GLogLevelFlags)0); /*value out of range*/
-	
-	cl_log_set_entity(crm_system_name);
-	cl_log_set_facility(HA_LOG_FACILITY);
-	cl_log_enable_stderr(TRUE);
-	set_crm_log_level(LOG_ERR);
-	
+
+	crm_log_init(basename(argv[0]), LOG_ERR, FALSE, TRUE, 0, NULL);
 	CL_SIGNAL(DEBUG_INC, alter_debug);
 	CL_SIGNAL(DEBUG_DEC, alter_debug);
 	
@@ -154,7 +147,7 @@
 				USE_LIVE_CIB = TRUE;
 				break;
 			case '?':
-				usage(crm_system_name, LSB_EXIT_GENERIC);
+				usage(crm_system_name, LSB_EXIT_OK);
 				break;
 			default:
 				printf("?? getopt returned character code 0%o ??\n", flag);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/Makefile
--- heartbeat-2.1.3/crm/admin/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/admin/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,883 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/admin/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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/lrm/liblrm.la \
+	$(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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/admin
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/admin
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+hasbindir = $(sbindir)
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(CRM_DEBUG_FLAGS)
+COMMONLIBS = \
+		$(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  		\
+		$(GLIBLIB)						\
+		$(CURSESLIBS)						\
+		$(LIBRT)
+
+halib_PYTHON = crm_primitive.py crm_utils.py crm_commands.py
+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/lrm/liblrm.la \
+			$(top_builddir)/lib/crm/pengine/libpe_status.la
+
+
+# Arguments could be made that this should live in crm/pengine
+crm_verify_SOURCES = crm_verify.c
+crm_verify_LDADD = $(COMMONLIBS) \
+			$(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) 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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 $(srcdir)/crm_sh.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+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 $(srcdir)/crm_commands.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-hasbinPROGRAMS: $(hasbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-hasbinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-hasbinPROGRAMS:
+	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+ccm_tool$(EXEEXT): $(ccm_tool_OBJECTS) $(ccm_tool_DEPENDENCIES) 
+	@rm -f ccm_tool$(EXEEXT)
+	$(LINK) $(ccm_tool_OBJECTS) $(ccm_tool_LDADD) $(LIBS)
+cibadmin$(EXEEXT): $(cibadmin_OBJECTS) $(cibadmin_DEPENDENCIES) 
+	@rm -f cibadmin$(EXEEXT)
+	$(LINK) $(cibadmin_OBJECTS) $(cibadmin_LDADD) $(LIBS)
+crm_attribute$(EXEEXT): $(crm_attribute_OBJECTS) $(crm_attribute_DEPENDENCIES) 
+	@rm -f crm_attribute$(EXEEXT)
+	$(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_OBJECTS) $(crm_diff_LDADD) $(LIBS)
+crm_failcount$(EXEEXT): $(crm_failcount_OBJECTS) $(crm_failcount_DEPENDENCIES) 
+	@rm -f crm_failcount$(EXEEXT)
+	$(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_OBJECTS) $(crm_master_LDADD) $(LIBS)
+crm_mon$(EXEEXT): $(crm_mon_OBJECTS) $(crm_mon_DEPENDENCIES) 
+	@rm -f crm_mon$(EXEEXT)
+	$(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_OBJECTS) $(crm_resource_LDADD) $(LIBS)
+crm_standby$(EXEEXT): $(crm_standby_OBJECTS) $(crm_standby_DEPENDENCIES) 
+	@rm -f crm_standby$(EXEEXT)
+	$(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_OBJECTS) $(crm_uuid_LDADD) $(LIBS)
+crm_verify$(EXEEXT): $(crm_verify_OBJECTS) $(crm_verify_DEPENDENCIES) 
+	@rm -f crm_verify$(EXEEXT)
+	$(LINK) $(crm_verify_OBJECTS) $(crm_verify_LDADD) $(LIBS)
+crmadmin$(EXEEXT): $(crmadmin_OBJECTS) $(crmadmin_DEPENDENCIES) 
+	@rm -f crmadmin$(EXEEXT)
+	$(LINK) $(crmadmin_OBJECTS) $(crmadmin_LDADD) $(LIBS)
+iso8601$(EXEEXT): $(iso8601_OBJECTS) $(iso8601_DEPENDENCIES) 
+	@rm -f iso8601$(EXEEXT)
+	$(LINK) $(iso8601_OBJECTS) $(iso8601_LDADD) $(LIBS)
+install-hasbinSCRIPTS: $(hasbin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-hasbinSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/ccm_epoche.Po
+include ./$(DEPDIR)/cibadmin.Po
+include ./$(DEPDIR)/crm_attribute.Po
+include ./$(DEPDIR)/crm_mon.Po
+include ./$(DEPDIR)/crm_resource.Po
+include ./$(DEPDIR)/crm_uuid.Po
+include ./$(DEPDIR)/crm_verify.Po
+include ./$(DEPDIR)/crmadmin.Po
+include ./$(DEPDIR)/test.iso8601.Po
+include ./$(DEPDIR)/xml_diff.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-halibPYTHON: $(halib_PYTHON)
+	@$(NORMAL_INSTALL)
+	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 \
+	    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; \
+	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)'; 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
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-hasbinPROGRAMS clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-halibPYTHON uninstall-hasbinPROGRAMS \
+	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 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-local
+
+
+clean-generic:
+	rm -f *.log *.debug *.xml *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/Makefile.am
--- heartbeat-2.1.3/crm/admin/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -68,6 +68,7 @@
 
 crm_mon_SOURCES		= crm_mon.c
 crm_mon_LDADD		= $(COMMONLIBS) \
+			$(top_builddir)/lib/lrm/liblrm.la \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
 # Arguments could be made that this should live in crm/pengine
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/Makefile.in
--- heartbeat-2.1.3/crm/admin/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/Makefile.in	2008-08-18 23:37:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -49,7 +49,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = crm_primitive.py crm_sh crm_utils.py \
@@ -87,6 +87,7 @@
 am_crm_mon_OBJECTS = crm_mon.$(OBJEXT)
 crm_mon_OBJECTS = $(am_crm_mon_OBJECTS)
 crm_mon_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+	$(top_builddir)/lib/lrm/liblrm.la \
 	$(top_builddir)/lib/crm/pengine/libpe_status.la
 am_crm_resource_OBJECTS = crm_resource.$(OBJEXT)
 crm_resource_OBJECTS = $(am_crm_resource_OBJECTS)
@@ -113,7 +114,7 @@
 iso8601_DEPENDENCIES = $(am__DEPENDENCIES_2)
 hasbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(hasbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -180,6 +181,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -197,24 +199,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -276,12 +266,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -473,6 +464,7 @@
 crm_diff_LDADD = $(COMMONLIBS)
 crm_mon_SOURCES = crm_mon.c
 crm_mon_LDADD = $(COMMONLIBS) \
+			$(top_builddir)/lib/lrm/liblrm.la \
 			$(top_builddir)/lib/crm/pengine/libpe_status.la
 
 
@@ -546,8 +538,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -701,8 +693,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -714,8 +706,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -725,13 +717,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/admin/xml_diff.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/admin/xml_diff.c
--- heartbeat-2.1.3/crm/admin/xml_diff.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/admin/xml_diff.c	2008-08-18 13:32:19.000000000 +0100
@@ -48,7 +48,6 @@
 
 #include <ha_msg.h> /* someone complaining about _ha_msg_mod not being found */
 
-const char *crm_system_name = "diff";
 void usage(const char *cmd, int exit_status);
 
 #define OPTARGS	"V?o:n:p:scfO:N:"
@@ -87,9 +86,7 @@
 	};
 #endif
 
-	cl_log_set_entity(crm_system_name);
-	cl_log_set_facility(LOG_USER);
-	set_crm_log_level(LOG_CRIT-1);
+	crm_log_init("diff", LOG_CRIT-1, FALSE, FALSE, 0, NULL);
 	
 	if(argc < 2) {
 		usage(crm_system_name, LSB_EXIT_EINVAL);
@@ -137,6 +134,9 @@
 				cl_log_enable_stderr(TRUE);
 				alter_debug(DEBUG_INC);
 				break;				
+			case '?':
+				usage(crm_system_name, LSB_EXIT_OK);
+				break;
 			default:
 				printf("Argument code 0%o (%c)"
 				       " is not (?yet?) supported\n",
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/cib/callbacks.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/cib/callbacks.c
--- heartbeat-2.1.3/crm/cib/callbacks.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/cib/callbacks.c	2008-08-18 13:32:19.000000000 +0100
@@ -1303,6 +1303,8 @@
 	    rc = cib_server_ops[call_type].fn(
 		op, call_options, section, input,
 		current_cib, &result_cib, &output);
+
+	    fix_plus_plus_recursive(result_cib);
 	}
 		
 	if(rc == cib_ok) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/cib/io.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/cib/io.c
--- heartbeat-2.1.3/crm/cib/io.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/cib/io.c	2008-08-18 13:32:19.000000000 +0100
@@ -271,7 +271,7 @@
 	
     } else if(validate_cib_digest(root, sigfile) == FALSE) {
 	crm_err("Checksum of %s failed!  Configuration contents ignored!", filename);
-	crm_err("Usually this is caused by manually changes, "
+	crm_err("Usually this is caused by manual changes, "
 		"please refer to http://linux-ha.org/v2/faq/cib_changes_detected");
 	crm_warn("Continuing but %s will NOT used.", filename);
 	free_xml(root);
@@ -524,6 +524,21 @@
 	return TRUE;
 }
 
+static void
+sync_file(const char *file) 
+{
+    FILE *syncme = fopen(file, "a");
+    if(syncme == NULL) {
+	cl_perror("Cannot open file %s for syncing", file);
+	return;
+    }
+    
+    if(fsync(fileno(syncme)) < 0) {
+	cl_perror("fsync for %s failed:", file);
+    }
+    fclose(syncme);
+}
+
 int
 archive_file(const char *oldname, const char *newname, const char *ext, gboolean preserve)
 {
@@ -592,6 +607,7 @@
 		} else {
 			crm_debug("%s archived as %s", oldname, backup_file);
 		}
+		sync_file(backup_file);
 	}
 	crm_free(backup_file);
 	return rc;
@@ -723,6 +739,7 @@
 
 	    CRM_ASSERT(retrieveCib(CIB_FILENAME, CIB_FILENAME".sig", FALSE) != NULL);
 	    CRM_ASSERT(retrieveCib(CIB_FILENAME".last", CIB_FILENAME".sig.last", FALSE) != NULL);
+	    
 	    crm_debug("Verified CIB archive");	    
 	}
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/cib/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/cib/Makefile
--- heartbeat-2.1.3/crm/cib/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/cib/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,704 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/cib/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/cib
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/cib
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+
+# sockets with path
+crmdir = $(havarlibdir)/crm
+apigid = 65
+crmuid = 17
+crmreqsocket = $(havarlibdir)/api/crm.req
+crmressocket = $(havarlibdir)/api/crm.rsp
+COMMONLIBS = \
+		  $(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			\
+		  $(GLIBLIB)						\
+		  $(LIBRT)
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(CRM_DEBUG_FLAGS)
+
+#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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+cib$(EXEEXT): $(cib_OBJECTS) $(cib_DEPENDENCIES) 
+	@rm -f cib$(EXEEXT)
+	$(cib_LINK) $(cib_OBJECTS) $(cib_LDADD) $(LIBS)
+cibmon$(EXEEXT): $(cibmon_OBJECTS) $(cibmon_DEPENDENCIES) 
+	@rm -f cibmon$(EXEEXT)
+	$(LINK) $(cibmon_OBJECTS) $(cibmon_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/callbacks.Po
+include ./$(DEPDIR)/cib.Po
+include ./$(DEPDIR)/cibmon.Po
+include ./$(DEPDIR)/io.Po
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/messages.Po
+include ./$(DEPDIR)/notify.Po
+include ./$(DEPDIR)/primatives.Po
+include ./$(DEPDIR)/remote.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-local
+
+
+clean-generic:
+	rm -f *.log *.debug *.xml *~
+
+install-exec-local:
+#	cp -f $(top_srcdir)/crm/cib/cib.pam $(DESTDIR)/etc/pam.d/cib
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/cib/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/cib/Makefile.in
--- heartbeat-2.1.3/crm/cib/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/cib/Makefile.in	2008-08-18 23:37:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -67,7 +67,7 @@
 am_cibmon_OBJECTS = cibmon.$(OBJEXT)
 cibmon_OBJECTS = $(am_cibmon_OBJECTS)
 cibmon_DEPENDENCIES = $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -116,6 +116,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -133,24 +134,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -212,12 +201,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -453,8 +443,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -527,8 +517,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -540,8 +530,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -551,13 +541,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/cib/messages.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/cib/messages.c
--- heartbeat-2.1.3/crm/cib/messages.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/cib/messages.c	2008-08-18 13:32:19.000000000 +0100
@@ -684,6 +684,9 @@
 	
 	if(safe_str_eq(XML_CIB_TAG_SECTION_ALL, section)) {
 		section = NULL;
+
+	} else if(safe_str_eq(XML_TAG_CIB, section)) {
+		section = NULL;
 	}
 
 	if(input == NULL) {
@@ -718,9 +721,11 @@
 			if(result == cib_ok) {
 				crm_debug_2("Processing section=%s", type);
 				sub_input = get_object_root(type, input);
-				result = updateList(
+				if(sub_input) {
+				    result = updateList(
 					*result_cib, sub_input, failed,
 					cib_update_op, type);
+				}
 			}
 		}
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/callbacks.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/callbacks.c
--- heartbeat-2.1.3/crm/crmd/callbacks.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/callbacks.c	2008-08-18 13:32:19.000000000 +0100
@@ -297,15 +297,19 @@
 	crm_data_t *update = NULL;
 	crm_notice("Status update: Node %s now has status [%s]",node,status);
 
+	if(safe_str_eq(status, PINGSTATUS)) {
+	    return;
+	}
+	
 	if(safe_str_eq(status, DEADSTATUS)) {
 		/* this node is taost */
 		update = create_node_state(
-			node, status, XML_BOOLEAN_NO, OFFLINESTATUS,
+			node, DEADSTATUS, XML_BOOLEAN_NO, OFFLINESTATUS,
 			CRMD_STATE_INACTIVE, NULL, TRUE, __FUNCTION__);
 		
-	} else if(safe_str_eq(status, ACTIVESTATUS)) {
+	} else {
 		update = create_node_state(
-			node, status, NULL, NULL, NULL, NULL,
+			node, ACTIVESTATUS, NULL, NULL, NULL, NULL,
 			FALSE, __FUNCTION__);
 	}
 		
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/control.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/control.c
--- heartbeat-2.1.3/crm/crmd/control.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/control.c	2008-08-18 13:32:19.000000000 +0100
@@ -331,14 +331,6 @@
 	fsa_cib_conn = cib_new();
 	fsa_lrm_conn = ll_lrm_new(XML_CIB_TAG_LRM);	
 	
-	crm_debug("Init server comms");
-	if(ipc_server == NULL) {
-		ipc_server = crm_strdup(CRM_SYSTEM_CRMD);
-	}
-
-	was_error = init_server_ipc_comms(ipc_server, crmd_client_connect,
-					  default_ipc_connection_destroy);
-
 	/* set up the timers */
 	crm_malloc0(integration_timer, sizeof(fsa_timer_t));
 	crm_malloc0(finalization_timer, sizeof(fsa_timer_t));
@@ -567,6 +559,17 @@
 		return;
 	}
 
+	crm_debug("Init server comms");
+	if(ipc_server == NULL) {
+		ipc_server = crm_strdup(CRM_SYSTEM_CRMD);
+	}
+
+	if(init_server_ipc_comms(ipc_server, crmd_client_connect,
+				 default_ipc_connection_destroy)) {
+	    crm_err("Couldn't start IPC server");
+	    register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+	}
+
 	crm_info("The local CRM is operational");
 	clear_bit_inplace(fsa_input_register, R_STARTING);
 	register_fsa_input(msg_data->fsa_cause, I_PENDING, NULL);
@@ -624,6 +627,7 @@
 {
 	const char *value = NULL;
 	GHashTable *config_hash = NULL;
+	ha_time_t *now = new_ha_date(TRUE);
 
 	if(rc != cib_ok) {
 		fsa_data_t *msg_data = NULL;
@@ -646,7 +650,7 @@
 
 	unpack_instance_attributes(
 		output, XML_CIB_TAG_PROPSET, NULL, config_hash,
-		CIB_OPTIONS_FIRST, NULL);
+		CIB_OPTIONS_FIRST, now);
 	
 	value = g_hash_table_lookup(config_hash, XML_CONFIG_ATTR_DC_DEADTIME);
 	if(value == NULL) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/election.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/election.c
--- heartbeat-2.1.3/crm/crmd/election.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/election.c	2008-08-18 13:32:19.000000000 +0100
@@ -284,7 +284,8 @@
 	} else if(your_node->node_born_on > our_node->node_born_on) {
 		crm_debug("Election pass: born_on");
 		
-	} else if(strcasecmp(fsa_our_uname, vote_from) > 0) {
+	} else if(fsa_our_uname == NULL
+		  || strcasecmp(fsa_our_uname, vote_from) > 0) {
 		crm_debug("Election fail: uname");
 		we_loose = TRUE;
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/join_dc.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/join_dc.c
--- heartbeat-2.1.3/crm/crmd/join_dc.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/join_dc.c	2008-08-18 13:32:19.000000000 +0100
@@ -116,22 +116,27 @@
 void
 erase_node_from_join(const char *uname) 
 {
+	gboolean w = FALSE, i = FALSE, f = FALSE, c = FALSE;
+    
 	if(uname == NULL) {
 		return;
 	}
 
 	if(welcomed_nodes != NULL) {
-		g_hash_table_remove(welcomed_nodes, uname);
+	    w = g_hash_table_remove(welcomed_nodes, uname);
 	}
 	if(integrated_nodes != NULL) {
-		g_hash_table_remove(integrated_nodes, uname);
+	    i = g_hash_table_remove(integrated_nodes, uname);
 	}
 	if(finalized_nodes != NULL) {
-		g_hash_table_remove(finalized_nodes, uname);
+	    f = g_hash_table_remove(finalized_nodes, uname);
 	}
 	if(confirmed_nodes != NULL) {
-		g_hash_table_remove(confirmed_nodes, uname);
+	    c = g_hash_table_remove(confirmed_nodes, uname);
 	}
+	crm_info("Removed dead node %s from join calculations:"
+		 " welcomed=%d itegrated=%d finalized=%d confirmed=%d",
+		 uname, w, i, f, c);
 }
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/lrm.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/lrm.c
--- heartbeat-2.1.3/crm/crmd/lrm.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/lrm.c	2008-08-18 13:32:19.000000000 +0100
@@ -49,6 +49,8 @@
 		char *op_key;
 		int   call_id;
 		int   interval;
+		gboolean remove;
+		gboolean cancelled;
 };
 
 char *make_stop_id(const char *rsc, int call_id);
@@ -189,14 +191,42 @@
 static void
 ghash_print_pending(gpointer key, gpointer value, gpointer user_data) 
 {
-	const char *action = key;
+	const char *stop_id = key;
 	int *log_level = user_data;
-	do_crm_log(*log_level, "Pending action: %s", action);
+	struct recurring_op_s *pending = value;
+	do_crm_log(*log_level, "Pending action: %s (%s)", stop_id, pending->op_key);
+}
+
+static void
+ghash_print_pending_for_rsc(gpointer key, gpointer value, gpointer user_data) 
+{
+	const char *stop_id = key;
+	char *rsc = user_data;
+	struct recurring_op_s *pending = value;
+	if(safe_str_eq(rsc, pending->rsc_id)) {
+	    do_crm_log(LOG_NOTICE, "%sction %s (%s) incomplete at shutdown",
+		       pending->interval==0?"A":"Recurring a", stop_id, pending->op_key);
+	}
+}
+
+static void
+ghash_count_pending(gpointer key, gpointer value, gpointer user_data) 
+{
+	int *counter = user_data;
+	struct recurring_op_s *pending = value;
+
+	if(pending->interval > 0) {
+	    /* Ignore recurring actions in the shutdown calculations */
+	    return;
+	}
+
+	(*counter)++;
 }
 
 gboolean
 verify_stopped(enum crmd_fsa_state cur_state, int log_level)
 {
+	int counter = 0;
 	gboolean rc = TRUE;
 	GListPtr lrm_list = NULL;
 
@@ -206,7 +236,9 @@
 		log_level = LOG_ERR;
 	}	
 
-	if(g_hash_table_size(pending_ops) > 0) {
+	g_hash_table_foreach(pending_ops, ghash_count_pending, &counter);
+
+	if(counter > 0) {
 	    rc = FALSE;
 	    do_crm_log(log_level,
 		       "%d pending LRM operations at shutdown%s",
@@ -230,11 +262,13 @@
 			continue;
 		}
 		
-		rc = FALSE;
 		crm_err("Resource %s was active at shutdown."
 			"  You may ignore this error if it is unmanaged.",
 			rsc_id);
-		);
+
+		g_hash_table_foreach(
+		    pending_ops, ghash_print_pending_for_rsc, rsc_id);
+	    );
 	
   bail:
 	set_bit_inplace(fsa_input_register, R_SENT_RSC_STOP);
@@ -392,7 +426,7 @@
 		return;
 	}
 
-	restart = create_xml_node(NULL, "parameters");
+	restart = create_xml_node(NULL, XML_TAG_PARAMS);
 	slist_iter(param, const char, restart_list, lpc,
 		   int start = len;
 		   value = g_hash_table_lookup(op->params, param);
@@ -535,7 +569,7 @@
 			  " %s_%s_%d %d from %s",
 			  op->rsc_id, op->op_type, op->interval, op->call_id,
 			  op->app_name);
-		local_user_data = generate_transition_key(-1, 0, id);
+		local_user_data = generate_transition_key(-1, 0, 0, id);
 		op->user_data = local_user_data;
 		crm_free(id);
 	}
@@ -847,6 +881,7 @@
 	 *
 	 * Avoids refreshing the entire LRM section of this host
 	 */
+
 	if(op != NULL) {
 		xml_top = create_xml_node(NULL, XML_LRM_TAG_RSC_OP);
 		crm_xml_add_int(xml_top, XML_LRM_ATTR_CALLID, op->call_id);
@@ -888,7 +923,6 @@
 	}
 
  	crm_log_xml_debug_2(xml_top, "op:cancel");
-
  	free_xml(xml_top);
 }
 
@@ -896,62 +930,90 @@
 cancel_op(lrm_rsc_t *rsc, const char *key, int op, gboolean remove)
 {
 	int rc = HA_OK;
+	struct recurring_op_s *pending = NULL;
 
 	CRM_CHECK(op != 0, return FALSE);
 	CRM_CHECK(rsc != NULL, return FALSE);
 	if(key == NULL) {
-		key = "unknown";
+	    key = make_stop_id(rsc->id, op);
 	}
-	
+	pending = g_hash_table_lookup(pending_ops, key);
+
+	if(pending) {
+	    if(remove && pending->remove == FALSE) {
+		pending->remove = TRUE;
+		crm_debug("Scheduling %s for removal", key);
+	    }
+	    
+	    if(pending->cancelled) {
+		crm_debug("Operation %s already cancelled", key);
+		return TRUE;
+	    }
+
+	    pending->cancelled = TRUE;
+
+	} else {
+	    crm_info("No pending op found for %s", key);
+	}
+
 	crm_debug("Cancelling op %d for %s (%s)", op, rsc->id, key);
 
 	rc = rsc->ops->cancel_op(rsc, op);
 	if(rc != HA_OK) {
 		crm_debug("Op %d for %s (%s): Nothing to cancel", op, rsc->id, key);
-		if(key && remove) {
-			delete_op_entry(NULL, rsc->id, key, op);
-		}
-		/* not doing this will block the node from shutting down */
-		g_hash_table_remove(pending_ops, key);
+		/* The caller needs to make sure the entry is
+		 * removed from the pending_ops list
+		 *
+		 * Usually by returning TRUE inside the worker function
+		 * supplied to g_hash_table_foreach_remove()
+		 *
+		 * Not removing the entry from pending_ops will block
+		 * the node from shutting down
+		 */
+		return FALSE;
 	}
 	
 	return TRUE;
 }
 
-const char *cancel_key = NULL;
-gboolean cancel_done = FALSE;
-lrm_rsc_t *cancel_rsc = NULL;
+struct cancel_data 
+{
+	gboolean done;
+	gboolean remove;
+	const char *key;
+	lrm_rsc_t *rsc;
+};
 
-static void
+static gboolean
 cancel_action_by_key(gpointer key, gpointer value, gpointer user_data)
 {
+	struct cancel_data *data = user_data;
 	struct recurring_op_s *op = (struct recurring_op_s*)value;
 	
-	if(safe_str_eq(op->op_key, cancel_key)) {
-		cancel_done = TRUE;
-		cancel_op(cancel_rsc, key, op->call_id, TRUE);
+	if(safe_str_eq(op->op_key, data->key)) {
+	    data->done = TRUE;
+	    if (cancel_op(data->rsc, key, op->call_id, data->remove) == FALSE) {
+		return TRUE;
+	    }
 	}
+	return FALSE;
 }
 
 static gboolean
 cancel_op_key(lrm_rsc_t *rsc, const char *key, gboolean remove)
 {
-	CRM_CHECK(rsc != NULL, return FALSE);
-	
-	cancel_key = key;
-	cancel_rsc = rsc;
-	cancel_done = FALSE;
+	struct cancel_data data;
 
+	CRM_CHECK(rsc != NULL, return FALSE);
 	CRM_CHECK(key != NULL, return FALSE);
-	
-	g_hash_table_foreach(pending_ops, cancel_action_by_key, NULL);
 
-	if(cancel_done == FALSE && remove) {
-		crm_err("No known %s operation to cancel", key);
-		delete_op_entry(NULL, rsc->id, key, 0);
-	}
+	data.key = key;
+	data.rsc = rsc;
+	data.done = FALSE;
+	data.remove = remove;
 	
-	return cancel_done;
+	g_hash_table_foreach_remove(pending_ops, cancel_action_by_key, &data);
+	return data.done;
 }
 
 static lrm_rsc_t *
@@ -1042,6 +1104,7 @@
 	      enum crmd_fsa_input current_input,
 	      fsa_data_t *msg_data)
 {
+	gboolean done = FALSE;
 	gboolean create_rsc = TRUE;
 	const char *crm_op = NULL;
 	const char *from_sys = NULL;
@@ -1093,8 +1156,10 @@
 
 	} else if(safe_str_eq(operation, CRM_OP_PROBED)
 		  || safe_str_eq(crm_op, CRM_OP_REPROBE)) {
+		int cib_options = cib_inhibit_notify;
 		const char *probed = XML_BOOLEAN_TRUE;
 		if(safe_str_eq(crm_op, CRM_OP_REPROBE)) {
+			cib_options = cib_none;
 			probed = XML_BOOLEAN_FALSE;
 		}
 		
@@ -1173,16 +1238,32 @@
 			op_key = generate_op_key(
 				rsc->id,op_task,crm_parse_int(op_interval,"0"));
 
+			crm_debug("PE requested op %s (call=%s) be cancelled",
+				  op_key, call_id?call_id:"NA");
 			call = crm_parse_int(call_id, "0");
 			if(call == 0) {
-				cancel_op_key(rsc, op_key, TRUE);
+			    /* the normal case when the PE cancels a recurring op */
+			    done = cancel_op_key(rsc, op_key, TRUE);
+
 			} else {
-				cancel_op(rsc, op_key, call, TRUE);
+			    /* the normal case when the PE cancels an orphan op */
+			    done = cancel_op(rsc, NULL, call, TRUE);
 			}
-			
-			op->op_status = LRM_OP_DONE;
+
+			if(done == FALSE) {
+			    crm_debug("Nothing known about operation %d for %s", call, op_key);
+			    delete_op_entry(NULL, rsc->id, op_key, call);
+
+			    /* needed?? surely not otherwise the cancel_op_(_key) wouldn't
+			     * have failed in the first place
+			     */
+			    g_hash_table_remove(pending_ops, op_key);
+			}
+
 			op->rc = EXECRA_OK;
+			op->op_status = LRM_OP_DONE;
 			send_direct_ack(from_host, from_sys, op, rsc->id);
+			
 			crm_free(op_key);
 			free_lrm_op(op);			
 			
@@ -1400,15 +1481,19 @@
 	free_xml(update);
 }
 
-static void
+static gboolean
 stop_recurring_action_by_rsc(gpointer key, gpointer value, gpointer user_data)
 {
 	lrm_rsc_t *rsc = user_data;
 	struct recurring_op_s *op = (struct recurring_op_s*)value;
 	
 	if(op->interval != 0 && safe_str_eq(op->rsc_id, rsc->id)) {
-		cancel_op(rsc, key, op->call_id, FALSE);
+		if (cancel_op(rsc, key, op->call_id, FALSE) == FALSE) {
+			return TRUE;
+		}
 	}
+
+	return FALSE;
 }
 
 void
@@ -1436,8 +1521,10 @@
 
 	/* stop the monitor before stopping the resource */
 	if(crm_str_eq(operation, CRMD_ACTION_STOP, TRUE)
+	   || crm_str_eq(operation, CRMD_ACTION_DEMOTE, TRUE)
+	   || crm_str_eq(operation, CRMD_ACTION_PROMOTE, TRUE)
 	   || crm_str_eq(operation, CRMD_ACTION_MIGRATE, TRUE)) {
-		g_hash_table_foreach(pending_ops, stop_recurring_action_by_rsc, rsc);
+		g_hash_table_foreach_remove(pending_ops, stop_recurring_action_by_rsc, rsc);
 	}
 	
 	/* now do the op */
@@ -1608,12 +1695,16 @@
 cib_rsc_callback(const HA_Message *msg, int call_id, int rc,
 		 crm_data_t *output, void *user_data)
 {
-	if(rc != cib_ok && rc != cib_diff_resync) {
-		crm_err("Resource update %d failed: %s",
-			call_id, cib_error2string(rc));	
-	} else {
-		crm_debug("Resource update %d complete: rc=%d", call_id, rc);
-	}
+    switch(rc) {
+	case cib_ok:
+	case cib_diff_failed:
+	case cib_diff_resync:
+	    crm_debug("Resource update %d complete: rc=%d", call_id, rc);
+	    break;
+	default:
+	    crm_err("Resource update %d failed: (rc=%d) %s",
+		    call_id, rc, cib_error2string(rc));
+    }
 }
 
 
@@ -1713,6 +1804,7 @@
 	char *op_id = NULL;
 	char *op_key = NULL;
 	int log_level = LOG_ERR;
+	struct recurring_op_s *pending = NULL;
 	CRM_CHECK(op != NULL, return FALSE);
 	CRM_CHECK(op->rsc_id != NULL, return FALSE);
 
@@ -1756,6 +1848,9 @@
 		crm_info("Result: %s", op->output);
 	}
 	
+	op_id = make_stop_id(op->rsc_id, op->call_id);
+	pending = g_hash_table_lookup(pending_ops, op_id);
+
 	if(op->op_status != LRM_OP_CANCELLED) {
 		do_update_resource(op);
 		if(op->interval != 0) {
@@ -1766,20 +1861,23 @@
 		/* no known valid reason for this to happen */
 		crm_err("Op %s (call=%d): Cancelled", op_key, op->call_id);
 
-	} else if(op->user_data != NULL) {
-		delete_op_entry(op, NULL, NULL, op->call_id);
-		
-	} else {
+	} else if(pending == NULL) {
+		crm_err("Op %s (call=%d): No 'pending' entry",
+			op_key, op->call_id);
+
+	} else if(op->user_data == NULL) {
 		crm_err("Op %s (call=%d): No user data", op_key, op->call_id);
-	}	
+	    
+	} else if(pending->remove) {
+		delete_op_entry(op, op->rsc_id, op_key, op->call_id);
 
-	op_id = make_stop_id(op->rsc_id, op->call_id);
-	if(g_hash_table_remove(pending_ops, op_id)) {
-		crm_debug("Op %s (call=%d): Confirmed", op_key, op->call_id);
-		goto out;
+	} else {
+		crm_debug("Op %s (call=%d): no delete event required", op_key, op->call_id);
 	}
 
-	crm_err("Op %s (call=%d): Not matched", op_key, op->call_id);
+	if(g_hash_table_remove(pending_ops, op_id)) {
+	    crm_debug("Op %s (call=%d, stop_id=%s): Confirmed", op_key, op->call_id, op_id);
+	}
 
   out:
 	crm_free(op_key);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/Makefile
--- heartbeat-2.1.3/crm/crmd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/crmd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,764 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/crmd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/crmd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/crmd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+
+# sockets with path
+crmdir = $(havarlibdir)/crm
+apigid = 65
+crmuid = 17
+COMMONLIBS = \
+		$(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		\
+		$(GLIBLIB)						\
+		$(LIBRT)
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char						\
+		$(CRM_DEBUG_FLAGS)
+
+lib_LTLIBRARIES = 
+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  
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+atest$(EXEEXT): $(atest_OBJECTS) $(atest_DEPENDENCIES) 
+	@rm -f atest$(EXEEXT)
+	$(LINK) $(atest_OBJECTS) $(atest_LDADD) $(LIBS)
+crmd$(EXEEXT): $(crmd_OBJECTS) $(crmd_DEPENDENCIES) 
+	@rm -f crmd$(EXEEXT)
+	$(LINK) $(crmd_OBJECTS) $(crmd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/atest.Po
+include ./$(DEPDIR)/callbacks.Po
+include ./$(DEPDIR)/ccm.Po
+include ./$(DEPDIR)/cib.Po
+include ./$(DEPDIR)/control.Po
+include ./$(DEPDIR)/crmd.Po
+include ./$(DEPDIR)/election.Po
+include ./$(DEPDIR)/fsa.Po
+include ./$(DEPDIR)/join_client.Po
+include ./$(DEPDIR)/join_dc.Po
+include ./$(DEPDIR)/lrm.Po
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/messages.Po
+include ./$(DEPDIR)/misc.Po
+include ./$(DEPDIR)/pengine.Po
+include ./$(DEPDIR)/subsystems.Po
+include ./$(DEPDIR)/tengine.Po
+include ./$(DEPDIR)/utils.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-halibPROGRAMS clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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
+
+
+clean-generic:
+	rm -f *.log *.debug *.xml *~
+
+install-exec-local:
+
+uninstall-local:
+
+graphs:	fsa_inputs.png fsa_inputs_by_action.png fsa_actions_by_state.png
+
+%.png: %.dot
+	dot -Tpng $< > $@ 
+
+%.dot : fsa_matrix.h make_dot.pl
+	perl $(top_srcdir)/crm/crmd/make_dot.pl $(top_srcdir)/crm/crmd/fsa_matrix.h $(top_builddir)/crm/crmd
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/Makefile.in
--- heartbeat-2.1.3/crm/crmd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/Makefile.in	2008-08-18 23:37:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -43,7 +43,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -78,7 +78,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -127,6 +127,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -144,24 +145,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -223,12 +212,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -465,8 +455,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -474,8 +464,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -495,8 +485,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -578,8 +568,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -591,8 +581,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -602,13 +592,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/crmd/messages.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/crmd/messages.c
--- heartbeat-2.1.3/crm/crmd/messages.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/crmd/messages.c	2008-08-18 13:32:19.000000000 +0100
@@ -527,7 +527,7 @@
 			is_local = 1;
 		}
 			
-	} else if(strcasecmp(fsa_our_uname, host_to) == 0) {
+	} else if(safe_str_eq(fsa_our_uname, host_to)) {
 		is_local=1;
 	}
 
@@ -650,10 +650,11 @@
 		crm_free(minor_version);
 	}
 
-	if (strcasecmp(CRM_SYSTEM_PENGINE, client_name) == 0) {
+	
+	if (safe_str_eq(CRM_SYSTEM_PENGINE, client_name)) {
 		the_subsystem = pe_subsystem;
 		
-	} else if (strcasecmp(CRM_SYSTEM_TENGINE, client_name) == 0) {
+	} else if (safe_str_eq(CRM_SYSTEM_TENGINE, client_name)) {
 		the_subsystem = te_subsystem;
 	}
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/Makefile
--- heartbeat-2.1.3/crm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,697 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-dtdSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(SCRIPTS)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-dtdSCRIPTS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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
+	cp $(top_srcdir)/crm/crm-1.0.dtd crm.dtd
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)/$(crm_varlibdir)
+	-chown $(HA_CCMUSER) $(DESTDIR)/$(crm_varlibdir)
+	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_varlibdir)
+	-chmod 750 $(DESTDIR)/$(crm_varlibdir)
+	$(mkinstalldirs) $(DESTDIR)/$(crm_varrundir)
+	-chown $(HA_CCMUSER) $(DESTDIR)/$(crm_varrundir)
+	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(crm_varrundir)
+	-chmod 750 $(DESTDIR)/$(crm_varrundir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/Makefile.in
--- heartbeat-2.1.3/crm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/Makefile.in	2008-08-18 23:37:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -91,6 +91,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -108,24 +109,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -187,12 +176,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -486,8 +476,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -512,8 +502,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -523,13 +513,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/allocate.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/allocate.c
--- heartbeat-2.1.3/crm/pengine/allocate.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/allocate.c	2008-08-18 13:32:19.000000000 +0100
@@ -185,19 +185,22 @@
 		if(op_match == NULL && data_set->stop_action_orphans) {
 			/* create a cancel action */
 			action_t *cancel = NULL;
-			char *cancel_key = NULL;
+			char *cancel_key = crm_strdup(key);
 			const char *call_id = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
 			
 			crm_info("Orphan action will be stopped: %s on %s",
 				 key, active_node->details->uname);
 
-			cancel_key = generate_op_key(
-				rsc->id, CRMD_ACTION_CANCEL, interval);
+			/* cancel_key = generate_op_key( */
+			/* 	rsc->id, CRMD_ACTION_CANCEL, interval); */
 
 			cancel = custom_action(
 				rsc, cancel_key, CRMD_ACTION_CANCEL,
 				active_node, FALSE, TRUE, data_set);
 
+			crm_free(cancel->task);
+			cancel->task = crm_strdup(CRMD_ACTION_CANCEL);
+			
 			add_hash_param(cancel->meta, XML_LRM_ATTR_TASK,     task);
 			add_hash_param(cancel->meta, XML_LRM_ATTR_CALLID,   call_id);
 			add_hash_param(cancel->meta, XML_LRM_ATTR_INTERVAL, interval_s);
@@ -463,7 +466,7 @@
  * Check nodes for resources started outside of the LRM
  */
 gboolean
-stage1(pe_working_set_t *data_set)
+probe_resources(pe_working_set_t *data_set)
 {
 	action_t *probe_complete = NULL;
 	action_t *probe_node_complete = NULL;
@@ -482,13 +485,7 @@
 			continue;
 
 		} else if(probe_complete == NULL) {
-			probe_complete = custom_action(
-				NULL, crm_strdup(CRM_OP_PROBED),
-				CRM_OP_PROBED, NULL, FALSE, TRUE,
-				data_set);
-
-			probe_complete->pseudo = TRUE;
-			probe_complete->optional = TRUE;
+			probe_complete = get_pseudo_op(CRM_OP_PROBED, data_set);
 		}
 
 		if(probed != NULL && crm_is_true(probed) == FALSE) {
@@ -516,6 +513,7 @@
 
 				probe_complete->optional = FALSE;
 				probe_node_complete->optional = FALSE;
+
 				custom_action_order(
 					NULL, NULL, probe_complete,
 					rsc, start_key(rsc), NULL,
@@ -590,9 +588,15 @@
 	slist_iter(
 		rsc, resource_t, data_set->resources, lpc,
 		rsc->cmds->color(rsc, data_set);
-		rsc->cmds->create_actions(rsc, data_set);	
 		);
+
+	probe_resources(data_set);
 	
+	slist_iter(
+		rsc, resource_t, data_set->resources, lpc,
+		rsc->cmds->create_actions(rsc, data_set);	
+		);
+
 	return TRUE;
 }
 
@@ -731,7 +735,7 @@
 		order, order_constraint_t, data_set->ordering_constraints, lpc,
 
 		resource_t *rsc = order->lh_rsc;
-		crm_debug_2("Applying ordering constraint: %d", order->id);
+		crm_debug_3("Applying ordering constraint: %d", order->id);
 		
 		if(rsc != NULL) {
 			crm_debug_4("rsc_action-to-*");
@@ -781,6 +785,15 @@
 	value = pe_pref(data_set->config_hash, "cluster-delay");
 	crm_xml_add(data_set->graph, "cluster-delay", value);
 
+	crm_xml_add(data_set->graph, "failed-stop-offset", "INFINITY");
+
+	value = pe_pref(data_set->config_hash, "start-failure-is-fatal");
+	if(crm_is_true(value)) {
+	    crm_xml_add(data_set->graph, "failed-start-offset", "INFINITY");
+	} else {
+	    crm_xml_add(data_set->graph, "failed-start-offset", "1");
+	}
+	
 	value = pe_pref(data_set->config_hash, "batch-limit");
 	crm_xml_add(data_set->graph, "batch-limit", value);
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/clone.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/clone.c
--- heartbeat-2.1.3/crm/pengine/clone.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/clone.c	2008-08-18 13:32:19.000000000 +0100
@@ -27,8 +27,6 @@
 #include <lib/crm/pengine/variant.h>
 
 gint sort_clone_instance(gconstpointer a, gconstpointer b);
-resource_t *find_compatible_child(
-    resource_t *local_child, resource_t *rsc, enum rsc_role_e filter);
 
 void clone_create_notifications(
 	resource_t *rsc, action_t *action, action_t *action_complete,
@@ -80,6 +78,7 @@
 
 	gboolean can1 = TRUE;
 	gboolean can2 = TRUE;
+	gboolean with_scores = TRUE;
 	
 	const resource_t *resource1 = (const resource_t*)a;
 	const resource_t *resource2 = (const resource_t*)b;
@@ -114,12 +113,39 @@
 		node2 = resource2->running_on->data;
 	}
 
+	if(node1) {
+	    node_t *match = pe_find_node_id(resource1->allowed_nodes, node1->details->id);
+	    if(match == NULL || match->weight < 0) {
+		do_crm_log(level, "%s: current location is unavailable", resource1->id);
+		node1 = NULL;
+		can1 = FALSE;
+	    }
+	}
+
+	if(node2) {
+	    node_t *match = pe_find_node_id(resource2->allowed_nodes, node2->details->id);
+	    if(match == NULL || match->weight < 0) {
+		do_crm_log(level, "%s: current location is unavailable", resource2->id);
+		node2 = NULL;
+		can2 = FALSE;
+	    }
+	}
+
+	if(can1 != can2) {
+		if(can1) {
+			do_crm_log(level, "%s < %s: availability of current location", resource1->id, resource2->id);
+			return -1;
+		}
+		do_crm_log(level, "%s > %s: availability of current location", resource1->id, resource2->id);
+		return 1;
+	}
+	
 	if(resource1->priority < resource2->priority) {
-		do_crm_log(level, "%s < %s: score", resource1->id, resource2->id);
+		do_crm_log(level, "%s < %s: priority", resource1->id, resource2->id);
 		return 1;
 
 	} else if(resource1->priority > resource2->priority) {
-		do_crm_log(level, "%s > %s: score", resource1->id, resource2->id);
+		do_crm_log(level, "%s > %s: priority", resource1->id, resource2->id);
 		return -1;
 	}
 	
@@ -174,13 +200,45 @@
 		return 1;
 	}
 
-	if(node1->weight < node2->weight) {
-		do_crm_log(level, "%s < %s: node score", resource1->id, resource2->id);
-		return 1;
+	if(with_scores) {
+	    int max = 0;
+	    int lpc = 0;
+	    GListPtr list1 = node_list_dup(resource1->allowed_nodes, FALSE, FALSE);
+	    GListPtr list2 = node_list_dup(resource2->allowed_nodes, FALSE, FALSE);
+	    
+	    list1 = g_list_sort(list1, sort_node_weight);
+	    list2 = g_list_sort(list2, sort_node_weight);
+	    max = g_list_length(list1);
+	    if(max < g_list_length(list2)) {
+		max = g_list_length(list2);
+	    }
+	    
+	    for(;lpc < max; lpc++) {
+		node1 = g_list_nth_data(list1, lpc);
+		node2 = g_list_nth_data(list2, lpc);
+		if(node1 == NULL) {
+		    do_crm_log(level, "%s < %s: node score NULL", resource1->id, resource2->id);
+		    pe_free_shallow(list1); pe_free_shallow(list2);
+		    return 1;
+		} else if(node2 == NULL) {
+		    do_crm_log(level, "%s > %s: node score NULL", resource1->id, resource2->id);
+		    pe_free_shallow(list1); pe_free_shallow(list2);
+		    return -1;
+		}
+		
+		if(node1->weight < node2->weight) {
+		    do_crm_log(level, "%s < %s: node score", resource1->id, resource2->id);
+		    pe_free_shallow(list1); pe_free_shallow(list2);
+		    return 1;
+		    
+		} else if(node1->weight > node2->weight) {
+		    do_crm_log(level, "%s > %s: node score", resource1->id, resource2->id);
+		    pe_free_shallow(list1); pe_free_shallow(list2);
+		    return -1;
+		}
+	    }
 
-	} else if(node1->weight > node2->weight) {
-		do_crm_log(level, "%s > %s: node score", resource1->id, resource2->id);
-		return -1;
+	    pe_free_shallow(list1); pe_free_shallow(list2);
 	}
 
 	can1 = did_fail(resource1);
@@ -271,18 +329,26 @@
 	return chosen;
 }
 
-static void append_parent_colocation(resource_t *rsc, resource_t *child) 
+static void append_parent_colocation(resource_t *rsc, resource_t *child, gboolean all) 
 {
     slist_iter(cons, rsc_colocation_t, rsc->rsc_cons, lpc,
-	       child->rsc_cons = g_list_append(child->rsc_cons, cons));
+	       if(all || cons->score < 0 || cons->score == INFINITY) {
+		   child->rsc_cons = g_list_append(child->rsc_cons, cons);
+	       }
+	       
+	);
     slist_iter(cons, rsc_colocation_t, rsc->rsc_cons_lhs, lpc,
-	       child->rsc_cons_lhs = g_list_append(child->rsc_cons_lhs, cons));
+	       if(all || cons->score < 0) {
+		   child->rsc_cons_lhs = g_list_append(child->rsc_cons_lhs, cons);
+	       }
+	);
 }
 
 node_t *
 clone_color(resource_t *rsc, pe_working_set_t *data_set)
 {
 	int allocated = 0;
+	int available_nodes = 0;
 	clone_variant_data_t *clone_data = NULL;
 	get_clone_variant_data(clone_data, rsc);
 
@@ -308,7 +374,7 @@
 		constraint->score/INFINITY, TRUE);
 	    );
 	
-	dump_node_scores(LOG_DEBUG_2, rsc, __FUNCTION__, rsc->allowed_nodes);
+	dump_node_scores(scores_log_level, rsc, __FUNCTION__, rsc->allowed_nodes);
 	
 	/* count now tracks the number of clones currently allocated */
 	slist_iter(node, node_t, rsc->allowed_nodes, lpc,
@@ -339,13 +405,26 @@
 	rsc->allowed_nodes = g_list_sort(
 		rsc->allowed_nodes, sort_node_weight);
 
+
+	slist_iter(node, node_t, rsc->allowed_nodes, lpc,
+		   if(can_run_resources(node) == FALSE) {
+		       available_nodes++;
+		   }
+	    );
 	
 	slist_iter(child, resource_t, rsc->children, lpc,
 		   if(allocated >= clone_data->clone_max) {
 			   crm_debug("Child %s not allocated - limit reached", child->id);
 			   resource_location(child, NULL, -INFINITY, "clone_color:limit_reached", data_set);
+
+		   } else if (clone_data->clone_max < available_nodes) {
+		       /* Only include positive colocation preferences of dependant resources
+			* if not every node will get a copy of the clone
+			*/
+		       append_parent_colocation(rsc, child, TRUE);
+
 		   } else {
-		       append_parent_colocation(rsc, child);		       
+		       append_parent_colocation(rsc, child, FALSE);
 		   }
 		   
 		   if(color_instance(child, data_set)) {
@@ -364,13 +443,20 @@
 
 static void
 clone_update_pseudo_status(
-	resource_t *child, gboolean *stopping, gboolean *starting) 
+	resource_t *rsc, gboolean *stopping, gboolean *starting) 
 {
+	if(rsc->children) {
+	    slist_iter(child, resource_t, rsc->children, lpc,
+		       clone_update_pseudo_status(child, stopping, starting)
+		);
+	    return;
+	}
+    
 	CRM_ASSERT(stopping != NULL);
 	CRM_ASSERT(starting != NULL);
 
 	slist_iter(
-		action, action_t, child->actions, lpc,
+		action, action_t, rsc->actions, lpc,
 
 		if(*starting && *stopping) {
 			return;
@@ -538,13 +624,13 @@
 	custom_action_order(
 		rsc, NULL, notify,
 		rsc, NULL, notify_complete,
-		pe_order_implies_left, data_set);
+		pe_order_optional, data_set);
 	
 	/* pre_notify_complete before action */
 	custom_action_order(
 		rsc, NULL, notify_complete,
 		rsc, NULL, action,
-		pe_order_implies_left, data_set);
+		pe_order_optional, data_set);
 
 	action->pre_notify = notify;
 	action->pre_notified = notify_complete;
@@ -567,7 +653,7 @@
 	custom_action_order(
 		rsc, NULL, action_complete,
 		rsc, NULL, notify, 
-		pe_order_implies_right, data_set);
+		pe_order_optional, data_set);
 	
 	/* create post_notify_complete */
 	notify_key = generate_notify_key(
@@ -597,7 +683,7 @@
 	custom_action_order(
 		rsc, NULL, notify,
 		rsc, NULL, notify_complete,
-		pe_order_implies_left, data_set);
+		pe_order_optional, data_set);
 
 	action->post_notify = notify;
 	action->post_notified = notify_complete;
@@ -638,12 +724,13 @@
 	}
     
 	if(child != NULL) {
-		order_start_start(rsc, child, pe_order_runnable_left);
+		order_start_start(
+		    rsc, child, pe_order_runnable_left|pe_order_implies_left_printed);
 		
 		custom_action_order(
 			child, start_key(child), NULL,
 			rsc, started_key(rsc), NULL,
-			pe_order_optional, data_set);
+			pe_order_implies_right_printed, data_set);
 	}
 	
 	if(clone_data->ordered) {
@@ -678,12 +765,12 @@
 	}
 
 	if(child != NULL) {
-		order_stop_stop(rsc, child, pe_order_shutdown);
+		order_stop_stop(rsc, child, pe_order_shutdown|pe_order_implies_left_printed);
 		
 		custom_action_order(
 			child, stop_key(child), NULL,
 			rsc, stopped_key(rsc), NULL,
-			pe_order_optional, data_set);
+			pe_order_implies_right_printed, data_set);
 	}
 	
 	if(clone_data->ordered) {
@@ -750,14 +837,14 @@
 
 resource_t*
 find_compatible_child(
-    resource_t *local_child, resource_t *rsc, enum rsc_role_e filter)
+    resource_t *local_child, resource_t *rsc, enum rsc_role_e filter, gboolean current)
 {
 	node_t *local_node = NULL;
 	node_t *node = NULL;
 	clone_variant_data_t *clone_data = NULL;
 	get_clone_variant_data(clone_data, rsc);
 	
-	local_node = local_child->fns->location(local_child, NULL, FALSE);
+	local_node = local_child->fns->location(local_child, NULL, current);
 	if(local_node == NULL) {
 		crm_debug("Can't colocate unrunnable child %s with %s",
 			 local_child->id, rsc->id);
@@ -767,15 +854,15 @@
 	slist_iter(
 		child_rsc, resource_t, rsc->children, lpc,
 
-		enum rsc_role_e next_role = child_rsc->fns->state(child_rsc, FALSE);
-		node = child_rsc->fns->location(child_rsc, NULL, FALSE);
+		enum rsc_role_e next_role = child_rsc->fns->state(child_rsc, current);
+		node = child_rsc->fns->location(child_rsc, NULL, current);
 
 		if(filter != RSC_ROLE_UNKNOWN && next_role != filter) {
 		    crm_debug_2("Filtered %s", child_rsc->id);
 		    continue;
 		}
 		
-		if(node->details == local_node->details) {
+		if(node && local_node && node->details == local_node->details) {
 			crm_info("Colocating %s with %s on %s",
 				 local_child->id, child_rsc->id, node->details->uname);
 			return child_rsc;
@@ -836,7 +923,7 @@
 				}
 				);
 			
-			rsc_lh->allowed_nodes = node_list_and(lhs, rhs, FALSE);
+			rsc_lh->allowed_nodes = node_list_exclude(lhs, rhs);
 			
 			pe_free_shallow_adv(rhs, FALSE);
 			pe_free_shallow(lhs);
@@ -857,10 +944,12 @@
 
 			   CRM_ASSERT(lh_child != NULL);
 			   rh_child = find_compatible_child(
-			       lh_child, rsc_rh, RSC_ROLE_UNKNOWN);
+			       lh_child, rsc_rh, RSC_ROLE_UNKNOWN, FALSE);
 			   if(rh_child == NULL) {
-				   continue;
+			       crm_debug_2("No match found for %s", lh_child->id);
+			       continue;
 			   }
+			   crm_debug("Interleaving %s with %s", lh_child->id, rh_child->id);
 			   lh_child->cmds->rsc_colocation_lh(
 				   lh_child, rh_child, constraint);
 			);
@@ -905,7 +994,7 @@
 			}
 			);
 
-		rsc_lh->allowed_nodes = node_list_and(lhs, rhs, FALSE);
+		rsc_lh->allowed_nodes = node_list_exclude(lhs, rhs);
 
 		pe_free_shallow_adv(rhs, FALSE);
 		pe_free_shallow(lhs);
@@ -923,10 +1012,11 @@
 {
 	resource_t *r1 = NULL;
 	resource_t *r2 = NULL;	
+	gboolean do_interleave = FALSE;
 	clone_variant_data_t *clone_data = NULL;
 	get_clone_variant_data(clone_data, rsc);
 
-	crm_debug_2("%s->%s", order->lh_action_task, order->rh_action_task);
+	crm_debug_4("%s->%s", order->lh_action_task, order->rh_action_task);
 	
 	r1 = uber_parent(rsc);
 	r2 = uber_parent(order->rh_rsc);
@@ -936,14 +1026,55 @@
 		return;
 	}
 
+	if(order->rh_rsc->variant == pe_clone
+	    || order->rh_rsc->variant == pe_master) {
+	    clone_variant_data_t *clone_data_rh = NULL;
+	    get_clone_variant_data(clone_data_rh, order->rh_rsc);
+	    if(clone_data->clone_node_max != clone_data_rh->clone_node_max) {
+		crm_config_err("Cannot interleave "XML_CIB_TAG_INCARNATION
+			       " %s and %s because they do not support the same"
+			       " number of resources per node",
+			       rsc->id, order->rh_rsc->id);
+		
+		/* only the LHS side needs to be labeled as interleave */
+	    } else if(clone_data->interleave) {
+		do_interleave = TRUE;
+	    }
+	}
+
+	if(do_interleave && order->rh_rsc) {
+	    resource_t *lh_child = NULL;
+	    resource_t *rh_saved = order->rh_rsc;
+	    gboolean current = FALSE;
+	    if(strstr(order->lh_action_task, "_stop_0") || strstr(order->lh_action_task, "_demote_0")) {
+		current = TRUE;
+	    }
+	    
+	    slist_iter(
+		rh_child, resource_t, rh_saved->children, lpc,
+		
+		CRM_ASSERT(rh_child != NULL);
+		lh_child = find_compatible_child(rh_child, rsc, RSC_ROLE_UNKNOWN, current);
+		if(lh_child == NULL) {
+		    crm_debug_2("No match found for %s", rh_child->id);
+		    continue;
+		}
+		crm_debug("Interleaving %s with %s", lh_child->id, rh_child->id);
+		order->rh_rsc = rh_child;
+		lh_child->cmds->rsc_order_lh(lh_child, order, data_set);
+		order->rh_rsc = rh_saved;
+		);
+	    
+	} else {
+	    
 #if 0
-	if(order->type != pe_order_optional) {
+	    if(order->type != pe_order_optional) {
 		crm_debug("Upgraded ordering constraint %d - 0x%.6x", order->id, order->type);
 		native_rsc_order_lh(rsc, order, data_set);
-	}
+	    }
 #endif
-	
-	if(order->type & pe_order_implies_left) {
+	    
+	    if(order->type & pe_order_implies_left) {
 		if(rsc->variant == order->rh_rsc->variant) {
 			crm_debug_2("Clone-to-clone ordering: %s -> %s 0x%.6x",
 				order->lh_action_task, order->rh_action_task, order->type);
@@ -961,10 +1092,16 @@
 				native_rsc_order_lh(child_rsc, order, data_set);
 				);
 		}
-	}
+	    }
+	    convert_non_atomic_task(rsc, order, FALSE);
+	    native_rsc_order_lh(rsc, order, data_set);
+	}	
 
-	convert_non_atomic_task(rsc, order);
-	native_rsc_order_lh(rsc, order, data_set);
+	if(is_set(rsc->flags, pe_rsc_notify)) {
+	    order->type = pe_order_optional;
+	    convert_non_atomic_task(rsc, order, TRUE);
+	    native_rsc_order_lh(rsc, order, data_set);
+	}
 }
 
 void clone_rsc_order_rh(
@@ -973,8 +1110,18 @@
 	clone_variant_data_t *clone_data = NULL;
 	get_clone_variant_data(clone_data, rsc);
 
-	crm_debug_2("%s->%s", lh_action->uuid, order->rh_action_task);
+	crm_debug_4("%s->%s", lh_action->uuid, order->rh_action_task);
+	if(safe_str_eq(CRM_OP_PROBED, lh_action->uuid)) {
+	    slist_iter(
+		child_rsc, resource_t, rsc->children, lpc,
+		child_rsc->cmds->rsc_order_rh(lh_action, child_rsc, order);
+		);
 
+	    if(rsc->fns->state(rsc, TRUE) < RSC_ROLE_STARTED
+		&& rsc->fns->state(rsc, FALSE) > RSC_ROLE_STOPPED) {
+		order->type |= pe_order_implies_right;
+	    }
+	}
  	native_rsc_order_rh(lh_action, rsc, order);
 
 }
@@ -1084,6 +1231,47 @@
 		   );
 }
 
+static void mark_notifications_required(resource_t *rsc, enum action_tasks task, gboolean top) 
+{
+    char *key = NULL;
+    char *key_complete = NULL;
+    const char *task_s = task2text(task);
+
+    if(top) {
+	key = generate_op_key(rsc->id, task_s, 0);
+	key_complete = generate_op_key(rsc->id, task2text(task+1), 0);
+    }
+    
+    slist_iter(action, action_t, rsc->actions, lpc,
+	       
+	       if(action->optional == FALSE) {
+		   continue;
+	       }
+	       
+	       if(safe_str_eq(action->uuid, key)
+		  || safe_str_eq(action->uuid, key_complete)) {
+		   crm_debug_3("Marking top-level action %s as required", action->uuid);
+		   action->optional = FALSE;
+	       }
+	       
+	       if(strstr(action->uuid, task_s)) {
+		   if(safe_str_eq(CRMD_ACTION_NOTIFIED, action->task)
+		      || safe_str_eq(CRMD_ACTION_NOTIFY, action->task)) {
+		       crm_debug_3("Marking %s as required", action->uuid);
+		       action->optional = FALSE;
+		   }   
+	       }
+	);
+
+    slist_iter(
+	child, resource_t, rsc->children, lpc,
+	mark_notifications_required(child, task, FALSE);
+	);
+    
+    crm_free(key_complete);
+    crm_free(key);
+}
+
 void clone_expand(resource_t *rsc, pe_working_set_t *data_set)
 {
 	char *rsc_list = NULL;
@@ -1128,6 +1316,9 @@
 		g_hash_table_insert(
 			n_data->keys,
 			crm_strdup("notify_stop_uname"), node_list);
+		if(rsc_list != NULL) {
+		    mark_notifications_required(rsc, stop_rsc, TRUE);
+		}
 	}
 
 	if(is_set(rsc->flags, pe_rsc_notify) && n_data->start) {
@@ -1142,6 +1333,7 @@
 		g_hash_table_insert(
 			n_data->keys,
 			crm_strdup("notify_start_uname"), node_list);
+		mark_notifications_required(rsc, start_rsc, TRUE);
 	}
 	
 	if(is_set(rsc->flags, pe_rsc_notify) && n_data->demote) {
@@ -1156,6 +1348,7 @@
 		g_hash_table_insert(
 			n_data->keys,
 			crm_strdup("notify_demote_uname"), node_list);
+		mark_notifications_required(rsc, action_demote, TRUE);
 	}
 	
 	if(is_set(rsc->flags, pe_rsc_notify) && n_data->promote) {
@@ -1170,6 +1363,7 @@
 		g_hash_table_insert(
 			n_data->keys,
 			crm_strdup("notify_promote_uname"), node_list);
+		mark_notifications_required(rsc, action_promote, TRUE);
 	}
 	
 	if(is_set(rsc->flags, pe_rsc_notify) && n_data->active) {
@@ -1271,6 +1465,19 @@
 	return strcmp(resource1->id, resource2->id);
 }
 
+static resource_t *find_instance_on(resource_t *rsc, node_t *node)
+{
+    slist_iter(child, resource_t, rsc->children, lpc,
+
+	       slist_iter(known ,node_t, child->known_on, lpc2,
+			  if(node->details == known->details) {
+			      return child;
+			  }
+		   );
+	);
+    return NULL;
+}
+
 gboolean
 clone_create_probe(resource_t *rsc, node_t *node, action_t *complete,
 		    gboolean force, pe_working_set_t *data_set) 
@@ -1280,18 +1487,38 @@
 	get_clone_variant_data(clone_data, rsc);
 
 	rsc->children = g_list_sort(rsc->children, sort_rsc_id);
-
+	
 	if(is_not_set(rsc->flags, pe_rsc_unique)
 	   && clone_data->clone_node_max == 1) {
 		/* only look for one copy */	 
+		resource_t *child = NULL;
+
+		/* Try whoever we probed last time */
+		child = find_instance_on(rsc, node);
+		if(child) {
+		    return child->cmds->create_probe(
+			child, node, complete, force, data_set);
+		}
+
+		/* Try whoever we plan on starting there */
 		slist_iter(	 
 			child_rsc, resource_t, rsc->children, lpc,	 
 
-			if(pe_find_node_id(child_rsc->running_on, node->details->id)) {	 
-				return child_rsc->cmds->create_probe(
-					child_rsc, node, complete, force, data_set);
+			node_t *local_node = child_rsc->fns->location(child_rsc, NULL, FALSE);
+			if(local_node == NULL) {
+			    continue;
 			}
-			);
+			
+			if(local_node->details == node->details) {
+			    return child_rsc->cmds->create_probe(
+				child_rsc, node, complete, force, data_set);
+			}
+		    );
+
+		/* Fall back to the first clone instance */
+		child = rsc->children->data;
+		return child->cmds->create_probe(child, node, complete, force, data_set);
+		
 	}
 	slist_iter(
 		child_rsc, resource_t, rsc->children, lpc,
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/constraints.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/constraints.c
--- heartbeat-2.1.3/crm/pengine/constraints.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/constraints.c	2008-08-18 13:32:19.000000000 +0100
@@ -211,9 +211,9 @@
 		rsc_rh, generate_op_key(rsc_rh->id, action_rh, 0), NULL,
 		cons_weight, data_set);
 
-	crm_debug("order-%d (%s): %s_%s %s %s_%s flags=0x%.6x",
-		  order_id, id, rsc_lh->id, action, type, rsc_rh->id, action_rh,
-		  cons_weight);
+	crm_debug_2("order-%d (%s): %s_%s %s %s_%s flags=0x%.6x",
+		    order_id, id, rsc_lh->id, action, type, rsc_rh->id, action_rh,
+		    cons_weight);
 	
 	
 	if(symmetrical_bool == FALSE) {
@@ -258,9 +258,9 @@
 		rsc_rh, generate_op_key(rsc_rh->id, action_rh, 0), NULL,
 		rsc_lh, generate_op_key(rsc_lh->id, action, 0), NULL,
 		cons_weight, data_set);
-	crm_debug("order-%d (%s): %s_%s %s %s_%s flags=0x%.6x",
-		  order_id, id, rsc_rh->id, action_rh, type, rsc_lh->id, action,
-		  cons_weight);
+	crm_debug_2("order-%d (%s): %s_%s %s %s_%s flags=0x%.6x",
+		    order_id, id, rsc_rh->id, action_rh, type, rsc_lh->id, action,
+		    cons_weight);
 	
 	return TRUE;
 }
@@ -561,9 +561,8 @@
 	new_con->role_lh = text2role(state_lh);
 	new_con->role_rh = text2role(state_rh);
 	new_con->node_attribute = node_attr;
-	
-	crm_debug_4("Adding constraint %s (%p) to %s",
-		  new_con->id, new_con, rsc_lh->id);
+
+	crm_debug_4("%s ==> %s (%d)", rsc_lh->id, rsc_rh->id, score);
 	
 	rsc_lh->rsc_cons = g_list_insert_sorted(
 		rsc_lh->rsc_cons, new_con, sort_cons_priority_rh);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/graph.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/graph.c
--- heartbeat-2.1.3/crm/pengine/graph.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/graph.c	2008-08-18 13:32:19.000000000 +0100
@@ -50,15 +50,16 @@
 update_action(action_t *action)
 {
 	int local_type = 0;
-	int log_level = LOG_DEBUG_2;
+	int default_log_level = LOG_DEBUG_3;
+	int log_level = default_log_level;
 	gboolean changed = FALSE;
-	
+
 	do_crm_log(log_level, "Processing action %s: %s %s %s",
 		   action->uuid,
 		   action->optional?"optional":"required",
 		   action->runnable?"runnable":"unrunnable",
 		   action->pseudo?"pseudo":action->task);
-
+	
 	slist_iter(
 		other, action_wrapper_t, action->actions_before, lpc,
 
@@ -70,7 +71,18 @@
 		if(other_rsc) {
 		    other_role = other_rsc->fns->state(other_rsc, TRUE);
 		}
-		
+
+		if(other->type & pe_order_test) {
+		    log_level = LOG_NOTICE;
+		    do_crm_log(log_level, "Processing action %s: %s %s %s",
+			       action->uuid,
+			       action->optional?"optional":"required",
+			       action->runnable?"runnable":"unrunnable",
+			       action->pseudo?"pseudo":action->task);
+		} else {
+		    log_level = default_log_level;
+		}
+
 		do_crm_log(log_level, "   Checking action %s: %s %s %s (flags=0x%.6x)",
 			   other->action->uuid,
 			   other->action->optional?"optional":"required",
@@ -80,6 +92,15 @@
 
 		local_type = other->type;
 
+		if((local_type & pe_order_demote_stop)
+		   && other->action->pseudo == FALSE
+		   && other_role > RSC_ROLE_SLAVE
+		   && node != NULL
+		   && node->details->online) {
+		    local_type |= pe_order_implies_left;
+		    do_crm_log(log_level,"Upgrading demote->stop constraint to implies_left");
+		}
+
 		if((local_type & pe_order_demote)
 		   && other->action->pseudo == FALSE
 		   && other_role > RSC_ROLE_SLAVE
@@ -89,7 +110,24 @@
 		    do_crm_log(log_level,"Upgrading restart constraint to runnable_left");
 		}
 
+		if((local_type & pe_order_complex_right)
+		   && action->optional
+		   && other->action->optional == FALSE
+		   && (local_type ^ pe_order_complex_right) != pe_order_optional) {
+		    local_type |= pe_order_implies_right;
+		    do_crm_log(log_level,"Upgrading complex constraint to implies_right");
+		}
+
+		if((local_type & pe_order_complex_left)
+		   && action->optional == FALSE
+		   && other->action->optional
+		   && (local_type ^ pe_order_complex_left) != pe_order_optional) {
+		    local_type |= pe_order_implies_left;
+		    do_crm_log(log_level,"Upgrading complex constraint to implies_left");
+		}
+		
 		if((local_type & pe_order_shutdown)
+		   && action->optional
 		   && other->action->optional == FALSE
 		   && is_set(other_rsc->flags, pe_rsc_shutdown)) {
 		    action->optional = FALSE;
@@ -152,7 +190,7 @@
 				other_changed = TRUE;
 			}
 		}		
-		
+
 		if(local_type & pe_order_implies_left) {
 			if(other->action->optional == FALSE) {
 				/* nothing to do */
@@ -180,10 +218,25 @@
 			}
 		}
 		
+		if(local_type & pe_order_implies_left_printed) {
+		    if(other->action->optional == TRUE
+		       && other->action->print_always == FALSE) {
+			if(action->optional == FALSE
+			   || (other->action->pseudo && action->print_always)) {
+			    other_changed = TRUE;
+			    other->action->print_always = TRUE;
+			    do_crm_log(log_level-1,
+				       "   * (implies left) Ensuring action %s is included because of %s",
+				       other->action->uuid, action->uuid);
+			}
+		    }
+		}
+
 		if(local_type & pe_order_implies_right) {
 			if(action->optional == FALSE) {
 				/* nothing to do */
 				do_crm_log(log_level+1, "      Ignoring implies right - redundant");
+
 			} else if(other->action->optional == FALSE) {
 				action->optional = FALSE;
 				do_crm_log(log_level-1,
@@ -196,6 +249,20 @@
 			}
 		}
 
+		if(local_type & pe_order_implies_right_printed) {
+		    if(action->optional == TRUE
+		       && action->print_always == FALSE) {
+			if(other->action->optional == FALSE
+			   || (action->pseudo && other->action->print_always)) {
+			    changed = TRUE;
+			    action->print_always = TRUE;
+			    do_crm_log(log_level-1,
+				       "   * (implies right) Ensuring action %s is included because of %s",
+				       action->uuid, other->action->uuid);
+			}
+		    }
+		}
+
 		if(other_changed) {
 			do_crm_log(log_level, "%s changed, processing after list", other->action->uuid);
 			update_action(other->action);
@@ -204,17 +271,29 @@
 				do_crm_log(log_level, "%s changed, processing %s", other->action->uuid, before_other->action->uuid);
 				update_action(before_other->action);
 				);
+			slist_iter(
+				before_other, action_wrapper_t, other->action->actions_before, lpc2,
+				do_crm_log(log_level, "%s changed, processing %s", other->action->uuid, before_other->action->uuid);
+				update_action(before_other->action);
+				);
 		}
 		
 		);
 
 	if(changed) {
+		update_action(action);
 		do_crm_log(log_level, "%s changed, processing after list", action->uuid);
 		slist_iter(
 			other, action_wrapper_t, action->actions_after, lpc,
 			do_crm_log(log_level, "%s changed, processing %s", action->uuid, other->action->uuid);
 			update_action(other->action);
 			);
+		do_crm_log(log_level, "%s changed, processing before list", action->uuid);
+		slist_iter(
+			other, action_wrapper_t, action->actions_before, lpc,
+			do_crm_log(log_level, "%s changed, processing %s", action->uuid, other->action->uuid);
+			update_action(other->action);
+			);
 	}
 	
 	return FALSE;
@@ -428,37 +507,32 @@
 static gboolean
 should_dump_action(action_t *action) 
 {
-	const char * interval = NULL;
+	int log_filter = LOG_DEBUG_5;
 
 	CRM_CHECK(action != NULL, return FALSE);
 
-	interval = g_hash_table_lookup(action->meta, XML_LRM_ATTR_INTERVAL);
-	if(action->optional) {
-		crm_debug_5("action %d (%s) was optional",
+	if(action->dumped) {
+		do_crm_log(log_filter, "action %d (%s) was already dumped",
 			    action->id, action->uuid);
 		return FALSE;
 
 	} else if(action->runnable == FALSE) {
-		crm_debug_5("action %d (%s) was not runnable",
+		do_crm_log(log_filter, "action %d (%s) was not runnable",
 			    action->id, action->uuid);
 		return FALSE;
 
-	} else if(action->dumped) {
-		crm_debug_5("action %d (%s) was already dumped",
+	} else if(action->optional && action->print_always == FALSE) {
+		do_crm_log(log_filter, "action %d (%s) was optional",
 			    action->id, action->uuid);
 		return FALSE;
 
 	} else if(action->rsc != NULL
 		  && is_not_set(action->rsc->flags, pe_rsc_managed)) {
+		const char * interval = NULL;
+		interval = g_hash_table_lookup(action->meta, XML_LRM_ATTR_INTERVAL);
 
-		/* make sure probes go through */
-		if(safe_str_neq(action->task, CRMD_ACTION_STATUS)) {
-			pe_warn("action %d (%s) was for an unmanaged resource (%s)",
-				action->id, action->uuid, action->rsc->id);
-			return FALSE;
-		}
-		
-		if(interval != NULL && safe_str_neq(interval, "0")) {
+		/* make sure probes and recurring monitors go through */
+		if(safe_str_neq(action->task, CRMD_ACTION_STATUS) && interval == NULL) {
 			pe_warn("action %d (%s) was for an unmanaged resource (%s)",
 				action->id, action->uuid, action->rsc->id);
 			return FALSE;
@@ -519,49 +593,77 @@
 static gboolean
 should_dump_input(int last_action, action_t *action, action_wrapper_t *wrapper)
 {
+    int type = wrapper->type;
+    int log_dump = LOG_DEBUG_3;
+    int log_filter = LOG_DEBUG_3;
+    
+    type &= ~pe_order_implies_left_printed;
+    type &= ~pe_order_implies_right_printed;
+    type &= ~pe_order_optional;
+    
     wrapper->state = pe_link_not_dumped;	
     if(last_action == wrapper->action->id) {
-	crm_debug_2("Input (%d) %s duplicated",
-		    wrapper->action->id,
-		    wrapper->action->uuid);
+	do_crm_log(log_filter, "Input (%d) %s duplicated for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
 	wrapper->state = pe_link_dup;
 	return FALSE;
 	
     } else if(wrapper->type == pe_order_none) {
-	crm_debug_2("Input (%d) %s suppressed",
-		    wrapper->action->id,
-		    wrapper->action->uuid);
+	do_crm_log(log_filter, "Input (%d) %s suppressed for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
 	return FALSE;
-	
-    } else if(wrapper->action->optional == TRUE) {
-	crm_debug_2("Input (%d) %s optional",
-		    wrapper->action->id,
-		    wrapper->action->uuid);
-	return FALSE;
-	
+
     } else if(wrapper->action->runnable == FALSE
-	      && wrapper->action->pseudo == FALSE
-	      && wrapper->type == pe_order_optional) {
-	crm_debug("Input (%d) %s optional (ordering)",
-		  wrapper->action->id,
-		  wrapper->action->uuid);
+	      && type == pe_order_none) {
+	do_crm_log(log_filter, "Input (%d) %s optional (ordering) for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
 	return FALSE;
 
     } else if(action->pseudo
 	      && (wrapper->type & pe_order_stonith_stop)) {
-	crm_debug("Input (%d) %s suppressed",
-		  wrapper->action->id,
-		  wrapper->action->uuid);
+	do_crm_log(log_filter, "Input (%d) %s suppressed for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
 	return FALSE;
-    }
-    crm_debug_3("Input (%d) %s n=%p p=%d r=%d f=0x%.6x dumped for %s",
-		wrapper->action->id,
-		wrapper->action->uuid,
-		wrapper->action->node,
-		wrapper->action->pseudo,
-		wrapper->action->runnable,      
-		wrapper->type,      
-		action->uuid);
+
+    } else if(wrapper->action->dumped || should_dump_action(wrapper->action)) {
+	do_crm_log(log_dump, "Input (%d) %s should be dumped for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
+	goto dump;
+
+#if 0
+    } if(wrapper->action->runnable
+	 && wrapper->action->pseudo
+	 && wrapper->action->rsc->variant != pe_native) {
+	do_crm_log(LOG_CRIT, "Input (%d) %s should be dumped for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
+	goto dump;
+#endif
+    } else if(wrapper->action->optional == TRUE && wrapper->action->print_always == FALSE) {
+	do_crm_log(log_filter, "Input (%d) %s optional for %s",
+		   wrapper->action->id, wrapper->action->uuid, action->uuid);
+    do_crm_log(log_filter, "Input (%d) %s n=%p p=%d r=%d o=%d a=%d f=0x%.6x",
+	       wrapper->action->id,
+	       wrapper->action->uuid,
+	       wrapper->action->node,
+	       wrapper->action->pseudo,
+	       wrapper->action->runnable,
+	       wrapper->action->optional,
+	       wrapper->action->print_always,
+	       wrapper->type);
+	return FALSE;
+    } 
+	
+  dump:
+    do_crm_log(log_dump, "Input (%d) %s n=%p p=%d r=%d o=%d a=%d f=0x%.6x dumped for %s",
+	       wrapper->action->id,
+	       wrapper->action->uuid,
+	       wrapper->action->node,
+	       wrapper->action->pseudo,
+	       wrapper->action->runnable,      
+	       wrapper->action->optional,
+	       wrapper->action->print_always,
+	       wrapper->type,      
+	       action->uuid);
     return TRUE;
 }
 		   
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/group.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/group.c
--- heartbeat-2.1.3/crm/pengine/group.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/group.c	2008-08-18 13:32:19.000000000 +0100
@@ -58,8 +58,29 @@
 		group_data->first_child->rsc_cons, rsc->rsc_cons);
 	rsc->rsc_cons = NULL;
 
+	dump_node_scores(scores_log_level, rsc, __PRETTY_FUNCTION__, rsc->allowed_nodes);
+	
 	slist_iter(
 		child_rsc, resource_t, rsc->children, lpc,
+
+		/* another place we need the force-to-minus-infinity hack until resource-failure-stickiness goes away */
+		slist_iter(
+		    node, node_t, child_rsc->allowed_nodes, lpc2,
+		    if(node->weight < 0 && node->weight > -INFINITY) {
+			/* Once a child's score goes below zero, force the node score to -INFINITY
+			 *
+			 * This prevents the group from being partially active in scenarios
+			 *  where it could be fully active elsewhere
+			 *
+			 * If we don't do this, then the next child(ren)'s stickiness might bring
+			 *  the combined score above 0 again - which confuses the PE into thinking
+			 *  the whole group can run there but is pointless since the later children
+			 *  are not be able to run if the ones before them can't
+			 */
+			node->weight = -INFINITY;
+		    }
+		    );
+
 		node = child_rsc->cmds->color(child_rsc, data_set);
 		if(group_node == NULL) {
 		    group_node = node;
@@ -81,6 +102,7 @@
 void group_create_actions(resource_t *rsc, pe_working_set_t *data_set)
 {
 	action_t *op = NULL;
+	const char *value = NULL;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
@@ -92,26 +114,40 @@
 		group_update_pseudo_status(rsc, child_rsc);
 		);
 
-	op = start_action(rsc, NULL, !group_data->child_starting);
+	op = start_action(rsc, NULL, TRUE/* !group_data->child_starting */);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
 	op = custom_action(rsc, started_key(rsc),
 			   CRMD_ACTION_STARTED, NULL,
-			   !group_data->child_starting, TRUE, data_set);
+			   TRUE/* !group_data->child_starting */, TRUE, data_set);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
-	op = stop_action(rsc, NULL, !group_data->child_stopping);
+	op = stop_action(rsc, NULL, TRUE/* !group_data->child_stopping */);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 	
 	op = custom_action(rsc, stopped_key(rsc),
 			   CRMD_ACTION_STOPPED, NULL,
-			   !group_data->child_stopping, TRUE, data_set);
+			   TRUE/* !group_data->child_stopping */, TRUE, data_set);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
+	value = g_hash_table_lookup(rsc->parameters, crm_meta_name("stateful"));
+	if(crm_is_true(value)) {
+	    op = custom_action(rsc, demote_key(rsc), CRMD_ACTION_DEMOTE, NULL, TRUE, TRUE, data_set);
+	    op->pseudo = TRUE; op->runnable = TRUE;
+	    op = custom_action(rsc, demoted_key(rsc), CRMD_ACTION_DEMOTED, NULL, TRUE, TRUE, data_set);
+	    op->pseudo = TRUE; op->runnable = TRUE;
+
+	    op = custom_action(rsc, promote_key(rsc), CRMD_ACTION_PROMOTE, NULL, TRUE, TRUE, data_set);
+	    op->pseudo = TRUE; op->runnable = TRUE;
+	    op = custom_action(rsc, promoted_key(rsc), CRMD_ACTION_PROMOTED, NULL, TRUE, TRUE, data_set);
+	    op->pseudo = TRUE; op->runnable = TRUE;
+	}
+
+	
 	rsc->actions = rsc->actions;
 /* 	rsc->actions = NULL; */
 }
@@ -122,6 +158,11 @@
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, parent);
 
+	if(group_data->ordered == FALSE) {
+	    /* If this group is not ordered, then leave the meta-actions as optional */ 
+	    return;
+	}
+	
 	if(group_data->child_stopping && group_data->child_starting) {
 		return;
 	}
@@ -145,16 +186,16 @@
 
 void group_internal_constraints(resource_t *rsc, pe_working_set_t *data_set)
 {
+	const char *value = NULL;
+	gboolean stateful = FALSE;
 	resource_t *last_rsc = NULL;
-	int stopstop = pe_order_shutdown;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	native_internal_constraints(rsc, data_set);
 
-	if(group_data->ordered == FALSE) {
-	    stopstop |= pe_order_implies_right;
-	}
+	value = g_hash_table_lookup(rsc->parameters, crm_meta_name("stateful"));
+	stateful = crm_is_true(value);
 	
 	custom_action_order(
 		rsc, stopped_key(rsc), NULL,
@@ -164,7 +205,7 @@
 	custom_action_order(
 		rsc, stop_key(rsc), NULL,
 		rsc, stopped_key(rsc), NULL,
-		pe_order_runnable_left, data_set);
+		pe_order_runnable_left|pe_order_implies_right|pe_order_implies_left, data_set);
 
 	custom_action_order(
 		rsc, start_key(rsc), NULL,
@@ -173,33 +214,75 @@
 	
 	slist_iter(
 		child_rsc, resource_t, rsc->children, lpc,
-
+		int stop = pe_order_shutdown|pe_order_implies_right;
+		int stopped = pe_order_implies_right_printed;
+		int start = pe_order_implies_right|pe_order_runnable_left;
+		int started = pe_order_runnable_left|pe_order_implies_right|pe_order_implies_right_printed;
+		
 		child_rsc->cmds->internal_constraints(child_rsc, data_set);
 
-		if(group_data->colocated && last_rsc != NULL) {
+		if(last_rsc == NULL) {
+		    stop |= pe_order_implies_left;
+		    stopped = pe_order_implies_right;
+		    
+		} else if(group_data->colocated) {
 			rsc_colocation_new(
 				"group:internal_colocation", NULL, INFINITY,
 				child_rsc, last_rsc, NULL, NULL, data_set);
 		}
 
-		order_stop_stop(rsc, child_rsc, stopstop);
+		if(stateful) {
+		    custom_action_order(rsc,  demote_key(rsc), NULL,
+					child_rsc, demote_key(child_rsc), NULL,
+					stop|pe_order_implies_left_printed, data_set);
+
+		    custom_action_order(child_rsc, demote_key(child_rsc), NULL,
+					rsc,  demoted_key(rsc), NULL,
+					stopped, data_set);
+
+		    custom_action_order(child_rsc, promote_key(child_rsc), NULL,
+					rsc, promoted_key(rsc), NULL,
+					started, data_set);
+
+		    custom_action_order(rsc, promote_key(rsc), NULL,
+					child_rsc, promote_key(child_rsc), NULL,
+					pe_order_implies_left_printed, data_set);
+
+		}
+		
+		order_start_start(rsc, child_rsc, pe_order_implies_left_printed);
+		order_stop_stop(rsc, child_rsc, stop|pe_order_implies_left_printed);
 		
 		custom_action_order(child_rsc, stop_key(child_rsc), NULL,
 				    rsc,  stopped_key(rsc), NULL,
-				    pe_order_optional, data_set);
+				    stopped, data_set);
 
 		custom_action_order(child_rsc, start_key(child_rsc), NULL,
 				    rsc, started_key(rsc), NULL,
-				    pe_order_runnable_left, data_set);
+				    started, data_set);
 		
  		if(group_data->ordered == FALSE) {
-			order_start_start(rsc, child_rsc, pe_order_implies_right|pe_order_runnable_left);
+			order_start_start(rsc, child_rsc, start|pe_order_implies_left_printed);
+			if(stateful) {
+			    custom_action_order(rsc, promote_key(rsc), NULL,
+						child_rsc, promote_key(child_rsc), NULL,
+						start|pe_order_implies_left_printed, data_set);
+			}
 
 		} else if(last_rsc != NULL) {
-			order_start_start(last_rsc, child_rsc, pe_order_implies_right|pe_order_runnable_left);
+			child_rsc->restart_type = pe_restart_restart;
+
+			order_start_start(last_rsc, child_rsc, start);
 			order_stop_stop(child_rsc, last_rsc, pe_order_implies_left);
 
-			child_rsc->restart_type = pe_restart_restart;
+			if(stateful) {
+			    custom_action_order(last_rsc, promote_key(last_rsc), NULL,
+						child_rsc, promote_key(child_rsc), NULL,
+						start, data_set);
+			    custom_action_order(child_rsc,  demote_key(child_rsc), NULL,
+						last_rsc, demote_key(last_rsc), NULL,
+						pe_order_implies_left, data_set);
+			}
 
 		} else {
 			/* If anyone in the group is starting, then
@@ -208,15 +291,37 @@
 			 * But this is safe since starting something that is already
 			 *  started is required to be "safe"
 			 */
-			order_start_start(rsc, child_rsc,
-					  pe_order_implies_right|pe_order_implies_left|pe_order_runnable_right|pe_order_runnable_left);
+			int flags = pe_order_implies_left|pe_order_implies_right|pe_order_runnable_right|pe_order_runnable_left;
+		    
+			order_start_start(rsc, child_rsc, flags);
+			if(stateful) {
+			    custom_action_order(rsc, promote_key(rsc), NULL,
+						child_rsc, promote_key(child_rsc), NULL,
+						flags, data_set);
+			}
+			
 		}
 		
 		last_rsc = child_rsc;
 		);
 
 	if(group_data->ordered && last_rsc != NULL) {
-		order_stop_stop(rsc, last_rsc, pe_order_implies_right);
+		int stop_stop_flags = pe_order_implies_right;
+		int stop_stopped_flags = pe_order_implies_left;
+	    
+		order_stop_stop(rsc, last_rsc, stop_stop_flags);
+		custom_action_order(last_rsc, stop_key(last_rsc), NULL,
+				    rsc,  stopped_key(rsc), NULL,
+				    stop_stopped_flags, data_set);
+
+		if(stateful) {
+		    custom_action_order(rsc, demote_key(rsc), NULL,
+					last_rsc, demote_key(last_rsc), NULL,
+					stop_stop_flags, data_set);
+		    custom_action_order(last_rsc, demote_key(last_rsc), NULL,
+					rsc, demoted_key(rsc), NULL,
+					stop_stopped_flags, data_set);
+		}
 	}		
 }
 
@@ -294,14 +399,14 @@
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
-	crm_debug_2("%s->%s", order->lh_action_task, order->rh_action_task);
+	crm_debug_4("%s->%s", order->lh_action_task, order->rh_action_task);
 
 	if(order->rh_rsc != NULL
 	   && (rsc == order->rh_rsc || rsc == order->rh_rsc->parent)) {
 		native_rsc_order_lh(rsc, order, data_set);
 		return;
 	}
-
+#if 0
 	if(order->type != pe_order_optional) {
 		native_rsc_order_lh(rsc, order, data_set);
 	}
@@ -309,8 +414,9 @@
 	if(order->type & pe_order_implies_left) {
  		native_rsc_order_lh(group_data->first_child, order, data_set);
 	}
+#endif
 
-	convert_non_atomic_task(rsc, order);
+	convert_non_atomic_task(rsc, order, TRUE);
 	native_rsc_order_lh(rsc, order, data_set);
 }
 
@@ -320,12 +426,60 @@
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
-	crm_debug_2("%s->%s", lh_action->uuid, order->rh_action_task);
+	crm_debug_4("%s->%s", lh_action->uuid, order->rh_action_task);
 
 	if(rsc == NULL) {
 		return;
 	}
 
+	if(safe_str_eq(CRM_OP_PROBED, lh_action->uuid)) {
+	    slist_iter(
+		child_rsc, resource_t, rsc->children, lpc,
+		child_rsc->cmds->rsc_order_rh(lh_action, child_rsc, order);
+		);
+
+	    if(rsc->fns->state(rsc, TRUE) < RSC_ROLE_STARTED
+		&& rsc->fns->state(rsc, FALSE) > RSC_ROLE_STOPPED) {
+		order->type |= pe_order_implies_right;
+	    }
+	    
+	} else if(lh_action->rsc != NULL
+	   && lh_action->rsc != rsc
+	   && lh_action->rsc != rsc->parent
+	   && lh_action->rsc->parent != rsc) {
+	    char *tmp = NULL;
+	    char *task_s = NULL;
+	    int interval = 0;
+	    enum action_tasks task = 0;
+	    
+	    parse_op_key(order->lh_action_task, &tmp, &task_s, &interval);
+	    task = text2task(task_s);
+	    crm_free(task_s);
+	    crm_free(tmp);
+	    
+	    switch(task) {
+		case no_action:
+		case monitor_rsc:
+		case action_notify:
+		case action_notified:
+		case shutdown_crm:
+		case stonith_node:
+		    break;
+		case stop_rsc:
+		case stopped_rsc:
+		case action_demote:
+		case action_demoted:
+		    order->type |= pe_order_complex_left;
+		    break;
+		case start_rsc:
+		case started_rsc:
+		case action_promote:
+		case action_promoted:
+		    order->type |= pe_order_complex_right;
+		    break;
+	    }
+	}
+	
 	native_rsc_order_rh(lh_action, rsc, order);
 }
 
@@ -371,10 +525,13 @@
 
 }
 
+extern void node_list_update(GListPtr list1, GListPtr list2, int factor);
+
 GListPtr
 group_merge_weights(
     resource_t *rsc, const char *rhs, GListPtr nodes, int factor, gboolean allow_rollback) 
 {
+    GListPtr archive = NULL;
     group_variant_data_t *group_data = NULL;
     get_group_variant_data(group_data, rsc);
     
@@ -382,13 +539,53 @@
 	crm_debug("Breaking dependancy loop with %s at %s", rsc->id, rhs);
 	return nodes;
 
-    } else if(is_not_set(rsc->flags, pe_rsc_provisional) || can_run_any(nodes) == FALSE) {
+    } else if(is_not_set(rsc->flags, pe_rsc_provisional)) {
 	return nodes;
     }
 
     set_bit(rsc->flags, pe_rsc_merging);
+
+#if 0
+    /* turn this back on once we switch to migration-threshold */
     nodes = group_data->first_child->cmds->merge_weights(
 	group_data->first_child, rhs, nodes, factor, allow_rollback);
+    
+#else
+    slist_iter(child, resource_t, rsc->children, lpc,
+
+	       if(allow_rollback) {
+		   archive = node_list_dup(nodes, FALSE, FALSE);
+	       }
+    	       
+	       slist_iter(
+		   node, node_t, child->allowed_nodes, lpc2,
+		   if(node->weight < 0 && node->weight > -INFINITY) {
+		       /* Once a child's score goes below zero, force the node score to -INFINITY
+			*
+			* This prevents the group from being partially active in scenarios
+			*  where it could be fully active elsewhere
+			*
+			* If we don't do this, then the next child(ren)'s stickiness might bring
+			*  the combined score above 0 again - which confuses the PE into thinking
+			*  the whole group can run there but is pointless since the later children
+			*  are not be able to run if the ones before them can't
+			*/
+		       node->weight = -INFINITY;
+		   }
+		   );
+	       
+	       node_list_update(nodes, child->allowed_nodes, factor);
+
+	       if(archive && can_run_any(nodes) == FALSE) {
+		   crm_debug("%s: Rolling back scores from %s", rhs, rsc->id);
+		   pe_free_shallow_adv(nodes, TRUE);
+		   nodes = archive;
+		   goto bail;
+	       }
+
+	       pe_free_shallow_adv(archive, TRUE);
+	);
+#endif
 
     slist_iter(
 	constraint, rsc_colocation_t, rsc->rsc_cons_lhs, lpc,
@@ -398,6 +595,7 @@
 	    constraint->score/INFINITY, allow_rollback);
 	);
 
+  bail:
     clear_bit(rsc->flags, pe_rsc_merging);
     return nodes;
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/Makefile
--- heartbeat-2.1.3/crm/pengine/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/pengine/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,790 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/pengine/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/pengine
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/pengine
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+pe_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/pengine
+
+# sockets with path
+crmdir = $(havarlibdir)/crm
+apigid = 65
+crmuid = 17
+COMMONLIBS = \
+		$(top_builddir)/lib/clplumbing/libplumb.la		\
+		$(top_builddir)/lib/crm/common/libcrmcommon.la		\
+		$(top_builddir)/lib/crm/pengine/libpe_status.la		\
+		libpengine.la						\
+		$(GLIBLIB)						\
+		$(CURSESLIBS)						\
+		$(LIBRT)
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(CRM_DEBUG_FLAGS)
+lib_LTLIBRARIES = libpengine.la
+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 
+ptest_LDADD = $(COMMONLIBS)						\
+		$(top_builddir)/lib/crm/cib/libcib.la			\
+		$(top_builddir)/lib/crm/transition/libtransitioner.la
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libpengine.la: $(libpengine_la_OBJECTS) $(libpengine_la_DEPENDENCIES) 
+	$(libpengine_la_LINK) -rpath $(libdir) $(libpengine_la_OBJECTS) $(libpengine_la_LIBADD) $(LIBS)
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+install-hasbinPROGRAMS: $(hasbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-hasbinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-hasbinPROGRAMS:
+	@list='$(hasbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+pengine$(EXEEXT): $(pengine_OBJECTS) $(pengine_DEPENDENCIES) 
+	@rm -f pengine$(EXEEXT)
+	$(LINK) $(pengine_OBJECTS) $(pengine_LDADD) $(LIBS)
+ptest$(EXEEXT): $(ptest_OBJECTS) $(ptest_DEPENDENCIES) 
+	@rm -f ptest$(EXEEXT)
+	$(LINK) $(ptest_OBJECTS) $(ptest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/allocate.Plo
+include ./$(DEPDIR)/clone.Plo
+include ./$(DEPDIR)/constraints.Plo
+include ./$(DEPDIR)/graph.Plo
+include ./$(DEPDIR)/group.Plo
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/master.Plo
+include ./$(DEPDIR)/native.Plo
+include ./$(DEPDIR)/pengine.Plo
+include ./$(DEPDIR)/ptest.Po
+include ./$(DEPDIR)/utils.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-halibPROGRAMS clean-hasbinPROGRAMS \
+	clean-libLTLIBRARIES clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-halibPROGRAMS uninstall-hasbinPROGRAMS \
+	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 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:
+	rm -f *.log *.debug *~ .gres.* testcases/.gres.*
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)/$(pe_varlibdir)
+	-chown $(HA_CCMUSER) $(DESTDIR)/$(pe_varlibdir)
+	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(pe_varlibdir)
+	-chmod 750 $(DESTDIR)/$(pe_varlibdir)
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/Makefile.in
--- heartbeat-2.1.3/crm/pengine/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/Makefile.in	2008-08-18 23:37:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -44,7 +44,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -83,7 +83,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -133,6 +133,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -150,24 +151,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -229,12 +218,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -470,8 +460,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -479,8 +469,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -502,8 +492,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -530,8 +520,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hasbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hasbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hasbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -606,8 +596,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -619,8 +609,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -630,13 +620,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/master.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/master.c
--- heartbeat-2.1.3/crm/pengine/master.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/master.c	2008-08-18 13:32:19.000000000 +0100
@@ -27,6 +27,7 @@
 #include <lib/crm/pengine/variant.h>
 
 extern gint sort_clone_instance(gconstpointer a, gconstpointer b);
+void node_list_update_one(GListPtr list1, node_t *other, int score);
 
 extern void clone_create_notifications(
 	resource_t *rsc, action_t *action, action_t *action_complete,
@@ -39,10 +40,6 @@
 	clone_variant_data_t *clone_data, enum pe_ordering type,
 	resource_t *rsc, resource_t *child, resource_t *last, pe_working_set_t *data_set)
 {
-/* 	if(clone_data->ordered */
-/* 	   || clone_data->self->restart_type == pe_restart_restart) { */
-/* 		type = pe_order_implies_left; */
-/* 	} */
 	if(child == NULL) {
 		if(clone_data->ordered && last != NULL) {
 			crm_debug_4("Ordered version (last node)");
@@ -52,8 +49,22 @@
 				rsc, promoted_key(rsc), NULL,
 				type, data_set);
 		}
-		
-	} else if(clone_data->ordered) {
+		return;
+	}
+
+	/* child promote before global promoted */
+	custom_action_order(
+	    child, promote_key(child), NULL,
+	    rsc, promoted_key(rsc), NULL,
+	    type, data_set);
+	
+	/* global promote before child promote */
+	custom_action_order(
+	    rsc, promote_key(rsc), NULL,
+	    child, promote_key(child), NULL,
+	    type, data_set);
+
+	if(clone_data->ordered) {
 		crm_debug_4("Ordered version");
 		if(last == NULL) {
 			/* global promote before first child promote */
@@ -69,19 +80,6 @@
 
 	} else {
 		crm_debug_4("Un-ordered version");
-		
-		/* child promote before global promoted */
-		custom_action_order(
-			child, promote_key(child), NULL,
-			rsc, promoted_key(rsc), NULL,
-			type, data_set);
-                
-		/* global promote before child promote */
-		custom_action_order(
-			rsc, promote_key(rsc), NULL,
-			child, promote_key(child), NULL,
-			type, data_set);
-
 	}
 }
 
@@ -90,11 +88,6 @@
 	clone_variant_data_t *clone_data, enum pe_ordering type,
 	resource_t *rsc, resource_t *child, resource_t *last, pe_working_set_t *data_set)
 {
-/* 	if(clone_data->ordered */
-/* 	   || clone_data->self->restart_type == pe_restart_restart) { */
-/* 		type = pe_order_implies_left; */
-/* 	} */
-	
 	if(child == NULL) {
 		if(clone_data->ordered && last != NULL) {
 			crm_debug_4("Ordered version (last node)");
@@ -104,8 +97,22 @@
 				last, demote_key(last), NULL,
 				pe_order_implies_left, data_set);
 		}
-		
-	} else if(clone_data->ordered && last != NULL) {
+		return;
+	}
+	
+	/* child demote before global demoted */
+	custom_action_order(
+	    child, demote_key(child), NULL,
+	    rsc, demoted_key(rsc), NULL,
+	    pe_order_implies_right_printed, data_set);
+	
+	/* global demote before child demote */
+	custom_action_order(
+	    rsc, demote_key(rsc), NULL,
+	    child, demote_key(child), NULL,
+	    pe_order_implies_left_printed, data_set);
+	
+	if(clone_data->ordered && last != NULL) {
 		crm_debug_4("Ordered version");
 
 		/* child/child relative demote */
@@ -123,30 +130,25 @@
 
 	} else {
 		crm_debug_4("Un-ordered version");
-
-		/* child demote before global demoted */
-		custom_action_order(
-			child, demote_key(child), NULL,
-			rsc, demoted_key(rsc), NULL,
-			type, data_set);
-                        
-		/* global demote before child demote */
-		custom_action_order(
-			rsc, demote_key(rsc), NULL,
-			child, demote_key(child), NULL,
-			type, data_set);
 	}
 }
 
 static void
 master_update_pseudo_status(
-	resource_t *child, gboolean *demoting, gboolean *promoting) 
-{
+	resource_t *rsc, gboolean *demoting, gboolean *promoting) 
+{	
+	if(rsc->children) {
+	    slist_iter(child, resource_t, rsc->children, lpc,
+		       master_update_pseudo_status(child, demoting, promoting)
+		);
+	    return;
+	}
+    
 	CRM_ASSERT(demoting != NULL);
 	CRM_ASSERT(promoting != NULL);
 
 	slist_iter(
-		action, action_t, child->actions, lpc,
+		action, action_t, rsc->actions, lpc,
 
 		if(*promoting && *demoting) {
 			return;
@@ -169,7 +171,7 @@
 		cons, rsc_to_node_t, list, lpc2,			\
 		cons_node = NULL;					\
 		if(cons->role_filter == RSC_ROLE_MASTER) {		\
-			crm_debug("Applying %s to %s",			\
+			crm_debug_2("Applying %s to %s",			\
 				  cons->id, child_rsc->id);		\
 			cons_node = pe_find_node_id(			\
 				cons->node_list_rh, chosen->details->id); \
@@ -177,7 +179,7 @@
 		if(cons_node != NULL) {					\
 			int new_priority = merge_weights(		\
 				child_rsc->priority, cons_node->weight); \
-			crm_debug("\t%s: %d->%d (%d)", child_rsc->id,	\
+			crm_debug_2("\t%s: %d->%d (%d)", child_rsc->id,	\
 				child_rsc->priority, new_priority, cons_node->weight);	\
 			child_rsc->priority = new_priority;		\
 		}							\
@@ -188,8 +190,24 @@
 {
 	node_t *node = NULL;
 	node_t *local_node = NULL;
+	resource_t *parent = uber_parent(rsc);
 	clone_variant_data_t *clone_data = NULL;
 	int level = LOG_DEBUG_2;
+#if 0
+	enum rsc_role_e role = RSC_ROLE_UNKNOWN;
+	role = rsc->fns->state(rsc, FALSE);
+	crm_info("%s role: %s", rsc->id, role2text(role));
+#endif
+	
+	if(rsc->children) {
+	    slist_iter(
+		child, resource_t, rsc->children, lpc,
+		if(can_be_master(child) == NULL) {
+		    do_crm_log(level, "Child %s of %s can't be promoted", child->id, rsc->id);
+		    return NULL;
+		}
+		);
+	}
 	
 	node = rsc->fns->location(rsc, NULL, FALSE);
 	if(rsc->priority < 0) {
@@ -205,10 +223,10 @@
 			    node->details->uname);
 		return NULL;
 	}
-
-	get_clone_variant_data(clone_data, rsc->parent);
+	
+	get_clone_variant_data(clone_data, parent);
 	local_node = pe_find_node_id(
-		rsc->parent->allowed_nodes, node->details->id);
+		parent->allowed_nodes, node->details->id);
 
 	if(local_node == NULL) {
 		crm_err("%s cannot run on %s: node not allowed",
@@ -267,14 +285,13 @@
 	return;
     }
     clone_data->merged_master_weights = TRUE;
-    crm_info("Merging weights for %s", rsc->id);
+    crm_debug_2("Merging weights for %s", rsc->id);
     slist_iter(
 	child, resource_t, rsc->children, lpc,
 	crm_debug_2("%s: %d", child->id, child->sort_index);
 	);
     dump_node_scores(LOG_DEBUG_3, rsc, "Before", rsc->allowed_nodes);
 
-#if 1
     slist_iter(
 	child, resource_t, rsc->children, lpc,
 
@@ -287,15 +304,17 @@
 	node = (node_t*)pe_find_node_id(
 	    rsc->allowed_nodes, chosen->details->id);
 	CRM_ASSERT(node != NULL);
+	/* adds in master preferences and rsc_location.role=Master */
 	node->weight = merge_weights(child->sort_index, node->weight);
 	);
     
     dump_node_scores(LOG_DEBUG_3, rsc, "Middle", rsc->allowed_nodes);
-#endif
     
     slist_iter(
 	constraint, rsc_colocation_t, rsc->rsc_cons_lhs, lpc,
-	
+	/* (re-)adds location preferences of resource that wish to be
+	 * colocated with the master instance
+	 */
 	if(constraint->role_rh == RSC_ROLE_MASTER) {
 	    rsc->allowed_nodes = constraint->rsc_lh->cmds->merge_weights(
 		constraint->rsc_lh, rsc->id, rsc->allowed_nodes,
@@ -331,12 +350,32 @@
 master_score(resource_t *rsc, node_t *node, int not_set_value)
 {
 	char *attr_name;
+	char *name = rsc->id;
 	const char *attr_value;
 	int score = not_set_value, len = 0;
 
-	len = 8 + strlen(rsc->id);
+	if(rsc->fns->state(rsc, TRUE) < RSC_ROLE_STARTED) {
+	    return score;
+	}
+
+	if(rsc->running_on) {
+	    node_t *match = pe_find_node_id(rsc->allowed_nodes, node->details->id);
+	    if(match->weight < 0) {
+		crm_debug_2("%s on %s has score: %d - ignoring master pref",
+			    rsc->id, match->details->uname, match->weight);
+		return score;
+	    }
+	}
+	    
+#if 0
+	if(rsc->clone_name) {
+	    name = rsc->clone_name;
+	    crm_err("%s ::= %s", rsc->id, rsc->clone_name);
+	}
+#endif
+	len = 8 + strlen(name);
 	crm_malloc0(attr_name, len);
-	sprintf(attr_name, "master-%s", rsc->id);
+	sprintf(attr_name, "master-%s", name);
 	
 	crm_debug_3("looking for %s on %s", attr_name,
 				node->details->uname);
@@ -397,14 +436,14 @@
 	    
 	    new_score = merge_weights(node->weight, score);
 	    if(new_score != node->weight) {
-		crm_debug("\t%s: Updating preference for %s (%d->%d)",
+		crm_debug_2("\t%s: Updating preference for %s (%d->%d)",
 			  child_rsc->id, node->details->uname, node->weight, new_score);
 		node->weight = new_score;
 	    }
 	    
 	    new_score = max(child_rsc->priority, score);
 	    if(new_score != child_rsc->priority) {
-		crm_debug("\t%s: Updating priority (%d->%d)",
+		crm_debug_2("\t%s: Updating priority (%d->%d)",
 			  child_rsc->id, child_rsc->priority, new_score);
 		child_rsc->priority = new_score;
 	    }
@@ -415,11 +454,20 @@
 static void set_role(resource_t *rsc, enum rsc_role_e role, gboolean current) 
 {
     if(current) {
-	rsc->role = role;
+	if(rsc->variant == pe_native && rsc->running_on != NULL && rsc->role > role) {
+	    crm_debug_6("Filtering change %s.role = %s (was %s)", rsc->id, role2text(role), role2text(rsc->role));
+
+	} else if(rsc->role < role) {
+	    crm_debug_5("Set %s.role = %s (was %s)", rsc->id, role2text(role), role2text(rsc->role));
+	    rsc->role = role;
+	}
     } else {
-	rsc->next_role = role;
-	if(role == RSC_ROLE_MASTER) {
-	    add_hash_param(rsc->parameters, crm_meta_name("role"), role2text(role));
+	if(rsc->next_role < role) {
+	    crm_debug_5("Set %s.next_role = %s (was %s)", rsc->id, role2text(role), role2text(rsc->next_role));
+	    rsc->next_role = role;
+	    if(role == RSC_ROLE_MASTER) {
+		add_hash_param(rsc->parameters, crm_meta_name("role"), role2text(role));
+	    }
 	}
     }
     
@@ -518,7 +566,7 @@
 
 	    );
 
-	master_promotion_order(rsc);	
+	master_promotion_order(rsc);
 
 	/* mark the first N as masters */
 	slist_iter(
@@ -526,6 +574,14 @@
 
 		chosen = NULL;
 		crm_debug_2("Processing %s", child_rsc->id);
+
+		chosen = child_rsc->fns->location(child_rsc, NULL, FALSE);
+		do_crm_log(scores_log_level, "%s promotion score on %s: %d",
+			   child_rsc->id, chosen?chosen->details->uname:"none", child_rsc->sort_index);
+		chosen = NULL; /* nuke 'chosen' so that we don't promote more than the
+				* required number of instances
+				*/
+		
 		if(promoted < clone_data->master_max) {
 			chosen = can_be_master(child_rsc);
 		}
@@ -541,7 +597,8 @@
 		}
 
 		chosen->count++;
-		crm_info("Promoting %s", child_rsc->id);
+		crm_info("Promoting %s (%s %s)",
+			 child_rsc->id, role2text(child_rsc->role), chosen->details->uname);
 		set_role(child_rsc, RSC_ROLE_MASTER, FALSE);
 		clone_data->masters_allocated++;
 		promoted++;		
@@ -581,6 +638,7 @@
 
 		any_demoting = any_demoting || child_demoting;
 		any_promoting = any_promoting || child_promoting;
+		crm_debug_2("Created actions for %s: %d %d", child_rsc->id, child_promoting, child_demoting);
 		);
 	
 	/* promote */
@@ -702,8 +760,7 @@
 	
 }
 
-extern resource_t *find_compatible_child(resource_t *local_child, resource_t *rsc, enum rsc_role_e filter);
-static void node_list_update_one(GListPtr list1, node_t *other, int score)
+void node_list_update_one(GListPtr list1, node_t *other, int score)
 {
     node_t *node = NULL;
     
@@ -726,6 +783,7 @@
 	clone_variant_data_t *clone_data = NULL;
 	get_clone_variant_data(clone_data, rsc_rh);
 
+	
 	CRM_CHECK(rsc_rh != NULL, return);
 	if(is_set(rsc_rh->flags, pe_rsc_provisional)) {
 		return;
@@ -740,7 +798,7 @@
 	CRM_CHECK(rsc_lh->variant == pe_native, return);
 	crm_debug_2("Processing constraint %s: %d", constraint->id, constraint->score);
 
-	if(constraint->score < INFINITY) {
+	if(constraint->role_rh == RSC_ROLE_UNKNOWN) {
 		slist_iter(
 			child_rsc, resource_t, rsc_rh->children, lpc,
 			
@@ -750,7 +808,6 @@
 	} else if(is_set(rsc_lh->flags, pe_rsc_provisional)) {
 		GListPtr lhs = NULL, rhs = NULL;
 		lhs = rsc_lh->allowed_nodes;
-		
 		slist_iter(
 			child_rsc, resource_t, rsc_rh->children, lpc,
 			node_t *chosen = child_rsc->fns->location(child_rsc, NULL, FALSE);
@@ -758,9 +815,11 @@
 			crm_debug_3("Processing: %s", child_rsc->id);
 			if(chosen != NULL
 			   && next_role == constraint->role_rh) {
-			    crm_debug_3("Applying: %s %s", child_rsc->id,
-					role2text(next_role));
-			    node_list_update_one(rsc_lh->allowed_nodes, chosen, constraint->score);
+			    crm_debug_3("Applying: %s %s %s %d", child_rsc->id,
+					role2text(next_role), chosen->details->uname, constraint->score);
+			    if(constraint->score < INFINITY) {
+				node_list_update_one(rsc_lh->allowed_nodes, chosen, constraint->score);
+			    }
 			    rhs = g_list_append(rhs, chosen);
 			}
 			);
@@ -769,15 +828,16 @@
 		 * Doing this unconditionally would prevent the slaves from being started
 		 */
 		if(constraint->role_lh != RSC_ROLE_MASTER
-		    || constraint->role_rh != RSC_ROLE_MASTER) {
-		    rsc_lh->allowed_nodes = node_list_and(lhs, rhs, FALSE);
-		    pe_free_shallow(lhs);
+		   || constraint->role_rh != RSC_ROLE_MASTER) {
+		    if(constraint->score > 0) {
+			rsc_lh->allowed_nodes = node_list_exclude(lhs, rhs);
+			pe_free_shallow(lhs);
+		    }
 		}
-		
 		pe_free_shallow_adv(rhs, FALSE);
 
 	} else if(constraint->role_lh == RSC_ROLE_MASTER) {
-	    resource_t *rh_child = find_compatible_child(rsc_lh, rsc_rh, constraint->role_rh);
+	    resource_t *rh_child = find_compatible_child(rsc_lh, rsc_rh, constraint->role_rh, FALSE);
 	    if(rh_child == NULL && constraint->score >= INFINITY) {
 		crm_debug_2("%s can't be promoted %s", rsc_lh->id, constraint->id);
 		rsc_lh->priority = -INFINITY;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/native.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/native.c
--- heartbeat-2.1.3/crm/pengine/native.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/native.c	2008-08-18 13:32:19.000000000 +0100
@@ -30,7 +30,7 @@
 #define VARIANT_NATIVE 1
 #include <lib/crm/pengine/variant.h>
 
-resource_t *ultimate_parent(resource_t *rsc);
+gboolean at_stack_bottom(resource_t *rsc);
 
 void node_list_update(GListPtr list1, GListPtr list2, int factor);
 
@@ -94,31 +94,58 @@
 	GListPtr nodes = NULL;
 	node_t *chosen = NULL;
 
+	int lpc = 0;
+	int multiple = 0;
+	int length = g_list_length(rsc->allowed_nodes);
+
 	if(is_not_set(rsc->flags, pe_rsc_provisional)) {
 		return rsc->allocated_to?TRUE:FALSE;
 	}
 	
 	crm_debug_3("Choosing node for %s from %d candidates",
-		    rsc->id, g_list_length(rsc->allowed_nodes));
+		    rsc->id, length);
 
 	if(rsc->allowed_nodes) {
-		rsc->allowed_nodes = g_list_sort(
-			rsc->allowed_nodes, sort_node_weight);
-		nodes = rsc->allowed_nodes;
-		chosen = g_list_nth_data(nodes, 0);
+	    rsc->allowed_nodes = g_list_sort(rsc->allowed_nodes, sort_node_weight);
+	    nodes = rsc->allowed_nodes;
+	    chosen = g_list_nth_data(nodes, 0);
+
+	    if(chosen
+	       && chosen->weight > 0
+	       && can_run_resources(chosen)) {
+		node_t *running = g_list_nth_data(rsc->running_on, 0);
+		if(can_run_resources(running) == FALSE) {
+		    running = NULL;
+		}
+		
+		for(lpc = 1; lpc < length; lpc++) {
+		    node_t *tmp = g_list_nth_data(nodes, lpc);
+		    if(tmp->weight == chosen->weight) {
+			multiple++;
+			if(running && tmp->details == running->details) {
+			    /* prefer the existing node if scores are equal */
+			    chosen = tmp;
+			}
+		    }
+		}
+	    }
 	}
-	
-	return native_assign_node(rsc, nodes, chosen);
-}
 
-resource_t *
-ultimate_parent(resource_t *rsc)
-{
-	resource_t *parent = rsc;
-	while(parent->parent) {
-		parent = parent->parent;
+	if(multiple > 1) {
+		int log_level = LOG_INFO;
+		char *score = score2char(chosen->weight);
+		if(chosen->weight >= INFINITY) {
+			log_level = LOG_WARNING;
+		}
+		
+		do_crm_log(log_level, "%d nodes with equal score (%s) for"
+			   " running %s resources.  Chose %s.",
+			   multiple, score, rsc->id, chosen->details->uname);
+		crm_free(score);
 	}
-	return parent;
+	
+	
+	return native_assign_node(rsc, nodes, chosen);
 }
 
 GListPtr
@@ -128,11 +155,11 @@
     GListPtr archive = NULL;
 
     if(is_set(rsc->flags, pe_rsc_merging)) {
-	crm_debug("%s: Breaking dependancy loop", rhs);
+	crm_info("%s: Breaking dependancy loop", rhs);
 	return nodes;
 
-    } else if(is_not_set(rsc->flags, pe_rsc_provisional)
-	      || can_run_any(nodes) == FALSE) {
+    } else if(is_not_set(rsc->flags, pe_rsc_provisional)) {
+	crm_debug_4("%s: not provisional", rsc->id);
 	return nodes;
     }
 
@@ -143,7 +170,35 @@
  	archive = node_list_dup(nodes, FALSE, FALSE);
     }
 
+#if 0
     node_list_update(nodes, rsc->allowed_nodes, factor);
+#else
+    /* turn this off once we switch to migration-threshold */
+    {
+	GListPtr tmp = node_list_dup(rsc->allowed_nodes, FALSE, FALSE);
+	
+	slist_iter(
+	    node, node_t, tmp, lpc,
+	    if(node->weight < 0 && node->weight > -INFINITY) {
+		/* Once a dependant's score goes below zero, force the node score to -INFINITY
+		 *
+		 * This prevents the colocation sets from being partially active in scenarios
+		 *  where it could be fully active elsewhere
+		 *
+		 * If we don't do this, then the next resource's stickiness might bring
+		 *  the combined score above 0 again - which confuses the PE into thinking
+		 *  the whole colocation set can run there but is pointless since the later children
+		 *  are not be able to run if the ones before them can't
+		 */
+		node->weight = -INFINITY;
+	    }
+	    );
+	
+	node_list_update(nodes, tmp, factor);
+	pe_free_shallow_adv(tmp, TRUE);
+    }
+#endif
+    
     if(archive && can_run_any(nodes) == FALSE) {
 	crm_debug("%s: Rolling back scores from %s", rhs, rsc->id);
   	pe_free_shallow_adv(nodes, TRUE);
@@ -169,7 +224,7 @@
 node_t *
 native_color(resource_t *rsc, pe_working_set_t *data_set)
 {
-        int alloc_details = LOG_DEBUG_2;
+        int alloc_details = scores_log_level;
 	if(rsc->parent && is_not_set(rsc->parent->flags, pe_rsc_allocating)) {
 		/* never allocate children on their own */
 		crm_debug("Escalating allocation of %s to its parent: %s",
@@ -187,20 +242,20 @@
 	}
 
 	set_bit(rsc->flags, pe_rsc_allocating);
-	print_resource(alloc_details, "Allocating: ", rsc, FALSE);
-	dump_node_scores(alloc_details, rsc, "Pre-allloc", rsc->allowed_nodes);
+	print_resource(alloc_details+1, "Allocating: ", rsc, FALSE);
+	dump_node_scores(alloc_details+1, rsc, "Pre-allloc", rsc->allowed_nodes);
 
 	slist_iter(
 		constraint, rsc_colocation_t, rsc->rsc_cons, lpc,
 
 		resource_t *rsc_rh = constraint->rsc_rh;
-		crm_debug("%s: Pre-Processing %s (%s)",
-			  rsc->id, constraint->id, rsc_rh->id);
+		crm_debug_2("%s: Pre-Processing %s (%s)",
+			    rsc->id, constraint->id, rsc_rh->id);
 		rsc_rh->cmds->color(rsc_rh, data_set);
 		rsc->cmds->rsc_colocation_lh(rsc, rsc_rh, constraint);	
 	    );	
 
-	dump_node_scores(alloc_details, rsc, "Post-coloc", rsc->allowed_nodes);
+	dump_node_scores(alloc_details+1, rsc, "Post-coloc", rsc->allowed_nodes);
 
 	slist_iter(
 	    constraint, rsc_colocation_t, rsc->rsc_cons_lhs, lpc,
@@ -210,17 +265,31 @@
 		constraint->score/INFINITY, TRUE);
 	    );
 	
-	dump_node_scores(alloc_details, rsc, "Post-merge", rsc->allowed_nodes);
-	
-	print_resource(LOG_DEBUG, "Allocating: ", rsc, FALSE);
+	print_resource(LOG_DEBUG_2, "Allocating: ", rsc, FALSE);
 	if(rsc->next_role == RSC_ROLE_STOPPED) {
 		crm_debug_2("Making sure %s doesn't get allocated", rsc->id);
 		/* make sure it doesnt come up again */
 		resource_location(
 			rsc, NULL, -INFINITY, "target_role", data_set);
 	}
-	
-	if(is_set(rsc->flags, pe_rsc_provisional)
+
+	dump_node_scores(alloc_details, rsc, __PRETTY_FUNCTION__, rsc->allowed_nodes);
+	if(is_not_set(rsc->flags, pe_rsc_managed)) {
+	    const char *reason = NULL;
+	    node_t *assign_to = NULL;
+	    if(rsc->running_on == NULL) {
+		reason = "inactive";
+	    } else if(is_set(rsc->flags, pe_rsc_failed)) {
+		reason = "failed";		
+	    } else {
+		assign_to = rsc->running_on->data;
+		reason = "active";
+	    }
+	    crm_info("Unmanaged resource %s allocated to %s: %s", rsc->id,
+		     assign_to?assign_to->details->uname:"'nowhere'", reason);
+	    native_assign_node(rsc, NULL, assign_to);
+
+	} else if(is_set(rsc->flags, pe_rsc_provisional)
 	   && native_choose_node(rsc) ) {
 		crm_debug_3("Allocated resource %s to %s",
 			    rsc->id, rsc->allocated_to->details->uname);
@@ -228,7 +297,7 @@
 	} else if(rsc->allocated_to == NULL) {
 		if(is_not_set(rsc->flags, pe_rsc_orphan)) {
 			pe_warn("Resource %s cannot run anywhere", rsc->id);
-		} else {
+		} else if(rsc->running_on != NULL) {
 			crm_info("Stopping orphan resource %s", rsc->id);
 		}
 		
@@ -243,6 +312,41 @@
 	return rsc->allocated_to;
 }
 
+static gboolean is_op_dup(
+    resource_t *rsc, const char *name, const char *interval) 
+{
+    gboolean dup = FALSE;
+    const char *id = NULL;
+    const char *value = NULL;
+    xml_child_iter_filter(
+	rsc->ops_xml, operation, "op",
+	value = crm_element_value(operation, "name");
+	if(safe_str_neq(value, name)) {
+	    continue;
+	}
+	
+	value = crm_element_value(operation, XML_LRM_ATTR_INTERVAL);
+	if(value == NULL) {
+	    value = "0";
+	}
+	
+	if(safe_str_neq(value, interval)) {
+	    continue;
+	}
+
+	if(id == NULL) {
+	    id = ID(operation);
+	    
+	} else {
+	    crm_config_err("Operation %s is a duplicate of %s", ID(operation), id);
+	    crm_config_err("Do not use the same (name, interval) combination more than once per resource");
+	    dup = TRUE;
+	}
+	);
+    
+    return dup;
+}
+
 void
 RecurringOp(resource_t *rsc, action_t *start, node_t *node,
 	    crm_data_t *operation, pe_working_set_t *data_set) 
@@ -258,7 +362,9 @@
 	gboolean is_optional = TRUE;
 	GListPtr possible_matches = NULL;
 	
-	crm_debug_2("Creating recurring actions for %s", rsc->id);
+	crm_debug_2("Creating recurring action %s for %s",
+		    ID(operation), rsc->id);
+	
 	if(node != NULL) {
 		node_uname = node->details->uname;
 	}
@@ -281,6 +387,10 @@
 	}
 	
 	name = crm_element_value(operation, "name");
+	if(is_op_dup(rsc, name, interval)) {
+	    return;
+	}
+
 	key = generate_op_key(rsc->id, name, interval_ms);
 	if(start != NULL) {
 		crm_debug_3("Marking %s %s due to %s",
@@ -291,7 +401,7 @@
 		crm_debug_2("Marking %s optional", key);
 		is_optional = TRUE;
 	}
-	
+
 	/* start a monitor for an already active resource */
 	possible_matches = find_actions_exact(rsc->actions, key, node);
 	if(possible_matches == NULL) {
@@ -320,11 +430,31 @@
 			mon->task = crm_strdup(CRMD_ACTION_CANCEL);
 			add_hash_param(mon->meta, XML_LRM_ATTR_INTERVAL, interval);
 			add_hash_param(mon->meta, XML_LRM_ATTR_TASK, name);
-			
-			custom_action_order(
-				rsc, NULL, mon,
-				rsc, promote_key(rsc), NULL,
-				pe_order_runnable_left, data_set);
+
+			local_key = NULL;
+
+			switch(rsc->role) {
+			    case RSC_ROLE_SLAVE:
+			    case RSC_ROLE_STARTED:
+				if(rsc->next_role == RSC_ROLE_MASTER) {
+				    local_key = promote_key(rsc);
+
+				} else if(rsc->next_role == RSC_ROLE_STOPPED) {
+				    local_key = stop_key(rsc);
+				}
+				
+				break;
+			    case RSC_ROLE_MASTER:
+				local_key = demote_key(rsc);
+				break;
+			    default:
+				break;
+			}
+
+			if(local_key) {
+			    custom_action_order(rsc, NULL, mon, rsc, local_key, NULL,
+						pe_order_runnable_left, data_set);
+			}
 			
 			mon = NULL;
 		}
@@ -359,7 +489,7 @@
 		mon->runnable = FALSE;
 		
 	} else if(mon->optional == FALSE) {
-		crm_notice("%s\t   %s", crm_str(node_uname),mon->uuid);
+	    crm_notice(" Start recurring %s (%ds) for %s on %s", mon->task, interval_ms/1000, rsc->id, crm_str(node_uname));
 	}
 	
 	custom_action_order(rsc, start_key(rsc), NULL,
@@ -374,7 +504,13 @@
 			rsc, NULL, mon,
 			pe_order_optional|pe_order_runnable_left, data_set);
 		crm_free(running_master);
-	}		
+
+	} else if(rsc->role == RSC_ROLE_MASTER) {
+		custom_action_order(
+			rsc, demote_key(rsc), NULL,
+			rsc, NULL, mon,
+			pe_order_optional|pe_order_runnable_left, data_set);
+	}
 }
 
 void
@@ -413,6 +549,9 @@
 	if(g_list_length(rsc->running_on) > 1) {
  		if(rsc->recovery_type == recovery_stop_start) {
 			pe_proc_err("Attempting recovery of resource %s", rsc->id);
+			if(rsc->role == RSC_ROLE_MASTER) {
+			    DemoteRsc(rsc, NULL, FALSE, data_set);
+			}
 			StopRsc(rsc, NULL, FALSE, data_set);
 			rsc->role = RSC_ROLE_STOPPED;
 		}
@@ -432,8 +571,16 @@
 		g_list_free(possible_matches);
 		crm_debug_2("Stopping a stopped resource");
 		crm_free(key);
-		return;
-	} 
+		goto do_recurring;
+		
+	} else if(rsc->role != RSC_ROLE_STOPPED) {
+	    /* A cheap trick to account for the fact that Master/Slave groups may not be
+	     * completely running when we set their role to Slave
+	     */
+	    crm_debug_2("Resetting %s.role = %s (was %s)",
+			rsc->id, role2text(RSC_ROLE_STOPPED), role2text(rsc->role));
+	    rsc->role = RSC_ROLE_STOPPED;
+	}
 
 	role = rsc->role;
 
@@ -448,7 +595,8 @@
 		role = next_role;
 	}
 
-	if(rsc->next_role != RSC_ROLE_STOPPED && is_set(rsc->flags, pe_rsc_managed)) {
+  do_recurring:
+	if(rsc->next_role != RSC_ROLE_STOPPED || is_set(rsc->flags, pe_rsc_managed) == FALSE) {
 		start = start_action(rsc, chosen, TRUE);
 		Recurring(rsc, start, chosen, data_set);
 	}
@@ -464,7 +612,7 @@
 		type |= pe_order_implies_right;
 	}
 
-	if(rsc->parent == NULL) {
+	if(rsc->parent == NULL || rsc->parent->variant == pe_group) {
 		type |= pe_order_restart;
 	}
 	
@@ -474,7 +622,7 @@
 
 	custom_action_order(rsc, demote_key(rsc), NULL,
 			    rsc, stop_key(rsc), NULL,
-			    pe_order_optional, data_set);
+			    pe_order_demote_stop, data_set);
 
 	custom_action_order(rsc, start_key(rsc), NULL,
 			    rsc, promote_key(rsc), NULL,
@@ -506,13 +654,7 @@
 		return;
 	} 
 
-	if(safe_str_eq(class, "stonith")) {
-	    custom_action_order(
-		NULL, crm_strdup(all_stopped->task), all_stopped,
-		rsc, stop_key(rsc), NULL,
-		pe_order_implies_left|pe_order_stonith_stop, data_set);
-	    
-	} else if(rsc->variant == pe_native) {
+	if(rsc->variant == pe_native && safe_str_neq(class, "stonith")) {
 	    custom_action_order(
 		rsc, stop_key(rsc), NULL,
 		NULL, crm_strdup(all_stopped->task), all_stopped,
@@ -543,23 +685,43 @@
 filter_colocation_constraint(
 	resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
 {
+	int level = LOG_DEBUG_4;
 	if(constraint->score == 0){
 		return FALSE;
 	}
 
-	if(constraint->role_lh != RSC_ROLE_UNKNOWN
+	if(constraint->score > 0
+	   && constraint->role_lh != RSC_ROLE_UNKNOWN
 	   && constraint->role_lh != rsc_lh->next_role) {
-		crm_debug_4("RH: Skipping constraint: \"%s\" state filter",
+		do_crm_log(level, "LH: Skipping constraint: \"%s\" state filter",
 			    role2text(constraint->role_rh));
 		return FALSE;
 	}
 	
-	if(constraint->role_rh != RSC_ROLE_UNKNOWN
+	if(constraint->score > 0
+	   && constraint->role_rh != RSC_ROLE_UNKNOWN
 	   && constraint->role_rh != rsc_rh->next_role) {
-		crm_debug_4("RH: Skipping constraint: \"%s\" state filter",
+		do_crm_log(level, "RH: Skipping constraint: \"%s\" state filter",
+			    role2text(constraint->role_rh));
+		return FALSE;
+	}
+
+	if(constraint->score < 0
+	   && constraint->role_lh != RSC_ROLE_UNKNOWN
+	   && constraint->role_lh == rsc_lh->next_role) {
+		do_crm_log(level, "LH: Skipping -ve constraint: \"%s\" state filter",
+			    role2text(constraint->role_rh));
+		return FALSE;
+	}
+	
+	if(constraint->score < 0
+	   && constraint->role_rh != RSC_ROLE_UNKNOWN
+	   && constraint->role_rh == rsc_rh->next_role) {
+		do_crm_log(level, "RH: Skipping -ve constraint: \"%s\" state filter",
 			    role2text(constraint->role_rh));
 		return FALSE;
 	}
+
 	return TRUE;
 }
 
@@ -592,10 +754,12 @@
 		node, node_t, rsc_lh->allowed_nodes, lpc,
 		tmp = g_hash_table_lookup(node->details->attrs, attribute);
 		if(do_check && safe_str_eq(tmp, value)) {
+		    if(constraint->score < INFINITY) {
 			crm_debug_2("%s: %s.%s += %d", constraint->id, rsc_lh->id,
 				  node->details->uname, constraint->score);
 			node->weight = merge_weights(
 				constraint->score, node->weight);
+		    }
 
 		} else if(do_check == FALSE || constraint->score >= INFINITY) {
 			crm_debug_2("%s: %s.%s = -INFINITY (%s)", constraint->id, rsc_lh->id,
@@ -664,8 +828,7 @@
 			continue;
 		}
 
-		other_node = (node_t*)pe_find_node_id(
-			list2, node->details->id);
+		other_node = (node_t*)pe_find_node_id(list2, node->details->id);
 
 		if(other_node != NULL) {
 			crm_debug_2("%s: %d + %d",
@@ -677,21 +840,46 @@
 		);	
 }
 
+static GListPtr find_actions_by_task(GListPtr actions, resource_t *rsc, const char *original_key)
+{
+    GListPtr list = NULL;
+
+    list = find_actions(actions, original_key, NULL);
+    if(list == NULL) {
+	/* we're potentially searching a child of the original resource */
+	char *key = NULL;
+	char *tmp = NULL;
+	char *task = NULL;
+	int interval = 0;
+	CRM_CHECK(parse_op_key(original_key, &tmp, &task, &interval),
+		  crm_err("search key: %s", original_key); return NULL);
+	
+	key = generate_op_key(rsc->id, task, interval);
+	list = find_actions(actions, key, NULL);
+
+	crm_free(key);
+	crm_free(tmp);
+	crm_free(task);
+    }
+
+    return list;
+}
+
 void native_rsc_order_lh(resource_t *lh_rsc, order_constraint_t *order, pe_working_set_t *data_set)
 {
 	GListPtr lh_actions = NULL;
 	action_t *lh_action = order->lh_action;
 	resource_t *rh_rsc = order->rh_rsc;
 
-	crm_debug_2("Processing LH of ordering constraint %d", order->id);
+	crm_debug_3("Processing LH of ordering constraint %d", order->id);
 	CRM_ASSERT(lh_rsc != NULL);
 	
 	if(lh_action != NULL) {
 		lh_actions = g_list_append(NULL, lh_action);
 
 	} else if(lh_action == NULL) {
-		lh_actions = find_actions(
-			lh_rsc->actions, order->lh_action_task, NULL);
+		lh_actions = find_actions_by_task(
+		    lh_rsc->actions, lh_rsc, order->lh_action_task);
 	}
 
 	if(lh_actions == NULL && lh_rsc != rh_rsc) {
@@ -760,8 +948,8 @@
 		rh_actions = g_list_append(NULL, rh_action);
 
 	} else if(rsc != NULL) {
-		rh_actions = find_actions(
-			rsc->actions, order->rh_action_task, NULL);
+		rh_actions = find_actions_by_task(
+		    rsc->actions, rsc, order->rh_action_task);
 	}
 
 	if(rh_actions == NULL) {
@@ -810,7 +998,7 @@
 	} else if(constraint->role_filter > 0
 		  && constraint->role_filter != rsc->next_role) {
 		crm_debug("Constraint (%s) is not active (role : %s)",
-			    constraint->id, role2text(constraint->role_filter));
+			  constraint->id, role2text(constraint->role_filter));
 		return;
 		
 	} else if(is_active(constraint) == FALSE) {
@@ -860,10 +1048,10 @@
 {
 	notify_entry_t *entry = NULL;
 
-	CRM_CHECK(node != NULL,
-		  crm_err("%s has no node for required action %s",
-			  rsc->id, task2text(task));
-		  return);
+	if(node == NULL) {
+	    pe_proc_warn("%s has no node for required action %s", rsc->id, task2text(task));
+	    return;
+	}
 
 	crm_malloc0(entry, sizeof(notify_entry_t));
 	entry->rsc = rsc;
@@ -1034,7 +1222,7 @@
 	value = g_hash_table_lookup(op->meta, "notify_type");
 	task = g_hash_table_lookup(op->meta, "notify_operation");
 
-	crm_debug("Creating notify actions for %s: %s (%s-%s)",
+	crm_debug_2("Creating notify actions for %s: %s (%s-%s)",
 		    op->uuid, rsc->id, value, task);
 	
 	key = generate_notify_key(rsc->id, value, task);
@@ -1116,21 +1304,64 @@
 	action_t *start = NULL;		
 	GListPtr possible_matches = NULL;
 
-	crm_debug_2("Executing: %s (role=%s)",rsc->id, role2text(rsc->next_role));
+	crm_debug_2("Executing: %s (role=%s)", rsc->id, role2text(rsc->next_role));
 
-	if(current == NULL || next == NULL) {
-		return;
+	if(current == NULL && next == NULL) {
+	    crm_notice("Leave resource %s\t(%s)",
+		       rsc->id, role2text(rsc->role));
+	    return;
+
+	} else if(next == NULL) {
+	    crm_notice("Stop resource %s\t(%s %s)",
+		       rsc->id, role2text(rsc->role), current->details->uname);
+	    return;
+
+	} else if(current == NULL && rsc->next_role > RSC_ROLE_SLAVE) {
+	    crm_notice("Promote %s\t(%s -> %s %s)", rsc->id,
+		       role2text(rsc->role), role2text(rsc->next_role),
+		       next->details->uname);
+	    return;
+
+	} else if(current == NULL) {
+	    crm_notice("Start %s\t(%s -> %s %s)", rsc->id,
+		       role2text(rsc->role), role2text(rsc->next_role),
+		       next->details->uname);
+	    return;
 	}
 
-	if(is_set(rsc->flags, pe_rsc_failed)
-	   || safe_str_neq(current->details->id, next->details->id)) {
+	if(rsc->role == rsc->next_role) {
+	    start = start_action(rsc, next, TRUE);
+	    if(start->optional) {
+		crm_notice("Leave resource %s\t(%s %s)",
+			   rsc->id, role2text(rsc->role), next->details->uname);
+
+	    } else if(safe_str_eq(current->details->id, next->details->id)) {
 		if(is_set(rsc->flags, pe_rsc_failed)) {
-			crm_notice("Recover resource %s\t(%s)",
-				   rsc->id, next->details->uname);
+		    crm_notice("Recover resource %s\t(%s %s)",
+			       rsc->id, role2text(rsc->role), next->details->uname);
 		} else {
-			crm_notice("Move  resource %s\t(%s -> %s)", rsc->id,
-				   current->details->uname, next->details->uname);
+		    crm_notice("Restart resource %s\t(%s %s)",
+			       rsc->id, role2text(rsc->role), next->details->uname);
 		}
+		
+	    } else {
+		crm_notice("Move resource %s\t(%s %s -> %s)",
+			   rsc->id, role2text(rsc->role), current->details->uname, next->details->uname);
+	    }
+
+	} else if(rsc->role < rsc->next_role) {
+	    crm_notice("Promote %s\t(%s -> %s %s)", rsc->id,
+		       role2text(rsc->role), role2text(rsc->next_role),
+		       next->details->uname);
+	    
+	} else if(rsc->role > rsc->next_role) {
+	    crm_notice("Demote %s\t(%s -> %s %s)", rsc->id,
+		       role2text(rsc->role), role2text(rsc->next_role),
+		       next->details->uname);
+	}
+	
+	if(is_set(rsc->flags, pe_rsc_failed)
+	   || safe_str_neq(current->details->id, next->details->id)) {
 
 		if(rsc->next_role > RSC_ROLE_STARTED) {
 		    gboolean optional = TRUE;
@@ -1159,7 +1390,7 @@
 		g_list_free(possible_matches);
 		
 	} else if(is_set(rsc->flags, pe_rsc_start_pending)) {
-		action_t *start = start_action(rsc, next, TRUE);
+		start = start_action(rsc, next, TRUE);
 		if(start->runnable) {
 			/* wait for StartRsc() to be called */
 			rsc->role = RSC_ROLE_STOPPED;
@@ -1169,6 +1400,7 @@
 		}
 		
 	} else {
+	    
 		stop = stop_action(rsc, current, TRUE);
 		start = start_action(rsc, next, TRUE);
 		stop->optional = start->optional;
@@ -1183,13 +1415,6 @@
 		
 		if(start->runnable == FALSE) {
 			rsc->next_role = RSC_ROLE_STOPPED;
-			
-		} else if(start->optional) {
-			crm_notice("Leave resource %s\t(%s)",
-				   rsc->id, next->details->uname);
-		} else {
-			crm_notice("Restart resource %s\t(%s)",
-				   rsc->id, next->details->uname);
 		}
 	}
 }
@@ -1199,16 +1424,28 @@
 StopRsc(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set)
 {
 	action_t *stop = NULL;
-	
+	const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS);
+
 	crm_debug_2("Executing: %s", rsc->id);
+
+	if(rsc->next_role == RSC_ROLE_STOPPED
+	   && rsc->variant == pe_native
+	   && safe_str_eq(class, "stonith")) {
+	    action_t *all_stopped = get_pseudo_op(ALL_STOPPED, data_set);
+	    custom_action_order(
+		NULL, crm_strdup(all_stopped->task), all_stopped,
+		rsc, stop_key(rsc), NULL,
+		pe_order_implies_left|pe_order_stonith_stop, data_set);
+	}
 	
 	slist_iter(
 		current, node_t, rsc->running_on, lpc,
 		stop = stop_action(rsc, current, optional);
+
 		if(stop->runnable && stop->optional == FALSE) {
-			crm_notice("  %s\tStop %s", current->details->uname, rsc->id);
+		    crm_notice("  %s\tStop %s",current->details->uname,rsc->id);
 		}
-
+		
 		if(data_set->remove_after_stop) {
 			DeleteRsc(rsc, current, optional, data_set);
 		}
@@ -1244,6 +1481,8 @@
 		  crm_err("Next role: %s", role2text(rsc->next_role));
 		  return FALSE);
 
+	CRM_CHECK(next != NULL, return FALSE);
+
 	key = start_key(rsc);
 	action_list = find_actions_exact(rsc->actions, key, next);
 	crm_free(key);
@@ -1259,7 +1498,7 @@
 	if(runnable) {
 		promote_action(rsc, next, optional);
 		if(optional == FALSE) {
-			crm_notice("%s\tPromote %s", next->details->uname, rsc->id);
+			crm_debug("%s\tPromote %s", next->details->uname, rsc->id);
 		}
 		return TRUE;
 	} 
@@ -1286,7 +1525,7 @@
 /* 	CRM_CHECK(rsc->next_role == RSC_ROLE_SLAVE, return FALSE); */
 	slist_iter(
 		current, node_t, rsc->running_on, lpc,
-		crm_notice("%s\tDemote %s", current->details->uname, rsc->id);
+		do_crm_log(optional?LOG_DEBUG:LOG_NOTICE, "%s\tDemote %s", current->details->uname, rsc->id);
 		demote_action(rsc, current, optional);
 		);
 	return TRUE;
@@ -1303,7 +1542,7 @@
 gboolean
 NullOp(resource_t *rsc, node_t *next, gboolean optional, pe_working_set_t *data_set)
 {
-	crm_debug("Executing: %s", rsc->id);
+	crm_debug_2("Executing: %s", rsc->id);
 	return FALSE;
 }
 
@@ -1407,7 +1646,7 @@
 	
 	crm_debug_2("Probing %s on %s (%s)", rsc->id, node->details->uname, role2text(rsc->role));
 	
-	custom_action_order(rsc, NULL, probe, rsc, NULL, complete,
+	custom_action_order(rsc, NULL, probe, NULL, NULL, complete,
 			    pe_order_implies_right, data_set);
 
 	return TRUE;
@@ -1436,15 +1675,10 @@
 			       order_actions(all_stopped, action, pe_order_implies_left);
 
 			   } else if(target != NULL
-			      && target->details->expected_up
 			      && safe_str_eq(action->task, CRMD_ACTION_START)
 			      && NULL == pe_find_node_id(
 				      rsc->known_on, target->details->id)) {
-				   /* if expected_up == TRUE, then we've seen
-				    *   the node before and it has failed (as
-				    *   opposed to just hasn't started up yet)
-				    *
-				    * if known == NULL, then we dont know if
+				   /* if known == NULL, then we dont know if
 				    *   the resource is active on the node
 				    *   we're about to shoot
 				    *
@@ -1464,7 +1698,8 @@
 					    action->uuid, target->details->uname);
 				   order_actions(all_stopped, action,
 						 pe_order_implies_left|pe_order_runnable_left);
-			   }   
+			   }
+			   
 			);
 	}
 }
@@ -1523,7 +1758,7 @@
 	    }
 	    
 	    if(parent) {
-		crm_info("Re-creating actions for %s", parent->id);
+		crm_debug_2("Re-creating actions for %s", parent->id);
 		parent->cmds->create_actions(parent, data_set);
 		
 		/* make sure we dont mess anything up in create_actions */
@@ -1619,11 +1854,124 @@
 	native_stop_constraints(rsc,  stonith_op, is_stonith, data_set);
 }
 
+#define ALLOW_WEAK_MIGRATION 0
+
+static gboolean
+check_stack_element(resource_t *rsc, resource_t *other_rsc, const char *type) 
+{
+    char *key = NULL;
+    int level = LOG_DEBUG;
+    GListPtr action_list = NULL;
+
+    if(other_rsc == NULL || other_rsc == rsc) {
+	return TRUE;
+    }
+
+    do_crm_log(level+1, "%s: processing %s (%s)", rsc->id, other_rsc->id, type);
+    
+    if(other_rsc->variant == pe_native) {
+	do_crm_log(level, "%s: depends on %s (mid-stack) %s",
+		   rsc->id, other_rsc->id, type);
+	return FALSE;
+	
+    } else if(other_rsc->variant == pe_group) {
+	if(at_stack_bottom(other_rsc) == FALSE) {
+	    do_crm_log(level, "%s: depends on group %s (mid-stack) %s",
+		       rsc->id, other_rsc->id, type);
+	    return FALSE;
+	}
+	return TRUE;
+    }
+    
+    /* is the clone also moving moved around?
+     *
+     * if so, then we can't yet be completely sure the
+     *   resource can safely migrate since the node we're
+     *   moving too may not have the clone instance started
+     *   yet
+     *
+     * in theory we can figure out if the clone instance we
+     *   will run on is already there, but there that would
+     *   involve too much knowledge of internal clone code.
+     *   maybe later...
+     */
+    
+    do_crm_log(level+1,"%s: start depends on clone %s",
+	       rsc->id, other_rsc->id);
+    key = stop_key(other_rsc);
+    action_list = find_actions(other_rsc->actions, key, NULL);
+    crm_free(key);
+    
+    slist_iter(
+	other_stop, action_t, action_list,lpc,
+	if(other_stop && other_stop->optional == FALSE) {
+	    do_crm_log(level, "%s: start depends on %s",
+		       rsc->id, other_stop->uuid);
+	    
+	    g_list_free(action_list);
+	    return FALSE;
+	}
+	);
+    g_list_free(action_list);
+    return TRUE;
+}
+
+gboolean
+at_stack_bottom(resource_t *rsc) 
+{
+    char *key = NULL;
+    action_t *start = NULL;
+    action_t *other = NULL;
+    GListPtr action_list = NULL;
+    
+    key = start_key(rsc);
+    action_list = find_actions(rsc->actions, key, NULL);
+    crm_free(key);
+    
+    crm_debug_3("%s: processing", rsc->id);
+    CRM_CHECK(action_list != NULL, return FALSE);
+    
+    start = action_list->data;
+    g_list_free(action_list);
+
+    slist_iter(
+	constraint, rsc_colocation_t, rsc->rsc_cons, lpc,
+
+	resource_t *target = constraint->rsc_rh;
+	crm_debug_4("%s == %s (%d)", rsc->id, target->id, constraint->score);
+	if(constraint->score > 0
+	   && check_stack_element(rsc, target, "coloc") == FALSE) {
+	    return FALSE;
+	}
+	);
+
+    slist_iter(
+	other_w, action_wrapper_t, start->actions_before, lpc,
+	other = other_w->action;
+
+#if ALLOW_WEAK_MIGRATION
+	if((other_w->type & pe_order_implies_right) == 0) {
+	    crm_debug_3("%s: depends on %s (optional ordering)",
+			rsc->id, other->uuid);
+	    continue;
+	}	
+#endif 
+
+	if(other->optional == FALSE
+	   && check_stack_element(rsc, other->rsc, "order") == FALSE) {
+	    return FALSE;
+	}
+	
+	);
+
+    return TRUE;
+}
+
 void
 complex_migrate_reload(resource_t *rsc, pe_working_set_t *data_set)
 {
 	char *key = NULL;
-	int level = LOG_DEBUG_2;
+	int level = LOG_DEBUG;
 	GListPtr action_list = NULL;
 	
 	action_t *stop = NULL;
@@ -1638,17 +1986,19 @@
 		
 		child_rsc->cmds->migrate_reload(child_rsc, data_set);
 		);
+	    other = NULL;
 	    return;
 	}
 
+	do_crm_log(level+1, "Processing %s", rsc->id);
 	CRM_CHECK(rsc->variant == pe_native, return);
 	
 	if(is_not_set(rsc->flags, pe_rsc_managed)
 	   || is_set(rsc->flags, pe_rsc_failed)
 	   || is_set(rsc->flags, pe_rsc_start_pending)
-	   || rsc->next_role != RSC_ROLE_STARTED		   
+	   || rsc->next_role != RSC_ROLE_STARTED
 	   || g_list_length(rsc->running_on) != 1) {
-		do_crm_log(level, "%s: resource", rsc->id);
+		do_crm_log(level+1, "%s: general resource state", rsc->id);
 		return;
 	}
 	
@@ -1663,15 +2013,15 @@
 	
 	start = action_list->data;
 	g_list_free(action_list);
-	
+
 	value = g_hash_table_lookup(rsc->meta, "allow_migrate");
 	if(crm_is_true(value)) {
 	    set_bit(rsc->flags, pe_rsc_can_migrate);	
-	}
-	
+	}	
+
 	if(is_not_set(rsc->flags, pe_rsc_can_migrate)
 	   && start->allow_reload_conversion == FALSE) {
-		do_crm_log(level, "%s: no need to continue", rsc->id);
+		do_crm_log(level+1, "%s: no need to continue", rsc->id);
 		return;
 	}
 	
@@ -1705,76 +2055,23 @@
 		return;
 	}
 	
-	slist_iter(
-		other_w, action_wrapper_t, start->actions_before, lpc,
-		gboolean can_migrate = TRUE;
-		resource_t *parent = NULL;
-		other = other_w->action;
-		parent = uber_parent(other->rsc);
-
-		if(other->optional == TRUE
-		   || other->rsc == rsc
-		   || parent == NULL) {
-			continue;
-		}
-
-		if(parent->variant == pe_native
-		   || parent->variant == pe_group) {
-			/* clones are the only ones that can be "moved"
-			 * and still allow resources sitting on top of
-			 * them (ie. us) to be migrated 
-			 */
-			can_migrate = FALSE;
-			
-		} else if(safe_str_eq(other->task, CRMD_ACTION_MIGRATE)
-			  || safe_str_eq(other->task, CRMD_ACTION_MIGRATED)) {
-			/* we depend on something that is already migrating...
-			 * we cant both migrate
-			 */
-			can_migrate = FALSE;
-			
-		} else {
-			/* is the clone also moving moved around?
-			 *
-			 * if so, then we can't yet be completely sure the
-			 *   resource can safely migrate since the node we're
-			 *   moving too may not have the clone instance started
-			 *   yet
-			 *
-			 * in theory we can figure out if the clone instance we
-			 *   will run on is already there, but there that would
-			 *   involve too much knowledge of internal clone code.
-			 *   maybe later...
-			 */
-			do_crm_log(level,
-				   "%s: start depends on clone %s",
-				   rsc->id, parent->id);
-			key = stop_key(parent);
-			action_list = find_actions(parent->actions, key, NULL);
-			crm_free(key);
-			
-			slist_iter(
-				other_stop, action_t, action_list,lpc,
-				if(other_stop && other_stop->optional == FALSE) {
-					do_crm_log(LOG_INFO,
-						   "%s: start depends on %s",
-						   rsc->id, other_stop->uuid);
-					can_migrate = FALSE;
-				}
-				);
-			g_list_free(action_list);
-		}
-		
-		if(can_migrate == FALSE) {
-			do_crm_log(LOG_INFO, "%s: start depends on %s",
-				   rsc->id, other->uuid);
-			return;
-		}
-		);
+	if(is_set(rsc->flags, pe_rsc_can_migrate)) {
+	    if(start->node == NULL
+	       || stop->node == NULL
+	       || stop->node->details == start->node->details) {
+		clear_bit(rsc->flags, pe_rsc_can_migrate);
+
+	    } else if(at_stack_bottom(rsc) == FALSE) {
+		crm_notice("Cannot migrate %s from %s to %s"
+			   " - %s is not at the bottom of the resource stack",
+			   rsc->id, stop->node->details->uname,
+			   start->node->details->uname, rsc->id);
+		clear_bit(rsc->flags, pe_rsc_can_migrate);
+	    }
+	}
 
-	if(is_set(rsc->flags, pe_rsc_can_migrate)
-	   && stop->node->details != start->node->details) {
-		crm_info("Migrating %s from %s to %s", rsc->id,
+	if(is_set(rsc->flags, pe_rsc_can_migrate)) {
+		crm_notice("Migrating %s from %s to %s", rsc->id,
 			 stop->node->details->uname,
 			 start->node->details->uname);
 		
@@ -1787,17 +2084,33 @@
 		add_hash_param(stop->meta, "migrate_target",
 			       start->node->details->uname);
 
+		/* Hook up to the all_stopped and shutdown actions */
+		slist_iter(
+			other_w, action_wrapper_t, stop->actions_after, lpc,
+			other = other_w->action;
+			if(other->optional == FALSE
+			   && other->rsc == NULL) {
+				order_actions(start, other, other_w->type);
+			}
+			);
 
 		slist_iter(
 			other_w, action_wrapper_t, start->actions_before, lpc,
 			other = other_w->action;
 			if(other->optional == FALSE
+#if ALLOW_WEAK_MIGRATION
+			   && (other_w->type & pe_order_implies_right)
+#endif
 			   && other->rsc != NULL
+			   && other->rsc != rsc->parent
 			   && other->rsc != rsc) {
+				do_crm_log(level, "Ordering %s before %s",
+					   other->uuid, stop->uuid);
+			    
 				order_actions(other, stop, other_w->type);
 			}
 			);
-		
+
 		crm_free(start->uuid);
 		crm_free(start->task);
 		start->task = crm_strdup(CRMD_ACTION_MIGRATED);
@@ -1821,6 +2134,6 @@
 		stop->pseudo = TRUE; /* easier than trying to delete it from the graph */
 		
 	} else {
-		do_crm_log(level, "%s nothing to do", rsc->id);
+		do_crm_log(level+1, "%s nothing to do", rsc->id);
 	}
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/pengine.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/pengine.c
--- heartbeat-2.1.3/crm/pengine/pengine.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/pengine.c	2008-08-18 13:32:19.000000000 +0100
@@ -39,7 +39,7 @@
 
 #define PE_WORKING_DIR	HA_VARLIBDIR"/heartbeat/pengine"
 
-
+int scores_log_level = LOG_DEBUG_2;
 extern int transition_id;
 
 #define get_series() 	was_processing_error?1:was_processing_warning?2:3
@@ -244,8 +244,6 @@
 		   rsc->fns->print(rsc, NULL, pe_print_log, &rsc_log_level);
 		);
 
-	crm_debug_5("apply placement constraints");
-	stage1(data_set);
 	
 #if MEMCHECK_STAGE_1
 	check_and_exit(1);
@@ -278,7 +276,7 @@
 #if MEMCHECK_STAGE_5
 	check_and_exit(5);
 #endif
-
+	
 	crm_debug_5("processing fencing and shutdown cases");
 	stage6(data_set);
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/pengine.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/pengine.h
--- heartbeat-2.1.3/crm/pengine/pengine.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/pengine.h	2008-08-18 13:32:19.000000000 +0100
@@ -56,8 +56,15 @@
 	pe_order_demote			= 0x800, /* stop-start constraint */
 
 	pe_order_shutdown		= 0x1000, /* combines with pe_order_restart to make a complex resource shut down */
+	pe_order_demote_stop		= 0x2000, /* upgrades to implies_left if the resource is a master */
+
+	pe_order_complex_left		= 0x10000, /* upgrades to implies left */
+	pe_order_complex_right		= 0x20000, /* upgrades to implies right */
+
+	pe_order_implies_left_printed	= 0x40000, /* Like implies left but only ensures the action is printed, not manditory */
+	pe_order_implies_right_printed	= 0x80000, /* Like implies right but only ensures the action is printed, not manditory */
 	
-	pe_order_test		        = 0x10000 /* test marker */
+	pe_order_test		        = 0x100000 /* test marker */
 };
 
 struct rsc_colocation_s { 
@@ -116,7 +123,7 @@
 };
 
 extern gboolean stage0(pe_working_set_t *data_set);
-extern gboolean stage1(pe_working_set_t *data_set);
+extern gboolean probe_resources(pe_working_set_t *data_set);
 extern gboolean stage2(pe_working_set_t *data_set);
 extern gboolean stage3(pe_working_set_t *data_set);
 extern gboolean stage4(pe_working_set_t *data_set);
@@ -170,6 +177,7 @@
 extern void graph_element_from_action(
 	action_t *action, pe_working_set_t *data_set);
 
+extern int scores_log_level;
 extern const char* transition_idle_timeout;
 
 #endif
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/ptest.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/ptest.c
--- heartbeat-2.1.3/crm/pengine/ptest.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/ptest.c	2008-08-18 13:32:19.000000000 +0100
@@ -35,7 +35,7 @@
 
 #include <crm/cib.h>
 
-#define OPTARGS	"V?X:D:G:I:Lwxd:aS"
+#define OPTARGS	"V?X:D:G:I:Lwxd:aSs"
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
@@ -104,6 +104,7 @@
 	fprintf(out, "    --%s (-%c): Increase verbosity (can be supplied multiple times)\n\n", "verbose", 'V');
 	fprintf(out, "    --%s (-%c): Connect to the CIB and use the current contents as input\n", "live-check", 'L');
 	fprintf(out, "    --%s (-%c): Look for xml on stdin\n", "xml-stream", 'x');
+	fprintf(out, "    --%s (-%c): Display resource allocation scores\n", "show-scores", 's');
 	fprintf(out, "    --%s (-%c)\t<filename> : Look for xml in the named file\n\n", "xml-file", 'X');
 
 	fprintf(out, "    --%s (-%c)\t<filename> : Save the transition graph to the named file\n", "save-graph",   'G');
@@ -128,6 +129,12 @@
 		action_host = "<none>";
 		action_name = crm_concat(action->uuid, action_host, ' ');
 	}
+	if(safe_str_eq(action->task, CRMD_ACTION_CANCEL)) {
+	    char *tmp_action_name = action_name;
+	    action_name = crm_concat("Cancel", tmp_action_name, ' ');
+	    crm_free(tmp_action_name);
+	}
+	
 	return action_name;
 }
 
@@ -137,6 +144,7 @@
 main(int argc, char **argv)
 {
 	gboolean all_good = TRUE;
+	gboolean show_scores = FALSE;
 	enum transition_status graph_rc = -1;
 	crm_graph_t *transition = NULL;
 	ha_time_t *a_date = NULL;
@@ -170,6 +178,7 @@
 
 			{"live-check",  0, 0, 'L'},
 			{"xml-stream",  0, 0, 'x'},
+			{"show-scores", 0, 0, 's'},
 			{"xml-file",    1, 0, 'X'},
 
 			{"simulate",    0, 0, 'S'},
@@ -212,6 +221,11 @@
 			case 'x':
 				use_stdin = TRUE;
 				break;
+			case 's':
+				show_scores = TRUE;
+				cl_log_enable_stderr(TRUE);
+				scores_log_level = crm_log_level;
+				break;
 			case 'X':
 				xml_file = optarg;
 				break;
@@ -230,6 +244,9 @@
 			case 'V':
 				cl_log_enable_stderr(TRUE);
 				alter_debug(DEBUG_INC);
+				if(show_scores) {
+				    scores_log_level = crm_log_level;
+				}
 				break;
 			case 'L':
 				USE_LIVE_CIB = TRUE;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/utils.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/utils.c
--- heartbeat-2.1.3/crm/pengine/utils.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/utils.c	2008-08-18 13:32:19.000000000 +0100
@@ -256,21 +256,10 @@
 gboolean
 native_assign_node(resource_t *rsc, GListPtr nodes, node_t *chosen)
 {
-	int multiple = 0;
 	CRM_ASSERT(rsc->variant == pe_native);
 
 	clear_bit(rsc->flags, pe_rsc_provisional);
 	
-	slist_iter(candidate, node_t, nodes, lpc, 
-		   crm_debug("Color %s, Node[%d] %s: %d", rsc->id, lpc,
-			     candidate->details->uname, candidate->weight);
-		   if(chosen->weight > 0
-		      && candidate->details->unclean == FALSE
-		      && candidate->weight == chosen->weight) {
-			   multiple++;
-		   }
-		);
-
 	if(chosen == NULL) {
 		crm_debug("Could not allocate a node for %s", rsc->id);
 		rsc->next_role = RSC_ROLE_STOPPED;
@@ -278,7 +267,8 @@
 
 	} else if(can_run_resources(chosen) == FALSE || chosen->weight < 0) {
 		crm_debug("All nodes for resource %s are unavailable"
-			  ", unclean or shutting down", rsc->id);
+			  ", unclean or shutting down (%s: %d, %d)",
+			  rsc->id, chosen->details->uname, can_run_resources(chosen), chosen->weight);
 		rsc->next_role = RSC_ROLE_STOPPED;
 		return FALSE;
 	}
@@ -287,19 +277,6 @@
 		rsc->next_role = RSC_ROLE_STARTED;
 	}
 	
-	if(multiple > 1) {
-		int log_level = LOG_INFO;
-		char *score = score2char(chosen->weight);
-		if(chosen->weight >= INFINITY) {
-			log_level = LOG_WARNING;
-		}
-		
-		do_crm_log(log_level, "%d nodes with equal score (%s) for"
-			      " running the listed resources (chose %s):",
-			      multiple, score, chosen->details->uname);
-		crm_free(score);
-	}
-	
 	/* todo: update the old node for each resource to reflect its
 	 * new resource count
 	 */
@@ -324,7 +301,7 @@
 }
 
 void
-convert_non_atomic_task(resource_t *rsc, order_constraint_t *order)
+convert_non_atomic_task(resource_t *rsc, order_constraint_t *order, gboolean with_notify)
 {
 	int interval = 0;
 	char *rid = NULL;
@@ -332,7 +309,7 @@
 	int task = no_action;
 	char *old_uuid = order->lh_action_task;
 
-	crm_debug("Processing %s", old_uuid);
+	crm_debug_3("Processing %s", old_uuid);
 	
 	if(order->lh_action_task == NULL
 	   || strstr(order->lh_action_task, "notify") != NULL) {
@@ -369,7 +346,7 @@
 	}
 	
 	if(task != no_action) {
-		if(is_set(rsc->flags, pe_rsc_notify)) {
+		if(with_notify && is_set(rsc->flags, pe_rsc_notify)) {
 			order->lh_action_task = generate_notify_key(
 				rsc->id, "confirmed-post",
 				task2text(task));
@@ -377,7 +354,7 @@
 			order->lh_action_task = generate_op_key(
 				rsc->id, task2text(task+1), 0);
 		}
-		crm_debug("Converted %s -> %s",
+		crm_debug_2("Converted %s -> %s",
 			  old_uuid, order->lh_action_task);
 		crm_free(old_uuid);
 	}
@@ -394,7 +371,7 @@
 	action_wrapper_t *wrapper = NULL;
 	GListPtr list = NULL;
 	
-	crm_debug_2("Ordering Action %s before %s",
+	crm_debug_3("Ordering Action %s before %s",
 		    lh_action->uuid, rh_action->uuid);
 
 	log_action(LOG_DEBUG_4, "LH (order_actions)", lh_action, FALSE);
@@ -503,16 +480,6 @@
 	}
 }
 
-resource_t *uber_parent(resource_t *rsc) 
-{
-	resource_t *parent = rsc;
-	while(parent != NULL && parent->parent != NULL) {
-		parent = parent->parent;
-	}
-	return parent;
-}
-
-
 action_t *get_pseudo_op(const char *name, pe_working_set_t *data_set) 
 {
     action_t *op = NULL;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/pengine/utils.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/pengine/utils.h
--- heartbeat-2.1.3/crm/pengine/utils.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/pengine/utils.h	2008-08-18 13:32:19.000000000 +0100
@@ -52,16 +52,17 @@
 extern gboolean can_run_resources(const node_t *node);
 extern gboolean native_assign_node(resource_t *rsc, GListPtr candidates, node_t *chosen);
 
-extern void convert_non_atomic_task(resource_t *rsc, order_constraint_t *order);
+extern void convert_non_atomic_task(resource_t *rsc, order_constraint_t *order, gboolean with_notify);
 extern void order_actions(
 	action_t *lh_action, action_t *rh_action, enum pe_ordering order);
 
 extern void log_action(unsigned int log_level, const char *pre_text,
 		       action_t *action, gboolean details);
 
-extern resource_t *uber_parent(resource_t *rsc);
 extern action_t *get_pseudo_op(const char *name, pe_working_set_t *data_set);
 extern gboolean can_run_any(GListPtr nodes);
+resource_t *find_compatible_child(
+    resource_t *local_child, resource_t *rsc, enum rsc_role_e filter, gboolean current);
 
 #define STONITH_UP "stonith_up"
 #define ALL_STOPPED "all_stopped"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/actions.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/actions.c
--- heartbeat-2.1.3/crm/tengine/actions.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/actions.c	2008-08-18 13:32:19.000000000 +0100
@@ -149,7 +149,7 @@
 	st_op->node_uuid = crm_strdup(uuid);
 	
 	st_op->private_data = generate_transition_key(
-		transition_graph->id, action->id, te_uuid);
+	    transition_graph->id, action->id, 0, te_uuid);
 	
 	CRM_ASSERT(stonithd_input_IPC_channel() != NULL);
 		
@@ -160,6 +160,17 @@
 	return TRUE;
 }
 
+static int get_target_rc(crm_action_t *action) 
+{
+	const char *target_rc_s = g_hash_table_lookup(
+	    action->params, crm_meta_name(XML_ATTR_TE_TARGET_RC));
+	
+	if(target_rc_s != NULL) {
+		return crm_parse_int(target_rc_s, "0");
+	}
+	return 0;
+}
+
 static gboolean
 te_crm_command(crm_graph_t *graph, crm_action_t *action)
 {
@@ -189,7 +200,7 @@
 			     CRM_SYSTEM_TENGINE, NULL);
 	
 	counter = generate_transition_key(
-		transition_graph->id, action->id, te_uuid);
+	    transition_graph->id, action->id, get_target_rc(action), te_uuid);
 	crm_xml_add(cmd, XML_ATTR_TRANSITION_KEY, counter);
 	ret = send_ipc_message(crm_ch, cmd);
 	crm_free(counter);
@@ -329,7 +340,8 @@
 
 	crm_free(code);
 
-	code = generate_transition_key(transition_graph->id, action->id,te_uuid);
+	code = generate_transition_key(
+	    transition_graph->id, action->id, get_target_rc(action), te_uuid);
 	crm_xml_add(xml_op, XML_ATTR_TRANSITION_KEY, code);
 	crm_free(code);
 
@@ -397,11 +409,11 @@
 	task_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
 	on_node = crm_element_value(rsc_op, XML_LRM_ATTR_TARGET);
 	counter = generate_transition_key(
-		transition_graph->id, action->id, te_uuid);
+	    transition_graph->id, action->id, get_target_rc(action), te_uuid);
 	crm_xml_add(rsc_op, XML_ATTR_TRANSITION_KEY, counter);
 
-	crm_info("Initiating action %d: %s on %s",
-		 action->id, task_uuid, on_node);
+	crm_info("Initiating action %d: %s %s on %s",
+		 action->id, task, task_uuid, on_node);
 
 	crm_free(counter);
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/callbacks.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/callbacks.c
--- heartbeat-2.1.3/crm/tengine/callbacks.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/callbacks.c	2008-08-18 13:32:19.000000000 +0100
@@ -243,8 +243,9 @@
 				INFINITY, tg_restart, "Transition Active", NULL);
 
 		}  else {
+			const char *value = NULL;
 			crm_data_t *graph_data = xml_data;
-			crm_debug("Processing graph derived from %s", graph_input);
+			crm_info("Processing graph derived from %s", graph_input);
 
 			if(graph_file != NULL) {
 				FILE *graph_fd = fopen(graph_file, "r");
@@ -264,6 +265,16 @@
 			start_global_timer(transition_timer,
 					   transition_graph->transition_timeout);
 
+			value = crm_element_value(graph_data, "failed-stop-offset");
+			if(value) {
+			    failed_stop_offset = crm_strdup(value);
+			}
+			
+			value = crm_element_value(graph_data, "failed-start-offset");
+			if(value) {
+			    failed_start_offset = crm_strdup(value);
+			}
+			
 			trigger_graph();
 			print_graph(LOG_DEBUG_2, transition_graph);
 
@@ -291,6 +302,7 @@
 tengine_stonith_callback(stonith_ops_t * op)
 {
 	const char *allow_fail  = NULL;
+	int target_rc = -1;
 	int stonith_id = -1;
 	int transition_id = -1;
 	char *uuid = NULL;
@@ -311,7 +323,7 @@
 	/* filter out old STONITH actions */
 
 	CRM_CHECK(decode_transition_key(
-			  op->private_data, &uuid, &transition_id, &stonith_id),
+		      op->private_data, &uuid, &transition_id, &stonith_id, &target_rc),
 		  crm_err("Invalid event detected");
 		  goto bail;
 		);
@@ -429,6 +441,16 @@
 	}
 }
 
+void
+cib_failcount_updated(const HA_Message *msg, int call_id, int rc,
+		   crm_data_t *output, void *user_data)
+{
+	trigger_graph();
+
+	if(rc < cib_ok) {
+		crm_err("Update %d FAILED: %s", call_id, cib_error2string(rc));
+	}
+}
 
 gboolean
 action_timer_callback(gpointer data)
@@ -556,14 +578,10 @@
 gboolean
 te_graph_trigger(gpointer user_data) 
 {
-	int timeout = 0;
-	enum transition_status graph_rc = -1;
-
-	if(transition_graph->complete) {
-		notify_crmd(transition_graph);
-		return TRUE;
-	}
+    int timeout = 0;
+    enum transition_status graph_rc = -1;
 
+    if(transition_graph->complete == FALSE) {
 	graph_rc = run_graph(transition_graph);
 	timeout = transition_graph->transition_timeout;
 	print_graph(LOG_DEBUG_3, transition_graph);
@@ -583,11 +601,12 @@
 		crm_err("Transition failed: %s", transition_status(graph_rc));
 		print_graph(LOG_WARNING, transition_graph);
 	}
-	
-	transition_graph->complete = TRUE;
-	notify_crmd(transition_graph);
-
-	return TRUE;	
+    }
+    
+    transition_graph->complete = TRUE;
+    notify_crmd(transition_graph);
+    
+    return TRUE;	
 }
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/events.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/events.c
--- heartbeat-2.1.3/crm/tengine/events.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/events.c	2008-08-18 13:32:19.000000000 +0100
@@ -29,10 +29,13 @@
 #include <clplumbing/Gmain_timeout.h>
 #include <lrm/lrm_api.h>
 
+char *failed_stop_offset = NULL;
+char *failed_start_offset = NULL;
+
 crm_data_t *need_abort(crm_data_t *update);
 void process_graph_event(crm_data_t *event, const char *event_node);
 int match_graph_event(int action_id, crm_data_t *event, const char *event_node,
-		      int op_status, int op_rc);
+		      int op_status, int op_rc, int target_rc);
 
 crm_data_t *
 need_abort(crm_data_t *update)
@@ -106,7 +109,7 @@
 				continue;
 			}
 			
-			target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
+			target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
 			if(safe_str_eq(target, down_node)) {
 				action->failed = TRUE;
 				last_action = action->xml;
@@ -214,7 +217,7 @@
 }
 
 static void
-update_failcount(crm_data_t *event, const char *event_node, int rc) 
+update_failcount(crm_data_t *event, const char *event_node, int rc, int target_rc) 
 {
 	int interval = 0;
 	char *task = NULL;
@@ -222,13 +225,24 @@
 	char *attr_name = NULL;
 	const char *id  = ID(event);
 	const char *on_uuid  = event_node;
-	const char *value = XML_NVPAIR_ATTR_VALUE"++";
+	const char *value = NULL;
 
 	if(rc == 99) {
 		/* this is an internal code for "we're busy, try again" */
 		return;
+
+	} else if(rc == target_rc) {
+	    return;
 	}
 
+	if(failed_stop_offset == NULL) {
+	    failed_stop_offset = crm_strdup(INFINITY_S);
+	}
+
+	if(failed_start_offset == NULL) {
+	    failed_start_offset = crm_strdup(INFINITY_S);
+	}
+	
 	CRM_CHECK(on_uuid != NULL, return);
 
 	CRM_CHECK(parse_op_key(id, &rsc_id, &task, &interval),
@@ -237,20 +251,30 @@
 	CRM_CHECK(task != NULL, goto bail);
 	CRM_CHECK(rsc_id != NULL, goto bail);
 
-	if(safe_str_eq(task, CRMD_ACTION_START)
-	   || safe_str_eq(task, CRMD_ACTION_STOP)) {
+	if(safe_str_eq(task, CRMD_ACTION_START)) {
+	    interval = 1;
+	    value = failed_start_offset;
+
+	} else if(safe_str_eq(task, CRMD_ACTION_STOP)) {
 	    interval = 1;
-	    value = "INFINITY";
+	    value = failed_stop_offset;
 	}
-	
+
+	if(value == NULL || safe_str_neq(value, INFINITY_S)) {
+	    value = XML_NVPAIR_ATTR_VALUE"++";
+	}
+
 	if(interval > 0) {
+		int call_id = 0;
 		attr_name = crm_concat("fail-count", rsc_id, '-');
-		crm_warn("Updating failcount for %s on %s after failed %s: rc=%d",
-			 rsc_id, on_uuid, task, rc);
-	
-		update_attr(te_cib_conn, cib_none, XML_CIB_TAG_STATUS,
-			    on_uuid, NULL,NULL, attr_name,
-			    XML_NVPAIR_ATTR_VALUE"++", FALSE);
+		crm_warn("Updating failcount for %s on %s after failed %s: rc=%d (update=%s)",
+			 rsc_id, on_uuid, task, rc, value);
+
+		call_id = update_attr(te_cib_conn, cib_inhibit_notify, XML_CIB_TAG_STATUS,
+			    on_uuid, NULL,NULL, attr_name, value, FALSE);
+
+		/* don't let notificatios of these updates cause new transitions */
+		add_cib_op_callback(call_id, FALSE, NULL, cib_failcount_updated);
 		crm_free(attr_name);
 	}
 
@@ -260,18 +284,9 @@
 }
 
 static int
-status_from_rc(crm_action_t *action, int orig_status, int rc)
+status_from_rc(crm_action_t *action, int orig_status, int rc, int target_rc)
 {
-	int target_rc = 0;
 	int status = orig_status;
-	const char *target_rc_s = g_hash_table_lookup(
-		action->params, crm_meta_name(XML_ATTR_TE_TARGET_RC));
-
-	if(target_rc_s != NULL) {
-		crm_debug_2("Target rc: %s vs. %d", target_rc_s, rc);
-		target_rc = crm_parse_int(target_rc_s, NULL);
-	}
-
 	if(target_rc == rc) {
 	    crm_debug_2("Target rc: == %d", rc);
 	    if(status != LRM_OP_DONE) {
@@ -294,8 +309,8 @@
 		const char *task, *uname;
 		task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
 		uname  = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
-		crm_warn("Action %s on %s failed (target: %s vs. rc: %d): %s",
-			 task, uname, crm_str(target_rc_s), rc, op_status2text(status));
+		crm_warn("Action %d (%s) on %s failed (target: %d vs. rc: %d): %s",
+			 action->id, task, uname, target_rc, rc, op_status2text(status));
 	}
 
 	return status;
@@ -309,7 +324,7 @@
  */
 int
 match_graph_event(int action_id, crm_data_t *event, const char *event_node,
-		  int op_status, int op_rc)
+		  int op_status, int op_rc, int target_rc)
 {
 	const char *target = NULL;
 	const char *allow_fail = NULL;
@@ -321,9 +336,9 @@
 		return -1;
 	}
 	
-	op_status = status_from_rc(action, op_status, op_rc);
+	op_status = status_from_rc(action, op_status, op_rc, target_rc);
 	if(op_status != LRM_OP_DONE) {
-		update_failcount(event, event_node, op_rc);
+	    update_failcount(event, event_node, op_rc, target_rc);
 	}
 	
 	/* Process OP status */
@@ -477,6 +492,7 @@
 	int status = -1;
 
 	int action = -1;
+	int target_rc = -1;
 	int transition_num = -1;
 	char *update_te_uuid = NULL;
 
@@ -496,7 +512,7 @@
 	
 	CRM_CHECK(decode_transition_magic(
 			  magic, &update_te_uuid, &transition_num, &action,
-			  &status, &rc),
+			  &status, &rc, &target_rc),
 		  crm_err("Invalid event %s detected", id);
 		  abort_transition(INFINITY, tg_restart,"Bad event", event);
 		);
@@ -506,11 +522,13 @@
 	}
 	
 	if(transition_num == -1) {
-		crm_err("Action %s initiated outside of a transition", id);
+		crm_err("Action %s (%s) initiated outside of a transition",
+			id, magic);
 		abort_transition(INFINITY, tg_restart,"Unexpected event",event);
 
 	} else if(action < 0 || safe_str_neq(update_te_uuid, te_uuid)) {
-		crm_info("Action %s initiated by a different transitioner", id);
+		crm_info("Action %s (%s) initiated by a different transitioner",
+			 id, magic);
 		abort_transition(INFINITY, tg_restart,"Foreign event", event);
 		
 	} else if(transition_graph->id != transition_num) {
@@ -523,7 +541,7 @@
 		abort_transition(INFINITY, tg_restart, "Inactive graph", event);
 
 	} else if(match_graph_event(
-			  action, event, event_node, status, rc) < 0) {
+		      action, event, event_node, status, rc, target_rc) < 0) {
 		crm_err("Unknown graph action %s", id);
 		abort_transition(INFINITY, tg_restart, "Unknown event", event);
 
@@ -533,7 +551,7 @@
 	}
 
 	if(passed == FALSE && rc != EXECRA_OK) {
-		update_failcount(event, event_node, rc);
+	    update_failcount(event, event_node, rc, target_rc);
 	}
 
   bail:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/main.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/main.c
--- heartbeat-2.1.3/crm/tengine/main.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/main.c	2008-08-18 13:32:19.000000000 +0100
@@ -39,12 +39,9 @@
 
 #include <tengine.h>
 
-
-#define SYS_NAME     CRM_SYSTEM_TENGINE
 #define OPTARGS      "hVc"
 
 GMainLoop*  mainloop = NULL;
-const char* crm_system_name = SYS_NAME;
 cib_t *te_cib_conn = NULL;
 
 void usage(const char* cmd, int exit_status);
@@ -63,7 +60,7 @@
 	int argerr = 0;
 	gboolean allow_cores = TRUE;
 	
-	crm_log_init(crm_system_name, LOG_INFO, TRUE, FALSE, 0, NULL);
+	crm_log_init(CRM_SYSTEM_TENGINE, LOG_INFO, TRUE, FALSE, 0, NULL);
 	G_main_add_SignalHandler(
 		G_PRIORITY_HIGH, SIGTERM, tengine_shutdown, NULL, NULL);
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/Makefile
--- heartbeat-2.1.3/crm/tengine/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/crm/tengine/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# crm/tengine/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/tengine
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/crm/tengine
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+crmdir = $(havarlibdir)/crm
+COMMONLIBS = \
+		$(top_builddir)/lib/clplumbing/libplumb.la		\
+		$(top_builddir)/lib/crm/common/libcrmcommon.la 	\
+		$(top_builddir)/lib/crm/cib/libcib.la	 	\
+		$(GLIBLIB)						\
+		$(LIBRT)
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(CRM_DEBUG_FLAGS)
+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
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+tengine$(EXEEXT): $(tengine_OBJECTS) $(tengine_DEPENDENCIES) 
+	@rm -f tengine$(EXEEXT)
+	$(LINK) $(tengine_OBJECTS) $(tengine_LDADD) $(LIBS)
+ttest$(EXEEXT): $(ttest_OBJECTS) $(ttest_DEPENDENCIES) 
+	@rm -f ttest$(EXEEXT)
+	$(LINK) $(ttest_OBJECTS) $(ttest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/actions.Po
+include ./$(DEPDIR)/callbacks.Po
+include ./$(DEPDIR)/events.Po
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/ttest.Po
+include ./$(DEPDIR)/utils.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-local
+
+
+clean-generic:
+	rm -f *.log *.debug *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/Makefile.in
--- heartbeat-2.1.3/crm/tengine/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/Makefile.in	2008-08-18 23:37:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -66,7 +66,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -115,6 +115,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -132,24 +133,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -211,12 +200,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -441,8 +431,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -512,8 +502,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -525,8 +515,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -536,13 +526,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/te_callbacks.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/te_callbacks.h
--- heartbeat-2.1.3/crm/tengine/te_callbacks.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/te_callbacks.h	2008-08-18 13:32:19.000000000 +0100
@@ -24,6 +24,9 @@
 extern void cib_action_updated(const HA_Message *msg, int call_id, int rc,
 			       crm_data_t *output, void *user_data);
 
+extern void cib_failcount_updated(const HA_Message *msg, int call_id, int rc,
+			       crm_data_t *output, void *user_data);
+
 extern gboolean global_timer_callback(gpointer data);
 extern gboolean action_timer_callback(gpointer data);
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/tengine.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/tengine.h
--- heartbeat-2.1.3/crm/tengine/tengine.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/tengine.h	2008-08-18 13:32:19.000000000 +0100
@@ -68,5 +68,8 @@
 extern GTRIGSource *stonith_reconnect;
 extern crm_action_timer_t *transition_timer;
 
+extern char *failed_stop_offset;
+extern char *failed_start_offset;
+
 #endif
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/crm/tengine/utils.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/crm/tengine/utils.c
--- heartbeat-2.1.3/crm/tengine/utils.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/crm/tengine/utils.c	2008-08-18 13:32:19.000000000 +0100
@@ -141,10 +141,5 @@
 		}
 	}
 	
-	if(transition_graph->complete) {
-		notify_crmd(transition_graph);
-		
-	} else {
-		G_main_set_trigger(transition_trigger);
-	}
+	G_main_set_trigger(transition_trigger);
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CIB.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CIB.py
--- heartbeat-2.1.3/cts/CIB.py	2007-12-21 20:45:39.000000000 +0000
+++ heartbeat-2.1.4/cts/CIB.py	2008-08-18 23:38:53.000000000 +0100
@@ -45,6 +45,7 @@
           </operations>
           <instance_attributes id="%s">
             <attributes>
+              <nvpair id="%s-netmask" name="cidr_netmask" value="32"/>
               <nvpair id="%s-ip" name="ip" value="%s"/>
             </attributes>
           </instance_attributes>
@@ -57,13 +58,13 @@
           </operations>
           <instance_attributes id="%s">
             <attributes>
-              <nvpair id="%s-ip" name="1" value="%s"/>
+              <nvpair id="%s-ip" name="1" value="%s/32"/>
             </attributes>
           </instance_attributes>
         </primitive> '''
 
     lsb_resource = ''' 
-        <primitive id="lsb_dummy" class="lsb" type="/usr/share/heartbeat/cts/LSBDummy" provider="heartbeat">
+        <primitive id="lsb_dummy" class="lsb" type="/usr/local/share/heartbeat/cts/LSBDummy" provider="heartbeat">
           <operations>
             <op id="ocf_lsb_monitor" name="monitor" interval="5s"/>
           </operations>
@@ -204,9 +205,9 @@
         ip1=self.NextIP()
         ip2=self.NextIP()
         ip3=self.NextIP()
-        ip1_rsc = self.ipaddr_template % (ip1, ip1, ip1, ip1, ip1)
+        ip1_rsc = self.ipaddr_template % (ip1, ip1, ip1, ip1, ip1, ip1)
         ip2_rsc = self.hb_ipaddr_template % (ip2, ip2, ip2, ip2, ip2)
-        ip3_rsc = self.ipaddr_template % (ip3, ip3, ip3, ip3, ip3)
+        ip3_rsc = self.ipaddr_template % (ip3, ip3, ip3, ip3, ip3, ip3)
         resources += self.resource_group_template % (ip1_rsc, ip2_rsc, ip3_rsc)
 
         # lsb resource
@@ -221,7 +222,7 @@
         for node in self.CM.Env["nodes"]:
             ip = self.NextIP()
             per_node_resources = self.ipaddr_template % \
-                ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, ip)    
+                ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, ip)    
             
             per_node_constraint = self.per_node_constraint_template % \
                 ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, node)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CIB.py.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CIB.py.in
--- heartbeat-2.1.3/cts/CIB.py.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/cts/CIB.py.in	2008-08-18 13:32:19.000000000 +0100
@@ -45,6 +45,7 @@
           </operations>
           <instance_attributes id="%s">
             <attributes>
+              <nvpair id="%s-netmask" name="cidr_netmask" value="32"/>
               <nvpair id="%s-ip" name="ip" value="%s"/>
             </attributes>
           </instance_attributes>
@@ -57,7 +58,7 @@
           </operations>
           <instance_attributes id="%s">
             <attributes>
-              <nvpair id="%s-ip" name="1" value="%s"/>
+              <nvpair id="%s-ip" name="1" value="%s/32"/>
             </attributes>
           </instance_attributes>
         </primitive> '''
@@ -204,9 +205,9 @@
         ip1=self.NextIP()
         ip2=self.NextIP()
         ip3=self.NextIP()
-        ip1_rsc = self.ipaddr_template % (ip1, ip1, ip1, ip1, ip1)
+        ip1_rsc = self.ipaddr_template % (ip1, ip1, ip1, ip1, ip1, ip1)
         ip2_rsc = self.hb_ipaddr_template % (ip2, ip2, ip2, ip2, ip2)
-        ip3_rsc = self.ipaddr_template % (ip3, ip3, ip3, ip3, ip3)
+        ip3_rsc = self.ipaddr_template % (ip3, ip3, ip3, ip3, ip3, ip3)
         resources += self.resource_group_template % (ip1_rsc, ip2_rsc, ip3_rsc)
 
         # lsb resource
@@ -221,7 +222,7 @@
         for node in self.CM.Env["nodes"]:
             ip = self.NextIP()
             per_node_resources = self.ipaddr_template % \
-                ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, ip)    
+                ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, ip)    
             
             per_node_constraint = self.per_node_constraint_template % \
                 ("rsc_"+node, "rsc_"+node, "rsc_"+node, "rsc_"+node, node)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CM_hb.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CM_hb.py
--- heartbeat-2.1.3/cts/CM_hb.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CM_hb.py	2008-08-18 23:38:52.000000000 +0100
@@ -43,7 +43,7 @@
 
     def __init__(self, Environment, randseed=None):
 
-        self.ResourceDirs = ["/etc/ha.d/resource.d", "/etc/rc.d/init.d", "/etc/rc.d/"]
+        self.ResourceDirs = ["/usr/local/etc/ha.d/resource.d", "/usr/local/etc/rc.d/init.d", "/usr/local/etc/rc.d/"]
         self.ResourceFile = Environment["HAdir"] + "/haresources"
         self.ConfigFile = Environment["HAdir"]+ "/ha.cf"
         ClusterManager.__init__(self, Environment, randseed=randseed)
@@ -51,23 +51,23 @@
             "Name"           : "heartbeat",
             "DeadTime"       : 30,
             "StableTime"     : 30,
-            "StartCmd"       : "/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1; MALLOC_CHECK_=2 /usr/lib/heartbeat/heartbeat >/dev/null 2>&1",
-            "StopCmd"        : "/usr/lib/heartbeat/heartbeat -k",
-            "StatusCmd"      : "/usr/lib/heartbeat/heartbeat -s",
-            "RereadCmd"      : "/usr/lib/heartbeat/heartbeat -r",
-            "StartDRBDCmd"   : "/etc/init.d/drbd start >/dev/null 2>&1",
-            "StopDRBDCmd"    : "/etc/init.d/drbd stop",
-            "StatusDRBDCmd"  : "/etc/init.d/drbd status",
-            "DRBDCheckconf"  : "/etc/init.d/drbd checkconfig >/var/run/drbdconf 2>&1",
-            "BreakCommCmd"   : "/usr/share/heartbeat/TestHeartbeatComm break-communication >/dev/null 2>&1",
-            "FixCommCmd"     : "/usr/share/heartbeat/TestHeartbeatComm fix-communication >/dev/null 2>&1",
-            "DelFileCommCmd" : "/usr/share/heartbeat/TestHeartbeatComm delete-testingfile >/dev/null 2>&1",
-            "SaveFileCmd"    : "/usr/share/heartbeat/TestHeartbeatComm save-testingfile /tmp/OnlyForTesting >/dev/null 2>&1",
-            "ReduceCommCmd"  : "/usr/share/heartbeat/TestHeartbeatComm reduce-communication %s %s>/dev/null 2>&1",
-            "RestoreCommCmd" : "/usr/share/heartbeat/TestHeartbeatComm restore-communication /tmp/OnlyForTesting >/dev/null 2>&1",
-            "IPaddrCmd"      : "/etc/ha.d/resource.d/IPaddr %s status",
-            "Standby"        : "/usr/share/heartbeat/hb_standby >/dev/null 2>&1",
-            "TestConfigDir"  : "/etc/ha.d/testconfigs",
+            "StartCmd"       : "/usr/local/lib/heartbeat/ha_logd -d >/dev/null 2>&1; MALLOC_CHECK_=2 /usr/local/lib/heartbeat/heartbeat >/dev/null 2>&1",
+            "StopCmd"        : "/usr/local/lib/heartbeat/heartbeat -k",
+            "StatusCmd"      : "/usr/local/lib/heartbeat/heartbeat -s",
+            "RereadCmd"      : "/usr/local/lib/heartbeat/heartbeat -r",
+            "StartDRBDCmd"   : "/usr/local/etc/init.d/drbd start >/dev/null 2>&1",
+            "StopDRBDCmd"    : "/usr/local/etc/init.d/drbd stop",
+            "StatusDRBDCmd"  : "/usr/local/etc/init.d/drbd status",
+            "DRBDCheckconf"  : "/usr/local/etc/init.d/drbd checkconfig >/var/run/drbdconf 2>&1",
+            "BreakCommCmd"   : "/usr/local/share/heartbeat/TestHeartbeatComm break-communication >/dev/null 2>&1",
+            "FixCommCmd"     : "/usr/local/share/heartbeat/TestHeartbeatComm fix-communication >/dev/null 2>&1",
+            "DelFileCommCmd" : "/usr/local/share/heartbeat/TestHeartbeatComm delete-testingfile >/dev/null 2>&1",
+            "SaveFileCmd"    : "/usr/local/share/heartbeat/TestHeartbeatComm save-testingfile /tmp/OnlyForTesting >/dev/null 2>&1",
+            "ReduceCommCmd"  : "/usr/local/share/heartbeat/TestHeartbeatComm reduce-communication %s %s>/dev/null 2>&1",
+            "RestoreCommCmd" : "/usr/local/share/heartbeat/TestHeartbeatComm restore-communication /tmp/OnlyForTesting >/dev/null 2>&1",
+            "IPaddrCmd"      : "/usr/local/etc/ha.d/resource.d/IPaddr %s status",
+            "Standby"        : "/usr/local/share/heartbeat/hb_standby >/dev/null 2>&1",
+            "TestConfigDir"  : "/usr/local/etc/ha.d/testconfigs",
             "LogFileName"    : Environment["LogFileName"],
 
             # Patterns to look for in the log files for various occasions...
@@ -108,15 +108,15 @@
         for j in *
         do
           if
-            [ -f "/etc/ha.d/$j" ];
+            [ -f "/usr/local/etc/ha.d/$j" ];
           then
             if
-              cmp $j /etc/ha.d/$j >/dev/null 2>&1;
+              cmp $j /usr/local/etc/ha.d/$j >/dev/null 2>&1;
             then
               : Config file $j is already up to correct.
             else
               echo "Touching $j"
-              cp $j /etc/ha.d/$j
+              cp $j /usr/local/etc/ha.d/$j
             fi
           fi
         done
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CM_LinuxHAv2.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CM_LinuxHAv2.py
--- heartbeat-2.1.3/cts/CM_LinuxHAv2.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CM_LinuxHAv2.py	2008-08-18 23:38:52.000000000 +0100
@@ -69,22 +69,22 @@
             "StableTime"     : 30,
             "StartCmd"       : "/etc/init.d/heartbeat start > /dev/null 2>&1",
             "StopCmd"        : "/etc/init.d/heartbeat stop  > /dev/null 2>&1",
-            "ElectionCmd"    : "/usr/sbin/crmadmin -E %s",
-            "StatusCmd"      : "/usr/sbin/crmadmin -S %s 2>/dev/null",
-            "EpocheCmd"      : "/usr/sbin/ccm_tool -e",
-            "QuorumCmd"      : "/usr/sbin/ccm_tool -q",
-            "CibQuery"       : "/usr/sbin/cibadmin -Ql",
-            "ParitionCmd"    : "/usr/sbin/ccm_tool -p",
-            "IsRscRunning"   : "/usr/lib/heartbeat/lrmadmin -E %s monitor 0 0 EVERYTIME 2>/dev/null|grep return",
-            "ExecuteRscOp"   : "/usr/lib/heartbeat/lrmadmin -n %s -E %s %s 0 %d EVERYTIME 2>/dev/null",
-            "CIBfile"        : "%s:/var/lib/heartbeat/crm/cib.xml",
+            "ElectionCmd"    : "/usr/local/sbin/crmadmin -E %s",
+            "StatusCmd"      : "/usr/local/sbin/crmadmin -S %s 2>/dev/null",
+            "EpocheCmd"      : "/usr/local/sbin/ccm_tool -e",
+            "QuorumCmd"      : "/usr/local/sbin/ccm_tool -q",
+            "CibQuery"       : "/usr/local/sbin/cibadmin -Ql",
+            "ParitionCmd"    : "/usr/local/sbin/ccm_tool -p",
+            "IsRscRunning"   : "/usr/local/lib/heartbeat/lrmadmin -E %s monitor 0 0 EVERYTIME 2>/dev/null|grep return",
+            "ExecuteRscOp"   : "/usr/local/lib/heartbeat/lrmadmin -n %s -E %s %s 0 %d EVERYTIME 2>/dev/null",
+            "CIBfile"        : "%s:/usr/local/var/lib/heartbeat/crm/cib.xml",
             "TmpDir"         : "/tmp",
-            "BreakCommCmd2"  : "/usr/share/heartbeat/TestHeartbeatComm break-communication %s>/dev/null 2>&1",
+            "BreakCommCmd2"  : "/usr/local/share/heartbeat/TestHeartbeatComm break-communication %s>/dev/null 2>&1",
             "IsIPAddrRscRunning"   : "",
 
-            "StandbyCmd"   : "/usr/sbin/crm_standby -U %s -v %s 2>/dev/null",
-            "UUIDQueryCmd"   : "/usr/sbin/crmadmin -N",
-            "StandbyQueryCmd"    : "/usr/sbin/crm_standby -GQ -U %s 2>/dev/null",
+            "StandbyCmd"   : "/usr/local/sbin/crm_standby -U %s -v %s 2>/dev/null",
+            "UUIDQueryCmd"   : "/usr/local/sbin/crmadmin -N",
+            "StandbyQueryCmd"    : "/usr/local/sbin/crm_standby -GQ -U %s 2>/dev/null",
 
             # Patterns to look for in the log files for various occasions...
             "Pat:DC_IDLE"      : "crmd.*State transition.*-> S_IDLE",
@@ -160,10 +160,10 @@
 
         if not self.CIBsync.has_key(node) and self.Env["ClobberCIB"] == 1:
             self.CIBsync[node] = 1
-            self.rsh.remote_py(node, "os", "system", "rm -f /var/lib/heartbeat/crm/cib.xml")
-            self.rsh.remote_py(node, "os", "system", "rm -f /var/lib/heartbeat/crm/cib.xml.sig")
-            self.rsh.remote_py(node, "os", "system", "rm -f /var/lib/heartbeat/crm/cib.xml.last")
-            self.rsh.remote_py(node, "os", "system", "rm -f /var/lib/heartbeat/crm/cib.xml.sig.last")
+            self.rsh.remote_py(node, "os", "system", "rm -f /usr/local/var/lib/heartbeat/crm/cib.xml")
+            self.rsh.remote_py(node, "os", "system", "rm -f /usr/local/var/lib/heartbeat/crm/cib.xml.sig")
+            self.rsh.remote_py(node, "os", "system", "rm -f /usr/local/var/lib/heartbeat/crm/cib.xml.last")
+            self.rsh.remote_py(node, "os", "system", "rm -f /usr/local/var/lib/heartbeat/crm/cib.xml.sig.last")
 
             # Only install the CIB on the first node, all the other ones will pick it up from there
             if self.cib_installed == 1:
@@ -178,7 +178,7 @@
                 os.system("rm -f "+cib_file)
                 self.debug("Creating new CIB for " + node + " in: " + cib_file)
                 os.system("echo \'" + self.default_cts_cib + "\' > " + cib_file)
-                if 0!=self.rsh.echo_cp(None, cib_file, node, "/var/lib/heartbeat/crm/cib.xml"):
+                if 0!=self.rsh.echo_cp(None, cib_file, node, "/usr/local/var/lib/heartbeat/crm/cib.xml"):
                     raise ValueError("Can not create CIB on %s "%node)
 
                 os.system("rm -f "+cib_file)
@@ -187,7 +187,7 @@
                 if 0!=self.rsh.cp(self.Env["CIBfilename"], "root@" + (self["CIBfile"]%node)):
                     raise ValueError("Can not scp file to %s "%node)
         
-            self.rsh.remote_py(node, "os", "system", "chown hacluster /var/lib/heartbeat/crm/cib.xml")
+            self.rsh.remote_py(node, "os", "system", "chown hacluster /usr/local/var/lib/heartbeat/crm/cib.xml")
 
     def prepare(self):
         '''Finish the Initialization process. Prepare to test...'''
@@ -314,7 +314,7 @@
 
     def active_resources(self, node):
         (rc, output) = self.rsh.remote_py(
-            node, "os", "system", """/usr/sbin/crm_mon -1 | grep "Started %s" """ % node)
+            node, "os", "system", """/usr/local/sbin/crm_mon -1 | grep "Started %s" """ % node)
 
         resources = []
         for line in output:
@@ -365,7 +365,7 @@
                 os.system("cp "+self.Env["CIBfilename"]+" "+cib_file)
         else:            
             if 0 != self.rsh.echo_cp(
-                self.Env["nodes"][0], "/var/lib/heartbeat/crm/cib.xml", None, cib_file):
+                self.Env["nodes"][0], "/usr/local/var/lib/heartbeat/crm/cib.xml", None, cib_file):
                 raise ValueError("Can not copy file to %s, maybe permission denied"%cib_file)
 
         self.config = parse(cib_file)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CTSaudits.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CTSaudits.py
--- heartbeat-2.1.3/cts/CTSaudits.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CTSaudits.py	2008-08-18 23:38:52.000000000 +0100
@@ -454,7 +454,7 @@
                         #self.CM.debug("Retrieved CIB: %s" % first_host_xml) 
                 else:
                         a_host_xml = self.store_remote_cib(a_host)
-                        diff_cmd="/usr/sbin/crm_diff -c -VV -f -N \'%s\' -O '%s'" % (a_host_xml, first_host_xml)
+                        diff_cmd="/usr/local/sbin/crm_diff -c -VV -f -N \'%s\' -O '%s'" % (a_host_xml, first_host_xml)
 
                         infile, outfile, errfile = os.popen3(diff_cmd)
                         diff_lines = outfile.readlines()
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CTSlab.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CTSlab.py
--- heartbeat-2.1.3/cts/CTSlab.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CTSlab.py	2008-08-18 23:38:52.000000000 +0100
@@ -51,7 +51,7 @@
 
 class Stonith(ResetMechanism):
     def __init__(self, sttype="external/ssh", pName=None, pValue=None
-        ,        path="/usr/sbin/stonith"):
+        ,        path="/usr/local/sbin/stonith"):
         self.pathname=path
         self.configName=pName
         self.configValue=pValue
@@ -71,15 +71,15 @@
         self.sttype = sttype
         self.nodes = nodes
 
-        self.query_cmd_pat   = '/usr/lib/heartbeat/stonithdtest/apitest 0 %s 60000 0'
-        self.reset_cmd_pat   = '/usr/lib/heartbeat/stonithdtest/apitest 1 %s 60000 0'
-        self.poweron_cmd_pat = '/usr/lib/heartbeat/stonithdtest/apitest 2 %s 60000 0'
-        self.poweroff_cmd_pat= '/usr/lib/heartbeat/stonithdtest/apitest 3 %s 60000 0'
-
-        self.lrmd_add_pat    = '/usr/lib/heartbeat/lrmadmin -A %s stonith ' + sttype + ' NULL hostlist=%s livedangerously=yes'
-        self.lrmd_start_pat  = '/usr/lib/heartbeat/lrmadmin -E %s start 0 0 EVERYTIME'
-        self.lrmd_stop_pat   = '/usr/lib/heartbeat/lrmadmin -E %s stop 0 0 EVERYTIME'
-        self.lrmd_del_pat    = '/usr/lib/heartbeat/lrmadmin -D %s'
+        self.query_cmd_pat   = '/usr/local/lib/heartbeat/stonithdtest/apitest 0 %s 60000 0'
+        self.reset_cmd_pat   = '/usr/local/lib/heartbeat/stonithdtest/apitest 1 %s 60000 0'
+        self.poweron_cmd_pat = '/usr/local/lib/heartbeat/stonithdtest/apitest 2 %s 60000 0'
+        self.poweroff_cmd_pat= '/usr/local/lib/heartbeat/stonithdtest/apitest 3 %s 60000 0'
+
+        self.lrmd_add_pat    = '/usr/local/lib/heartbeat/lrmadmin -A %s stonith ' + sttype + ' NULL hostlist=%s livedangerously=yes'
+        self.lrmd_start_pat  = '/usr/local/lib/heartbeat/lrmadmin -E %s start 0 0 EVERYTIME'
+        self.lrmd_stop_pat   = '/usr/local/lib/heartbeat/lrmadmin -E %s stop 0 0 EVERYTIME'
+        self.lrmd_del_pat    = '/usr/local/lib/heartbeat/lrmadmin -D %s'
 
         self.rsc_id          = 'my_stonithd_id'
 
@@ -347,7 +347,7 @@
         if not self.has_key("CMclass"):
             self["CMclass"] = HeartbeatCM
         if not self.has_key("LogFileName"):
-            self["LogFileName"] = "/var/log/ha-log"
+            self["LogFileName"] = "/usr/local/var/log/ha-log"
         if not self.has_key("logrestartcmd"):
             self["logrestartcmd"] = "/etc/init.d/syslog restart"
         if not self.has_key("logfacility"):
@@ -509,8 +509,8 @@
     from CTS import Scenario, InitClusterManager, PingFest, PacketLoss, BasicSanityCheck
     import CM_hb
 
-    HAdir = "/etc/ha.d"
-    LogFile = "/var/log/ha-log-"+DefaultFacility
+    HAdir = "/usr/local/etc/ha.d"
+    LogFile = "/usr/local/var/log/ha-log-"+DefaultFacility
     DoStonith = 1
     DoStandby = 1
     DoFencing = 1
@@ -779,7 +779,7 @@
     cm.log("Cluster nodes: ")
     for node in config.Parameters["node"]:
         (rc, lines) = cm.rsh.remote_py(node, "os", "system", 
-                                     "/usr/sbin/crm_uuid")
+                                     "/usr/local/sbin/crm_uuid")
         if not lines:
             cm.log("    * %s: __undefined_uuid__" % node)
         else:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CTS.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CTS.py
--- heartbeat-2.1.3/cts/CTS.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CTS.py	2008-08-18 23:38:52.000000000 +0100
@@ -195,7 +195,7 @@
            If the call fail, lastrc == 1 and return the reason (string)
         '''
         encode_args = binascii.b2a_base64(pickle.dumps(args))
-        encode_cmd = string.join(["/usr/share/heartbeat/cts/CTSproxy.py",module,func,encode_args])
+        encode_cmd = string.join(["/usr/local/share/heartbeat/cts/CTSproxy.py",module,func,encode_args])
 
         #print "%s: %s.%s %s" % (node, module, func, repr(args))
         result = self.readlines(node, encode_cmd)
@@ -431,7 +431,7 @@
         self.data = {
             "up"             : "up",        # Status meaning up
             "down"           : "down",  # Status meaning down
-            "StonithCmd"     : "/usr/sbin/stonith -t baytech -p '10.10.10.100 admin admin' %s",
+            "StonithCmd"     : "/usr/local/sbin/stonith -t baytech -p '10.10.10.100 admin admin' %s",
             "DeadTime"       : 30,        # Max time to detect dead node...
             "StartTime"      : 90,        # Max time to start up
     #
@@ -507,7 +507,7 @@
                 if self.ShouldBeStatus[node] == self["down"]:
                     self.debug("Removing cache file on: "+node)
                     self.rsh.remote_py(node, "os", "system", 
-                                       "rm -f /var/lib/heartbeat/hostcache")
+                                       "rm -f /usr/local/var/lib/heartbeat/hostcache")
                 else:
                     self.debug("NOT Removing cache file on: "+node)
 
@@ -546,7 +546,7 @@
         if self.clear_cache:
             self.debug("Removing cache file on: "+node)
             self.rsh.remote_py(node, "os", "system", 
-                               "rm -f /var/lib/heartbeat/hostcache")
+                               "rm -f /usr/local/var/lib/heartbeat/hostcache")
 
         if self.rsh(node, self["StartCmd"]) != 0:
             self.log ("Warn: Start command failed on node %s" %(node))
@@ -580,7 +580,7 @@
         if self.clear_cache:
             self.debug("Removing cache file on: "+node)
             self.rsh.remote_py(node, "os", "system", 
-                               "rm -f /var/lib/heartbeat/hostcache")
+                               "rm -f /usr/local/var/lib/heartbeat/hostcache")
 
         self.rsh.noBlock(node, self["StartCmd"])
         self.ShouldBeStatus[node]=self["up"]
@@ -951,7 +951,7 @@
         
     def kill(self, node):
         if self.CM.rsh(node, self.KillCmd) != 0:
-            self.CM.log ("ERROR: Kill %s failed on node %s" %(name,node))
+            self.CM.log ("ERROR: Kill %s failed on node %s" %(self.name,node))
             return None
         return 1
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CTS.py.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CTS.py.in
--- heartbeat-2.1.3/cts/CTS.py.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/cts/CTS.py.in	2008-08-18 13:32:19.000000000 +0100
@@ -951,7 +951,7 @@
         
     def kill(self, node):
         if self.CM.rsh(node, self.KillCmd) != 0:
-            self.CM.log ("ERROR: Kill %s failed on node %s" %(name,node))
+            self.CM.log ("ERROR: Kill %s failed on node %s" %(self.name,node))
             return None
         return 1
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/CTStests.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/CTStests.py
--- heartbeat-2.1.3/cts/CTStests.py	2007-12-21 20:45:38.000000000 +0000
+++ heartbeat-2.1.4/cts/CTStests.py	2008-08-18 23:38:52.000000000 +0100
@@ -1220,7 +1220,7 @@
             if stopwatch.look():
                 Stoptime = os.times()[4]
 #        This test is CM-specific - FIXME!!
-                self.CM.rsh(node, "killall -9 /usr/lib/heartbeat/ccm /usr/lib/heartbeat/ipfail >/dev/null 2>&1; true")
+                self.CM.rsh(node, "killall -9 /usr/local/lib/heartbeat/ccm /usr/local/lib/heartbeat/ipfail >/dev/null 2>&1; true")
                 Detectiontime = Stoptime-Starttime
                 detectms = int(Detectiontime*1000+0.5)
                 self.CM.log("...failure detection time: %d ms" % detectms)
@@ -1236,7 +1236,7 @@
                 return self.success()
             else:
 #        This test is CM-specific - FIXME!!
-                self.CM.rsh(node, "killall -9 /usr/lib/heartbeat/ccm /usr/lib/heartbeat/ipfail >/dev/null 2>&1; true")
+                self.CM.rsh(node, "killall -9 /usr/local/lib/heartbeat/ccm /usr/local/lib/heartbeat/ipfail >/dev/null 2>&1; true")
                 self.CM.ShouldBeStatus[node] = self.CM["down"]
                 ret=self.start(node)
                 return self.failure("Didn't find the log message")
@@ -1698,7 +1698,7 @@
         
         # fail a resource by calling an action it doesn't support
         self.CM.rsh.remote_py(node, "os", "system",
-                              "/usr/sbin/crm_resource -F -r %s -H %s &>/dev/null" % (self.rid, node))
+                              "/usr/local/sbin/crm_resource -F -r %s -H %s &>/dev/null" % (self.rid, node))
 
         watch.lookforall()
 
@@ -2279,7 +2279,7 @@
         CTSTest.__init__(self, cm)
         self.name="AddResource"
         self.resource_offset = 0
-        self.cib_cmd="""/usr/sbin/cibadmin -C -o %s -X '%s' """
+        self.cib_cmd="""/usr/local/sbin/cibadmin -C -o %s -X '%s' """
 
     def __call__(self, node):
         self.resource_offset =         self.resource_offset  + 1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/getpeinputs.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/getpeinputs.sh
--- heartbeat-2.1.3/cts/getpeinputs.sh	2007-12-21 20:45:39.000000000 +0000
+++ heartbeat-2.1.4/cts/getpeinputs.sh	2008-08-18 23:38:53.000000000 +0100
@@ -19,8 +19,8 @@
 
 Examples:
 
-	python /usr/share/heartbeat/cts/extracttests.py /var/log/ha-debug 122 | $0
-	python /usr/share/heartbeat/cts/extracttests.py /var/log/ha-debug 122 | tee 122.ha-debug | $0
+	python /usr/local/share/heartbeat/cts/extracttests.py /var/log/ha-debug 122 | $0
+	python /usr/local/share/heartbeat/cts/extracttests.py /var/log/ha-debug 122 | tee 122.ha-debug | $0
 
 NB: Files are copied using ssh as root. In case you use different
 user for ssh run the program like this:
@@ -45,7 +45,7 @@
 	shift 1
 done
 
-. /etc/ha.d/shellfuncs
+. /usr/local/etc/ha.d/shellfuncs
 
 
 : ${SSH_USER="root"}
@@ -110,11 +110,11 @@
 		ssh $SSH_USER@$n 'cd /tmp && tar xf -'
 }
 list_peinputs() {
-	ssh $SSH_USER@$n ". /etc/ha.d/shellfuncs && cd \$HA_VARLIB && find pengine \
+	ssh $SSH_USER@$n ". /usr/local/etc/ha.d/shellfuncs && cd \$HA_VARLIB && find pengine \
 		-type f -newer /tmp/$BEGINSTAMP ! -newer /tmp/$ENDSTAMP"
 }
 tar_peinputs() {
-	ssh $SSH_USER@$n ". /etc/ha.d/shellfuncs && cd \$HA_VARLIB && tar -cf - $*"
+	ssh $SSH_USER@$n ". /usr/local/etc/ha.d/shellfuncs && cd \$HA_VARLIB && tar -cf - $*"
 }
 
 for n in $nodes; do
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/Makefile
--- heartbeat-2.1.3/cts/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/cts/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,642 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# cts/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/cts
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/cts
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+ctsdir = /usr/share/heartbeat/cts
+cts_PYTHON = \
+			CM_fs.py		\
+			CM_hb.py		\
+			CM_LinuxHAv2.py		\
+			CTS.py			\
+			CTSaudits.py		\
+			CTSlab.py		\
+			CTStests.py		\
+			extracttests.py		\
+			getpeinputs.sh		\
+			OCFIPraTest.py		\
+			CIB.py
+
+cts_DATA = README
+cts_SCRIPTS = \
+			CTSproxy.py		\
+			getpeinputs.sh		\
+			LSBDummy
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/CM_hb.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+CTS.py: $(top_builddir)/config.status $(srcdir)/CTS.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+CTSaudits.py: $(top_builddir)/config.status $(srcdir)/CTSaudits.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+CTSlab.py: $(top_builddir)/config.status $(srcdir)/CTSlab.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+CTStests.py: $(top_builddir)/config.status $(srcdir)/CTStests.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+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 $(srcdir)/CTSproxy.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+extracttests.py: $(top_builddir)/config.status $(srcdir)/extracttests.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+getpeinputs.sh: $(top_builddir)/config.status $(srcdir)/getpeinputs.sh.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+OCFIPraTest.py: $(top_builddir)/config.status $(srcdir)/OCFIPraTest.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+CIB.py: $(top_builddir)/config.status $(srcdir)/CIB.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+LSBDummy: $(top_builddir)/config.status $(srcdir)/LSBDummy.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-ctsSCRIPTS: $(cts_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-ctsSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-ctsPYTHON: $(cts_PYTHON)
+	@$(NORMAL_INSTALL)
+	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 \
+	    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; \
+	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)'; 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
+install-ctsDATA: $(cts_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(ctsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(ctsdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS) $(DATA) all-local
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+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
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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)
+
+clean-local:
+	rm -f $(cts_PYTHON) $(cts_SCRIPTS)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/cts/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/cts/Makefile.in
--- heartbeat-2.1.3/cts/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/cts/Makefile.in	2008-08-18 23:37:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -47,7 +47,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 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 \
@@ -101,6 +101,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -118,24 +119,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -197,12 +186,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/apply /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/apply
--- heartbeat-2.1.3/debian/apply	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/debian/apply	1970-01-01 01:00:00.000000000 +0100
@@ -1,250 +0,0 @@
-#!/bin/sh 
-# Apply script for managing patches for debian builts
-# Taken from debian kernel-source-2.4.27 package
-# Original Author: Herbert Xu
-
-set -e
-
-length=50
-
-die() {
-	echo "E: $@" >&2
-	exit 1
-}
-
-warn() {
-	echo "W: $@" >&2
-}
-
-uncompress_patch() {
-	patch=$1
-	case "$patch" in
-		*.bz2) bzcat $patch ;;
-		*.gz) zcat $patch ;;
-		*) cat $patch ;;
-	esac
-}
-
-find_patch() {
-	patch=$1
-
-	if [ -f "$patch" ]; then
-		echo "$patch"
-	elif [ -f "$patch.bz2" ]; then
-		echo "$patch.bz2"
-	elif [ -f "$patch.gz" ]; then
-		echo "$patch.gz"
-	else
-		die "$patch is in the series, but doesn't exist!"
-	fi
-}
-		
-apply_patch() {
-	patch=$(find_patch $home/$1)
-	base=$1
-	if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch; then
-		printf "%-${length}s\tOK (+)\n" "$base"
-	else
-		printf "%-${length}s\tFAIL (+)\n" "$base"
-		exit 1
-	fi
-}
-
-deapply_patch() {
-	patch=$(find_patch $home/$1)
-	base=$1
-	if uncompress_patch "$patch" | patch -p1 -s -t -R --no-backup-if-mismatch; then
-		printf "%-${length}s\tOK (-)\n" "$base"
-	else
-		printf "%-${length}s\tFAIL (-)\n" "$base"
-		exit 1
-	fi
-}
-
-unpatch_series() {
-	series=$1
-	[ -f "$series" ] || die "I wasn't passed a series!"
-
-	tac $series | while read action patch; do
-		case "$action" in
-			+) deapply_patch $patch ;;
-			-) apply_patch $patch ;;
-			X)
-				bakfile="$(dirname $patch)/.$(basename $patch).bak"
-				if [ -f "$bakfile" ]; then
-					mv -f "$bakfile" "$patch"
-					printf "%-${length}s\tRESTORED (X)\n" "$patch"
-				else
-					printf "%-${length}s\tNO BACKUP (X)\n" "$patch"
-				fi
-			;;
-		esac
-	done 
-	echo "--> $(basename $series) fully unapplied."
-}
-
-patch_series() {
-	series=$1
-	[ -f "$series" ] || die "I wasn't passed a series!"
-
-	while read action patch; do
-		case "$action" in
-			+) apply_patch $patch ;;
-			-) deapply_patch $patch ;;
-			X)
-				bakfile="$(dirname $patch)/.$(basename $patch).bak"
-				if [ -f "$patch" ]; then
-					mv -f "$patch" "$bakfile"
-					printf "%-${length}s\tREMOVED (X)\n" "$patch"
-				else
-					printf "%-${length}s\tNO FILE (X)\n" "$patch"
-				fi
-			;;
-		esac
-	done < $series
-	echo "--> $(basename $series) fully applied."
-}
-
-bubble_sort ()
-{
-	DIR=$1
-	shift
-	SORTED=$@
-
-	SWAPED=1
-	while [ $SWAPED = 1 ]; do
-		X=0
-		A=""
-		SWAPED=0
-		NEW=""
-		for i in $SORTED; do
-			if [ -z "$A" ]; then
-				A="$i"
-				continue
-			fi
-			B="$i"
-		
-			if dpkg --compare-versions "$A" "$DIR" "$B"; then
-				SWAPED=1
-				NEW="$NEW $B"
-			else
-				NEW="$NEW $A"
-				A="$B"
-			fi
-
-			X=$(($X + 1))
-		done
-		SORTED="$NEW $A"
-	done
-
-	echo $SORTED
-}
-
-bubble_sort_fwd ()
-{
-	bubble_sort "lt" $@
-}
-
-bubble_sort_rev ()
-{
-	bubble_sort "gt" $@
-}
-
-
-if ! [ -d heartbeat ]; then
-	die 'Not in heartbeat top level directory.  Exiting'
-	exit 1
-fi
-
-# for THIS particular version of the source package
-#deb_version=$(sed -ne "/^heartbeat/ { s/.*(\([^)]*\)).*/\1/ p" -e "q}" \
-#                ${PWD}/debian/changelog)
-deb_version=$(dpkg-parsechangelog | awk '/^Version: / { print $2 }')
-version=${override_version:-$deb_version}
-upstream=${version%-*}
-revision=${version#*-}
-
-home="$PWD/debian/patches"
-
-
-if [ -f version.Debian ]; then
-	current=$(cat version.Debian)
-	current_rev=${current#*-}
-	current_up=${current%-*}
-
-	if [ "$current" = "$upstream" ]; then
-		current_rev=0
-	fi
-else
-	warn "No version.Debian file, assuming pristine heartbeat $upstream"
-	current=$upstream
-	current_rev=0
-fi
-
-target=${1:-$version}
-
-target_rev=${target#*-}
-target_up=${target%-*}
-
-# Sanity checks
-if [ "$target_up" != "$upstream" ]; then
-	die "Upstream $target_up doesn't match $upstream!"
-# We don't have that version out yet!
-elif [ ! -n "$target_rev" ] || ( [ "$target_rev" != "$target" ] && dpkg --compare-versions $target_rev gt $revision ); then
-	year=$(($(date +%Y) + 1))
-	die "Can't patch to nonexistent revision $target_rev (wait until $year)"
-fi
-
-# At this point, we must handle three cases.
-# 1. $target_rev is greater than $current_rev. We must patch forward for this.
-# 2. $target_rev is less than $current_rev. We must reverse the list of series,
-#    reverse each used series (tac) and unapply applied patches and vice versa.
-# 3. $target_rev is undefined, and $target is $upstream.
-
-# Revert to upstream.
-if [ "$target_rev" = "$target" ]; then
-	# already reverted
-	if [ "$current" = "$target" ]; then 
-		echo "Nothing to do, exiting."
-		exit 0
-	fi
-
-	for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *-*)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-			if dpkg --compare-versions $srev le $current_rev; then
-				unpatch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-elif [ "$current_rev" = "$upstream" ] || dpkg --compare-versions $target_rev gt $current_rev; then
-	for base in $(cd $home/series/ && bubble_sort_rev $(ls -d *-*)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-			if dpkg --compare-versions $srev gt $current_rev && dpkg --compare-versions $srev le $target_rev; then
-				patch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-elif [ $target_rev = $current_rev ]; then
-	echo "Nothing to do, exiting."
-	exit 0
-elif dpkg --compare-versions $target_rev lt $current_rev; then
-        for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *-*)); do
-		srev=${base#*-}
-		if [ -n "$srev" ]; then
-			# gt because you don't want to unapply the target series
-			if dpkg --compare-versions $srev le $current_rev && dpkg --compare-versions $srev gt $target_rev; then
-				unpatch_series $home/series/$base
-			fi
-		else
-			die "Series doesn't have a revision!"
-		fi
-	done
-fi
-
-echo $target > version.Debian
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/changelog /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/changelog
--- heartbeat-2.1.3/debian/changelog	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/changelog	2008-12-29 22:12:09.000000000 +0000
@@ -1,3 +1,169 @@
+heartbeat (2.1.4-2~hardy1) hardy-backports; urgency=low
+
+  * Backport build for Hardy.
+
+ -- Kees Cook <kees@ubuntu.com>  Mon, 29 Dec 2008 11:54:16 -0800
+
+heartbeat (2.1.4-2) unstable; urgency=low
+
+  * Dependancy on uuid-runtime for heartbeat-gui
+
+    Unfortuantely the 2.1.3-7 of this fix made it into upstream 2.1.4
+    but not the 2.1.3-8 version of the fix. This should rectify this
+    problem, again...
+
+    Patch: medium_debian_uuid-duntime__e2fsprogs_dependancy_for_heartbeat-gui.patch
+    Upstream-status: Pending
+    (closes: #484868)
+
+  * Dependancy on ${shlibs:Depends} for heartbeat-gui
+    As per lintian error "missing-dependency-on-libc"
+
+  * Pass --enable-libc-malloc to configure.
+    --enable-glib-malloc was a typo.
+
+    Upstream-satatus: Pending
+
+  * Don't ignore errors in clean target of debian/rules
+    As per lintian warning "debian-rules-ignores-make-clean-error"
+
+ -- Simon Horman <horms@debian.org>  Fri, 29 Aug 2008 04:34:10 +0000
+
+heartbeat (2.1.4-1) unstable; urgency=low
+
+  * New Upstream
+
+ -- Simon Horman <horms@debian.org>  Thu, 07 Aug 2008 15:57:52 +1000
+
+heartbeat (2.1.3-8) unstable; urgency=low
+
+  * The dependancy on uuid-runtime added in 2.1.3-7 was not a build dependacy,
+    it was a regular dependancy for heartbeat. However, it should have been
+    a dependancy for heartbeat-gui.
+    (closes: #484868)
+  * Update standards version from 3.7.3 to 3.8.0
+  * Remove bashisms from character clases
+    Patch: dash-case.patch
+    Upsteram-Status: commit 5aea0e314a77c15437765593a7b4f3f13c829f83
+                     "Low: Remove bashisms from character classes"
+    Ubuntu bug #248737
+
+ -- Simon Horman <horms@debian.org>  Thu, 07 Aug 2008 15:46:35 +1000
+
+heartbeat (2.1.3-7) unstable; urgency=low
+
+  * Remove some bashisms from ocf, xen and filesystem plugins
+    Thanks to Luca Falavigna
+    Patch: remove-some-bashisms-from-the-ocf-xen-and-filesystem-plugins.patch
+    Upstream-Status: commit 055ffbfe69b2b3810f9c71c491c30684fd67b669
+                     "Remove some Bashisms from the OCF Xen and Filesystem
+                      resources"
+
+    Note that upstream commit ed0972c7aa43699ae2ec31f68cac3b9cbcc5d5c5
+    "removing bashisms from stonith external plugins"
+    is not required as it applies to changes made after 2.1.3. At this
+    point no post-2.1.3 packages have been made available in Debian.
+
+    (closes: #487167)
+
+  * Remove some bashisms from STONITHBasicSanityCheck and BasicSanityCheck
+    Patch: remove-bashisms-from-STONITHDBasicSanityCheck.patch
+    Upstream-Status: submitted to pocemaker mailing list
+                     as this code has move from heartbeat to pacemaker
+    Patch: use-mktemp.patch
+    Upstream-Status: commit 82e3625e0198af52eb22ef8a42cebf5050ab69e3
+                     "Medium: safely create tempoary files"
+    (closes: #489607)
+
+  * dopd: fix basic failover; fix hb message corruption by fprintf(stderr)
+    Patch: fix-basic-failover-fix-hb-message-corruption-by-fprintf.patch
+    Upstream-Status: commit 47f60bebe7b25abd88ea7b5488e66dfe187416ae
+                     "dopd: fix basic failover; fix hb message corruption by
+                      fprintf(stderr)"
+    (closes: #486071)
+
+  * safely handle $RANDOM being empty, as the case under dash
+    Patch: cope-with-empty-random.patch
+    Upstream-Status: commit 597cfd99deee5128d77022c53112dfc1f8686889
+                     "Low: Cope with empty $RANDOM"
+
+  * Update series to allow using the "3.0 (quilt)" package format
+    Thanks to Raphael Hertzog
+    Upstream-Status: commit 70e9df3f594d73efe4336c9f74a689d6955abac8
+                     "Debian: Use quilt for patching which is supported by dpkg"
+    (closes: #485103)
+
+  * Add build dependancy on uuid-runtime
+    Thanks to Joshua Hutchins
+    Upstream-Status: commit 597cfd99deee5128d77022c53112dfc1f8686889
+                     "Medium: Debian: Build dependancy on uuid-runtime"
+    (closes: #484868)
+
+ -- Simon Horman <horms@debian.org>  Thu, 07 Aug 2008 00:55:37 +0000
+
+heartbeat (2.1.3-6) unstable; urgency=low
+
+  * Run confgure before clean in debian/rules to handle the
+    bizzare case where targets exist but Makefiles don't -
+    This is actually the case in 2.1.3-5, I'm not sure when or
+    how this occured.
+    
+    Thanks to Andrew Suffield for pointing this out
+
+    (closes: #476700)
+
+  * Recompile using a version of debhelper that doesn't feature
+    a bug whereby manpages aren't compressed.
+
+    (closes: #475667)
+
+ -- Simon Horman <horms@debian.org>  Wed, 23 Apr 2008 05:18:45 +0000
+
+heartbeat (2.1.3-5) unstable; urgency=high
+
+  * ldirectord: Define $rows in check_sql()
+    Upstream-Status: commit 600697207ff573913787d78ee56a1c6e458f08eb
+    Patch: ldirectord-rows.patch
+    (closes: #472663)
+
+ -- Simon Horman <horms@debian.org>  Wed, 26 Mar 2008 11:52:35 +0900
+
+heartbeat (2.1.3-4) unstable; urgency=low
+
+  * Add LSB tags to ldirectord init script
+    Upstream-Status: commit 34212491d1e069d99c0339e0479145af5d480711
+    Patch: ldirectord-init-lsb.patch
+    (closes: #469764)
+
+ -- Simon Horman <horms@debian.org>  Fri, 07 Mar 2008 10:52:51 +0900
+
+heartbeat (2.1.3-3) unstable; urgency=low
+
+  * Updated syslog related recommends
+    ldirectord: from: sysklogd | syslog-ng
+                to:   rsyslog | system-log-daemon
+    (closes: #464011)
+    heartbeat:  from: sysklogd | syslog-ng | system-log-daemon
+                to:   rsyslog | system-log-daemon
+  * Remove bashisms in ocf-tester, hb_report and heartbeat's init script
+    Upstream-Status: commit 2b3a34dc4257b65761f1ba021623d59f15944ae5
+    (closes: #464985)
+  * ldirectord: allow sql select checks to work
+    Thanks to Geoff Harrison
+    Upstream-Staus: commit eaa43842608caf75552e9f755c91e35b7a2ff6d1
+    Patch: bashisms.patch
+  * ldirectord: clear memory config on reload
+    Thanks to Geoff Harrison
+    Upstream-Status: c01c9790d2b83f493a4aa5f86e1a5b1233d7daa2
+    Patch: ldirectord-clear-config-in-memory-on-reload.patch
+  * lrm: Don't list complted opperations as failed
+    Linux Foundation Bug #1822
+    http://developerbugs.linux-foundation.org/show_bug.cgi?id=1833
+    Upstream-Status: Pending
+    Patch: lrm-dont-revise-op_status.patch
+
+ -- Simon Horman <horms@debian.org>  Mon, 18 Feb 2008 12:37:47 +0900
+
 heartbeat (2.1.3-2) unstable; urgency=low
 
   * Update standards version from 3.7.2 to 3.7.3
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/control /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/control
--- heartbeat-2.1.3/debian/control	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/control	2008-12-29 22:12:09.000000000 +0000
@@ -2,8 +2,8 @@
 Section: admin
 Priority: optional
 Maintainer: Simon Horman <horms@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev
+Standards-Version: 3.8.0
 XS-Python-Version: current
 
 Package: ldirectord
@@ -11,7 +11,7 @@
 Priority: extra
 Architecture: all
 Depends: ${perl:Depends}, ipvsadm, libauthen-radius-perl, libcrypt-ssleay-perl, libdbi-perl, libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl, libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
-Recommends: sysklogd|syslog-ng, logrotate
+Recommends: rsyslog | system-log-daemon, logrotate
 Conflicts: libpils0 (<< 2.0.8-3), libstonith0 (<< 2.0.8-3), stonith (<< 2.0.8-3)
 XB-Python-Version: ${python:Versions}
 Description: Monitors virtual services provided by LVS
@@ -24,7 +24,7 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, iproute, adduser, iputils-ping, psmisc, gawk, libxml2-utils, libpam-runtime (>= 0.76-14)
-Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate, iptables
+Recommends: rsyslog | system-log-daemon, logrotate, iptables
 XB-Python-Version: ${python:Versions}
 Description: Subsystem for High-Availability Linux
  heartbeat is a basic heartbeat subsystem for Linux-HA which implements
@@ -57,7 +57,7 @@
 Section: admin
 Priority: optional
 Architecture: any
-Depends: ${python:Depends},  python-gtk2, python-glade2
+Depends: ${shlibs:Depends}, ${python:Depends}, python-gtk2, python-glade2, uuid-runtime | e2fsprogs, python-xml
 Suggests: heartbeat (= ${binary:Version})
 XB-Python-Version: ${python:Versions}
 Description: Provides a gui interface to manage heartbeat clusters
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/heartbeat.files /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/heartbeat.files
--- heartbeat-2.1.3/debian/heartbeat.files	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/heartbeat.files	2008-08-18 13:32:19.000000000 +0100
@@ -115,6 +115,7 @@
 usr/lib/heartbeat/plugins/tiebreaker/twonodes.so
 usr/lib/heartbeat/quorumd
 usr/lib/heartbeat/quorumdtest
+usr/lib/heartbeat/ra-api-1.dtd
 usr/lib/heartbeat/recoverymgrd
 usr/lib/heartbeat/req_resource
 usr/lib/heartbeat/send_arp
@@ -229,6 +230,8 @@
 usr/lib/stonith/plugins/external/riloe
 usr/lib/stonith/plugins/external/ssh
 usr/lib/stonith/plugins/external/vmware
+usr/lib/stonith/plugins/external/xen0
+usr/lib/stonith/plugins/external/hmchttp
 usr/lib/stonith/plugins/stonith2/apcmaster.so
 usr/lib/stonith/plugins/stonith2/apcmastersnmp.so
 usr/lib/stonith/plugins/stonith2/apcsmart.so
@@ -238,6 +241,7 @@
 usr/lib/stonith/plugins/stonith2/drac3.so
 usr/lib/stonith/plugins/stonith2/external.so
 usr/lib/stonith/plugins/stonith2/ibmhmc.so
+usr/lib/stonith/plugins/stonith2/ipmilan.so
 usr/lib/stonith/plugins/stonith2/meatware.so
 usr/lib/stonith/plugins/stonith2/null.so
 usr/lib/stonith/plugins/stonith2/nw_rpc100s.so
@@ -277,6 +281,7 @@
 usr/share/doc/heartbeat/HardwareGuide.txt
 usr/share/doc/heartbeat/README
 usr/share/doc/heartbeat/README.cts
+usr/share/doc/heartbeat/README.lrm_regression_tests
 usr/share/doc/heartbeat/Requirements.html
 usr/share/doc/heartbeat/Requirements.txt
 usr/share/doc/heartbeat/apphbd.cf
@@ -320,7 +325,6 @@
 usr/share/heartbeat/hb_standby
 usr/share/heartbeat/hb_takeover
 usr/share/heartbeat/lrmtest/LRMBasicSanityCheck
-usr/share/heartbeat/lrmtest/README.regression
 usr/share/heartbeat/lrmtest/defaults
 usr/share/heartbeat/lrmtest/descriptions
 usr/share/heartbeat/lrmtest/evaltest.sh
@@ -342,6 +346,7 @@
 usr/share/heartbeat/lrmtest/testcases/rscmgmt.log_filter
 usr/share/heartbeat/lrmtest/testcases/xmllint.sh
 usr/share/heartbeat/mach_down
+usr/share/heartbeat/ra-api-1.dtd
 usr/share/heartbeat/req_resource
 usr/share/heartbeat/stonithdtest/STONITHDBasicSanityCheck
 usr/share/heartbeat/utillib.sh
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/ldirectord.postrm /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/ldirectord.postrm
--- heartbeat-2.1.3/debian/ldirectord.postrm	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/debian/ldirectord.postrm	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,38 @@
+#! /bin/sh
+#
+# License: GNU General Public License (GPL)
+#
+# postrm script for ldirectord
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	update-rc.d -f ldirectord remove >/dev/null
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/Makefile
--- heartbeat-2.1.3/debian/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/debian/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,513 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# debian/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+subdir = debian
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/debian
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/debian
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#                    This instance created by Horms
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = changelog compat control copyright \
+			  dpkg-checkbuild rules \
+			  heartbeat.dirs heartbeat.files \
+			  heartbeat.postinst heartbeat.postrm \
+			  heartbeat.preinst \
+			  heartbeat-dev.dirs heartbeat-dev.files \
+			  heartbeat-gui.dirs heartbeat-gui.files \
+			  heartbeat-2.prerm \
+			  ldirectord.files ldirectord.postinst \
+			  ldirectord.postrm
+
+all: all-am
+
+.SUFFIXES:
+$(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  debian/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  debian/Makefile
+.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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+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
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+
+clean-local:
+	rm -f *.substvars *.debhelper files
+	rm -r -f heartbeat heartbeat-dev ldirectord \
+		libpils0 libpils-dev libstonith0 libstonith-dev stonith tmp
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/Makefile.am
--- heartbeat-2.1.3/debian/Makefile.am	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -20,7 +20,7 @@
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
-EXTRA_DIST		= apply changelog compat control copyright \
+EXTRA_DIST		= changelog compat control copyright \
 			  dpkg-checkbuild rules \
 			  heartbeat.dirs heartbeat.files \
 			  heartbeat.postinst heartbeat.postrm \
@@ -29,13 +29,7 @@
 			  heartbeat-gui.dirs heartbeat-gui.files \
 			  heartbeat-2.prerm \
 			  ldirectord.files ldirectord.postinst \
-			  ldirectord.postrm \
-			  patches/ipv6-check.patch \
-			  patches/init-remote_fs.patch \
-			  patches/init-openhpid.patch \
-			  patches/init-ntp.patch \
-			  patches/series/2.1.3-1 \
-			  patches/series/2.1.3-2
+			  ldirectord.postrm
 
 clean-local:
 	rm -f *.substvars *.debhelper files
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/Makefile.in
--- heartbeat-2.1.3/debian/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/Makefile.in	2008-08-18 23:37:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -76,6 +76,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -93,24 +94,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -172,12 +161,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -334,7 +324,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = apply changelog compat control copyright \
+EXTRA_DIST = changelog compat control copyright \
 			  dpkg-checkbuild rules \
 			  heartbeat.dirs heartbeat.files \
 			  heartbeat.postinst heartbeat.postrm \
@@ -343,13 +333,7 @@
 			  heartbeat-gui.dirs heartbeat-gui.files \
 			  heartbeat-2.prerm \
 			  ldirectord.files ldirectord.postinst \
-			  ldirectord.postrm \
-			  patches/ipv6-check.patch \
-			  patches/init-remote_fs.patch \
-			  patches/init-openhpid.patch \
-			  patches/init-ntp.patch \
-			  patches/series/2.1.3-1 \
-			  patches/series/2.1.3-2
+			  ldirectord.postrm
 
 all: all-am
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/init-ntp.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/init-ntp.patch
--- heartbeat-2.1.3/debian/patches/init-ntp.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/init-ntp.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From: Simon Horman <horms@verge.net.au>
-To: Petter Reinholdtsen <pere@hungry.com>, 459497@bugs.debian.org
-Cc: linux-ha-dev@lists.linux-ha.org
-Subject: [patch] init: no need to start ntp as $time is a required-start
-
-See http://wiki.debian.org/LSBInitScripts
-
-Cc: Petter Reinholdtsen <pere@hungry.com>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-
-Index: heartbeat/heartbeat/init.d/heartbeat.in
-===================================================================
---- heartbeat.orig/heartbeat/init.d/heartbeat.in	2008-01-08 11:56:04.000000000 +0900
-+++ heartbeat/heartbeat/init.d/heartbeat.in	2008-01-08 11:57:15.000000000 +0900
-@@ -37,7 +37,7 @@
- # Short-Description: High-availability services.
- # Provides: heartbeat HA
- # Required-Start: $remote_fs $network $time $syslog
--# Should-Start: ntp openhpid
-+# Should-Start: openhpid
- # Required-Stop: $remote_fs $network $time $syslog
- # Should-stop: openhpid
- # Default-Start: 2 3 4 5
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/init-openhpid.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/init-openhpid.patch
--- heartbeat-2.1.3/debian/patches/init-openhpid.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/init-openhpid.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-Subject: init: should-start/stop $remote_fs to init script
-From: Simon Horman <horms@verge.net.au>
-To: Petter Reinholdtsen <pere@hungry.com>, 459497@bugs.debian.org
-Cc: linux-ha-dev@lists.linux-ha.org
-Subject: [patch] init: add should-start/stop $remote_fs to init script
-In-Reply-To: <2fly7b261cx.fsf@saruman.uio.no>
-
-On Sun, Jan 06, 2008 at 11:22:22PM +0100, Petter Reinholdtsen wrote:
-
-[snip]
-
-> I notice the package depend on openhpid.  If heartbeat need openhpid
-> to start before it in the boot, it should list it in required-start or
-> should-start, depending on how hard the dependency should be.  And the
-> same in required-stop or should-stop, if heartbeat need to stop before
-> openhpid during shutdown.  I do not know the package enough to say.
-
-Hi Petter,
-
-I've looked into this breifly and I believe that the short answer is yes.
-
-It seems that in Debian openhpid is a recomemdation of libopenhpi2 which
-is a dependancy of heartbeat, and thus using should-start/should-stop in
-the init script would be the most appropriate option. This should also
-nicely cover other distributions with a loose package dependancy on
-openhpid (the script in question is generic IIRC).
-
-Acked-by: Petter Reinholdtsen <pere@hungry.com>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-
-Index: heartbeat/heartbeat/init.d/heartbeat.in
-===================================================================
---- heartbeat.orig/heartbeat/init.d/heartbeat.in	2008-01-07 11:53:23.000000000 +0900
-+++ heartbeat/heartbeat/init.d/heartbeat.in	2008-01-07 11:54:17.000000000 +0900
-@@ -37,8 +37,9 @@
- # Short-Description: High-availability services.
- # Provides: heartbeat HA
- # Required-Start: $remote_fs $network $time $syslog
--# Should-Start: ntp
-+# Should-Start: ntp openhpid
- # Required-Stop: $remote_fs $network $time $syslog
-+# Should-stop: openhpid
- # Default-Start: 2 3 4 5
- # Default-Stop: 0 1 6
- ### END INIT INFO
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/init-remote_fs.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/init-remote_fs.patch
--- heartbeat-2.1.3/debian/patches/init-remote_fs.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/init-remote_fs.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,108 +0,0 @@
-From horms  Mon Jan  7 01:27:37 2008
-Return-Path: <debbugs@rietz.debian.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.1-kirsty.vergenet.net_2007012401
-	(2007-05-02) on kirsty.vergenet.net
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
-	version=3.2.1-kirsty.vergenet.net_2007012401
-X-Original-To: horms@verge.net.au
-Delivered-To: horms@vergenet.net
-Received: from mail.au.vergenet.net [202.4.237.240]
-	by tabatha.lab.ultramonkey.org with POP3 (fetchmail-6.3.8)
-	for <horms@localhost> (single-drop); Mon, 07 Jan 2008 10:27:37 +0900 (JST)
-Received: from rietz.debian.org (rietz.debian.org [140.211.166.43])
-	by kirsty.vergenet.net (Postfix) with ESMTP id 5E7CA24060
-	for <horms@verge.net.au>; Mon,  7 Jan 2008 09:39:43 +1100 (EST)
-Received: from debbugs by rietz.debian.org with local (Exim 4.63)
-	(envelope-from <debbugs@rietz.debian.org>)
-	id 1JBe94-0008Vf-KQ; Sun, 06 Jan 2008 22:39:06 +0000
-X-Loop: owner@bugs.debian.org
-Subject: init: add should-start/stop $remote_fs to init script
-Reply-To: Petter Reinholdtsen <pere@hungry.com>, 459497@bugs.debian.org
-Resent-From: Petter Reinholdtsen <pere@hungry.com>
-Original-Sender: Petter Reinholdtsen <petter.reinholdtsen@usit.uio.no>
-Resent-To: debian-bugs-dist@lists.debian.org
-Resent-CC: Simon Horman <horms@debian.org>
-Resent-Date: Sun, 06 Jan 2008 22:39:04 +0000
-Resent-Message-ID: <handler.459497.B.11996581495099@bugs.debian.org>
-X-Debian-PR-Message: report 459497
-X-Debian-PR-Package: heartbeat
-X-Debian-PR-Keywords: patch
-X-Debian-PR-Source: heartbeat
-Received: via spool by submit@bugs.debian.org id=B.11996581495099
-          (code B ref -1); Sun, 06 Jan 2008 22:39:04 +0000
-Received: (at submit) by bugs.debian.org; 6 Jan 2008 22:22:29 +0000
-Received: from pat.uio.no ([129.240.10.15])
-	by rietz.debian.org with esmtp (Exim 4.63)
-	(envelope-from <pre@saruman.uio.no>)
-	id 1JBdsz-0001J6-9B
-	for submit@bugs.debian.org; Sun, 06 Jan 2008 22:22:29 +0000
-Received: from mail-mx4.uio.no ([129.240.10.45])
-	by pat.uio.no with esmtp (Exim 4.67)
-	(envelope-from <pre@saruman.uio.no>)
-	id 1JBdst-0001Uz-E5
-	for submit@bugs.debian.org; Sun, 06 Jan 2008 23:22:23 +0100
-Received: from saruman.uio.no ([129.240.5.17])
-	by mail-mx4.uio.no with esmtp (Exim 4.67)
-	(envelope-from <pre@saruman.uio.no>)
-	id 1JBdss-0006Xm-Pu; Sun, 06 Jan 2008 23:22:23 +0100
-Received: from pre by saruman.uio.no with local (Exim 4.44)
-	id 1JBdss-0005XY-AZ; Sun, 06 Jan 2008 23:22:22 +0100
-To: submit@bugs.debian.org
-From: Petter Reinholdtsen <pere@hungry.com>
-Date: Sun, 06 Jan 2008 23:22:22 +0100
-Message-ID: <2fly7b261cx.fsf@saruman.uio.no>
-User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (usg-unix-v)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Sender: Petter Reinholdtsen <petter.reinholdtsen@usit.uio.no>
-X-UiO-ClamAV-Virus: No
-X-UiO-Spam-info: not spam, SpamAssassin (score=-4.0, required=5.0, autolearn=disabled, AWL=0.978,UIO_MAIL_IS_INTERNAL=-5)
-X-UiO-Scanned: 970378EB478AA26CD34F4A6F0CC56B6A453886AE
-X-UiO-SPAM-Test: remote_host: 129.240.5.17 spam_score: -39 maxlevel 99990 minaction 0 bait 0 mail/h: 1 total 38077 max/h 47 blacklist 0 greylist 0 ratelimit 0
-Delivered-To: submit@bugs.debian.org
-Resent-Sender: Debian BTS <debbugs@rietz.debian.org>
-Resent-Date: Sun, 06 Jan 2008 22:39:06 +0000
-X-Loop: oathstix_finish by kirsty.vergenet.net
-X-Loop: oathstix_finish by tabatha.lab.ultramonkey.org
-Status: RO
-X-Status: A
-Content-Length: 1632
-Lines: 46
-
-When testing dependency based boot sequencing, I discovered what I
-believe is a bug in the init.d/heartbeat script.  It need a mounted
-/usr/, but do not depend on $remote_fs which is the dependency
-required for scripts needing /usr/.  It uses the default params when
-calling update-rc.d, but do not list the equivalent runlevels in the
-LSB header.
-
-Debian Bug #459497. See: http://bugs.debian.org/459497
-
-Cc: Petter Reinholdtsen <pere@hungry.com>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-
-diff -ur heartbeat-2.1.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.1.3/heartbeat/init.d/heartbeat.in
---- heartbeat-2.1.3.orig/heartbeat/init.d/heartbeat.in  2008-01-06 23:07:28.000000000 +0100
-+++ heartbeat-2.1.3/heartbeat/init.d/heartbeat.in       2008-01-06 23:12:48.000000000 +0100
-@@ -36,11 +36,11 @@
- #
- # Short-Description: High-availability services.
- # Provides: heartbeat HA
--# Required-Start: $network $time $syslog
-+# Required-Start: $remote_fs $network $time $syslog
- # Should-Start: ntp
--# Required-Stop: $network $time $syslog
--# Default-Start: 3 5
--# Default-Stop: 0 6
-+# Required-Stop: $remote_fs $network $time $syslog
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
- ### END INIT INFO
-
-
-Happy hacking,
---
-Petter Reinholdtsen
-
-
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/ipv6-check.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/ipv6-check.patch
--- heartbeat-2.1.3/debian/patches/ipv6-check.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/ipv6-check.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-Subject: IPv6addr: Check for netinet/icmp6.h instead of  linux/icmpv6.h
-Date: Tue, 25 Dec 2007 13:51:34 +0900
-To: linux-ha-dev@lists.linux-ha.org
-Cc: Tuomo Soini <tis@foobar.fi>
-From: Simon Horman <horms@verge.net.au>
-
-Configure currently checks for asm/types.h+netinet/icmp6.h,
-however this check fails on debian ia64. Changing the check
-to sys/types.h+netinet/icmp6.h resolves the problem for Debian,
-but breaks RHEL 4.
-
-http://developerbugs.linux-foundation.org/show_bug.cgi?id=1660
-
-This revised check looks for sys/types.h+netinet/icmp6.h which
-is more or less what resources/OCF/IPv6addr.c actually uses,
-so hopefully this check keeps all the relevant parties happy.
-
-Tuomo, could you check this patch and see if it causes you pain?
-
-Cc: Tuomo Soini <tis@foobar.fi>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-
-Index: heartbeat/configure.in
-===================================================================
---- heartbeat.orig/configure.in	2007-12-25 13:24:20.000000000 +0900
-+++ heartbeat/configure.in	2007-12-25 13:44:26.000000000 +0900
-@@ -1099,9 +1099,9 @@ fi
- CPPFLAGS="$CPPFLAGS $XML2HEAD"
- 
- dnl ************************************************************************
--dnl * Check for linux/icmpv6.h to make enable the IPv6addr resource agent
--AC_CHECK_HEADERS(linux/icmpv6.h,[],[],[#include <asm/types.h>])
--AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_linux_icmpv6_h" = yes -a $new_libnet = yes )
-+dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
-+AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
-+AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes -a $new_libnet = yes )
- AC_CHECK_HEADERS(libxml/xpath.h)
- 
- dnl
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/medium_Debian_Build_packges_with_--enable-libc-malloc.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/medium_Debian_Build_packges_with_--enable-libc-malloc.patch
--- heartbeat-2.1.3/debian/patches/medium_Debian_Build_packges_with_--enable-libc-malloc.patch	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/debian/patches/medium_Debian_Build_packges_with_--enable-libc-malloc.patch	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Simon Horman <horms@verge.net.au>
+# Date 1219052556 -36000
+# Node ID 7ab767ca8ab5337cd0e8a97f3529adf1b56a5317
+# Parent  2b2914a1bb6f4c40be6da656276b123b4a33b3f4
+medium: Debian: Build packages with --enable-libc-malloc
+
+Build packages with --enable-libc-malloc.
+--enable-glib-malloc was a typo.
+
+Signed-off-by: Simon Horman <horms@verge.net.au>
+
+diff -r 2b2914a1bb6f -r 7ab767ca8ab5 debian/rules
+--- a/debian/rules	Mon Aug 18 09:54:31 2008 +0200
++++ b/debian/rules	Mon Aug 18 19:42:36 2008 +1000
+@@ -12,7 +12,7 @@
+   --mandir=/usr/share/man \
+   --with-group-name=haclient --with-ccmuser-name=hacluster \
+   --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
+-  --disable-fatal-warnings --enable-mgmt --enable-glib-malloc
++  --disable-fatal-warnings --enable-mgmt --enable-libc-malloc
+ 
+ # These are used for cross-compiling and for saving the configure script
+ # from having to guess our platform (since we know it already)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/medium_debian_uuid-duntime__e2fsprogs_dependancy_for_heartbeat-gui.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/medium_debian_uuid-duntime__e2fsprogs_dependancy_for_heartbeat-gui.patch
--- heartbeat-2.1.3/debian/patches/medium_debian_uuid-duntime__e2fsprogs_dependancy_for_heartbeat-gui.patch	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/debian/patches/medium_debian_uuid-duntime__e2fsprogs_dependancy_for_heartbeat-gui.patch	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Simon Horman <horms@verge.net.au>
+# Date 1219060649 -36000
+# Node ID 80898b4aa7fa49ac814ddc95aaade8ccc380b183
+# Parent  7ab767ca8ab5337cd0e8a97f3529adf1b56a5317
+medium: debian: uuid-runtime | e2fsprogs dependancy for heartbat-gui
+
+heartbeat-gui requires uuid-runtime so that uuidgen is available at runtime.
+On Etch this is provided by e2fsprogs, not uuid-runtime, so provide
+an alternate dependancy. uuid-runtime was previously mistakenly added
+as a dependancy of heartbeat to solve this problem.
+
+Signed-off-by: Simon Horman <horms@verge.net.au>
+
+diff -r 7ab767ca8ab5 -r 80898b4aa7fa debian/control
+--- a/debian/control	Mon Aug 18 19:42:36 2008 +1000
++++ b/debian/control	Mon Aug 18 21:57:29 2008 +1000
+@@ -23,7 +23,7 @@
+ Section: admin
+ Priority: optional
+ Architecture: any
+-Depends: ${shlibs:Depends}, ${python:Depends}, iproute, adduser, iputils-ping, psmisc, gawk, libxml2-utils, libpam-runtime (>= 0.76-14), uuid-runtime
++Depends: ${shlibs:Depends}, ${python:Depends}, iproute, adduser, iputils-ping, psmisc, gawk, libxml2-utils, libpam-runtime (>= 0.76-14)
+ Recommends: rsyslog | system-log-daemon, logrotate, iptables
+ XB-Python-Version: ${python:Versions}
+ Description: Subsystem for High-Availability Linux
+@@ -57,7 +57,7 @@
+ Section: admin
+ Priority: optional
+ Architecture: any
+-Depends: ${python:Depends},  python-gtk2, python-glade2
++Depends: ${python:Depends},  python-gtk2, python-glade2, uuid-runtime | e2fsprogs
+ Suggests: heartbeat (= ${binary:Version})
+ XB-Python-Version: ${python:Versions}
+ Description: Provides a gui interface to manage heartbeat clusters
File /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/series is a directory while file /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/series is a regular file
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/SphinxSearchDaemon.install.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/SphinxSearchDaemon.install.patch
--- heartbeat-2.1.3/debian/patches/SphinxSearchDaemon.install.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/SphinxSearchDaemon.install.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-Date: Thu, 27 Dec 2007 09:40:43 +0900
-From: DAIKI MATSUDA <d.matuda@gmail.com>
-To: High-Availability Linux Development List <linux-ha-dev@lists.linux-ha.org>
-Subject: OCF-resources: SphinxSearchDaemon is not installed
-
-Hi, All.
-
-Congratulations to release Heartbeat 2.1.3.
-
-I read Alan's release mail and made own rpm package. So, I was aware
-of difference that SphinxSearchDaemon RA is not installed. And I
-attached the simply patch file and please confirm.
-
-Cc: DAIKI MATSUDA <d.matuda@gmail.com>
-Signed-off-by: Simon Horman <horms@verge.net.au>
-
-Index: heartbeat/resources/OCF/Makefile.am
-===================================================================
---- heartbeat.orig/resources/OCF/Makefile.am	2007-11-30 16:15:19.000000000 +0900
-+++ heartbeat/resources/OCF/Makefile.am	2008-01-08 13:16:50.000000000 +0900
-@@ -76,6 +76,7 @@ ocf_SCRIPTS	     =  ClusterMon 	\
- 			SAPInstance	\
- 			SendArp		\
- 			ServeRAID	\
-+			SphinxSearchDaemon	\
- 			Stateful	\
- 			SysInfo		\
- 			tomcat		\
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/patches/SphinxSearchDaemon.patch /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/patches/SphinxSearchDaemon.patch
--- heartbeat-2.1.3/debian/patches/SphinxSearchDaemon.patch	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/patches/SphinxSearchDaemon.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,225 +0,0 @@
---- /dev/null	2007-11-12 10:15:50.332049316 +0900
-+++ a/resources/OCF/SphinxSearchDaemon	2007-11-29 16:49:13.000000000 +0900
-@@ -0,0 +1,222 @@
-+#!/bin/sh
-+#
-+#
-+#	Searchd OCF RA. 
-+#	Manages the Sphinx search daemon
-+#
-+# Copyright (c) 2007 Christian Rishoj (christian@rishoj.net)
-+#                    All Rights Reserved.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of version 2 of the GNU General Public License as
-+# published by the Free Software Foundation.
-+#
-+# This program is distributed in the hope that it would be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+#
-+# Further, this software is distributed without any warranty that it is
-+# free of the rightful claim of any third person regarding infringement
-+# or the like.  Any license provided herein, whether implied or
-+# otherwise, applies only to this software file.  Patent licenses, if
-+# any, provided herein do not apply to combinations of this program with
-+# other software, or any other product whatsoever.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write the Free Software Foundation,
-+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-+#
-+
-+#######################################################################
-+# Initialization:
-+
-+. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-+
-+#######################################################################
-+
-+meta_data() {
-+	cat <<END
-+<?xml version="1.0"?>
-+<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-+<resource-agent name="SphinxSearchDaemon" version="0.9">
-+<version>1.0</version>
-+
-+<longdesc lang="en">
-+This is a searchd Resource Agent. It manages the Sphinx Search Daemon.
-+</longdesc>
-+<shortdesc lang="en">searchd resource agent</shortdesc>
-+
-+<parameters>
-+
-+<parameter name="config" required="0" unique="1">
-+<longdesc lang="en">
-+searchd configuration file
-+</longdesc>
-+<shortdesc lang="en">Configuration file</shortdesc>
-+<content type="string" default="/etc/sphinx/sphinx.conf" />
-+</parameter>
-+
-+<parameter name="searchd" required="0" unique="0">
-+<longdesc lang="en">
-+searchd binary
-+</longdesc>
-+<shortdesc lang="en">searchd binary</shortdesc>
-+<content type="string" default="/usr/local/bin/searchd" />
-+</parameter>
-+
-+<parameter name="search" required="0" unique="0">
-+<longdesc lang="en">
-+Search binary for functional testing in the monitor action.
-+</longdesc>
-+<shortdesc lang="en">search binary</shortdesc>
-+<content type="string" default="/usr/local/bin/search" />
-+</parameter>
-+
-+<parameter name="testQuery" required="0" unique="0">
-+<longdesc lang="en">
-+Test query for functional testing in the monitor action.
-+The query does not need to match any documents in the index.
-+The purpose is merely to test whether the search daemon is
-+is able to query its indices and respond properly. 
-+</longdesc>
-+<shortdesc lang="en">test query</shortdesc>
-+<content type="string" default="Heartbeat_Monitor_Query_Match_string" />
-+</parameter>
-+
-+</parameters>
-+
-+<actions>
-+<action name="start"        timeout="90" />
-+<action name="stop"         timeout="100" />
-+<action name="monitor"      timeout="20" interval="10" depth="0" start-delay="0" />
-+<action name="meta-data"    timeout="5" />
-+<action name="verify-all"   timeout="30" />
-+</actions>
-+</resource-agent>
-+END
-+}
-+
-+#######################################################################
-+
-+searchd_usage() {
-+	cat <<END
-+usage: $0 {start|stop|monitor|validate-all|meta-data}
-+
-+Expects to have a fully populated OCF RA-compliant environment set.
-+END
-+}
-+
-+searchd_start() {
-+    if ! searchd_validate ; then
-+	return $OCF_ERR_GENERIC
-+    fi 
-+    if ! searchd_status ; then
-+	$OCF_RESKEY_searchd --config $OCF_RESKEY_config
-+	if [ $? != 0 ]; then 
-+	    return $OCF_ERR_GENERIC
-+	fi	    
-+    fi
-+    if searchd_check ; then
-+	return $OCF_SUCCESS
-+    else	
-+	return $OCF_ERR_GENERIC
-+    fi
-+}
-+
-+searchd_stop() {
-+    if ! searchd_validate ; then
-+	return $OCF_ERR_GENERIC
-+    fi 
-+    if searchd_status ; then 
-+	$OCF_RESKEY_searchd --config $OCF_RESKEY_config --stop
-+	if [ $? = 0 ]; then
-+	    return $OCF_SUCCESS
-+	else	    
-+	    return $OCF_ERR_GENERIC
-+	fi
-+    else
-+	return $OCF_SUCCESS
-+    fi
-+}
-+
-+isRunning()
-+{
-+    kill -0 "$1" > /dev/null && [ `ps -p "$1" | grep searchd | wc -l` -eq 1 ]
-+}
-+
-+searchd_status() {
-+    pidfile=`grep -v "^#" "$OCF_RESKEY_config" | grep -w pid_file | awk -F "[ \t]*=[ \t]*" '{ print $2 }'`
-+    if [ -f "$pidfile" ] ; then 
-+	PID=`head -n 1 $pidfile`
-+	if [ ! -z "$PID" ] ; then 
-+	    isRunning "$PID" 
-+	    if [ $? = 0 ] ; then
-+		return 0
-+	    fi
-+	fi
-+    fi
-+    false
-+}
-+
-+searchd_check() {
-+    $OCF_RESKEY_search --config $OCF_RESKEY_config --noinfo "$OCF_RESKEY_testQuery" > /dev/null
-+}
-+
-+searchd_monitor() {
-+    if ! searchd_validate ; then
-+	return $OCF_NOT_RUNNING
-+    fi 
-+    if searchd_status ; then 
-+	if searchd_check ; then
-+	    return $OCF_RUNNING
-+	else	    
-+	    return $OCF_ERR_GENERIC
-+	fi
-+    else
-+	return $OCF_NOT_RUNNING
-+    fi
-+}
-+
-+searchd_validate() {
-+    if [ ! -x "$OCF_RESKEY_search" ]; then
-+	ocf_log err "search binary '$OCF_RESKEY_search' does not exist or cannot be executed"
-+	return $OCF_ERR_ARGS
-+    fi
-+
-+    if [ ! -x "$OCF_RESKEY_searchd" ]; then
-+	ocf_log err "searchd binary '$OCF_RESKEY_searchd' does not exist or cannot be executed"
-+	return $OCF_ERR_ARGS
-+    fi
-+
-+    if [ ! -f "$OCF_RESKEY_config" ]; then
-+	ocf_log err "config file '$OCF_RESKEY_config' does not exist"
-+	return $OCF_ERR_ARGS
-+    fi
-+
-+    return $OCF_SUCCESS
-+}
-+
-+: ${OCF_RESKEY_config=/etc/sphinx/sphinx.conf} 
-+: ${OCF_RESKEY_search=/usr/local/bin/search}
-+: ${OCF_RESKEY_searchd=/usr/local/bin/searchd}
-+: ${OCF_RESKEY_testQuery=Heartbeat_Monitor_Query_Match_string} 
-+
-+case $__OCF_ACTION in
-+meta-data)	meta_data
-+		exit $OCF_SUCCESS
-+		;;
-+start)		searchd_start;;
-+stop)		searchd_stop;;
-+monitor)	searchd_monitor;;
-+validate-all)	searchd_validate;;
-+usage|help)	searchd_usage
-+		exit $OCF_SUCCESS
-+		;;
-+*)		searchd_usage
-+		exit $OCF_ERR_UNIMPLEMENTED
-+		;;
-+esac
-+rc=$?
-+ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
-+exit $rc
-+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/debian/rules /tmp/RRBT9Z8NmI/heartbeat-2.1.4/debian/rules
--- heartbeat-2.1.3/debian/rules	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/debian/rules	2008-12-29 22:12:09.000000000 +0000
@@ -8,24 +8,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#
-# Path to SSH and SCP
-# Usually this is guessed if ssh is installed.
-# However, there is a long standing bug with installing ssh
-# on arm in debian and this is preventing heartbeat from
-# moving into sarge. By adding this we can remove the build
-# dependancy on ssh and get an updated heartbeat into sarge... 
-# I hope. Horms 26th July 2004
-#
-# If this is removed then the build depandancy on ssh should be
-# restored
-#
-
 cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --mandir=/usr/share/man \
   --with-group-name=haclient --with-ccmuser-name=hacluster \
   --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
-  --disable-fatal-warnings --enable-mgmt --enable-glib-malloc
+  --disable-fatal-warnings --enable-mgmt --enable-libc-malloc
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -46,15 +33,8 @@
 RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
 
-patch:
-	override_version=$(RELEASE) sh debian/apply
-
-unpatch:
-	override_version=$(RELEASE) sh debian/apply $(UPSTREAM)
 
-
-build: checkbuild build-stamp
-build-stamp:
+configure: checkbuild
 	dh_testdir
 	# Allow debian packages to also be built directly from Hg archives
 	# Official debian packages are built from dist tarballs
@@ -63,8 +43,10 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
-	dh_testdir
+build: checkbuild configure build-stamp
+build-stamp:
+
+clean: configure
 	dh_testroot
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean MAKE=make
@@ -94,6 +76,8 @@
 
 	mv $(DTMP)/usr/share/heartbeat/cts/README \
 		$(DTMP)/usr/share/doc/heartbeat/README.cts
+	mv $(DTMP)/usr/share/heartbeat/lrmtest/README.regression \
+		$(DTMP)/usr/share/doc/heartbeat/README.lrm_regression_tests
 	find $(DTMP)/usr/share/man -type f | xargs gzip -v --best
 	install -c -m 755 heartbeat/init.d/heartbeat \
                 $(DTMP)/etc/init.d/heartbeat
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/depcomp /tmp/RRBT9Z8NmI/heartbeat-2.1.4/depcomp
--- heartbeat-2.1.3/depcomp	2007-12-21 20:44:17.000000000 +0000
+++ heartbeat-2.1.4/depcomp	2008-08-18 23:37:49.000000000 +0100
@@ -1,7 +1,10 @@
 #! /bin/sh
-
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+
+scriptversion=2007-03-29.01
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
@@ -15,8 +18,8 @@
 
 # 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.
+# 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
@@ -25,22 +28,45 @@
 
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -66,7 +92,20 @@
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -176,34 +215,39 @@
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -251,6 +295,46 @@
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -262,27 +346,43 @@
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -426,7 +526,8 @@
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
@@ -477,3 +578,12 @@
 esac
 
 exit 0
+
+# 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:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/ChangeLog /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/ChangeLog
--- heartbeat-2.1.3/doc/ChangeLog	2007-12-21 20:46:41.000000000 +0000
+++ heartbeat-2.1.4/doc/ChangeLog	2008-08-18 23:39:13.000000000 +0100
@@ -1,3 +1,92 @@
+* Mon Aug 18 2008 Lars Marowsky-Bree <lmb@suse.de> and MANY others (see doc/AUTHORS)
++ Version 2.1.4 - bug fixes and enhancements - shortened overview:
+- PE: Ordering between groups and primitives fixed (bnc#396293).
+- PE: Failure score could be overrode by collocation (bnc#385265).
+- PE: Restore the ability to have start failures not be fatal
+  (LF#1866).
+- PE: Allow the cluster to make progress by not retrying failed demote
+  actions.
+- PE: Implement promote/demote ordering for cloned groups.
+- PE: Group start ordering fixes.
+- PE: Make sure monitoring matches the promote/demote state.
+- PE: Collocation with clones caused unnecessary clone instance
+  shuffling (bnc#387749).
+- PE: The failure stickiness of group children is ignored until it
+  reaches -INFINITY (bnc#385265).
+- PE: Enforce mandatory group restarts due to ordering constraints
+  (bnc#396293).
+- PE: Don't restart group children who's individual score drops below
+  zero (bnc#417585)
+- PE: Correctly recover master instances found active on more than one
+  node.
+- PE: Improve probe handling and detection (LF#1920, LF#1932).
+- PE: Prefer the current location if it is one of a group of nodes with
+  the same (highest) score.
+- TE: Prevent the TE from interrupting itself and making failcounts work
+  right again (LF#1859).
+- crmd: Make sure cancelled recurring operations are cleaned out from
+  the CIB (LF#1894).
+- RA: Filesystem: Ensure OCFS2 membership links are only deleted on
+  clean umount (bnc#389599).
+- RA: drbd: Ensure the master preference is set/deleted consistently.
+- RA: IPaddr2: fix IP_CIP_HASH default.
+- RA: o2cb: Clarify description to explain that it should not be used.
+- stonith: external/rackpdu update.
+- stonith: apcmastersnmp handles poweron/poweroff correctly.
+- stonith: external/ipmi: add interface parameter.
+- stonith: external/xen0-ha: Support DomU clusters inside Dom0 clusters.
+- LRM: Support resource timing and async failure notifications
+  (LF#1625).
+- GUI: Support calling hb_report.
+- crm_mon: improved reporting (LF#1883).
+- Logging improvements.
+- ocf-tester: validate meta-data.
+- Minor bugs: LF#1868, LF#1866, LF#1814, LF#1812, bnc#381208, LF#1871,
+  LF#1881 LF#1882, LF#1875, LF#1900, LF#1906, LF#1926, bnc#399497,
+  bnc#357894.
+- crmd: Connecting to the crmd immediately after startup causes
+  use-of-NULL (bnc#369380)
+- crmd: Delay starting the IPC server until we're fully functional
+  (bnc#369380)
+- crmd: Handle unmanaged resources on shutdown (LF#1837)
+- cib: Ensure that the CIB is written to disk in all cases.
+- pengine: improved anonymous clone, group handling, improved
+  master/slave handling (LF#1777, LF#1822, LF#1820, PM#7, PM#12,
+  bnc#371783, PM#1, bnc#34700, 4LF#1648, PM#11, LF#1860, LF#1859,
+  LF#1941)
+- pengine: Handle STONITH on start-up properly (LF#1768)
+- cibadmin: require -f on potentially dangerous commands.
+- CLI: Handle stdout/stderr consistently (bnc#369914)
+- lrmd: fix a memory leak in raexechb.c (LF#1841)
+- lrmd/crmd: improve status propagation (LF#1830)
+- RA: Xen: Many fixes (LF#1830, LF#1856, LF#1858, bnc#369724)
+- RA: ids: allow meta-data and usage under all circumstances
+- RA: Update SAPDatabase to 1.91
+- RA: Update SAPInstance to 1.91
+- haclient: Fill all sub-resources into the list of combobox for
+  selecting
+- mgmt: Several improvements and fixes.
+- hb_report: Many improvements and collecting more relevant information.
+- Fix end-of-month time calculation in leap years (LF#1849)
+- mgmt: Resolve the issue caused by inconsistent names between DTD and
+  RA.
+- mgmt: Rewrite "instance_attributes", "operations" and "expression"
+  based on the new model.
+- Fix blank definition of HA_HBCONF_DIR corrupts heartbeat (bnc#364816)
+- OCF RAs: Make which quiet if it doesn't find the binary.
+- IPaddr RA: fix parsing loopback interface for lvs support.
+- mysql RA: Minor bug fixes.
+- PostgreSQL RA: fix status/monitor function.
+- Correct stonith.8 man page, add examples (LTC#32445)
+- mgmt: Return the actual value returned from cib_conn (bnc#356170)
+- CIB: Ensure changes to top-level attributes (like admin_epoch) cause a
+  disk write
+- stonith ipmilan: add an optional parameter to specify the reset method
+- Add openHPI dependency to build HPI STONITH module.
+- Fix IPMI STONITH (bnc#356219).
+- Fix hb_gui PAM definition (bnc#356169).
+- STONITH hmchttp: new STONITH external plugin
+
 * Fri Dec 21 2007  Alan Robertson <alanr@unix.sh> and MANY others (see doc/AUTHORS file)
 + Version 2.1.3 - bug fixes and enhancements - changelog includes everything after 2.1.2
   + hb_report: heartbeat reporting utility
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/cibadmin.8 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/cibadmin.8
--- heartbeat-2.1.3/doc/cibadmin.8	2007-12-21 20:45:40.000000000 +0000
+++ heartbeat-2.1.4/doc/cibadmin.8	2008-12-29 22:12:09.000000000 +0000
@@ -1,4 +1,4 @@
-.TH CIBADMIN 8 "$Date: 2006/06/26 12:54:48 $" "Linux-HA/OpenHA Project" "Heartbeat 2.1.3 Adminstration Guide"
+.TH CIBADMIN 8 "$Date: 2006/06/26 12:54:48 $" "Linux-HA/OpenHA Project" "Heartbeat 2.1.4 Adminstration Guide"
 .SH NAME
 \fIcibadmin\fP \- read, modify, or administer heartbeat Cluster Information Base
 .SH SYNOPSIS
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/crm_resource.8 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/crm_resource.8
--- heartbeat-2.1.3/doc/crm_resource.8	2007-12-21 20:45:40.000000000 +0000
+++ heartbeat-2.1.4/doc/crm_resource.8	2008-08-18 23:38:53.000000000 +0100
@@ -1,4 +1,4 @@
-.TH CRM_RESOURCE 8 "$Date: 2006/08/31 11:53:00 $" "Linux\-HA/OpenHA Project" "Heartbeat 2.1.3 Administration Guide"
+.TH CRM_RESOURCE 8 "$Date: 2006/08/31 11:53:00 $" "Linux\-HA/OpenHA Project" "Heartbeat 2.1.4 Administration Guide"
 .SH NAME
 \fIcrm_resource\fP \- Interact with the Cluster Resource Manager
 .SH SYNOPSIS
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/ha.cf /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/ha.cf
--- heartbeat-2.1.3/doc/ha.cf	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/doc/ha.cf	2008-08-18 13:32:19.000000000 +0100
@@ -15,14 +15,10 @@
 #
 #
 #       Note on logging:
-#       If any of debugfile, logfile and logfacility are defined then they
-#       will be used. If debugfile and/or logfile are not defined and
-#       logfacility is defined then the respective logging and debug
-#       messages will be loged to syslog. If logfacility is not defined
-#       then debugfile and logfile will be used to log messges. If
-#       logfacility is not defined and debugfile and/or logfile are not
-#       defined then defaults will be used for debugfile and logfile as
-#       required and messages will be sent there.
+#       If all of debugfile, logfile and logfacility are not defined, 
+#       logging is the same as use_logd yes. In other case, they are
+#       respectively effective. if detering the logging to syslog,
+#       logfacility must be "none".
 #
 #	File to write debug messages to
 #debugfile /var/log/ha-debug
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/hb_report.txt /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/hb_report.txt
--- heartbeat-2.1.3/doc/hb_report.txt	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/doc/hb_report.txt	2008-08-18 23:39:13.000000000 +0100
@@ -1,308 +1 @@
-Heartbeat reporting
-===================
-Dejan Muhamedagic <dmuhamedagic@suse.de>
-v1.0
-
-`hb_report` is a utility to collect all information relevant to
-Heartbeat over the given period of time.
-
-Quick start
------------
-
-Run `hb_report` on one of the nodes or on the host which serves as
-a central log server. Run `hb_report` without parameters to see usage.
-
-A few examples:
-
-1. Last night during the backup there were several warnings
-encountered (logserver is the log host):
-+
-	logserver# hb_report -f 3:00 -t 4:00 /tmp/report
-+
-collects everything from all nodes from 3am to 4am last night.
-The files are stored in /tmp/report and compressed to a tarball
-/tmp/report.tar.gz.
-
-2. Just found a problem during testing:
-
-	node1# date : note the current time
-	node1# /etc/init.d/heartbeat start
-	node1# nasty_command_that_breaks_things
-	node1# sleep 120 : wait for the cluster to settle
-	node1# hb_report -f time /tmp/hb1
-
-Introduction
-------------
-
-Managing clusters is cumbersome. Heartbeat v2 with its numerous
-configuration files and multi-node clusters just adds to the
-complexity. No wonder then that most problem reports were less
-than optimal. This is an attempt to rectify that situation and
-make life easier for both the users and the developers.
-
-On security
------------
-
-`hb_report` is a fairly complex program. As some of you are
-probably going to run it as `root` let us state a few important
-things you should keep in mind:
-
-1. Don't run `hb_report` as `root`! It is fairly simple to setup
-things in such a way that root access is not needed. I won't go
-into details, just to stress that all information collected
-should be readable by accounts belonging the haclient group.
-
-2. If you still have to run this as root. Well, don't use the
-`-C` option.
-
-3. Of course, every possible precaution has been taken not to
-disturb processes, or touch or remove files out of the given
-destination directory. If you (by mistake) specify an existing
-directory, `hb_report` will bail out soon. If you specify a
-relative path, it won't work either.
-
-The final product of `hb_report` is a tarball. However, the
-destination directory is not removed on any node, unless the user
-specifies `-C`. If you're too lazy to cleanup the previous run,
-do yourself a favour and just supply a new destination directory.
-You've been warned. If you worry about the space used, just put
-all your directories under `/tmp` and setup a cronjob to remove
-those directories once a week:
-..........
-	for d in /tmp/*; do
-		test -d $d ||
-			continue
-		test -f $d/description.txt || test -f $d/.env ||
-			continue
-		grep -qs 'By: hb_report' $d/description.txt ||
-			grep -qs '^UNIQUE_MSG=Mark' $d/.env ||
-			continue
-		rm -r $d
-	done
-..........
-
-Mode of operation
------------------
-
-Cluster data collection is straightforward: just run the same
-procedure on all nodes and collect the reports. There is,
-apart from many small ones, one large complication: central
-syslog destination. So, in order to allow this to be fully
-automated, we should sometimes run the procedure on the log host
-too. Actually, if there is a log host, then the best way is to
-run `hb_report` there.
-
-We use `ssh` for the remote program invocation. Even though it is
-possible to run `hb_report` without ssh by doing a more menial job,
-the overall user experience is much better if ssh works. Anyway,
-how else do you manage your cluster?
-
-Another ssh related point: In case your security policy
-proscribes loghost-to-cluster-over-ssh communications, then
-you'll have to copy the log file to one of the nodes and point
-`hb_report` to it.
-
-Prerequisites
--------------
-
-1. ssh
-+
-This is not strictly required, but you won't regret having a
-password-less ssh. It is not too difficult to setup and will save
-you a lot of time. If you can't have it, for example because your
-security policy does not allow such a thing, or you just prefer
-menial work, then you will have to resort to the semi-manual
-semi-automated report generation. See below for instructions.
-+
-If you need to supply a password for your passphrase/login, then
-please use the `-u` option.
-
-2. Times
-+
-In order to find files and messages in the given period and to
-parse the `-f` and `-t` options, `hb_report` uses perl and one of the
-`Date::Parse` or `Date::Manip` perl modules. Note that you need
-only one of these. Furthermore, on nodes which have no logs and
-where you don't run `hb_report` directly, no date parsing is
-necessary. In other words, if you run this on a loghost then you
-don't need these perl modules on the cluster nodes.
-+
-On rpm based distributions, you can find `Date::Parse` in
-`perl-TimeDate` and on Debian and its derivatives in
-`libtimedate-perl`.
-
-3. Core dumps
-+
-To backtrace core dumps `gdb` is needed and the Heartbeat packages
-with the debugging info. The debug info packages may be installed
-at the time the report is created. Let's hope that you will need
-this really seldom.
-
-What is in the report
----------------------
-
-1. Heartbeat related
-- heartbeat version/release information
-- heartbeat configuration (CIB, ha.cf, logd.cf)
-- heartbeat status (output from crm_mon, crm_verify, ccm_tool)
-- pengine transition graphs (if any)
-- backtraces of core dumps (if any)
-- heartbeat logs (if any)
-2. System related
-- general platform information (`uname`, `arch`, `distribution`)
-- system statistics (`uptime`, `top`, `ps`, `netstat -i`, `arp`)
-3. User created :)
-- problem description (template to be edited)
-4. Generated
-- problem analysis (generated)
-
-It is preferred that the Heartbeat is running at the time of the
-report, but not absolutely required. `hb_report` will also do a
-quick analysis of the collected information.
-
-Times
------
-
-Specifying times can at times be a nuisance. That is why we have
-chosen to use one of the perl modules--they do allow certain
-freedom when talking dates. You can either read the instructions
-at the
-http://search.cpan.org/dist/TimeDate/lib/Date/Parse.pm#EXAMPLE_DATES[Date::Parse
-examples page].
-
-or just rely on common sense and try stuff like:
-
-	3:00          (today at 3am)
-	15:00         (today at 3pm)
-	2007/9/1 2pm  (September 1st at 2pm)
-
-`hb_report` will (probably) complain if it can't figure out what do
-you mean.
-
-Try to delimit the event as close as possible in order to reduce
-the size of the report, but still leaving a minute or two around
-for good measure.
-
-Note that `-f` is not an optional option. And don't forget to quote
-dates when they contain spaces.
-
-It is also possible to extract a CTS test. Just prefix the test
-number with `cts:` in the `-f` option.
-
-Should I send all this to the rest of Internet?
------------------------------------------------
-
-We make an effort to remove sensitive data from the Heartbeat
-configuration (CIB, ha.cf, and transition graphs). However, you
-_have_ to tell us what is sensitive! Use the `-p` option to specify
-additional regular expressions to match variable names which may
-contain information you don't want to leak. For example:
-
-	# hb_report -f 18:00 -p "user.*" -p "secret.*" /var/tmp/report
-
-We look by default for variable names matching "pass.*" and the
-stonith_host ha.cf directive.
-
-Logs and other files are not filtered. Please filter them
-yourself if necessary.
-
-Logs
-----
-
-It may be tricky to find syslog logs. The scheme used is to log a
-unique message on all nodes and then look it up in the usual
-syslog locations. This procedure is not foolproof, in particular
-if the syslog files are in a non-standard directory. We look in
-/var/log /var/logs /var/syslog /var/adm /var/log/ha
-/var/log/cluster. In case we can't find the logs, please supply
-their location:
-
-	# hb_report -f 5pm -l /var/log/cluster1/ha-log -S /tmp/report_node1
-
-If you have different log locations on different nodes, well,
-perhaps you'd like to make them the same and make life easier for
-everybody.
-
-The log files are collected from all hosts where found. In case
-your syslog is configured to log to both the log server and local
-files and `hb_report` is run on the log server you will end up with
-multiple logs with same content.
-
-Files starting with "ha-" are preferred. In case syslog sends
-messages to more than one file, if one of them is named ha-log or
-ha-debug those will be favoured to syslog or messages.
-
-If there is no separate log for Heartbeat, possibly unrelated
-messages from other programs are included. We don't filter logs,
-just pick a segment for the period you specified.
-
-NB: Don't have a central log host? Read the CTS README and setup
-one.
-
-Manual report collection
-------------------------
-
-So, your ssh doesn't work. In that case, you will have to run
-this procedure on all nodes. Use `-S` so that we don't bother with
-ssh:
-
-	# hb_report -f 5:20pm -t 5:30pm -S /tmp/report_node1
-
-If you also have a log host which is not in the cluster, then
-you'll have to copy the log to one of the nodes and tell us where
-it is:
-
-	# hb_report -f 5:20pm -t 5:30pm -l /var/tmp/ha-log -S /tmp/report_node1
-
-Furthermore, to prevent `hb_report` from asking you to edit the
-report to describe the problem on every node use `-D` on all but
-one:
-
-	# hb_report -f 5:20pm -t 5:30pm -DS /tmp/report_node1
-
-If you reconsider and want the ssh setup, take a look at the CTS
-README file for instructions.
-
-Analysis
---------
-
-The point of analysis is to get out the most important
-information from probably several thousand lines worth of text.
-Perhaps this should be more properly named as report review as it
-is rather simple, but let's pretend that we are doing something
-utterly sophisticated.
-
-The analysis consists of the following:
-
-- compare files coming from different nodes; if they are equal,
-  make one copy in the top level directory, remove duplicates,
-  and create soft links instead
-- print errors, warnings, and lines matching `-L` patterns from logs
-- report if there were coredumps and by whom
-- report crm_verify results
-
-The goods
----------
-
-1. Common
-+
-- ha-log (if found on the log host)
-- description.txt (template and user report)
-- analysis.txt
-
-2. Per node
-+
-- ha.cf
-- logd.cf
-- ha-log (if found)
-- cib.xml (`cibadmin -Ql` or `cp` if Heartbeat is not running)
-- ccm_tool.txt (`ccm_tool -p`)
-- crm_mon.txt (`crm_mon -1`)
-- crm_verify.txt (`crm_verify -V`)
-- pengine/ (only on DC, directory with pengine transitions)
-- sysinfo.txt (static info)
-- sysstats.txt (dynamic info)
-- backtraces.txt (if coredumps found)
-- DC (well...)
-- RUNNING or STOPPED
-
+Lynx or w3m or user-defined HTML2TXT required to convert hb_report.html to hb_report.txt
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/Makefile
--- heartbeat-2.1.3/doc/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/doc/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,664 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# doc/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/doc
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/doc
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = $(datadir)/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# doc: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+htmlfiles = HardwareGuide.html	\
+			GettingStarted.html	\
+			Requirements.html	\
+			faqntips.html		\
+			hb_report.html	\
+			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)
+EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/cibadmin.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+crm_resource.8: $(top_builddir)/config.status $(srcdir)/crm_resource.8.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	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 \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  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"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  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"; \
+	done
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	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 \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  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"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  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"; \
+	done
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS) $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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)
+	rm -fr ChangeLog
+	sed -e '1,/^%changelog/d' -e '/^%/,$$d' < $(SPECSRC) > $@
+
+hb_report.txt: hb_report.html
+    @true : in this case .txt is the master source
+
+%.txt: %.html
+	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/doc/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/doc/Makefile.in
--- heartbeat-2.1.3/doc/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/doc/Makefile.in	2008-08-18 23:37:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = startstop cibadmin.8 crm_resource.8
@@ -94,6 +94,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -111,24 +112,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -190,12 +179,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/Makefile
--- heartbeat-2.1.3/fencing/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/fencing/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,652 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# fencing/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = stonithd test
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/Makefile.in
--- heartbeat-2.1.3/fencing/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/fencing/Makefile.in	2008-08-18 23:37:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,6 +88,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -105,24 +106,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -184,12 +173,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -458,8 +448,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/stonithd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/stonithd/Makefile
--- heartbeat-2.1.3/fencing/stonithd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/fencing/stonithd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,658 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# fencing/stonithd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing/stonithd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing/stonithd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#  File: Makefile.am
+#  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+#  Copyright (c) 2004 International Business Machines
+#
+# 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., 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 = 65
+halibdir = $(libdir)/heartbeat
+havarlibdir = $(localstatedir)/lib/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
+		    $(top_builddir)/lib/hbclient/libhbclient.la  \
+                    $(top_builddir)/lib/pils/libpils.la		\
+		    $(top_builddir)/lib/stonith/libstonith.la	\
+		    $(top_builddir)/lib/apphb/libapphb.la	\
+		    $(GLIBLIB)
+
+stonithd_SOURCES = stonithd.c
+stonithd_LDFLAGS = $(COMMONLIBS)   \
+		   $(top_builddir)/lib/fencing/libstonithd.la
+
+AM_CFLAGS = $(INCLUDES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+stonithd$(EXEEXT): $(stonithd_OBJECTS) $(stonithd_DEPENDENCIES) 
+	@rm -f stonithd$(EXEEXT)
+	$(stonithd_LINK) $(stonithd_OBJECTS) $(stonithd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/stonithd.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+
+# need to make stonithd's owner as hacluster:haclient?
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)/$(havarlibdir)/fencing
+	-chgrp $(apigid) $(DESTDIR)/$(havarlibdir)/fencing
+	chmod 750 $(DESTDIR)/$(havarlibdir)/fencing
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/stonithd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/stonithd/Makefile.in
--- heartbeat-2.1.3/fencing/stonithd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/fencing/stonithd/Makefile.in	2008-08-18 23:37:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -53,7 +53,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -101,6 +101,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -118,24 +119,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -197,12 +186,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -419,8 +409,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -482,8 +472,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -495,8 +485,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -506,13 +496,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/stonithd/stonithd.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/stonithd/stonithd.c
--- heartbeat-2.1.3/fencing/stonithd/stonithd.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/fencing/stonithd/stonithd.c	2008-08-18 13:32:19.000000000 +0100
@@ -73,7 +73,7 @@
 #include <assert.h>
 #define ST_ASSERT(cond) assert(cond)
 
-#define REBOOT_BLOCK_TIMEOUT 90*1000
+#define REBOOT_BLOCK_TIMEOUT 10*1000
 
 /* For integration with heartbeat */
 #define MAXCMP 80
@@ -301,6 +301,7 @@
 static void remove_shm_hostlist(pid_t pid);
 static gboolean hostlist2shmem(int shmid,char **hostlist,int maxlist);
 static char ** shmem2hostlist(pid_t pid);
+static char ** copyshmem(char *s);
 static void record_new_srsc(stonithRA_ops_t *ra_op);
 
 static struct api_msg_to_handler api_msg_to_handlers[] = {
@@ -2863,7 +2864,7 @@
 	StonithNVpair*	snv;
 	Stonith *	stonith_obj = NULL;
 	char 		buf_tmp[40];
-	int		shmid=0, shmsize=0;
+	int		shmid=0, shmsize=MAXNODE*(64+1);
 	char **		hostlist;
 
 	/* Check the parameter */
@@ -2883,7 +2884,6 @@
 		goto probe_status;
 	}
 
-	shmsize = hb->llc_ops->num_nodes(hb)*(HOSTLENG+1)+1;
 	shmid = shmget(IPC_PRIVATE, shmsize, (SHM_R | SHM_W));
 	if( shmid < 0 ) {
 		stonithd_log(LOG_ERR,"%s:%d: shmget failed: %s",
@@ -3028,6 +3028,7 @@
 hostlist2shmem(int shmid,char **hostlist,int maxlist)
 {
 	char *s, *q, **h;
+	int rc = TRUE;
 
 	if( !hostlist ) {
 		return FALSE;
@@ -3037,15 +3038,20 @@
 			__FUNCTION__, __LINE__, strerror(errno));
 		return FALSE;
 	}
-	for( q = s, h = hostlist; *h; q += strlen(q)+1, h++ ) {
+	q = s;
+	for( h = hostlist; *h; h++ ) {
+		if( !TEST && !strcmp(*h, local_nodename) ) {
+			continue; /* we can't reset ourselves */
+		}
 		if( q-s+strlen(*h)+1 > maxlist-1 ) {
 			stonithd_log(LOG_ERR,"%s:%d: size of node "
 				"list exceeds storage: skipping %s",
 				__FUNCTION__, __LINE__, *h);
+			rc = FALSE;
+			break;
 		}
-		else {
-			strcpy(q,*h);
-		}
+		strcpy(q,*h);
+		q += strlen(q)+1;
 	}
 	*q = '\0'; /* additional '\0' to end the list */
 	stonith_free_hostlist(hostlist);
@@ -3054,7 +3060,10 @@
 			__FUNCTION__, __LINE__, strerror(errno));
 		return FALSE;
 	}
-	return TRUE;
+	if( q == s ) { /* oops, no hosts configured */
+		rc = FALSE;
+	}
+	return rc;
 }
 
 /* build the hostlist from the shmem segment
@@ -3064,8 +3073,7 @@
 shmem2hostlist(pid_t pid)
 {
 	struct hostlist_shmseg *p;
-	int n;
-	char *s, *q, **h, **hostlist;
+	char *s, **hostlist;
 
 	if( !(p = lookup_shm_hostlist(pid)) ) {
 		stonithd_log(LOG_ERR, "%s: no hostlist found for pid %d"
@@ -3078,8 +3086,29 @@
 			__FUNCTION__, __LINE__, strerror(errno));
 		return NULL;
 	}
+	hostlist = copyshmem(s);
+	if( shmdt(s) == -1 ) {
+		stonithd_log(LOG_ERR,"%s:%d: shmdt failed: %s",
+			__FUNCTION__, __LINE__, strerror(errno));
+		stonith_free_hostlist(hostlist);
+		return NULL;
+	}
+	remove_shm_hostlist(pid);
+	return_to_dropped_privs();
+	return hostlist;
+}
+
+static char **
+copyshmem(char *s)
+{
+	int n;
+	char *q, **h, **hostlist;
+
 	for( q = s, n = 0; *q; q += strlen(q)+1, n++ )
 		;
+	if( n == 0 ) {
+		return NULL;
+	}
 	if( !(hostlist = (char **)cl_calloc(sizeof(char *),(n+1))) ) {
 		stonithd_log(LOG_ERR, "out of memory");
 		return NULL;
@@ -3087,17 +3116,11 @@
 	for( q = s, h = hostlist; *q; q += strlen(q)+1, h++ ) {
 		if( !(*h = (char *)cl_malloc(strlen(q)+1)) ) {
 			stonithd_log(LOG_ERR, "out of memory");
+			stonith_free_hostlist(hostlist);
 			return NULL;
 		}
 		strcpy(*h,q);
 	}
-	if( shmdt(s) == -1 ) {
-		stonithd_log(LOG_ERR,"%s:%d: shmdt failed: %s",
-			__FUNCTION__, __LINE__, strerror(errno));
-		return NULL;
-	}
-	remove_shm_hostlist(pid);
-	return_to_dropped_privs();
 	return hostlist;
 }
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/test/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/test/Makefile
--- heartbeat-2.1.3/fencing/test/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/fencing/test/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,677 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# fencing/test/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing/test
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/fencing/test
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#  File: Makefile.am
+#  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+#  Copyright (c) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+havarlibdir = $(localstatedir)/lib/heartbeat
+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_SOURCES = apitest.c
+apitest_LDFLAGS = $(COMMONLIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)/$@
+install-apitestPROGRAMS: $(apitest_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(apitestPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(apitestdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(apitestPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(apitestdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-apitestPROGRAMS:
+	@$(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"; \
+	done
+
+clean-apitestPROGRAMS:
+	@list='$(apitest_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+apitest$(EXEEXT): $(apitest_OBJECTS) $(apitest_DEPENDENCIES) 
+	@rm -f apitest$(EXEEXT)
+	$(apitest_LINK) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
+install-testSCRIPTS: $(test_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-testSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/apitest.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-apitestPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/test/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/test/Makefile.in
--- heartbeat-2.1.3/fencing/test/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/fencing/test/Makefile.in	2008-08-18 23:37:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = STONITHDBasicSanityCheck
@@ -57,7 +57,7 @@
 	$(LDFLAGS) -o $@
 testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(test_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -105,6 +105,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -122,24 +123,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -201,12 +190,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -423,8 +413,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(apitestPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(apitestdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(apitestPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(apitestdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -505,8 +495,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -518,8 +508,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -529,13 +519,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/test/STONITHDBasicSanityCheck /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/test/STONITHDBasicSanityCheck
--- heartbeat-2.1.3/fencing/test/STONITHDBasicSanityCheck	2007-12-21 20:45:51.000000000 +0000
+++ heartbeat-2.1.4/fencing/test/STONITHDBasicSanityCheck	2008-12-29 22:12:09.000000000 +0000
@@ -38,23 +38,23 @@
 
 	# Add stonith resource.
 	$LRMADMIN -A s1 stonith null NULL hostlist=$MYSELF
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Start stonith resource, equal to initializing the stonith device.
 	$LRMADMIN -E s1 start 0 0 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonith operation: query
 	$APITEST $QUERY $MYSELF $TIMEOUT 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonith operation: reset
 	$APITEST $RESET $MYSELF $TIMEOUT 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonithd's error handling - to stonith an unaccessible host
 	$APITEST $POWEROFF notexist $TIMEOUT 2
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 }
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/fencing/test/STONITHDBasicSanityCheck.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/fencing/test/STONITHDBasicSanityCheck.in
--- heartbeat-2.1.3/fencing/test/STONITHDBasicSanityCheck.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/fencing/test/STONITHDBasicSanityCheck.in	2008-08-18 13:32:19.000000000 +0100
@@ -38,23 +38,23 @@
 
 	# Add stonith resource.
 	$LRMADMIN -A s1 stonith null NULL hostlist=$MYSELF
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Start stonith resource, equal to initializing the stonith device.
 	$LRMADMIN -E s1 start 0 0 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonith operation: query
 	$APITEST $QUERY $MYSELF $TIMEOUT 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonith operation: reset
 	$APITEST $RESET $MYSELF $TIMEOUT 0
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 
 	# Test stonithd's error handling - to stonith an unaccessible host
 	$APITEST $POWEROFF notexist $TIMEOUT 2
-	[ $? -eq 0 ] || let ERR_COUNT++ 
+	[ $? -eq 0 ] || ERR_COUNT=$(($ERR_COUNT + 1))
 }
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/config.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/config.c
--- heartbeat-2.1.3/heartbeat/config.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/config.c	2008-08-18 13:32:19.000000000 +0100
@@ -2650,12 +2650,12 @@
 	,	{"apiauth", "attrd   	uid=" HA_CCMUSER}
 	,	{"apiauth", "crmd   	uid=" HA_CCMUSER}
 
-	,	{"failfast"," "HA_CCMUSER " "HA_LIBHBDIR"/ccm"}
-	,	{"failfast"," "HA_CCMUSER " "VALGRIND_BIN" "HA_LIBHBDIR"/cib"}
+	,	{"respawn"," "HA_CCMUSER " "HA_LIBHBDIR"/ccm"}
+	,	{"respawn"," "HA_CCMUSER " "VALGRIND_BIN" "HA_LIBHBDIR"/cib"}
 	,	{"respawn", "root "          HA_LIBHBDIR"/lrmd -r"}
 	,	{"respawn", "root "	     HA_LIBHBDIR"/stonithd"}
 	,	{"respawn", " "HA_CCMUSER " "VALGRIND_BIN" "HA_LIBHBDIR"/attrd" }
-	,	{"failfast"," "HA_CCMUSER " "VALGRIND_BIN" "HA_LIBHBDIR"/crmd"}
+	,	{"respawn"," "HA_CCMUSER " "VALGRIND_BIN" "HA_LIBHBDIR"/crmd"}
 		/* Don't 'respawn' pingd - it's a resource agent */
 	};
     
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/ha_msg_internal.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/ha_msg_internal.c
--- heartbeat-2.1.3/heartbeat/ha_msg_internal.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/ha_msg_internal.c	2008-08-18 13:32:19.000000000 +0100
@@ -81,6 +81,7 @@
 	int		noseqno;
 	const char *	to;
 	cl_uuid_t	touuid;
+	char uuidstr[UU_UNPARSE_SIZEOF];
 	
 
 	/* if F_TO field is present
@@ -104,7 +105,9 @@
 				ha_log(LOG_WARNING, " adding field to message failed");
 			}
 		}else {
-			ha_log(LOG_WARNING, " nodename not found for uuid");
+			memset(uuidstr,0,UU_UNPARSE_SIZEOF);
+			cl_uuid_unparse(&touuid, uuidstr);
+			ha_log(LOG_WARNING,"nodename not found for uuid %s",uuidstr);
 		}
 	}
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/init.d/heartbeat /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/init.d/heartbeat
--- heartbeat-2.1.3/heartbeat/init.d/heartbeat	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/init.d/heartbeat	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,480 @@
+#!/bin/sh
+#
+#
+# heartbeat     Start high-availability services
+#
+# Author:       Alan Robertson	<alanr@unix.sh>
+# License:      GNU General Public License (GPL)
+#
+#		This script works correctly under SuSE, Debian,
+#		Conectiva, Red Hat and a few others.  Please let me know if it
+#		doesn't work under your distribution, and we'll fix it.
+#		We don't hate anyone, and like for everyone to use
+#		our software, no matter what OS or distribution you're using.
+#
+# chkconfig: 2345 75 05
+# description: Startup script high-availability services.
+# processname: heartbeat
+# pidfile: /var/run/heartbeat.pid
+# config: /etc/ha.d/ha.cf
+#
+### BEGIN INIT INFO
+# Description: heartbeat is a basic high-availability subsystem.
+#	It will start services at initialization, and when machines go up
+#	or down.  This version will also perform IP address takeover using
+#	gratuitous ARPs.  It works correctly for a 2-node configuration,
+#	and is extensible to larger configurations.
+#	
+#	It implements the following kinds of heartbeats:
+#		- Bidirectional Serial Rings ("raw" serial ports)
+#		- UDP/IP broadcast (ethernet, etc)
+#		- UDP/IP multicast (ethernet, etc)
+#		- Unicast heartbeats
+#		- "ping" heartbeats (for routers, switches, etc.)
+#	   	(to be used for breaking ties in 2-node systems
+#		 and monitoring networking availability)
+#
+# Short-Description: High-availability services.
+# Provides: heartbeat HA
+# Required-Start: $remote_fs $network $time $syslog
+# Should-Start: openhpid
+# Required-Stop: $remote_fs $network $time $syslog
+# Should-stop: openhpid
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+
+
+HA_DIR=/etc/ha.d; export HA_DIR
+CONFIG=$HA_DIR/ha.cf
+. $HA_DIR/shellfuncs
+
+LOCKDIR=/var/lock/subsys
+RUNDIR=/var/run
+
+
+#	Echo without putting a newline on the end
+EchoNoNl() {
+    Echo  "$@"
+}
+
+#	Echo with escapes enabled...
+EchoEsc() {
+    Echo  "$@"
+}
+
+echo_failure() {
+    EchoEsc " Heartbeat failure [rc=$1]. $rc_failed"
+    return $1
+}
+
+echo_success() {
+    : Cool!  It started!
+    EchoEsc "$rc_done"
+}
+
+if
+  [ -r /etc/SuSE-release ]
+then
+  # rc.status is new since SuSE 7.0
+  [ -r /etc/rc.status ] && . /etc/rc.status
+  [ -r /etc/rc.config ] && . /etc/rc.config
+
+  # Determine the base and follow a runlevel link name.
+  base=${0##*/}
+  link=${base#*[SK][0-9][0-9]}
+
+fi
+if
+  [ -z "$rc_done" ]
+then
+  rc_done="Done."
+  rc_failed="Failed."
+  rc_skipped="Skipped."
+fi
+
+
+# exec 2>>/var/log/ha-debug
+
+#	This should probably be it's own autoconf parameter
+#	because RH has moved it from time to time...
+#	and I suspect Conectiva and Mandrake also supply it.
+
+DISTFUNCS=/etc/rc.d/init.d/functions
+SUBSYS=heartbeat
+MODPROBE=/sbin/modprobe
+US=`uname -n`
+
+# Set this to a 1 if you want to automatically load kernel modules
+USE_MODULES=1
+
+[ -x $HA_BIN/heartbeat ] || exit 0
+
+#
+#	Some environments like it if we use their functions...
+#
+if
+  [ ! -x $DISTFUNCS ]
+then
+  # Provide our own versions of these functions
+  status() {
+	$HA_BIN/heartbeat -s
+  }
+  echo_failure() {
+      EchoEsc " Heartbeat failure [rc=$1]. $rc_failed"
+      return $1
+  }
+  echo_success() {
+	: Cool!  It started!
+      EchoEsc "$rc_done"
+  }
+else
+  . $DISTFUNCS
+fi
+
+#
+#	See if they've configured things yet...
+#
+if
+  [ ! -f $CONFIG ]
+then
+  EchoNoNl "Heartbeat not configured: $CONFIG not found."
+  echo_failure 1
+  exit 0
+fi
+
+CrmEnabled() {
+  case `ha_parameter crm | tr '[A-Z]' '[a-z]'` in
+    y|yes|enable|on|true|1|manual)	true;;
+    *)				false;;
+  esac
+}
+StartLogd() {
+
+    $HA_BIN/ha_logd -s >/dev/null 2>&1
+
+    if 
+	[ $? -eq 0 ]
+    then
+	Echo "logd is already running" 
+	return 0
+    fi
+    
+
+    $HA_BIN/ha_logd -d >/dev/null 2>&1
+    if 
+	[ $? -ne 0 ]
+    then
+	Echo "starting logd failed"
+    fi
+    
+}
+
+StopLogd() {
+    $HA_BIN/ha_logd -s >/dev/null 2>&1
+    
+    if 
+	[ $? -ne 0 ] 
+    then
+	   Echo "logd is already stopped" 
+	   return 0
+    fi
+
+    $HA_BIN/ha_logd -k >/dev/null 2>&1
+    if 
+	[ $? -ne 0 ]	
+    then
+	Echo "stopping logd failed"
+    fi    
+}
+
+init_watchdog() {
+  if
+    [  -f /proc/devices -a  -x $MODPROBE ]
+  then
+    init_watchdog_linux
+  fi
+}
+
+#
+#	Install the softdog module if we need to
+#
+init_watchdog_linux() {
+#
+# 	We need to install it if watchdog is specified in $CONFIG, and
+#	/dev/watchdog refers to a softdog device, or it /dev/watchdog
+#	doesn't exist at all.
+#
+#	If we need /dev/watchdog, then we'll make it if necessary.
+#
+#	Whatever the user says we should use for watchdog device, that's
+#	what we'll check for, use and create if necessary.  If they misspell
+#	it, or don't put it under /dev, so will we.
+#	Hope they do it right :-)
+#
+#
+  insmod=no
+  # What do they think /dev/watchdog is named?
+  MISCDEV=`grep ' misc$' /proc/devices | cut -c1-4`
+  MISCDEV=`Echo $MISCDEV`
+  WATCHDEV=`ha_parameter watchdog`
+  WATCHDEV=`Echo $WATCHDEV`
+  if
+    [ "X$WATCHDEV" != X ]
+  then
+    : Watchdog requested by $CONFIG file
+  #
+  #	We try and modprobe the module if there's no dev or the dev exists
+  #	and points to the softdog major device.
+  #
+    if
+      [ ! -c "$WATCHDEV" ]
+    then
+      insmod=yes
+    else
+      case `ls -l "$WATCHDEV" 2>/dev/null` in
+      *$MISCDEV,*)
+	    insmod=yes;;
+      *)	: "$WATCHDEV isn't a softdog device (wrong major)" ;;
+      esac
+    fi
+  else
+    : No watchdog device specified in $CONFIG file.
+  fi
+  case $insmod in
+    yes)
+      if
+        grep softdog /proc/modules >/dev/null 2>&1 
+      then
+        : softdog already loaded
+      else
+        $MODPROBE softdog nowayout=0 >/dev/null 2>&1
+      fi;;
+  esac
+  if
+    [ "X$WATCHDEV" != X -a ! -c "$WATCHDEV" -a $insmod = yes ]
+  then
+    minor=`cat /proc/misc | grep watchdog | cut -c1-4`
+    mknod -m 600 $WATCHDEV c $MISCDEV $minor
+  fi
+} # init_watchdog_linux()
+
+
+#
+#	Start the heartbeat daemon...
+#
+
+start_heartbeat() {
+  if
+    ERROR=`$HA_BIN/heartbeat 2>&1`
+  then
+    : OK
+  else
+    return $?
+  fi
+}
+
+
+#
+#	Start Linux-HA
+#
+
+StartHA() {
+  EchoNoNl "Starting High-Availability services: "
+
+  if
+    CrmEnabled
+  then
+    : OK
+  else
+    $HA_NOARCHBIN/ResourceManager verifyallidle
+  fi
+  if
+    [ $USE_MODULES = 1 ]
+  then
+    #	Create /dev/watchdog and load module if we should
+    init_watchdog
+  fi
+  rm -f $RUNDIR/ppp.d/*
+  if
+    [ ! -d $RUNDIR/heartbeat ]
+  then
+    mkdir -p $RUNDIR/heartbeat/ccm
+    mkdir -p $RUNDIR/heartbeat/crm
+    chown -R hacluster:haclient $RUNDIR/heartbeat
+    chmod -R 750 $RUNDIR/heartbeat
+  fi
+  if
+    [  -f $HA_DIR/ipresources -a ! -f $HA_DIR/haresources ]
+  then
+    mv $HA_DIR/ipresources $HA_DIR/haresources
+  fi
+  #	Start heartbeat daemon
+  if
+    start_heartbeat
+  then
+    echo_success
+    return 0 
+  else
+    RC=$?
+    echo_failure $RC
+    if [ ! -z "$ERROR" ]; then
+      Echo
+      Echo "$ERROR"
+    fi 
+    return $RC
+  fi
+}
+
+#
+#	Ask heartbeat to stop.  It will give up its resources...
+#
+StopHA() {
+  EchoNoNl "Stopping High-Availability services: "
+
+  if
+    $HA_BIN/heartbeat -k >/dev/null 2>&1	# Kill it
+  then
+    echo_success
+    return 0
+  else
+    RC=$?
+    echo_failure $RC
+    return $RC
+  fi
+}
+
+StatusHA() {
+  $HA_BIN/heartbeat -s
+}
+
+StandbyHA() {
+  auto_failback=`ha_parameter auto_failback | tr '[A-Z]' '[a-z]'`
+  nice_failback=`ha_parameter nice_failback | tr '[A-Z]' '[a-z]'`
+
+  case "$auto_failback" in
+    *legacy*)	echo "auto_failback is set to legacy.  Cannot enter standby."
+		exit 1;;
+  esac
+  case "$nice_failback" in
+    *off*)	echo "nice_failback is disabled.  Cannot enter standby."
+		exit 1;;
+  esac
+  case "${auto_failback}${nice_failback}" in
+    "")	echo "auto_failback defaulted to legacy.  Cannot enter standby."
+		exit 1;;
+  esac
+
+  echo "auto_failback: $auto_failback"
+  if
+    StatusHA >/dev/null 2>&1
+  then
+    EchoNoNl "Attempting to enter standby mode"
+    if
+      $HA_NOARCHBIN/hb_standby
+    then
+      # It's impossible to tell how long this will take.
+      echo_success
+    else
+      echo_failure $?
+    fi
+  else
+    Echo "Heartbeat is not currently running."
+    exit 1
+  fi
+}
+
+#
+#	Ask heartbeat to restart.  It will *keep* its resources
+#
+ReloadHA() {
+  EchoNoNl "Reloading High-Availability services: "
+
+  if
+    $HA_BIN/heartbeat -r # Restart, and keep your resources
+  then
+    echo_success
+    return 0
+  else
+    RC=$?
+    echo_failure $RC
+    return $RC
+  fi
+}
+
+RunStartStop() {
+  # Run pre-startup script if it exists
+  if
+    [  -f $HA_DIR/resource.d/startstop ]
+  then
+    $HA_DIR/resource.d/startstop  "$@"
+  fi
+}
+
+RC=0
+# See how we were called.
+
+case "$1" in
+  start)
+	StartLogd
+	RunStartStop pre-start
+	StartHA
+	RC=$?
+	Echo
+	if
+	  [ $RC -eq 0 ]
+	then
+	  [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR
+	  touch $LOCKDIR/$SUBSYS
+	fi
+	RunStartStop post-start $RC
+	;;
+
+  standby)
+	StandbyHA
+        RC=$?;;
+
+  status)
+	StatusHA
+	RC=$?;;
+
+  stop)
+	RunStartStop "pre-stop"
+	StopHA
+	RC=$?
+	Echo
+        if
+          [ $RC -eq 0 ]
+        then
+          rm -f $LOCKDIR/$SUBSYS
+        fi
+        RunStartStop post-stop $RC
+	StopLogd
+	;;
+
+  restart)
+        sleeptime=`ha_parameter deadtime`
+	StopHA
+	Echo
+	EchoNoNl Waiting to allow resource takeover to complete:
+	sleep $sleeptime
+	sleep 10 # allow resource takeover to complete (hopefully).
+	echo_success
+	Echo
+	StartHA
+	Echo
+	;;
+
+  force-reload|reload)
+	ReloadHA
+	Echo
+	RC=$?
+	;;
+
+  *)
+	Echo "Usage: $0 {start|stop|status|restart|reload|force-reload}"
+	exit 1
+esac
+
+exit $RC
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/init.d/heartbeat.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/init.d/heartbeat.in
--- heartbeat-2.1.3/heartbeat/init.d/heartbeat.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/init.d/heartbeat.in	2008-08-18 13:32:19.000000000 +0100
@@ -333,7 +333,7 @@
   EchoNoNl "Stopping High-Availability services: "
 
   if
-    $HA_BIN/heartbeat -k &> /dev/null	# Kill it
+    $HA_BIN/heartbeat -k >/dev/null 2>&1	# Kill it
   then
     echo_success
     return 0
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/init.d/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/init.d/Makefile
--- heartbeat-2.1.3/heartbeat/init.d/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/init.d/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/init.d/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/init.d
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/init.d
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+initddir = /etc/init.d
+initd_SCRIPTS = heartbeat
+EXTRA_DIST = heartbeat.in
+all: all-am
+
+.SUFFIXES:
+$(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
+.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)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(initddir)
+	@list='$(initd_SCRIPTS)'; for p in $$list; do \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(initddir)/$$f"; \
+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(initddir)/$$f; \
+	  elif test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(initddir)/$$f"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(initddir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-initdSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(initd_SCRIPTS)'; for p in $$list; do \
+	  f="`echo $$p|sed '$(transform)'`"; \
+	  echo " rm -f $(DESTDIR)$(initddir)/$$f"; \
+	  rm -f $(DESTDIR)$(initddir)/$$f; \
+	done
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/init.d/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/init.d/Makefile.in
--- heartbeat-2.1.3/heartbeat/init.d/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/init.d/Makefile.in	2008-08-18 23:37:56.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = heartbeat
@@ -81,6 +81,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -98,24 +99,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -177,12 +166,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/BasicSanityCheck /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/BasicSanityCheck
--- heartbeat-2.1.3/heartbeat/lib/BasicSanityCheck	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/BasicSanityCheck	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,1077 @@
+#!/bin/sh
+#
+#   Support:      linux-ha-dev@lists.tummy.com
+#   License:      GNU General Public License (GPL)
+#
+#	Basic tests of sanity for a newly-built version of
+#	linux-HA software (heartbeat)
+#
+#	Conditions for running:
+#
+#	Heartbeat must be installed.
+#
+#	Must be root.
+#
+#	CANNOT have a real heartbeat configuration.
+#
+#	Must have networking configured with one working
+#		network interface.
+#
+#	should not have $TESTIP below used for anything ;-)
+#
+#	should have multicast address $MCASTIP port 694
+#		available
+#		(you don't need a multicast capable router).
+#
+#
+# Note: you might have to change TESTIP and MCASTIP
+#
+DEFAULTINTERFACE="" #  Used when all guesses fail (which they shouldnt)
+TESTIP=10.253.252.251
+MCASTIP=225.224.223.222
+#
+IFCONFIG="/sbin/ifconfig -a"
+HADIR=/etc/ha.d
+HBSCRIPT=/etc/init.d/heartbeat
+STONITH=/usr/sbin/stonith
+OCF_TESTER=/usr/sbin/ocf-tester
+LIBDIR=/usr/lib/
+HBLIB=/usr/lib/heartbeat
+SCRIPTDIR=/usr/share/heartbeat
+APPHBD=$HBLIB/apphbd
+CLSTATUS=/usr/bin/cl_status
+APPHBTEST=$HBLIB/apphbtest
+IPCTEST=$HBLIB/ipctest
+MGMTDTEST=$SCRIPTDIR/mgmtdtest
+LRMTEST=$SCRIPTDIR/lrmtest/LRMBasicSanityCheck
+STONITHDTEST=$SCRIPTDIR/stonithdtest/STONITHDBasicSanityCheck
+CRMTEST="/usr/bin/python $SCRIPTDIR/cts/CTSlab.py --bsc"
+SNMPAGENTTEST=$SCRIPTDIR/SNMPAgentSanityCheck
+BASE64_MD5_TEST=$HBLIB/base64_md5_test
+MALLOC_CHECK_=2; export MALLOC_CHECK_
+TESTPROG=/usr/bin/test
+#
+IDENTSTRING="Linux-HA TEST configuration file - REMOVEME!!"
+DUMMYNODE=ImAlwaysDead.com
+LOCALNODE=`uname -n`
+RSCDIR=$HADIR/resource.d
+PATH=$PATH:/sbin:/usr/sbin
+export PATH
+
+# Some signals to trap and act on
+SIGLIST="0 1 2 3 6 15"
+
+errcount=0
+
+# Make a safe place to store logs
+maketempdir()
+{
+	i=1
+	tmp=""
+
+	while [ $i -gt 0 ]; do
+		tmp="/tmp/lha-dir-$$-$i"
+		if (umask 077 && mkdir "$tmp"); then
+			echo "$tmp"
+			return 0
+		fi
+		i=$((i+1))
+	done
+
+	echo "Could not create tempoary directory to store logs" >& 2
+	return 1
+}
+
+LOGDIR=`maketempdir` || exit 1
+LOGFILE="$LOGDIR/log"
+touch "$LOGFILE"
+
+# CTSlab.py needs this otherwise it hangs.
+# Presumably it tries to stat or open the log file after
+# relinquishing root privileges. It would be nice to get to
+# the bottom of this and make a cleaner fix.
+chmod o+x "$LOGDIR"
+
+cd $HADIR
+ulimit -c unlimited
+
+
+GetAllIFNames() {
+
+    if [ "apple" = "unknown" ]; then
+	# "flags=8863" signifies an active interface that supports tcp
+	$IFCONFIG | grep '^[a-zA-Z]' | grep "flags=8863" | sed 's%:* .*%%'
+    else
+	$IFCONFIG | grep '^[a-zA-Z]' | sed 's%:* .*%%'
+    fi
+}
+
+GuessIFname() {
+  # Machines with multiple nics rarely got this right
+  #  using ip and route should prove much more reliable
+  #  for those that have it
+
+  external_host=123.0.0.1
+  if
+    [ -x /sbin/ip ]
+  then
+    /sbin/ip r g $external_host | head -n 1 | awk '{print $5}'
+  else
+    route get $external_host | grep interface | awk '{print $2}'
+  fi
+}
+
+INTERFACE=`GuessIFname`
+if
+  [ "x" = "x$INTERFACE" ]
+then
+  INTERFACE=`GetAllIFNames | grep -v '^lo' | head -n 1`
+fi
+
+if
+  [ "x" = "x$INTERFACE" ]
+then
+  INTERFACE=$DEFAULTINTERFACE
+fi
+
+if
+  [ "x" = "x$INTERFACE" ]
+then
+  echo "No valid interface found.  Please modify DEFAULTINTERFACE in this script and re-execute"
+  exit 1
+fi
+
+echo "Using interface: $INTERFACE"
+#
+#	Is it safe to overwrite this config file?
+#
+CheckConfigFile() {
+  if
+    [ ! -f $1 ] 
+  then
+    return 0
+  fi
+  if
+    grep "$IDENTSTRING" $1 >/dev/null 2>&1
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+GenerateAuthKeys() {
+  if
+    [ "$AuthTry" = "" ]
+  then
+    AuthTry=1
+  else
+    AuthTry=`expr "$AuthTry" + 1`
+  fi
+  cat <<-! >$1
+	#	$IDENTSTRING
+	#
+	auth $AuthTry
+	1 sha1 SuperSecretKey--SHHH!!!
+	2 md5  Encript-string-for-md5!!
+	3 crc
+	!
+  chmod 600 $1
+}
+
+GenerateHaCf() {
+  cat <<-! >$1
+	#	$IDENTSTRING
+	logfile   /dev/null
+	debugfile $LOGFILE
+	keepalive 10ms
+	debug 1
+	deadtime 5
+	initdead 5
+	auto_failback on
+	stonith_host * null $LOCALNODE $DUMMYNODE
+	mcast $INTERFACE $MCASTIP 694 0 0
+	#bcast $INTERFACE
+        ping 127.0.0.1
+        ping_group pingus_please 127.0.0.1
+	node $LOCALNODE $DUMMYNODE
+	use_logd off
+	respawn hacluster $HBLIB/ccm
+	respawn hacluster $HBLIB/ipfail
+	apiauth stonithd uid=root
+	# Eventually I'd like to be able to enable this and
+	# have things work right...
+	#respawn root $HBLIB/hbagent
+	!
+  chmod 644 $1
+}
+
+GenerateCrmdHaCf() {
+  cat <<-! >$1
+	#	$IDENTSTRING
+	syslogmsgfmt true
+	logfile   /dev/null
+	debugfile $LOGFILE
+	keepalive 10ms
+	debug    1
+	deadtime 5
+	initdead 5
+	mcast $INTERFACE $MCASTIP 694 0 0
+	#bcast $INTERFACE
+        ping 127.0.0.1
+        ping_group pingus_please 127.0.0.1
+	node $LOCALNODE $DUMMYNODE
+	use_logd off
+	crm yes
+	apiauth cibmon   uid=hacluster
+	respawn hacluster $HBLIB/cibmon -d
+	respawn root $HBLIB/pingd
+	!
+  chmod 644 $1
+#	conn_logd_time 60
+#	use_logd  true
+#	respawn root $HBLIB/ha_logd -c $2
+#  cat <<-! >$2
+#	#	$IDENTSTRING
+#	logfile   /dev/null
+#	debugfile $LOGFILE
+#	#logfacility
+#	entity ha_logd
+#	#useapphbd no
+#	!
+}
+GenerateMgmtdCrmdHaCf() {
+  cat <<-! >$1
+	#	$IDENTSTRING
+	logfile   /dev/null
+	debugfile $LOGFILE
+	keepalive 10ms
+	debug    1
+	deadtime 5
+	initdead 5
+	mcast $INTERFACE $MCASTIP 694 0 0
+	#bcast $INTERFACE
+        ping 127.0.0.1
+        ping_group pingus_please 127.0.0.1
+	node $LOCALNODE $DUMMYNODE
+	use_logd off
+	crm yes
+	apiauth mgmtd   uid=root
+	respawn root $HBLIB/mgmtd -t
+	!
+  chmod 644 $1
+}
+
+GenerateHaResources() {
+  cat <<-! >$1
+	#	$IDENTSTRING
+	$DUMMYNODE IPaddr::$TESTIP/30
+	!
+  chmod 644 $1
+}
+CONFIGFILES="$HADIR/ha.cf $HADIR/authkeys $HADIR/haresources"
+CONFIGFILES="$CONFIGFILES /var/lib/heartbeat/crm/cib.xml"
+CONFIGFILES="$CONFIGFILES /var/lib/heartbeat/crm/cib.xml.last"
+CACHEFILES="/var/lib/heartbeat/hostcache  /var/lib/heartbeat/delhostcache"
+CACHEFILES="$CACHEFILES /var/lib/heartbeat/crm/cib.xml.sig"
+CACHEFILES="$CACHEFILES /var/lib/heartbeat/crm/cib.xml.sig.last"
+
+SetUpConfigFiles() {
+  if
+    HBStatus
+  then
+    echo "Should not run tests with heartbeat already running."
+  fi
+  SaveConfigFiles
+  for j in $CONFIGFILES 
+  do
+    if
+      CheckConfigFile $j
+    then
+      : OK
+    else
+      echo "OOPS! $j already exists!"
+      echo "Real configuration already set up."
+      echo "Sorry..."
+      exit 1
+    fi
+  done
+
+  GenerateAuthKeys $HADIR/authkeys
+  GenerateHaCf $HADIR/ha.cf
+  GenerateHaResources $HADIR/haresources
+  rm -f $HADIR/core
+}
+
+RemoveConfigFiles() {
+  for j in $CONFIGFILES
+  do
+    if
+      CheckConfigFile $j
+    then
+      rm -f $j
+    else
+      echo "OOPS! Cannot remove real config file $j!"
+    fi
+  done
+
+  for j in $CACHEFILES
+  do 
+	rm -f $j
+  done
+  RestoreConfigFiles
+}
+
+SaveLog() {
+  SAVELOG=/tmp/linux-ha.testlog
+  chmod a+r $LOGFILE
+  mv $LOGFILE $SAVELOG
+  rmdir "$LOGDIR"
+  echo "$errcount errors. Log file is stored in $SAVELOG"
+}
+
+RemoveConfigFilesAndSaveLogAndExit() {
+  trap "" $SIGLIST		# tidying: ignore other signals
+  RemoveConfigFiles
+  SaveLog
+  exit
+}
+
+SaveConfigFiles() {
+  cd $HADIR
+  if
+    [ ! -d .cfsave ]
+  then
+    mkdir .cfsave
+  fi
+  mv $CONFIGFILES .cfsave >/dev/null 2>&1
+  mv $CACHEFILES .cfsave >/dev/null 2>&1
+}
+
+RestoreConfigFiles() {
+ mv $HADIR/.cfsave/cib.xml*  /var/lib/heartbeat/crm/ >/dev/null 2>&1
+  mv $HADIR/.cfsave/hostcache /var/lib/heartbeat/  >/dev/null 2>&1
+  mv $HADIR/.cfsave/delhostcache /var/lib/heartbeat/ >/dev/null 2>&1
+  mv $HADIR/.cfsave/* $HADIR >/dev/null 2>&1
+}
+
+HBStart() {
+  echo "Starting heartbeat"
+  $HBSCRIPT start
+}
+
+HBStop() {
+  echo "Stopping heartbeat"
+  $HBSCRIPT stop
+}
+
+HBReload() {
+  echo "Reloading heartbeat"
+  $HBSCRIPT reload >/dev/null 2>&1
+  rc=$?
+  sleep 5
+  return $rc
+}
+
+HBStatus() {
+  case `$HBSCRIPT status 2>&1` in
+    *running*)	true;;
+    *)		false;;
+  esac
+}
+
+#
+#	Search the log file for the given grep pattern
+#
+LookForString() {
+  count=1
+  while
+    if
+      grep -i "$1" $LOGFILE
+    then
+      return 0
+    fi
+   [ $count -lt 60 ]
+  do
+    count=`expr $count + 1`
+    sleep 1
+  done
+  return 1
+}
+
+#	Check for the given count of the given string
+#	Complain unless the right number are there.
+CheckPat()
+{
+  count=`egrep -ic "$1" $LOGFILE`
+  min=$2
+  if
+    [ $# -gt 2 ]
+  then
+    max=$3
+  else
+    max=$2
+  fi
+  if
+    [ $count -lt $min -o $count -gt $max ]
+  then
+    echo "ERROR: Did not find [$2:$3] occurances of $1 in $LOGFILE `date`" 2>&1 | tee -a $LOGFILE
+    echo "ERROR: Found $count instead." | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+}
+
+TestHeartbeat() {
+  if
+    HBStatus
+  then
+    echo "That's weird.  Heartbeat seems to be running..."
+    HBStop
+  fi
+  if
+    $CLSTATUS hbstatus >/dev/null 2>&1
+  then
+    echo "$CLSTATUS shows heartbeat running" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+   
+  if
+    HBStart
+  then
+    if
+      HBStatus
+    then
+     : COOL!
+    else
+     echo "Heartbeat did not start." | tee -a $LOGFILE
+     exit 1
+    fi
+  fi
+
+ sleep 5
+
+  j=0
+  while
+    [ "$j" -lt 30 ]
+  do
+    if
+      $CLSTATUS hbstatus >/dev/null 2>&1
+    then
+       break
+    else
+      sleep 1
+    fi
+    j=`expr "$j" + 1`
+  done
+
+  if
+    $CLSTATUS hbstatus >/dev/null 2>&1
+  then
+   : OK
+  else
+    echo "$CLSTATUS shows heartbeat not running ($?)" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  for node in $LOCALNODE 127.0.0.1 pingus_please
+  do
+    if
+      $CLSTATUS nodestatus $node >/dev/null 2>&1
+    then
+     : $node status is OK
+    else
+      echo "$CLSTATUS shows status of [$node] as dead ($?)" | tee -a $LOGFILE
+      errcount=`expr $errcount + 1`
+    fi
+  done
+
+  #
+  # Heartbeat seems to be running...
+  #
+
+  if
+    LookForString "node $DUMMYNODE.*is dead" >/dev/null
+  then
+    : OK
+  else
+    echo "Does not look like we noticed $DUMMYNODE was dead" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    $CLSTATUS nodestatus $DUMMYNODE >/dev/null 2>&1
+  then
+    echo "$CLSTATUS shows $DUMMYNODE status as alive(!)" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+
+
+  if
+    LookForString "Resetting node $DUMMYNODE with" >/dev/null &&
+    LookForString "node $DUMMYNODE now reset" >/dev/null
+  then
+    : OK
+  else
+    echo "Does not look like we STONITHed $DUMMYNODE" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  
+  if
+    LookForString "IPaddr.*$TESTIP" >/dev/null
+  then
+    :  Looks good
+  else
+    echo "Does not look like we took over the IP address" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+
+  #	Wait until heartbeat thinks things are stable
+  #	that is, not in "transition"
+  for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+  do
+    if
+      STAT=`$CLSTATUS rscstatus 2>/dev/null`
+    then
+      case "$STAT" in
+        transition)
+		sleep 1
+		;;
+        all)	break
+		;;
+        *)	echo "$CLSTATUS shows resource status as $STAT" | tee -a $LOGFILE
+		break
+		;;
+      esac
+    else
+      echo "$CLSTATUS rscstatus failed [$?]" | tee -a $LOGFILE
+      break
+    fi
+  done
+  if
+    LookForString ARP >/dev/null
+  then
+    :  Looks good
+  else
+    echo "Does not look like we ARPed the address" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    $RSCDIR/IPaddr $TESTIP status >/dev/null 2>&1 &&
+    $RSCDIR/IPaddr $TESTIP monitor >/dev/null 2>&1
+  then
+    : COOL!
+  else
+    echo "Looks like monitor operation failed" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+
+  #
+  #	Reload test -- ha.cf changed
+  #
+  echo "Performing ha.cf reload test" >> $LOGFILE
+  touch $HADIR/ha.cf
+  if
+    HBReload
+  then
+    : OK! reload after touching ha.cf worked!
+  else
+    echo "Heartbeat reload operation returned $?" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    LookForString "restart exec" >/dev/null
+  then
+    :  Looks good
+  else
+    echo "Does not look like we did a restart exec." | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    HBStatus
+  then
+    : "OK - reload didn't kill anything ;-)"
+  fi
+  #
+  #	Reload test -- authkeys changed
+  #
+  echo "Performing authkeys reload test" >> $LOGFILE
+  GenerateAuthKeys $HADIR/authkeys
+  if
+    HBReload
+  then
+    : OK! reload after changing authkeys worked!
+  else
+    echo "Heartbeat reload operation returned $?" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    CheckPat "Signalling.* to reread config files" 2 >/dev/null
+  then
+    : OK
+  else
+    echo "Heartbeat did not reread config files exactly twice" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  sleep 2
+  if
+    CheckPat "restart exec" 1 >/dev/null
+  then
+    :  Looks good -- did not do another exec
+  else
+    echo "Looks like we did an extra exec" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    HBStatus
+  then
+    : "OK - reload didn't kill anything ;-)"
+  fi
+  
+  echo "Stopping heartbeat." >> $LOGFILE
+  if
+    HBStop
+  then
+    : OK!
+  else
+    echo "Heartbeat stop operation returned $?" | tee -a $LOGFILE
+    errcount=`expr $errcount + 1`
+  fi
+  if
+    HBStatus
+  then
+    echo "Looks like heartbeat did not really stop." | tee -a $LOGFILE
+    echo "You\'ll probably need to kill some processes yourself."
+    errcount=`expr $errcount + 1`
+  fi
+
+  if
+    $RSCDIR/IPaddr $TESTIP status >/dev/null 2>&1 &&
+    $RSCDIR/IPaddr $TESTIP monitor >/dev/null 2>&1
+  then
+    echo "Looks like the test IP address is still live..."
+    errcount=`expr $errcount + 1`
+  fi
+
+}
+
+StonithCheck() {
+
+  serrcount=0
+
+  echo "Checking STONITH basic sanity." | tee -a $LOGFILE
+  if
+    $STONITH -h >/dev/null
+  then
+    : OK
+  else
+    echo "$STONITH -h failed" | tee -a $LOGFILE
+    serrcount=`expr $serrcount + 1`
+  fi
+  wc=`$STONITH -h | wc -l`
+  if
+    [ $wc -lt 100 ]
+  then
+    echo "$STONITH -h help message is too short ($wc lines)" | tee -a $LOGFILE
+    serrcount=`expr $serrcount + 1`
+  fi
+  if
+    FOOBARLIST=`$STONITH -t null -p "foo bar" -l`
+  then
+    : FOOBARLIST OK
+  else
+    echo "$STONITH -t null list option failed" | tee -a $LOGFILE
+    serrcount=`expr $serrcount + 1`
+  fi
+  if
+    echo $FOOBARLIST | grep foo >/dev/null &&
+    echo $FOOBARLIST | grep bar >/dev/null
+  then
+    : OK null list
+  else
+    echo "$STONITH -t null list option incorrect" | tee -a $LOGFILE
+    serrcount=`expr $serrcount + 1`
+  fi
+
+  if
+    RESETOUT=`$STONITH -t null -p "foo bar" foo 2>&1`
+  then
+    case $RESETOUT in
+     *"Host null-reset: foo"*)	: NULL Stonith output OK;;
+     *)				echo "NULL reset failed."
+  				  serrcount=`expr $serrcount + 1`;;
+    esac
+  else
+    echo "$STONITH -t null reset failed." | tee -a $LOGFILE
+  fi
+  errcount=`expr $errcount + $serrcount`
+}
+
+
+AppHBCheck() {
+	CFFILE=/var/run/$$.apphbd.cf
+	clientcount=5
+	cat <<-! >$CFFILE
+		realtime yes
+		debug_level	1
+		debugfile	$LOGFILE
+		logfile		/dev/null
+	!
+	echo "Performing apphbd success case tests" | tee -a $LOGFILE
+	if
+          $APPHBD -s >/dev/null 2>&1
+        then
+          echo "That's odd, $APPHBD is already running."
+	  killcount=2
+	  $APPHBD -k >/dev/null 2>&1
+        else
+          killcount=1
+        fi
+	$APPHBD -c $CFFILE
+	sleep 5
+	$APPHBTEST -i 1000 -p $clientcount -n 5 >> $LOGFILE 2>&1 
+	for pat in "apphb_client_register:" "type=setint" "info:.*apphb_client_remove:"
+	do
+	  CheckPat "$pat" $clientcount
+	done
+	CheckPat "failed to heartbeat|resumed heartbeats" 0
+	
+	echo "Performing apphbd failure case tests" | tee -a $LOGFILE
+	$APPHBTEST -F -i 1000 -p 1 -n 5 >>$CFFILE 2>&1
+	for pat in "'failtest'.* failed to heartbeat" "'failtest'.* resumed heartbeats"
+	do
+          CheckPat "$pat" 1 2
+	done
+	sleep 5
+	CheckPat "WARN:.*hangup" 1
+	$APPHBD -k $CFFILE
+	CheckPat "info:.*apphbd.*stopped" $killcount
+	if
+          $APPHBD -s >/dev/null 2>&1
+        then
+          echo "ERROR: $APPHBD is still running!" | tee -a $LOGFILE
+        fi
+}
+
+IPCtest() {
+	echo "Starting IPC tests" | tee -a $LOGFILE
+	$IPCTEST >>$LOGFILE 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		errcount=`expr $errcount + $ret`
+		return $ret
+	fi
+	### Might here try "transient-test.sh" test.
+	errcount=`expr $errcount + $ret`
+	return $ret
+}
+
+LRMTest() {
+  	if
+	  [ ! -f $LRMTEST ] 
+	then
+	  return 0
+	fi
+	echo "Starting LRM tests" | tee -a $LOGFILE
+	$LRMTEST $HBLIB >> $LOGFILE 2>&1
+	ret=$?
+	errcount=`expr $errcount + $ret`
+	if
+	  [ $ret != 0 ] 
+	then
+	  echo "LRM tests failed."
+	fi
+}
+
+StonithDaemonTest() {
+	if 
+		[ ! -f $STONITHDTEST ]
+	then 
+		return 1
+	fi
+	if 
+		HBStart
+	then
+		:
+	else
+		echo "Cannot start heartbeat, so do not start stonith daemon test." | tee -a $LOGFILE
+		return 1
+	fi
+
+  	i=0
+	while
+		[ "$i" -lt 10 ]
+	do
+		if
+			$CLSTATUS hbstatus >/dev/null 2>&1
+		then
+			break
+		else
+			sleep 1
+		fi
+		i=`expr "$i" + 1`
+	done
+
+	if
+		$CLSTATUS hbstatus >/dev/null 2>&1
+	then
+		:
+	else
+		echo "There are internal errors in heartbeat, so do not start stonith daemon test." | tee -a $LOGFILE
+		return 1
+	fi
+
+	echo "starting STONITH Daemon tests" | tee -a $LOGFILE
+	$STONITHDTEST >> $LOGFILE 2>&1
+	ret=$?
+	errcount=`expr $errcount + $ret`
+	if 
+	        [ $ret != 0 ]
+	then 
+		echo "STONITH Daemon tests failed."
+	else 
+	  	echo "STONITH Daemon tests passed."
+	fi
+	HBStop
+}
+
+TestCRM() {
+	GenerateCrmdHaCf $HADIR/ha.cf $HADIR/ha_logd.cf
+	echo "Starting CRM tests" | tee -a $LOGFILE
+
+	$CRMTEST -L $LOGFILE 2> /dev/null
+	ret=$?
+	if [ $ret != 0 ]; then
+	    errcount=`expr $errcount + 1`
+	    echo "CRM tests failed (rc=$ret)." | tee -a $LOGFILE
+	    return 1
+	fi	
+	echo "CRM tests passed."  | tee -a $LOGFILE
+	return 0
+}
+
+TestMgmtd() {
+  	if [ ! -f $MGMTDTEST ]; then
+	    return 0
+	fi
+	GenerateMgmtdCrmdHaCf $HADIR/ha.cf $HADIR/ha_logd.cf
+	echo "Starting Mgmtd tests" | tee -a $LOGFILE
+
+	if 
+		HBStart
+	then
+		:
+	else
+		echo "cannot start heartbeat, so do not start mgmt daemon test." | tee -a $LOGFILE
+		return 1
+	fi
+
+ 	i=0
+	while
+		[ "$i" -lt 10 ]
+	do
+		if
+			$CLSTATUS hbstatus >/dev/null 2>&1
+		then
+			break
+		else
+			sleep 1
+		fi
+		i=`expr "$i" + 1`
+	done
+
+	if
+		$CLSTATUS hbstatus >/dev/null 2>&1
+	then
+		:
+	else
+		echo "There are internal errors in heartbeat, so do not start mgmt daemon test." | tee -a $LOGFILE
+		$CLSTATUS hbstatus
+		return 1
+	fi
+
+	sleep 10
+	$MGMTDTEST > $LOGFILE 2>&1
+	ret=$?
+	if [ $ret != 0 ]; then
+	    errcount=`expr $errcount + 1`
+	    echo "Mgmtd test failed." | tee -a  $LOGFILE
+	else 
+	    echo "Mgmtd test passed."
+	fi
+
+	HBStop
+
+	
+}
+
+SNMPAgentTest() {
+	if 
+	    [ ! -f $SNMPAGENTTEST ]
+	then 
+	    return 0
+	fi
+	if 
+	    HBStart
+	then
+	    sleep 6
+	    echo "starting SNMP Agent tests" | tee -a $LOGFILE
+	    $SNMPAGENTTEST >> $LOGFILE 2>&1
+	    ret=$?
+	    errcount=`expr $errcount + $ret`
+	    if 
+	        [ $ret != 0 ]
+	    then 
+	        echo "SNMP Agent tests failed."
+	    else 
+	    	echo "SNMP Agent tests pass."
+	    fi
+	    HBStop
+	fi
+}
+
+Base64MD5Test() {
+  	if
+	  [ ! -x $BASE64_MD5_TEST ] 
+	then
+	  return 0
+	fi
+	echo "Starting base64 and md5 algorithm tests" | tee -a $LOGFILE
+	$BASE64_MD5_TEST >> $LOGFILE 2>&1
+	ret=$?
+	errcount=`expr $errcount + $ret`
+	if
+	  [ $ret != 0 ] 
+	then
+	  echo "base64 and md5 algorithm tests failed."
+        else
+          echo "base64 and md5 algorithm tests succeeded."
+	fi
+}
+
+TestRA() {
+	if [ ! -x $OCF_TESTER ]; then
+		return 0
+	fi
+        OCF_ROOT=/usr/lib/ocf
+        export OCF_ROOT
+	RADIR=/usr/lib/ocf/resource.d//heartbeat
+	echo "Starting Resource Agent tests" | tee -a $LOGFILE
+
+	echo "Testing RA: Dummy" | tee -a $LOGFILE
+	$OCF_TESTER -n DemoDummy $RADIR/Dummy >>$LOGFILE 2>&1
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		echo "ERROR: Dummy RA failed" | tee -a $LOGFILE
+		return
+	fi
+
+	echo "Testing RA: IPaddr" | tee -a $LOGFILE
+	$OCF_TESTER -o ip=127.0.0.20 -o netmask=32 -n DemoIPaddr \
+		$RADIR/IPaddr >>$LOGFILE 2>&1
+	rc=$?
+	if [ $rc -ne 0 ]; then
+		echo "ERROR: IPaddr RA failed" | tee -a $LOGFILE
+		return
+	fi
+	
+	if [ -x /sbin/ip ]; then
+		echo "Testing RA: IPaddr2" | tee -a $LOGFILE
+		$OCF_TESTER -o ip=127.0.0.20 -o netmask=32 -n DemoIPaddr2 \
+			$RADIR/IPaddr2 >>$LOGFILE 2>&1
+		rc=$?
+		if [ $rc -ne 0 ]; then
+			echo "ERROR: IPaddr2 RA failed" | tee -a $LOGFILE
+			return
+		fi
+	fi
+
+	if [ `uname -s` = 'Linux' ]; then
+		MNT_DIR="$LOGDIR/mnt"
+		mkdir "$MNT_DIR"
+		echo "Testing RA: Filesystem" | tee -a $LOGFILE
+		$OCF_TESTER -o device=/dev/null -o fstype=proc -o directory=$MNT_DIR \
+			-n DemoFS $RADIR/Filesystem >>$LOGFILE 2>&1
+		rc=$?
+		rmdir $MNT_DIR
+		if [ $rc -ne 0 ]; then
+			echo "ERROR: Filesystem RA failed" | tee -a $LOGFILE
+			return
+		fi
+	fi
+	echo "RA tests PASSED" | tee -a $LOGFILE
+}
+
+
+#
+#	Check our identity.
+#	Set Up Config Files.
+#	Run Tests.
+#	Remove Config Files.
+#
+
+ID=`/usr/bin/whoami`
+case $ID in
+  root)	: OK;;
+  *)	echo "Must be root to run this.  Sorry."
+	exit 1;;
+esac
+
+touch $LOGFILE
+chown hacluster $LOGFILE
+
+trap 'RemoveConfigFilesAndSaveLogAndExit' $SIGLIST
+
+SetUpConfigFiles
+> $LOGFILE
+
+COREPID=/proc/sys/kernel/core_uses_pid
+if
+  [ -f "$COREPID" ]
+then
+  echo 1 > $COREPID
+fi
+
+# Create temp rsc dir if it doesn't yet exist, RAs depend on it
+HARSCTMP=/var/run/heartbeat/rsctmp
+if
+  [ ! -d "$HARSCTMP" ]
+then
+  mkdir $HARSCTMP
+fi
+
+Base64MD5Test
+TestRA
+
+IPCtest
+ret=$?
+if [ $ret -ne 0 ]; then
+	# If IPC is faulty, then it is pointless to attempt dependent checks.
+	echo "ERROR: IPCtest failed; continuing is pointless" | tee -a $LOGFILE
+	exit $ret
+fi
+# Might want to add a longer, more substantial IPC test later.
+
+TestHeartbeat
+StonithCheck
+AppHBCheck
+LRMTest
+StonithDaemonTest
+TestCRM
+SNMPAgentTest
+#TestMgmtd
+
+ls -l $HADIR/core* 2>/dev/null
+if
+  [ $? = 0 ]
+then
+  errcount=`expr $errcount + 1`
+  echo "OOPS! We generated a core file!"
+  file $HADIR/core*
+fi
+
+if
+  egrep  'CRIT|ERROR' $LOGFILE
+then
+  echo "OOPS! Looks like we had some errors come up."
+  errcount=`expr $errcount + 1`
+fi
+
+exit $errcount
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/BasicSanityCheck.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/BasicSanityCheck.in
--- heartbeat-2.1.3/heartbeat/lib/BasicSanityCheck.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/lib/BasicSanityCheck.in	2008-08-18 13:32:19.000000000 +0100
@@ -49,7 +49,6 @@
 SNMPAGENTTEST=$SCRIPTDIR/SNMPAgentSanityCheck
 BASE64_MD5_TEST=$HBLIB/base64_md5_test
 MALLOC_CHECK_=2; export MALLOC_CHECK_
-MKTEMP=@MKTEMP@
 TESTPROG=@TEST@
 #
 IDENTSTRING="Linux-HA TEST configuration file - REMOVEME!!"
@@ -64,35 +63,34 @@
 
 errcount=0
 
-# Make temp files the paranoid way...
-maketempfile() {
-#
-#	Use mktemp if we have it, otherwise...
-#
-#	Construct a difficult-to-guess filename if we don't
-#	Make sure non-mktemp files can't be subverted
-#	$RANDOM is not strictly necessary, but nice to have...
-#
-  if
-    test "x$MKTEMP" != "x" \
-      && F=`$MKTEMP /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
-  then
-    echo $F
-  else
-    while
-      echo >/dev/null &
-      F=/tmp/lha-${RANDOM}-$$-$!
-      rm -f "$F"; touch "$F"
-      # Try again if we don't own it, or it's a symlink
-      # Or somehow not a regular file...
-      $TESTPROG ! -O "$F" -o -L "$F" -o ! -f "$F"
-    do
-     : Try again...
-    done
-    echo $F
-  fi
+# Make a safe place to store logs
+maketempdir()
+{
+	i=1
+	tmp=""
+
+	while [ $i -gt 0 ]; do
+		tmp="/tmp/lha-dir-$$-$i"
+		if (umask 077 && mkdir "$tmp"); then
+			echo "$tmp"
+			return 0
+		fi
+		i=$((i+1))
+	done
+
+	echo "Could not create tempoary directory to store logs" >& 2
+	return 1
 }
-LOGFILE=`maketempfile`
+
+LOGDIR=`maketempdir` || exit 1
+LOGFILE="$LOGDIR/log"
+touch "$LOGFILE"
+
+# CTSlab.py needs this otherwise it hangs.
+# Presumably it tries to stat or open the log file after
+# relinquishing root privileges. It would be nice to get to
+# the bottom of this and make a cleaner fix.
+chmod o+x "$LOGDIR"
 
 cd $HADIR
 ulimit -c unlimited
@@ -328,6 +326,7 @@
   SAVELOG=/tmp/linux-ha.testlog
   chmod a+r $LOGFILE
   mv $LOGFILE $SAVELOG
+  rmdir "$LOGDIR"
   echo "$errcount errors. Log file is stored in $SAVELOG"
 }
 
@@ -985,7 +984,8 @@
 	fi
 
 	if [ `uname -s` = 'Linux' ]; then
-		MNT_DIR=`@MKTEMP@ -d /tmp/lha-dir-XXXXXXXXXXX`
+		MNT_DIR="$LOGDIR/mnt"
+		mkdir "$MNT_DIR"
 		echo "Testing RA: Filesystem" | tee -a $LOGFILE
 		$OCF_TESTER -o device=/dev/null -o fstype=proc -o directory=$MNT_DIR \
 			-n DemoFS $RADIR/Filesystem >>$LOGFILE 2>&1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/ha_config /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/ha_config
--- heartbeat-2.1.3/heartbeat/lib/ha_config	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/ha_config	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+#       Support:      linux-ha-dev@lists.tummy.com
+#       License:      GNU General Public License (GPL)
+#
+#
+#       This script contains some variables for linux-ha which
+#       are set at configure time.
+#
+#       Created to alow this information to be passed to
+#       debian postinst scripts. Might be useful for other
+#       stuff too.
+#
+
+# /var/lib directory
+HA_VARLIBDIR="/var/lib" 
+
+# directory to drop core files into
+HA_COREDIR="/var/lib/heartbeat/cores" 
+
+# Group to own API fifos
+HA_APIGROUP="haclient" 
+
+# GID to own API fifos
+HA_APIGID="65" 
+
+# User to own CCM fifos
+HA_CCMUSER="hacluster" 
+
+# UID to own CCM fifos
+HA_CCMUID="17" 
+
+# Init start priority
+HB_INITSTARTPRI="75" 
+
+# Init stop priority
+HB_INITSTOPPRI="05" 
+
+# heartbeat rc script directory
+# HB_RC_DIR is the old name
+HB_RC_DIR="/etc/ha.d/rc.d" 
+HA_RC_DIR="/etc/ha.d/rc.d" 
+
+# Version number of package
+VERSION="2.1.4"
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/ha_propagate /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/ha_propagate
--- heartbeat-2.1.3/heartbeat/lib/ha_propagate	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/ha_propagate	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+#
+#   Support:      linux-ha-dev@lists.tummy.com
+#   License:      GNU General Public License (GPL)
+#
+#       This script read the list of nodes from the ha.cf file
+#       and then uses 'scp' to copy the ha.cf file to each node.
+#
+
+import os, sys
+from stat import *
+
+cfgdir = "/etc/ha.d/"
+cfgfile = cfgdir + "ha.cf"
+authfile = cfgdir + "authkeys"
+
+try:
+	os.stat(cfgfile)
+	os.stat(authfile)
+except:
+	print "HA Linux not configured on this node.  Can not propagate."
+	sys.exit()
+
+nodes = []
+
+f=open(cfgfile)
+for line in f:
+    if line.startswith("node"):
+       toks = line.split()
+       if (len(toks) == 2):
+	  nodeName = toks[1]
+	  nodes.append(nodeName)
+f.close()
+
+thisnode = os.uname()[1]
+if nodes.count(thisnode) > 0:
+   nodes.remove(thisnode)
+
+for i, v in enumerate(nodes):
+    print "Propagating HA configuration files to node " + v + "."
+    res = os.system("scp " + cfgfile + " " + authfile + " root@" + v + ":" + cfgdir)
+    print "Setting HA startup configuration on node " + v + "."
+    res = os.system("ssh " + " root@" + v + " chkconfig `chkconfig heartbeat`")
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_addnode /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_addnode
--- heartbeat-2.1.3/heartbeat/lib/hb_addnode	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_addnode	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+# This script sets the node (where it was called) to *active*
+# It forces the other node to release all the held resources and lets
+# this node do a takeover.
+#
+#       This script will only work for a two machine setup...
+#       More than that and you need to vote, or something...
+
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+usage() {
+	echo "usage: hb_addnode <node> <node> ..."
+	exit 1
+}
+
+if 
+  [ $# = 0 ]
+then
+	usage
+fi
+
+nodelist="$@"
+if [ "$nodelist" = "--help" ]; then
+	usage
+fi
+
+ha_clustermsg <<-!MSG
+	t=addnode
+	nodelist=$nodelist
+!MSG
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_delnode /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_delnode
--- heartbeat-2.1.3/heartbeat/lib/hb_delnode	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_delnode	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+# This script sets the node (where it was called) to *active*
+# It forces the other node to release all the held resources and lets
+# this node do a takeover.
+#
+#       This script will only work for a two machine setup...
+#       More than that and you need to vote, or something...
+
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+usage() {
+	echo "usage: hb_delnode <node> <node> ..."
+	exit 1
+}
+
+if 
+  [ $# = 0 ]
+then
+	usage
+fi
+
+nodelist="$@"
+if [ "$nodelist" = "--help" ]; then
+	usage
+fi
+
+ha_clustermsg <<-!MSG
+	t=delnode
+	nodelist=$nodelist
+!MSG
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_setsite /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_setsite
--- heartbeat-2.1.3/heartbeat/lib/hb_setsite	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_setsite	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+# This script sets the site of node 
+
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+usage() {
+	echo "usage: hb_setsite <node> <site>"
+	exit 1
+}
+
+if 
+  [ $# = 0 ]
+then
+	usage
+fi
+
+
+if [ "$1" = "--help" ]; then
+	usage
+fi
+
+ha_clustermsg <<-!MSG
+	t=setsite
+	node=$1
+	site=$2
+!MSG
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_setweight /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_setweight
--- heartbeat-2.1.3/heartbeat/lib/hb_setweight	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_setweight	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+# This script sets the weight of the node 
+
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+usage() {
+	echo "usage: hb_setweight <node> <weight>"
+	exit 1
+}
+
+if 
+  [ $# = 0 ]
+then
+	usage
+fi
+
+
+if [ "$1" = "--help" ]; then
+	usage
+fi
+
+ha_clustermsg <<-!MSG
+	t=setweight
+	node=$1
+	weight=$2
+!MSG
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_standby /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_standby
--- heartbeat-2.1.3/heartbeat/lib/hb_standby	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_standby	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+#
+# This script sets the node (where it was called) to *standby*
+# It forces the node to release all the held resources and lets
+# the other node do a takeover.
+
+#	This script will only work for a two machine setup...
+#	More than that and you need to vote, or something...
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+: Now running $0: $*
+
+usage() {
+	echo "usage:"
+	echo "$0 [all|foreign|local|failback]" >&2
+	exit 1;
+}
+
+if
+  [ $# -ge 2 ]
+then
+        echo "$0: too many arguments"
+        usage
+        exit 1
+fi
+
+if
+  [ $# -ge 1 ]
+then
+  resources=$1
+else
+  resources=all
+fi
+
+if [ $resources != "all" ] && [ $resources != "foreign" ] &&
+   [ $resources != "local" ] && [ $resources != "failback" ] &&
+   [ $resources != "--help" ]; then
+        echo "$0: wrong resources($resources)."
+	usage
+        exit 1
+fi
+
+case $resources in
+  all|foreign|local)	;;
+  failback)		resources=foreign;;
+  *)			usage;;
+esac
+    
+ha_log "Going standby [$resources]."
+  	ha_clustermsg <<-!MSG
+	t=ask_resources
+	rsc_hold=$resources
+	info=me
+	!MSG
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/hb_takeover /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/hb_takeover
--- heartbeat-2.1.3/heartbeat/lib/hb_takeover	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/hb_takeover	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh  
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+# This script sets the node (where it was called) to *active*
+# It forces the other node to release all the held resources and lets
+# this node do a takeover.
+#
+#       This script will only work for a two machine setup...
+#       More than that and you need to vote, or something...
+
+
+HA_DIR=/etc/ha.d
+. ${HA_DIR}/shellfuncs
+
+usage() {
+	echo "usage:"
+	echo "$0 [all|foreign|local|failback]" >&2
+	exit 1
+}
+
+if 
+  [ $# -ge 2 ]
+then
+	echo "$0: too many arguments"
+	usage
+	exit 1
+fi
+
+if
+  [ $# -ge 1 ]
+then
+  resources=$1
+else
+  resources=all
+fi
+
+if [ $resources = "--help" ]; then
+	usage
+fi
+
+if [ $resources != "all" ] && [ $resources != "foreign" ] &&
+   [ $resources != "local" ] && [ $resources != "failback" ]; then
+	echo "$0: wrong resources($resources)."
+	usage
+	exit 1
+fi
+
+ha_clustermsg <<-!MSG
+	t=hb_takeover
+	rsc_hold=$resources
+!MSG
+
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/mach_down /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/mach_down
--- heartbeat-2.1.3/heartbeat/lib/mach_down	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/mach_down	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+#   Support:      linux-ha-dev@lists.tummy.com
+#   License:      GNU General Public License (GPL)
+#
+#	This script will only work for a two machine setup...
+#	More than that and you need to vote, or something...
+#
+#
+prefix=/usr
+exec_prefix=/usr
+. /etc/ha.d/shellfuncs
+
+: Now running $0: $*
+
+mdown=`echo $1 | tr '[A-Z]' '[a-z]'`; # The name of the downed machine...
+
+#ha_log "info: DEBUG: $0 -- taking resources for $mdown"
+
+case $mdown in
+  $HA_CURHOST)	exit 0;;	# Oh No!  It's us!
+esac
+
+case $HA_info in
+  *ping*)	exit 0;;
+esac
+#
+#	In the case of nice_failback, we may know that we
+#	already own these resources, but we ignore that fact
+#	and take it over anyway, because getting that information
+#	to us would require another environment variable or something
+#	like that which would be a pain.
+#
+for groupkey in `$HA_NOARCHBIN/ResourceManager listkeys $mdown`
+do
+  ha_log "info: Taking over resource group $groupkey"
+  $HA_NOARCHBIN/ResourceManager takegroup $groupkey
+done
+
+# Be nice_failback compliant :)
+# case 1 - part 2
+#
+# This code triggers actions inside heartbeat, because we receive our own
+# resource messages as well as those sent by others...
+#
+# This code shouldn't be executed if we aren't running nice_failback...
+#
+#	The field info=mach_down tells heartbeat that the message is from us
+#	so it can consider the takeover complete.
+#
+case $HA_NICEFAILBACK in
+  [Yy]es)
+    ha_log "info: $0: nice_failback: foreign resources acquired"
+  	ha_clustermsg <<-!MSG
+	t=resource
+	rsc_hold=foreign
+	info=mach_down
+	!MSG
+    ;;
+esac
+# The CTS testing code needs to know when this is really done ;-)
+ha_log "info: mach_down takeover complete for node $mdown."
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/Makefile
--- heartbeat-2.1.3/heartbeat/lib/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,565 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/lib/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/lib
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/lib
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+
+# subpath for internal scripts
+halibdir = "/usr/share/heartbeat"
+halib_SCRIPTS = mach_down req_resource ResourceManager hb_standby \
+			BasicSanityCheck TestHeartbeatComm ha_config hb_takeover hb_addnode \
+			hb_delnode ha_propagate hb_setweight hb_setsite
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/ha_config.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ha_propagate: $(top_builddir)/config.status $(srcdir)/ha_propagate.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_standby: $(top_builddir)/config.status $(srcdir)/hb_standby.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+mach_down: $(top_builddir)/config.status $(srcdir)/mach_down.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+req_resource: $(top_builddir)/config.status $(srcdir)/req_resource.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ResourceManager: $(top_builddir)/config.status $(srcdir)/ResourceManager.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+TestHeartbeatComm: $(top_builddir)/config.status $(srcdir)/TestHeartbeatComm.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_takeover: $(top_builddir)/config.status $(srcdir)/hb_takeover.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_addnode: $(top_builddir)/config.status $(srcdir)/hb_addnode.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_delnode: $(top_builddir)/config.status $(srcdir)/hb_delnode.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_setweight: $(top_builddir)/config.status $(srcdir)/hb_setweight.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_setsite: $(top_builddir)/config.status $(srcdir)/hb_setsite.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-halibSCRIPTS: $(halib_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-halibSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/Makefile.in
--- heartbeat-2.1.3/heartbeat/lib/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/lib/Makefile.in	2008-08-18 23:37:56.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -46,7 +46,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = BasicSanityCheck ha_config ha_propagate \
@@ -90,6 +90,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -107,24 +108,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -186,12 +175,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/req_resource /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/req_resource
--- heartbeat-2.1.3/heartbeat/lib/req_resource	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/req_resource	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+#   Support:      linux-ha-dev@lists.tummy.com
+#   License:      GNU General Public License (GPL)
+#
+#	This script is called to politely request that a resource be given up
+#	to us.
+#
+#	At the end of $TIMEOUT, we take it anyway.
+#
+#	It could be that we already have taken it, in which case it should
+#	do nothing.
+#
+#
+
+# set -x
+prefix=/usr
+exec_prefix=/usr
+HA_DIR=/etc/ha.d; export HA_DIR
+. $HA_DIR/shellfuncs
+
+#
+#	This code is the "ask nicely" case for when we first start up a node.
+#	The case of the other node failing or being dead when we start up
+#	is handled by mach_down which invokes takegroup just like we do
+#	except it never asks for permission.
+#
+#	The nice_failback = yes ($HA_NICEFAILBACK) case coordinates things
+#	so always know the other guy doesn't have the resources before we
+#	get here, so we don't need to ever wait in that case...
+#
+#	If no one else is up, then we set HA_DONTASK in the environment.
+#	It is possible that the TIMEOUT case should be removed now...
+#	This is a failsafe case, but it's kind of a dangerous failsafe
+#	case...
+#
+TIMEOUT=1200
+
+RESOURCE=$1
+
+#
+#	Do we already have this resource?
+#
+
+$HA_NOARCHBIN/ResourceManager status $RESOURCE && exit 0
+
+#
+#	Now give our ip-request-message...
+#
+#		"ip-request"		Message type
+#		ip-address		IP address requested
+#						DENY if we won't/can't
+#
+case $HA_DEBUG in
+ [123458789]*)	ha_log "debug: in $0 $*"
+		ha_log "debug: dont_ask: $HA_DONTASK nice_failback: $HA_NICEFAILBACK";;
+esac
+
+#
+#	The nice failback case only takes over from dead machines...
+#
+case $HA_NICEFAILBACK in
+  yes)	HA_DONTASK=yes;;
+esac
+
+CMD=ip-request
+case $HA_DONTASK in
+  yes)
+	#
+	#	Pretend the current owner gave it up peacefully
+	#
+	ha_clustermsg <<-!MSG
+		t=$CMD-resp
+		dest=$HA_CURHOST
+		ipaddr=$RESOURCE
+		weown=yes
+		ok=OK
+!MSG
+	;;
+
+  *)
+	: "Ask Nicely ;-)"
+	ha_clustermsg <<-!MSG
+	t=$CMD
+	ipaddr=$RESOURCE
+!MSG
+
+	#	NOTE!
+	#	The original dangerous failsafe takeover of resources
+	#	has been disabled!!
+
+	exit 0
+
+
+  # Normally they will have already replied to us before we get here
+  # and we will have already taken things over.  This is to allow
+  # for the case that they somehow never tell us to go ahead...
+  # Heartbeat should kill us if it shuts down before we finish.
+  # For that to work we can't go into the background...
+
+	sleep $TIMEOUT
+	$HA_NOARCHBIN/ResourceManager status "$RESOURCE" ||
+	$HA_NOARCHBIN/ResourceManager takegroup "$RESOURCE"
+	;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/ResourceManager /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/ResourceManager
--- heartbeat-2.1.3/heartbeat/lib/ResourceManager	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/ResourceManager	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,455 @@
+#!/bin/sh
+#
+#
+#   Support:      linux-ha-dev@lists.tummy.com
+#   License:      GNU General Public License (GPL)
+#
+#	New haresources format:
+#
+#	machine resource resource resource resource
+#
+#	Where a resource can be an IP address or a scriptname, or a scriptname
+#	and single argument.
+#
+#	When it's a scriptname with an argument, the argument is connected to
+#	the scriptname with "::".  Another way of expressing an IP address is
+#	via IPaddr::ip-address, since the script name IPaddr is the one assumed
+#	for resources which are spelled like an IP address.
+#
+#	As an illustration, the following two lines are identical in effect:
+#
+#	node1	123.45.67.89 httpd
+#	node1	IPaddr::123.45.67.89 httpd
+#
+#       One can also pass multiple arguments to a script by separating each
+#       argument with a double colon:
+#
+#       node1  10.0.0.170 Filesystem::/dev/sda1::/data1::ext2
+#
+#	Note:  The first resource on the line must be unique in the haresources
+#	file.  Maybe I should add a resource type called Unique which can
+#	put on the front of a line to meet this requirement.
+#
+#
+
+# set -x
+: 
+: 
+: ==================== Starting ResourceManager $* ==========================
+ 
+unset LC_ALL; export LC_ALL # Make ifconfig work in France for David Jules :-)
+unset LANGUAGE; export LANGUAGE # Make ifconfig work in France for Fabrice :-)
+ 
+prefix=/usr
+exec_prefix=/usr
+HA_DIR=/etc/ha.d
+HA_FUNCS=$HA_DIR/shellfuncs
+export HA_DIR HA_FUNCS
+INITDIR=/etc/init.d
+STANDBY=/usr/share/heartbeat/hb_standby
+USAGE="usage: $0 listkeys machine | takegroup key | givegroup key|status resource";
+. $HA_FUNCS
+
+: ${HA_STOPRETRYMAX=10}
+
+isip() {
+  case $1 in
+    [0-9]*.[0-9]*.[0-9]*.[0-9]*)	true;;
+    *)					false;;
+  esac
+}
+
+#
+# Reverseargs doesn't deal with arguments containing  white space correctly.
+# To fix this I think you'd have to change it to put out the arguments
+# one per line, and then have the caller use them a line at a time using
+# "read" or something.  This could be done either using a tmp file or
+# by using eval on the argument numbers starting from $# and going
+# down.  But, no existing resource script deals with these either, so
+# I'm not too worried yet...
+#
+reverseargs() {
+  L=""
+  for arg in "$@"
+  do
+    case $L in
+      ?*)	L="$arg $L";;
+      "")	L=$arg;;
+    esac
+  done
+  echo $L
+}
+
+#
+#	Remove comments and extra blanks from haresources
+#	translate all white space into single blanks.  Each line ends with
+#	a blank, making parsing it easier for dumb shell scripts.
+#
+ipres() {
+  grepflags=""
+  case $# in
+    0)	pat='.'			;;
+    1)  pat=$1			;;
+    2)  grepflags=$1; pat=$2	;;
+  esac
+  cat $HA_DIR/haresources |
+	#
+	#	Explanation of Sed -e expressions below:
+	#
+	#	1) Strip out comments
+	#	2) Repeatedly join lines together when they're ended by '\'
+        #		(":a" is a label.  "ta" is a conditional
+	#		branch to "a:")
+	#	3) Append a blank to the end of the line
+	#	4) Compress multiple blanks/tabs into a single blank
+	#	5) Remove lines that only contain whitespace or are empty
+	#	6) Strip off a leading space (if any)
+	#
+	sed						\
+		-e  's%#.*%%'				\
+		-e :a -e '/\\$/N; s/\\\n//; ta'		\
+		-e  's%$% %'				\
+		-e  's%[	 ][	 ]*% %g' 	\
+		-e  '/^[	 ]*$/ d' 		\
+		-e  's%^ %%' 				|
+	awk '/.*/ {$1 = tolower($1); print $0, ""}'	|
+  	egrep $grepflags "$pat"
+}
+
+ipresline() {
+	ipres " $1 "
+}
+
+KeyResources() {
+	ipres -i "^$1 "  | cut -d' ' -f2
+}
+
+OurGroupKeys() {
+	ipres -i "^${HA_CURHOST} "  | cut -d' ' -f2-
+}
+
+OtherGroupKeys() {
+	ipres -iv "^${HA_CURHOST} "  | cut -d' ' -f2-
+}
+
+StandbyGroupType() {
+  if
+    OurGroupKeys | grep "^$1\$" >/dev/null 
+  then
+    echo local
+  else
+    echo foreign
+  fi
+}
+
+
+canonname() {
+  if
+    isip $1
+  then
+    echo "IPaddr::$1"
+  else
+    echo $1
+  fi
+}
+
+resource2script() {
+  case `canonname $1` in
+    *::*)	echo $1 | sed 's%::.*%%'
+		;;
+    *)		echo $1;;
+  esac
+}
+
+# Return the list of arguments after the script name.
+# multiple arguments are separated by :: delimiters
+resource2arg() {
+  case `canonname $1` in
+    *::*)	echo $1 | sed 's%[^:]*::%%' | sed 's%::% %g'
+		;;
+  esac
+}
+
+scriptpath() {
+  script=`canonname $1`
+  script=`resource2script $script`
+  for dir in $HA_RESOURCEDIR $INITDIR
+  do
+    if
+      [ -f $dir/$script -a -x $dir/$script ]
+    then
+      echo $dir/$script;
+      return 0;
+    fi
+  done
+
+  ha_log "ERROR: Cannot locate resource script $script"
+  false
+}
+#
+#	Since we're patterned after the LSB's init scripts, here are
+#	the exit codes we should be returning for status...
+#
+#	0	program is running
+#	1	program is dead and /var/run pid file exists
+#	2	program is dead and /var/lock lock file exists
+#	3	program is stopped
+#	4-100	reserved for future LSB use
+#	100-149	reserved for distribution use
+#	150-199	reserved for application use
+#	200-254	reserved
+#
+
+we_own_resource() {
+  arg=`resource2arg $1`
+  spath=`scriptpath $1`;
+
+  case `$spath $arg status` in
+    *[Nn][Oo][Tt]\ *[Rr]unning*)	return 3;;
+    *[Rr]unning*|*OK*)			return 0;;
+    *)					return 3;;
+  esac
+}
+
+
+doscript() {
+  script=`resource2script $1`
+  arg=`resource2arg $1`
+
+  spath=`scriptpath $script`
+  if
+    [ -f "$spath" -a -x "$spath" ]
+  then
+    ha_log "info: Running $spath $arg $2"
+    ha_debug "debug: Starting $spath $arg $2"
+    $spath $arg "$2" 2>>$HA_DEBUGLOG
+    RC=$?
+    ha_debug "debug: $spath $arg $2 done. RC=$RC"
+    case $RC in
+      0);;
+      *) ha_log "ERROR: Return code $RC from $spath";;
+    esac
+    return $RC;
+  fi
+  ha_log "ERROR: Cannot locate resource script $script"
+  return 1;
+}
+
+
+# Arguments are: nodename resource1 resource2 ...
+giveupresourcegroup() {
+
+  ha_log "info: Releasing resource group: $*"
+  shift
+  rc=0
+  for j in `reverseargs "$@"`
+  do
+    retries=0
+    while
+      doscript $j stop >>$HA_DEBUGLOG 2>&1
+      rc1=$?
+      [ $HA_STOPRETRYMAX -le 0 -o  $retries -lt $HA_STOPRETRYMAX ] &&
+      [ $rc1 -ne 0 ]
+    do
+      sleep 1
+      retries=`expr 1 + "$retries"`
+      ha_log "info: Retrying failed stop operation [$j]"
+    done
+    if
+      [ $rc1 -ne 0 ]
+    then
+      if
+        we_own_resource $j
+      then
+        rc=$rc1
+        RecoverFromFailedStop	# Bye Bye!
+      else
+        # Red Hat (and probably others) Kludge!
+        ha_log "ERROR: Resource script for $j probably not LSB-compliant."
+        ha_log "WARN: it ($j) MUST succeed on a stop when already stopped"
+        ha_log "WARN: Machine reboot narrowly avoided!"
+      fi
+    fi
+  done
+  return $rc
+}
+
+# Arguments are: nodename resource1 resource2 ...
+acquireresourcegroup() {
+  ha_log "info: Acquiring resource group: $*"
+  node="$1"
+  shift
+  rc=0;
+  for j in "$@"
+  do
+    if
+      we_own_resource "$j" || doscript "$j" start
+    then
+      : $j start succeeded
+    else
+      rc=$?
+      ha_log "CRIT: Giving up resources due to failure of $j"
+      giveupresourcegroup "$node" "$@"
+      (sleep 30; $STANDBY `StandbyGroupType "$j"`) &
+      break
+    fi
+  done
+  return $rc
+}
+
+#
+#	We may be given a resource to give up that we don't own...
+#
+GiveUpGroup() {
+  #	Get the list of resources we've been requested to give up...
+  haresources=`ipresline $1`
+  if
+    [ ! -z "$haresources" ]
+  then
+    giveupresourcegroup $haresources
+  fi
+}
+
+TakeGroup() {
+  #	Get the list of resources we've been requested to take...
+  haresources=`ipresline $1`
+  if
+    [ ! -z "$haresources" ]
+  then
+    acquireresourcegroup $haresources
+  fi
+}
+
+#
+# Determine the status of all the resources in a resource group
+#
+# Results are echoed to stdout:
+#
+# NONE:	None of the resources in the resource group are held
+#      (or there no such resource group)
+# ALL:	All of the resources in the resource group are held
+# SOME:	Some of the resources in the resource group are held
+#
+StatGroup() {
+  result="FirstTime"
+
+  set `ipresline $1`
+  shift
+  for resource
+  do
+    if
+      we_own_resource $resource
+    then
+      case $result in
+        FirstTime)	result=ALL;;
+        NONE)		echo SOME; return 0;;
+        SOME|ALL)		;;
+      esac
+    else
+      case $result in
+        FirstTime)	result=NONE;;
+        ALL)		echo SOME; return 0;;
+        SOME|NONE)	;;
+      esac
+    fi
+  done
+
+  case $result in
+    FirstTime)	echo NONE;;
+    *)		echo $result;;
+  esac
+}
+
+#
+#	Verify that all resources in the resource group are idle
+#
+
+VerifyAllIdle() {
+  rc=0
+  for rsc in `KeyResources ".*"`
+  do
+    if
+      we_own_resource $rsc
+    then
+      ha_log "CRITICAL: Resource $rsc is active, and should not be!"
+      ha_log "CRITICAL: Non-idle resources can affect data integrity!" >&2
+      ha_log "info: If you don't know what this means, then get help!"
+      ha_log "info: Read the docs and/or source to $0 for more details."
+      cat <<-! >&2
+	CRITICAL: Resource $rsc is active, and should not be!
+	CRITICAL: Non-idle resources can affect data integrity!
+	info: If you don't know what this means, then get help!
+	info: Read the docs and/or the source to $0 for more details.
+	!
+      #
+      # What this means is that if you have a shared disk and it's already mounted
+      # before you start heartbeat, then you could have it mounted simultaneously
+      # on both sides.  If this happens then your disk data is toast!
+      # So, this is sometimes VERY BAD INDEED!
+      #
+      # The most *common* cause for this message is that you told your OS to manage one
+      # of the IP addresses that you asked heartbeat to manage.  You can't put
+      # both your OS startup scripts and heartbeat in charge of HA resources.
+      # This particular case is discussed in detail in the docs.
+      #
+      rc=`expr $rc + 1`
+    fi
+  done
+  if
+    [ $rc -ne 0 ]
+  then
+    ha_log "CRITICAL: Non-idle resources will affect resource takeback!"
+    ha_log "CRITICAL: Non-idle resources may affect data integrity!"
+  fi
+  exit $rc
+}
+
+#
+#	If we are unable to stop a resource, then everything is in a
+#	hosed state.  The only way out is through a reboot...
+#
+RecoverFromFailedStop() {
+  ha_log "CRIT: Resource STOP failure. Reboot required!"
+  ha_log "CRIT: Killing heartbeat ungracefully!"
+  for name in heartbeat ipfail ccm
+  do
+    pkill -9 $name
+  done
+  if
+    [ -x /sbin/reboot ] && /sbin/reboot -nf
+  then
+    : OK - reboot succeeded
+  elif
+    [ -x /sbin/init ] && /sbin/init 6
+  then
+    : OK - init 6 succeeded
+  else
+    ha_log "CRIT: Unable to force reboot."
+  fi
+}
+
+case $1 in
+
+  listkeys)	KeyResources "$2";;
+
+  allkeys)	KeyResources '.*';;
+
+  ourkeys)	OurGroupKeys;;
+
+  otherkeys)	OtherGroupKeys;;
+
+  status)	we_own_resource $2;;
+
+  givegroup)	GiveUpGroup $2 >>$HA_DEBUGLOG 2>&1 ;;
+
+  takegroup)	TakeGroup $2 >>$HA_DEBUGLOG 2>&1 ;;
+
+  statgroup)	StatGroup $2 >>$HA_DEBUGLOG 2>&1 ;;
+
+  verifyallidle)VerifyAllIdle ;;
+
+  *)		echo "$USAGE" >&2
+  		echo "" >&2
+		exit 1;;
+esac
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/lib/TestHeartbeatComm /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/lib/TestHeartbeatComm
--- heartbeat-2.1.3/heartbeat/lib/TestHeartbeatComm	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/lib/TestHeartbeatComm	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+#
+# The purpose of this script is to break or fix the communication in the cluster.
+#
+HADIR=/etc/ha.d
+HBSCRIPT=/etc/init.d/heartbeat
+
+LIBDIR=/usr/lib/
+HBLIB=$LIBDIR/heartbeat
+TESTFILE=OnlyForTesting
+
+USAGE="Usage: 'TestHeartbeatComm break-communication allow-nodes-list|reduce-communication  xmit_loss recv_loss allow-nodes-list|fix-communication|delete-testingfile|save-testingfile testingfile|restore-communication testingfile'"
+
+if 
+  [ $# -lt 1 ]
+then
+  echo "$USAGE";
+  exit 1;
+fi
+
+cd /etc/ha.d
+
+# Create OnlyForTesting File. It is invoked by ParseTestOpts() in heartbeat.c
+
+GenerateTestingFile(){
+save_IFS=$IFS
+IFS=';'
+  cat <<EOF >$TESTFILE
+xmitloss=$1
+rcvloss=$2
+EOF
+shift
+shift
+  cat <<EOF >>$TESTFILE
+allownodes=$*;
+EOF
+
+IFS=$save_IFS
+}
+
+DeleteTestingFile(){
+  rm -f $TESTFILE
+  echo "DeleteTestFileOK"
+}
+
+RestoreTestingFile(){
+  if [ -f $1 ]
+  then 
+      cp $1 $TESTFILE
+      exit $?
+  fi
+}
+SaveTestingFile(){
+  cp $TESTFILE $1 
+  exit $?
+}
+
+HBReload(){
+  $HBSCRIPT reload
+}
+
+
+OPT=$1
+case "$OPT" in
+  break-communication)
+	shift
+	GenerateTestingFile 1 1 $@
+	HBReload
+	;;
+  reduce-communication)
+	shift
+	GenerateTestingFile $@
+	HBReload
+	;;
+  fix-communication)
+	DeleteTestingFile
+	HBReload
+	;;
+  delete-testingfile)
+	DeleteTestingFile
+	;;
+  save-testingfile)
+	shift
+	SaveTestingFile $1
+	;;
+  restore-communication)
+	shift
+	RestoreTestingFile $1
+	HBReload
+	;;
+  *)
+	echo "$USAGE"
+	;;
+esac
+
+exit $?
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/libnet_util/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/libnet_util/Makefile
--- heartbeat-2.1.3/heartbeat/libnet_util/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/libnet_util/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,643 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/libnet_util/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/libnet_util
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/libnet_util
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 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)/heartbeat
+gliblib = -lglib-2.0  
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+send_arp_SOURCES = send_arp.c
+send_arp_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
+			  $(gliblib) -lnet
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+send_arp$(EXEEXT): $(send_arp_OBJECTS) $(send_arp_DEPENDENCIES) 
+	@rm -f send_arp$(EXEEXT)
+	$(LINK) $(send_arp_OBJECTS) $(send_arp_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/send_arp.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/libnet_util/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/libnet_util/Makefile.in
--- heartbeat-2.1.3/heartbeat/libnet_util/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/libnet_util/Makefile.in	2008-08-18 23:37:57.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -52,7 +52,7 @@
 am__DEPENDENCIES_1 =
 send_arp_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
 	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -100,6 +100,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -117,24 +118,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -196,12 +185,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -410,8 +400,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -473,8 +463,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -486,8 +476,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -497,13 +487,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/libnet_util/send_arp.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/libnet_util/send_arp.c
--- heartbeat-2.1.3/heartbeat/libnet_util/send_arp.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/libnet_util/send_arp.c	2008-08-18 13:32:19.000000000 +0100
@@ -214,11 +214,7 @@
 		unlink(pidfilename);
 		return EXIT_FAILURE;
 	}
-#ifdef ON_DARWIN
- 	if ((signed)(ip = libnet_name2addr4(l, (unsigned char *)ipaddr, 1)) == -1) {
-#else
 	if ((signed)(ip = libnet_name2addr4(l, ipaddr, 1)) == -1) {
-#endif
 		cl_log(LOG_ERR, "Cannot resolve IP address [%s]", ipaddr);
 		unlink(pidfilename);
 		return EXIT_FAILURE;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/logrotate.d/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/logrotate.d/Makefile
--- heartbeat-2.1.3/heartbeat/logrotate.d/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/logrotate.d/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,529 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/logrotate.d/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/logrotate.d
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/logrotate.d
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+logrotateddir = $(sysconfdir)/logrotate.d
+logrotated_DATA = heartbeat
+EXTRA_DIST = $(logrotated_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-logrotatedDATA: $(logrotated_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(logrotateddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(logrotateddir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/logrotate.d/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/logrotate.d/Makefile.in
--- heartbeat-2.1.3/heartbeat/logrotate.d/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/logrotate.d/Makefile.in	2008-08-18 23:37:57.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -86,6 +86,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -103,24 +104,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -182,12 +171,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/Makefile
--- heartbeat-2.1.3/heartbeat/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,1029 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 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 = /usr/bin
+halibdir = $(libdir)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+havarrundir = $(localstatedir)/run
+havarrunhbdir = $(localstatedir)/run/heartbeat
+# fifos with path
+hafifo = $(havarlibdir)/fifo
+apigid = 65
+gliblib = -lglib-2.0  
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+SUBDIRS = init.d lib logrotate.d rc.d libnet_util
+noinst_HEADERS = hb_config.h		\
+				hb_module.h		\
+				hb_proc.h		\
+				hb_resource.h		\
+				hb_signal.h		\
+				heartbeat_private.h	\
+				test.h
+
+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	\
+			$(top_builddir)/lib/clplumbing/libplumbgpl.la	\
+			$(top_builddir)/lib/apphb/libapphb.la		\
+			$(top_builddir)/replace/libreplace.la		\
+			$(gliblib) $(LIBRT)
+
+heartbeat_LDFLAGS = -ldl  -export-dynamic	
+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)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)/$@
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+findif$(EXEEXT): $(findif_OBJECTS) $(findif_DEPENDENCIES) 
+	@rm -f findif$(EXEEXT)
+	$(LINK) $(findif_OBJECTS) $(findif_LDADD) $(LIBS)
+heartbeat$(EXEEXT): $(heartbeat_OBJECTS) $(heartbeat_DEPENDENCIES) 
+	@rm -f heartbeat$(EXEEXT)
+	$(heartbeat_LINK) $(heartbeat_OBJECTS) $(heartbeat_LDADD) $(LIBS)
+install-haSCRIPTS: $(ha_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-haSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/findif.Po
+include ./$(DEPDIR)/heartbeat-auth.Po
+include ./$(DEPDIR)/heartbeat-config.Po
+include ./$(DEPDIR)/heartbeat-ha_msg_internal.Po
+include ./$(DEPDIR)/heartbeat-hb_api.Po
+include ./$(DEPDIR)/heartbeat-hb_resource.Po
+include ./$(DEPDIR)/heartbeat-hb_rexmit.Po
+include ./$(DEPDIR)/heartbeat-hb_signal.Po
+include ./$(DEPDIR)/heartbeat-hb_uuid.Po
+include ./$(DEPDIR)/heartbeat-heartbeat.Po
+include ./$(DEPDIR)/heartbeat-module.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+heartbeat-heartbeat.o: heartbeat.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-heartbeat.Tpo $(DEPDIR)/heartbeat-heartbeat.Po
+#	source='heartbeat.c' object='heartbeat-heartbeat.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-heartbeat.Tpo $(DEPDIR)/heartbeat-heartbeat.Po
+#	source='heartbeat.c' object='heartbeat-heartbeat.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-auth.o: auth.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-auth.Tpo $(DEPDIR)/heartbeat-auth.Po
+#	source='auth.c' object='heartbeat-auth.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-auth.Tpo $(DEPDIR)/heartbeat-auth.Po
+#	source='auth.c' object='heartbeat-auth.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-config.o: config.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-config.Tpo $(DEPDIR)/heartbeat-config.Po
+#	source='config.c' object='heartbeat-config.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-config.Tpo $(DEPDIR)/heartbeat-config.Po
+#	source='config.c' object='heartbeat-config.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-ha_msg_internal.o: ha_msg_internal.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-ha_msg_internal.Tpo $(DEPDIR)/heartbeat-ha_msg_internal.Po
+#	source='ha_msg_internal.c' object='heartbeat-ha_msg_internal.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-ha_msg_internal.Tpo $(DEPDIR)/heartbeat-ha_msg_internal.Po
+#	source='ha_msg_internal.c' object='heartbeat-ha_msg_internal.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-hb_api.o: hb_api.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-hb_api.Tpo $(DEPDIR)/heartbeat-hb_api.Po
+#	source='hb_api.c' object='heartbeat-hb_api.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-hb_api.Tpo $(DEPDIR)/heartbeat-hb_api.Po
+#	source='hb_api.c' object='heartbeat-hb_api.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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_resource.o: hb_resource.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-hb_resource.Tpo $(DEPDIR)/heartbeat-hb_resource.Po
+#	source='hb_resource.c' object='heartbeat-hb_resource.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-hb_resource.Tpo $(DEPDIR)/heartbeat-hb_resource.Po
+#	source='hb_resource.c' object='heartbeat-hb_resource.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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_signal.o: hb_signal.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-hb_signal.Tpo $(DEPDIR)/heartbeat-hb_signal.Po
+#	source='hb_signal.c' object='heartbeat-hb_signal.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-hb_signal.Tpo $(DEPDIR)/heartbeat-hb_signal.Po
+#	source='hb_signal.c' object='heartbeat-hb_signal.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-module.o: module.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-module.Tpo $(DEPDIR)/heartbeat-module.Po
+#	source='module.c' object='heartbeat-module.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-module.Tpo $(DEPDIR)/heartbeat-module.Po
+#	source='module.c' object='heartbeat-module.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-hb_uuid.o: hb_uuid.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-hb_uuid.Tpo $(DEPDIR)/heartbeat-hb_uuid.Po
+#	source='hb_uuid.c' object='heartbeat-hb_uuid.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-hb_uuid.Tpo $(DEPDIR)/heartbeat-hb_uuid.Po
+#	source='hb_uuid.c' object='heartbeat-hb_uuid.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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_rexmit.o: hb_rexmit.c
+	$(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
+	mv -f $(DEPDIR)/heartbeat-hb_rexmit.Tpo $(DEPDIR)/heartbeat-hb_rexmit.Po
+#	source='hb_rexmit.c' object='heartbeat-hb_rexmit.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/heartbeat-hb_rexmit.Tpo $(DEPDIR)/heartbeat-hb_rexmit.Po
+#	source='hb_rexmit.c' object='heartbeat-hb_rexmit.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-haDATA: $(ha_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(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
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+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-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-haDATA uninstall-haSCRIPTS \
+	uninstall-halibPROGRAMS uninstall-local
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(havarrundir) 
+	$(mkinstalldirs) $(DESTDIR)$(havarlibdir)
+	$(mkinstalldirs) $(DESTDIR)$(havarrunhbdir)
+	-chmod 755 $(DESTDIR)$(havarrunhbdir)
+
+uninstall-local:
+	-test -p $(DESTDIR)$(hafifo) && rm $(DESTDIR)$(hafifo)
+	rm -rf $(DESTDIR)$(havarrunhbdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/Makefile.in
--- heartbeat-2.1.3/heartbeat/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/Makefile.in	2008-08-18 23:37:56.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -44,7 +44,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = shellfuncs
@@ -75,7 +75,7 @@
 	$(CFLAGS) $(heartbeat_LDFLAGS) $(LDFLAGS) -o $@
 haSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(ha_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -142,6 +142,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -159,24 +160,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -238,12 +227,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -488,8 +478,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -810,8 +800,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -836,8 +826,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -847,13 +837,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/rc.d/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/rc.d/Makefile
--- heartbeat-2.1.3/heartbeat/rc.d/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/heartbeat/rc.d/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,532 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# heartbeat/rc.d/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/rc.d
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/heartbeat/rc.d
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 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)
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/hb_takeover.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-harcdSCRIPTS: $(harcd_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-harcdSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/rc.d/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/rc.d/Makefile.in
--- heartbeat-2.1.3/heartbeat/rc.d/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/rc.d/Makefile.in	2008-08-18 23:37:57.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ask_resources hb_takeover
@@ -81,6 +81,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -98,24 +99,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -177,12 +166,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/shellfuncs /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/shellfuncs
--- heartbeat-2.1.3/heartbeat/shellfuncs	2007-12-21 20:45:46.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/shellfuncs	2008-12-29 22:12:09.000000000 +0000
@@ -30,7 +30,6 @@
 export HA_DEBUGLOG HA_LOGFILE HA_LOGFACILITY
 export HA_DATEFMT HA_RESOURCEDIR HA_DOCDIR
 
-MKTEMP=/bin/mktemp
 TESTPROG=/usr/bin/test
 PATH=$HA_BIN:${HA_SBIN_DIR}:/usr/share/heartbeat:$PATH
 PATH=`echo $PATH | sed -e 's%::%%' -e 's%:\.:%:%' -e 's%^:%%' -e 's%^\.:%%'`
@@ -226,33 +225,98 @@
   esac
 }
 
-# Make temp files the paranoid way...
-maketempfile() {
-#
-#	Use mktemp if we have it, otherwise...
-#
-#	Construct a difficult-to-guess filename if we don't
-#	Make sure non-mktemp files can't be subverted
-#	$RANDOM is not strictly necessary, but nice to have...
-#
-  if
-    test "x$MKTEMP" != "x" \
-      && F=`$MKTEMP /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
-  then
-    echo $F
-  else
-    while
-      echo >/dev/null &
-      F=/tmp/lha-${RANDOM}-$$-$!
-      rm -f "$F"; touch "$F"
-      # Try again if we don't own it, or it's a symlink
-      # Or somehow not a regular file...
-      $TESTPROG ! -O "$F" -o -L "$F" -o ! -f "$F"
-    do
-     : Try again...
-    done
-    echo $F
-  fi
+# usage: dirname DIR
+dirname()
+{
+	local a
+	local b
+
+	[ $# = 1 ] || return 1
+	a="$1"
+	while [ 1 ]; do
+		b="${a%/}"
+		[ "$a" = "$b" ] && break
+		a="$b"
+	done
+	b=${a%/*}
+	[ -z "$b" -o "$a" = "$b"  ] && b="."
+
+	echo "$b"
+	return 0
+}
+
+# usage: maketempdir
+maketempdir()
+{
+	local i=1
+	local tmp
+
+	# The loop allows for the cases where
+	# A process has multiple tempfiles or dirs or;
+	# A previous process with the same PID that had tempfiles or
+	# directories did not exit cleanly
+	while [ $i -gt 0 ]; do
+		tmp="/tmp/lha-dir-$$-$i"
+		if (umask 077 && mkdir "$tmp" 2>/dev/null); then
+			echo "$tmp"
+			return 0
+		fi
+		i=$((i+1))
+	done
+
+	echo "Could not create tempoary directory to store logs" >& 2
+	return 1
+}
+
+# usage: rmtempdir TMPDIR
+rmtempdir()
+{
+	[ $# = 1 ] || return 1
+	if [ -e "$1" ]; then
+		rmdir "$1" || return 1
+	fi
+	return 0
+}
+
+# usage: maketempfile [-d]
+maketempfile()
+{
+	local dir="no"
+	local name
+
+	if [ $# = 1 -a "$1" = "-d" ]; then
+		dir="yes"
+	elif [ $# != 0 ]; then
+		return 1
+	fi
+
+	name=$(maketempdir) || return $?
+
+	if [ "$dir" = "yes" ]; then
+		echo "$name"
+		return 0
+	fi
+
+	name="$name/tmpfile"
+
+	if ! touch "$name"; then
+		rmtempdir
+		return 1
+	fi
+
+	echo "$name"
+	return 0
+}
+
+# usage: rmtempfile TMPFILE
+rmtempfile ()
+{
+	[ $# = 1 ] || return 1
+	if [ -e "$1" ]; then
+		rm "$1" || return 1
+	fi
+	rmtempdir $(dirname "$1") || return 1
+	return 0
 }
 
 # The 'ping' command takes highly OS-dependent arguments, so this
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat/shellfuncs.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat/shellfuncs.in
--- heartbeat-2.1.3/heartbeat/shellfuncs.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat/shellfuncs.in	2008-08-18 13:32:19.000000000 +0100
@@ -30,7 +30,6 @@
 export HA_DEBUGLOG HA_LOGFILE HA_LOGFACILITY
 export HA_DATEFMT HA_RESOURCEDIR HA_DOCDIR
 
-MKTEMP=@MKTEMP@
 TESTPROG=@TEST@
 PATH=$HA_BIN:${HA_SBIN_DIR}:@HA_NOARCHDATAHBDIR@:$PATH
 PATH=`echo $PATH | sed -e 's%::%%' -e 's%:\.:%:%' -e 's%^:%%' -e 's%^\.:%%'`
@@ -226,33 +225,98 @@
   esac
 }
 
-# Make temp files the paranoid way...
-maketempfile() {
-#
-#	Use mktemp if we have it, otherwise...
-#
-#	Construct a difficult-to-guess filename if we don't
-#	Make sure non-mktemp files can't be subverted
-#	$RANDOM is not strictly necessary, but nice to have...
-#
-  if
-    test "x$MKTEMP" != "x" \
-      && F=`$MKTEMP /tmp/lha-XXXXXX` && [ ! -z "$F" -a -f "$F" ]
-  then
-    echo $F
-  else
-    while
-      echo >/dev/null &
-      F=/tmp/lha-${RANDOM}-$$-$!
-      rm -f "$F"; touch "$F"
-      # Try again if we don't own it, or it's a symlink
-      # Or somehow not a regular file...
-      $TESTPROG ! -O "$F" -o -L "$F" -o ! -f "$F"
-    do
-     : Try again...
-    done
-    echo $F
-  fi
+# usage: dirname DIR
+dirname()
+{
+	local a
+	local b
+
+	[ $# = 1 ] || return 1
+	a="$1"
+	while [ 1 ]; do
+		b="${a%/}"
+		[ "$a" = "$b" ] && break
+		a="$b"
+	done
+	b=${a%/*}
+	[ -z "$b" -o "$a" = "$b"  ] && b="."
+
+	echo "$b"
+	return 0
+}
+
+# usage: maketempdir
+maketempdir()
+{
+	local i=1
+	local tmp
+
+	# The loop allows for the cases where
+	# A process has multiple tempfiles or dirs or;
+	# A previous process with the same PID that had tempfiles or
+	# directories did not exit cleanly
+	while [ $i -gt 0 ]; do
+		tmp="/tmp/lha-dir-$$-$i"
+		if (umask 077 && mkdir "$tmp" 2>/dev/null); then
+			echo "$tmp"
+			return 0
+		fi
+		i=$((i+1))
+	done
+
+	echo "Could not create tempoary directory to store logs" >& 2
+	return 1
+}
+
+# usage: rmtempdir TMPDIR
+rmtempdir()
+{
+	[ $# = 1 ] || return 1
+	if [ -e "$1" ]; then
+		rmdir "$1" || return 1
+	fi
+	return 0
+}
+
+# usage: maketempfile [-d]
+maketempfile()
+{
+	local dir="no"
+	local name
+
+	if [ $# = 1 -a "$1" = "-d" ]; then
+		dir="yes"
+	elif [ $# != 0 ]; then
+		return 1
+	fi
+
+	name=$(maketempdir) || return $?
+
+	if [ "$dir" = "yes" ]; then
+		echo "$name"
+		return 0
+	fi
+
+	name="$name/tmpfile"
+
+	if ! touch "$name"; then
+		rmtempdir
+		return 1
+	fi
+
+	echo "$name"
+	return 0
+}
+
+# usage: rmtempfile TMPFILE
+rmtempfile ()
+{
+	[ $# = 1 ] || return 1
+	if [ -e "$1" ]; then
+		rm "$1" || return 1
+	fi
+	rmtempdir $(dirname "$1") || return 1
+	return 0
 }
 
 # The 'ping' command takes highly OS-dependent arguments, so this
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat.spec /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat.spec
--- heartbeat-2.1.3/heartbeat.spec	2007-12-21 20:45:37.000000000 +0000
+++ heartbeat-2.1.4/heartbeat.spec	2008-12-29 22:12:09.000000000 +0000
@@ -7,29 +7,29 @@
 #	Arguments given to configure -- cleaned up by removing
 #	libdir definitions, etc.
 #
-%define cleaned_configure_args  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--disable-rpath' '--disable-ansi' '--enable-mgmt' '--enable-bundled_ltdl'
+%define cleaned_configure_args  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
 #
 #	Heartbeat features turned on/off
 #
 %define ENABLE_MGMT	1
-%define ENABLE_SNMP_SUBAGENT	0
+%define ENABLE_SNMP_SUBAGENT	1
 %define REQUIRE_OPENHPI	1
 #
 #	Heartbeat-specific defines
 #
 %if %{ENABLE_SNMP_SUBAGENT}
-	%define MIBS_DIR	
+	%define MIBS_DIR	/usr/share/snmp/mibs
 %endif
 %define HA_CCMUSER hacluster
 %define HA_APIGROUP haclient
-%define HA_CCMUID 498
-%define HA_APIGID 496
-%define HB_VERSION 2.1.3
+%define HA_CCMUID 17
+%define HA_APIGID 65
+%define HB_VERSION 2.1.4
 %define SSH /usr/bin/ssh
 %define INITDIR /etc/init.d
 %define OCF_ROOT_DIR /usr/lib/ocf
 %define OCF_RA_DIR /usr/lib/ocf/resource.d/
-%define SNMP_RPM_BUILD_REQUIRES BuildRequires: net-snmp openssl tcp_wrappers
+%define SNMP_RPM_BUILD_REQUIRES BuildRequires: net-snmp tcp_wrappers
 %define PING /bin/ping
 %if	"" != ""
 	%define build_cmpi	1
@@ -136,7 +136,7 @@
 	%define bindir	/usr/bin
 	%define sbindir /usr/sbin
 	%define mandir	/usr/share/man
-	%define docdir	/usr/share/doc/heartbeat-2.1.3
+	%define docdir	/usr/share/doc/heartbeat-2.1.4
 	%define share	/usr/share
 	%define sysconfdir	/etc
 	%define localstatedir	/var
@@ -219,7 +219,7 @@
 URL: http://linux-ha.org/
 Group: %{pkg_group}
 %if !%{distro_style_rpms}
-Packager: Alan Robertson <alanr@unix.sh>
+Packager: Linux-HA <linux-ha-dev@lists.linux-ha.org>
 %endif
 Source: http://linux-ha.org/download/%{HB_PKG}-%{HB_VERSION}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -253,6 +253,9 @@
 Requires: %{STONITH_NAME} = %{version}-%{release}, %{PILS_NAME} = %{version}-%{release}
 Requires: perl, iputils, %{SSH} %{PING} %{IPTABLES}
 Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
+# This is the 2.1.x branch with pacemaker still included as CRM; this
+# prevents the 2.1.x version to be installed along pacemaker:
+Conflicts: pacemaker heartbeat-core heartbeat-common heartbeat-resources
 
 %if %{is_suse}
 %if %{ENABLE_MGMT} && !%{GUI_PACKAGE}
@@ -672,9 +675,14 @@
 else
   USEROPT="-g %{HA_APIGROUP} -u %{HA_CCMUID} -d %{HA_COREDIR}/%{HA_CCMUSER}"
   if
-    /usr/sbin/useradd $USEROPT %{HA_CCMUSER} 2>/dev/null \
-    || /usr/sbin/useradd -M $USEROPT %{HA_CCMUSER} 2>/dev/null
-    # -M to suppress creation of home directory on Red Hat
+    # try with -M first to suppress the creation of the home explicitly
+    # retry without -M for an old useradd which may not recognize the option
+    #
+    # Newer version of useradd tries to create the home by default depending
+    # on its configuration, and returns an error about creating the home
+    # even if the user was added correctly when -M was not specified.
+    /usr/sbin/useradd -M $USEROPT %{HA_CCMUSER} 2>/dev/null \
+    || /usr/sbin/useradd $USEROPT %{HA_CCMUSER} 2>/dev/null
   then
     : OK we were able to add user %{HA_CCMUSER}
   else
@@ -696,6 +704,95 @@
 true
 ###########################################################
 %changelog
+* Mon Aug 18 2008 Lars Marowsky-Bree <lmb@suse.de> and MANY others (see doc/AUTHORS)
++ Version 2.1.4 - bug fixes and enhancements - shortened overview:
+- PE: Ordering between groups and primitives fixed (bnc#396293).
+- PE: Failure score could be overrode by collocation (bnc#385265).
+- PE: Restore the ability to have start failures not be fatal
+  (LF#1866).
+- PE: Allow the cluster to make progress by not retrying failed demote
+  actions.
+- PE: Implement promote/demote ordering for cloned groups.
+- PE: Group start ordering fixes.
+- PE: Make sure monitoring matches the promote/demote state.
+- PE: Collocation with clones caused unnecessary clone instance
+  shuffling (bnc#387749).
+- PE: The failure stickiness of group children is ignored until it
+  reaches -INFINITY (bnc#385265).
+- PE: Enforce mandatory group restarts due to ordering constraints
+  (bnc#396293).
+- PE: Don't restart group children who's individual score drops below
+  zero (bnc#417585)
+- PE: Correctly recover master instances found active on more than one
+  node.
+- PE: Improve probe handling and detection (LF#1920, LF#1932).
+- PE: Prefer the current location if it is one of a group of nodes with
+  the same (highest) score.
+- TE: Prevent the TE from interrupting itself and making failcounts work
+  right again (LF#1859).
+- crmd: Make sure cancelled recurring operations are cleaned out from
+  the CIB (LF#1894).
+- RA: Filesystem: Ensure OCFS2 membership links are only deleted on
+  clean umount (bnc#389599).
+- RA: drbd: Ensure the master preference is set/deleted consistently.
+- RA: IPaddr2: fix IP_CIP_HASH default.
+- RA: o2cb: Clarify description to explain that it should not be used.
+- stonith: external/rackpdu update.
+- stonith: apcmastersnmp handles poweron/poweroff correctly.
+- stonith: external/ipmi: add interface parameter.
+- stonith: external/xen0-ha: Support DomU clusters inside Dom0 clusters.
+- LRM: Support resource timing and async failure notifications
+  (LF#1625).
+- GUI: Support calling hb_report.
+- crm_mon: improved reporting (LF#1883).
+- Logging improvements.
+- ocf-tester: validate meta-data.
+- Minor bugs: LF#1868, LF#1866, LF#1814, LF#1812, bnc#381208, LF#1871,
+  LF#1881 LF#1882, LF#1875, LF#1900, LF#1906, LF#1926, bnc#399497,
+  bnc#357894.
+- crmd: Connecting to the crmd immediately after startup causes
+  use-of-NULL (bnc#369380)
+- crmd: Delay starting the IPC server until we're fully functional
+  (bnc#369380)
+- crmd: Handle unmanaged resources on shutdown (LF#1837)
+- cib: Ensure that the CIB is written to disk in all cases.
+- pengine: improved anonymous clone, group handling, improved
+  master/slave handling (LF#1777, LF#1822, LF#1820, PM#7, PM#12,
+  bnc#371783, PM#1, bnc#34700, 4LF#1648, PM#11, LF#1860, LF#1859,
+  LF#1941)
+- pengine: Handle STONITH on start-up properly (LF#1768)
+- cibadmin: require -f on potentially dangerous commands.
+- CLI: Handle stdout/stderr consistently (bnc#369914)
+- lrmd: fix a memory leak in raexechb.c (LF#1841)
+- lrmd/crmd: improve status propagation (LF#1830)
+- RA: Xen: Many fixes (LF#1830, LF#1856, LF#1858, bnc#369724)
+- RA: ids: allow meta-data and usage under all circumstances
+- RA: Update SAPDatabase to 1.91
+- RA: Update SAPInstance to 1.91
+- haclient: Fill all sub-resources into the list of combobox for
+  selecting
+- mgmt: Several improvements and fixes.
+- hb_report: Many improvements and collecting more relevant information.
+- Fix end-of-month time calculation in leap years (LF#1849)
+- mgmt: Resolve the issue caused by inconsistent names between DTD and
+  RA.
+- mgmt: Rewrite "instance_attributes", "operations" and "expression"
+  based on the new model.
+- Fix blank definition of HA_HBCONF_DIR corrupts heartbeat (bnc#364816)
+- OCF RAs: Make which quiet if it doesn't find the binary.
+- IPaddr RA: fix parsing loopback interface for lvs support.
+- mysql RA: Minor bug fixes.
+- PostgreSQL RA: fix status/monitor function.
+- Correct stonith.8 man page, add examples (LTC#32445)
+- mgmt: Return the actual value returned from cib_conn (bnc#356170)
+- CIB: Ensure changes to top-level attributes (like admin_epoch) cause a
+  disk write
+- stonith ipmilan: add an optional parameter to specify the reset method
+- Add openHPI dependency to build HPI STONITH module.
+- Fix IPMI STONITH (bnc#356219).
+- Fix hb_gui PAM definition (bnc#356169).
+- STONITH hmchttp: new STONITH external plugin
+
 * Fri Dec 21 2007  Alan Robertson <alanr@unix.sh> and MANY others (see doc/AUTHORS file)
 + Version 2.1.3 - bug fixes and enhancements - changelog includes everything after 2.1.2
   + hb_report: heartbeat reporting utility
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/heartbeat.spec.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/heartbeat.spec.in
--- heartbeat-2.1.3/heartbeat.spec.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/heartbeat.spec.in	2008-08-18 13:32:19.000000000 +0100
@@ -219,7 +219,7 @@
 URL: http://linux-ha.org/
 Group: %{pkg_group}
 %if !%{distro_style_rpms}
-Packager: Alan Robertson <alanr@unix.sh>
+Packager: Linux-HA <linux-ha-dev@lists.linux-ha.org>
 %endif
 Source: http://linux-ha.org/download/%{HB_PKG}-%{HB_VERSION}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -253,6 +253,9 @@
 Requires: %{STONITH_NAME} = %{version}-%{release}, %{PILS_NAME} = %{version}-%{release}
 Requires: perl, iputils, %{SSH} %{PING} %{IPTABLES}
 Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
+# This is the 2.1.x branch with pacemaker still included as CRM; this
+# prevents the 2.1.x version to be installed along pacemaker:
+Conflicts: pacemaker heartbeat-core heartbeat-common heartbeat-resources
 
 %if %{is_suse}
 %if %{ENABLE_MGMT} && !%{GUI_PACKAGE}
@@ -672,9 +675,14 @@
 else
   USEROPT="-g %{HA_APIGROUP} -u %{HA_CCMUID} -d %{HA_COREDIR}/%{HA_CCMUSER}"
   if
-    /usr/sbin/useradd $USEROPT %{HA_CCMUSER} 2>/dev/null \
-    || /usr/sbin/useradd -M $USEROPT %{HA_CCMUSER} 2>/dev/null
-    # -M to suppress creation of home directory on Red Hat
+    # try with -M first to suppress the creation of the home explicitly
+    # retry without -M for an old useradd which may not recognize the option
+    #
+    # Newer version of useradd tries to create the home by default depending
+    # on its configuration, and returns an error about creating the home
+    # even if the user was added correctly when -M was not specified.
+    /usr/sbin/useradd -M $USEROPT %{HA_CCMUSER} 2>/dev/null \
+    || /usr/sbin/useradd $USEROPT %{HA_CCMUSER} 2>/dev/null
   then
     : OK we were able to add user %{HA_CCMUSER}
   else
@@ -696,6 +704,95 @@
 true
 ###########################################################
 %changelog
+* Mon Aug 18 2008 Lars Marowsky-Bree <lmb@suse.de> and MANY others (see doc/AUTHORS)
++ Version 2.1.4 - bug fixes and enhancements - shortened overview:
+- PE: Ordering between groups and primitives fixed (bnc#396293).
+- PE: Failure score could be overrode by collocation (bnc#385265).
+- PE: Restore the ability to have start failures not be fatal
+  (LF#1866).
+- PE: Allow the cluster to make progress by not retrying failed demote
+  actions.
+- PE: Implement promote/demote ordering for cloned groups.
+- PE: Group start ordering fixes.
+- PE: Make sure monitoring matches the promote/demote state.
+- PE: Collocation with clones caused unnecessary clone instance
+  shuffling (bnc#387749).
+- PE: The failure stickiness of group children is ignored until it
+  reaches -INFINITY (bnc#385265).
+- PE: Enforce mandatory group restarts due to ordering constraints
+  (bnc#396293).
+- PE: Don't restart group children who's individual score drops below
+  zero (bnc#417585)
+- PE: Correctly recover master instances found active on more than one
+  node.
+- PE: Improve probe handling and detection (LF#1920, LF#1932).
+- PE: Prefer the current location if it is one of a group of nodes with
+  the same (highest) score.
+- TE: Prevent the TE from interrupting itself and making failcounts work
+  right again (LF#1859).
+- crmd: Make sure cancelled recurring operations are cleaned out from
+  the CIB (LF#1894).
+- RA: Filesystem: Ensure OCFS2 membership links are only deleted on
+  clean umount (bnc#389599).
+- RA: drbd: Ensure the master preference is set/deleted consistently.
+- RA: IPaddr2: fix IP_CIP_HASH default.
+- RA: o2cb: Clarify description to explain that it should not be used.
+- stonith: external/rackpdu update.
+- stonith: apcmastersnmp handles poweron/poweroff correctly.
+- stonith: external/ipmi: add interface parameter.
+- stonith: external/xen0-ha: Support DomU clusters inside Dom0 clusters.
+- LRM: Support resource timing and async failure notifications
+  (LF#1625).
+- GUI: Support calling hb_report.
+- crm_mon: improved reporting (LF#1883).
+- Logging improvements.
+- ocf-tester: validate meta-data.
+- Minor bugs: LF#1868, LF#1866, LF#1814, LF#1812, bnc#381208, LF#1871,
+  LF#1881 LF#1882, LF#1875, LF#1900, LF#1906, LF#1926, bnc#399497,
+  bnc#357894.
+- crmd: Connecting to the crmd immediately after startup causes
+  use-of-NULL (bnc#369380)
+- crmd: Delay starting the IPC server until we're fully functional
+  (bnc#369380)
+- crmd: Handle unmanaged resources on shutdown (LF#1837)
+- cib: Ensure that the CIB is written to disk in all cases.
+- pengine: improved anonymous clone, group handling, improved
+  master/slave handling (LF#1777, LF#1822, LF#1820, PM#7, PM#12,
+  bnc#371783, PM#1, bnc#34700, 4LF#1648, PM#11, LF#1860, LF#1859,
+  LF#1941)
+- pengine: Handle STONITH on start-up properly (LF#1768)
+- cibadmin: require -f on potentially dangerous commands.
+- CLI: Handle stdout/stderr consistently (bnc#369914)
+- lrmd: fix a memory leak in raexechb.c (LF#1841)
+- lrmd/crmd: improve status propagation (LF#1830)
+- RA: Xen: Many fixes (LF#1830, LF#1856, LF#1858, bnc#369724)
+- RA: ids: allow meta-data and usage under all circumstances
+- RA: Update SAPDatabase to 1.91
+- RA: Update SAPInstance to 1.91
+- haclient: Fill all sub-resources into the list of combobox for
+  selecting
+- mgmt: Several improvements and fixes.
+- hb_report: Many improvements and collecting more relevant information.
+- Fix end-of-month time calculation in leap years (LF#1849)
+- mgmt: Resolve the issue caused by inconsistent names between DTD and
+  RA.
+- mgmt: Rewrite "instance_attributes", "operations" and "expression"
+  based on the new model.
+- Fix blank definition of HA_HBCONF_DIR corrupts heartbeat (bnc#364816)
+- OCF RAs: Make which quiet if it doesn't find the binary.
+- IPaddr RA: fix parsing loopback interface for lvs support.
+- mysql RA: Minor bug fixes.
+- PostgreSQL RA: fix status/monitor function.
+- Correct stonith.8 man page, add examples (LTC#32445)
+- mgmt: Return the actual value returned from cib_conn (bnc#356170)
+- CIB: Ensure changes to top-level attributes (like admin_epoch) cause a
+  disk write
+- stonith ipmilan: add an optional parameter to specify the reset method
+- Add openHPI dependency to build HPI STONITH module.
+- Fix IPMI STONITH (bnc#356219).
+- Fix hb_gui PAM definition (bnc#356169).
+- STONITH hmchttp: new STONITH external plugin
+
 * Fri Dec 21 2007  Alan Robertson <alanr@unix.sh> and MANY others (see doc/AUTHORS file)
 + Version 2.1.3 - bug fixes and enhancements - changelog includes everything after 2.1.2
   + hb_report: heartbeat reporting utility
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/clplumbing/cl_log.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/clplumbing/cl_log.h
--- heartbeat-2.1.3/include/clplumbing/cl_log.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/clplumbing/cl_log.h	2008-08-18 13:32:19.000000000 +0100
@@ -61,6 +61,7 @@
 
 void		cl_flush_logs(void);
 void cl_log_args(int argc, char **argv);
+int cl_log_is_logd_fd(int fd);
 
 
 typedef struct CircularBuffer_s 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/clplumbing/ipc.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/clplumbing/ipc.h
--- heartbeat-2.1.3/include/clplumbing/ipc.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/clplumbing/ipc.h	2008-08-18 13:32:19.000000000 +0100
@@ -65,6 +65,8 @@
 #define IPC_FAIL 1
 #define IPC_BROKEN 2
 #define IPC_INTR 3
+#define IPC_TIMEOUT 4
+
 /*
  *	IPC:  Sockets-like Interprocess Communication Abstraction
  *
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/clplumbing/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/clplumbing/Makefile
--- heartbeat-2.1.3/include/clplumbing/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/clplumbing/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,610 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/clplumbing/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2002 International Business Machines.
+# Author:	Alan Robertson <alanr@unix.sh>
+#
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/clplumbing
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/clplumbing
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/clplumbing
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = \
+	Gmain_timeout.h	\
+	GSource.h	\
+	GSource_internal.h	\
+	apphb_cs.h	\
+	base64.h	\
+	cl_log.h	\
+	cl_malloc.h	\
+	cl_poll.h	\
+	cl_signal.h	\
+	cl_pidfile.h	\
+	cl_random.h	\
+	cl_reboot.h	\
+	cl_syslog.h	\
+	cl_uuid.h	\
+	coredumps.h	\
+	cpulimits.h	\
+	ipc.h		\
+	lsb_exitcodes.h	\
+	loggingdaemon.h	\
+	longclock.h	\
+	mkstemp_mode.h	\
+	netstring.h	\
+	proctrack.h	\
+	realtime.h	\
+	replytrack.h	\
+	setproctitle.h	\
+	recoverymgr_cs.h\
+	timers.h	\
+	uids.h		\
+	cl_misc.h	\
+	md5.h		\
+	cl_plugin.h	\
+	cl_tiebreaker.h	\
+	cl_quorum.h	\
+	cl_quorumd.h
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/clplumbing/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/clplumbing/Makefile.in
--- heartbeat-2.1.3/include/clplumbing/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/clplumbing/Makefile.in	2008-08-18 23:37:58.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -60,7 +60,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -109,6 +109,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -126,24 +127,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -205,12 +194,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -446,8 +436,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -459,8 +449,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -470,13 +460,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/config.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/config.h
--- heartbeat-2.1.3/include/config.h	2007-12-21 20:45:54.000000000 +0000
+++ heartbeat-2.1.4/include/config.h	2008-12-29 22:12:09.000000000 +0000
@@ -3,10 +3,10 @@
 
 /* Set if CLOCK_T is adequate by itself for the "indefinite future" (>= 100
    years) */
-/* #undef CLOCK_T_IS_LONG_ENOUGH */
+#define CLOCK_T_IS_LONG_ENOUGH 1
 
 /* Use libc malloc instead of Heartbeat's custom one. */
-/* #undef CL_USE_LIBC_MALLOC */
+#define CL_USE_LIBC_MALLOC 1
 
 /* big-endian */
 /* #undef CONFIG_BIG_ENDIAN */
@@ -48,7 +48,7 @@
 #define HAVE_DAEMON 1
 
 /* Define to 1 if you have the <db.h> header file. */
-#define HAVE_DB_H 1
+/* #undef HAVE_DB_H */
 
 /* Have getopt function */
 #define HAVE_DECL_GETOPT 1
@@ -171,9 +171,6 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
-/* Define to 1 if you have the <linux/icmpv6.h> header file. */
-#define HAVE_LINUX_ICMPV6_H 1
-
 /* Define to 1 if you have the <linux/watchdog.h> header file. */
 #define HAVE_LINUX_WATCHDOG_H 1
 
@@ -193,7 +190,10 @@
 #define HAVE_NCURSES_H 1
 
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
-#define HAVE_NCURSES_NCURSES_H 1
+/* #undef HAVE_NCURSES_NCURSES_H */
+
+/* Define to 1 if you have the <netinet/icmp6.h> header file. */
+#define HAVE_NETINET_ICMP6_H 1
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #define HAVE_NETINET_IN_H 1
@@ -262,7 +262,7 @@
 /* #undef HAVE_SETPROCTITLE */
 
 /* Define to 1 if you have the `sigignore' function. */
-/* #undef HAVE_SIGIGNORE */
+#define HAVE_SIGIGNORE 1
 
 /* */
 /* #undef HAVE_SOCKADDR_IN_SIN_LEN */
@@ -429,13 +429,13 @@
 #define HAVE___PROGNAME 1
 
 /* id for api group */
-#define HA_APIGID 496
+#define HA_APIGID 65
 
 /* group for our programs */
 #define HA_APIGROUP "haclient"
 
 /* id for ccm user */
-#define HA_CCMUID 498
+#define HA_CCMUID 17
 
 /* user to run privileged non-root things as */
 #define HA_CCMUSER "hacluster"
@@ -561,7 +561,7 @@
 #define PING_TIMEOUT_OPT "-w1"
 
 /* path to the poweroff command */
-#define POWEROFF_CMD "/usr/bin/poweroff"
+#define POWEROFF_CMD "/sbin/poweroff"
 
 /* poweroff options */
 #define POWEROFF_OPTIONS "-nf"
@@ -570,7 +570,7 @@
 #define PROCROUTE "/proc/net/route"
 
 /* path to the reboot command */
-#define REBOOT "/usr/bin/reboot"
+#define REBOOT "/sbin/reboot"
 
 /* reboot options */
 #define REBOOT_OPTIONS "-nf"
@@ -588,7 +588,7 @@
 #define SIZEOF_INT 4
 
 /* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
+#define SIZEOF_LONG 8
 
 /* The size of `long long', as computed by sizeof. */
 #define SIZEOF_LONG_LONG 8
@@ -612,7 +612,7 @@
 #define UCDSNMPDEVEL 
 
 /* Valgrind command */
-#define VALGRIND_BIN "/usr/bin/valgrind"
+#define VALGRIND_BIN ""
 
 /* Valgrind logging options */
 #define VALGRIND_LOG "--log-socket=127.0.0.1:1234"
@@ -621,7 +621,7 @@
 #define VALGRIND_SUPP "/dev/null"
 
 /* Version number of package */
-#define VERSION "2.1.3"
+#define VERSION "2.1.4"
 
 /* Use the new Cluster Resource Manager */
 #define WITH_CRM 1
@@ -631,7 +631,7 @@
 #define YYTEXT_POINTER 1
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
+/* #undef _FILE_OFFSET_BITS */
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/common/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/common/Makefile
--- heartbeat-2.1.3/include/crm/common/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/crm/common/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,570 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/crm/common/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+# Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm/common
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm/common
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/crm/common
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = xml.h ipc.h msg.h ctrl.h util.h iso8601.h
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/common/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/common/Makefile.in
--- heartbeat-2.1.3/include/crm/common/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/crm/common/Makefile.in	2008-08-18 23:37:58.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -58,7 +58,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -107,6 +107,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -124,24 +125,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -203,12 +192,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -406,8 +396,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +409,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +420,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/common/util.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/common/util.h
--- heartbeat-2.1.3/include/crm/common/util.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/crm/common/util.h	2008-08-18 13:32:19.000000000 +0100
@@ -100,12 +100,12 @@
 
 extern gboolean decode_transition_magic(
 	const char *magic, char **uuid,
-	int *transition_id, int *action_id, int *op_status, int *op_rc);
+	int *transition_id, int *action_id, int *op_status, int *op_rc, int *target_rc);
 
-extern char *generate_transition_key(int action, int transition_id, const char *node);
+extern char *generate_transition_key(int action, int transition_id, int target_rc, const char *node);
 
 extern gboolean decode_transition_key(
-	const char *key, char **uuid, int *action, int *transition_id);
+    const char *key, char **uuid, int *action, int *transition_id, int *target_rc);
 
 extern char *crm_concat(const char *prefix, const char *suffix, char join);
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/common/xml.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/common/xml.h
--- heartbeat-2.1.3/include/crm/common/xml.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/crm/common/xml.h	2008-08-18 13:32:19.000000000 +0100
@@ -67,6 +67,8 @@
  *
  */
 extern void copy_in_properties(crm_data_t *target, const crm_data_t *src);
+extern void expand_plus_plus(crm_data_t* target, const char *name, const char *value);
+extern void fix_plus_plus_recursive(crm_data_t* target);
 
 /*
  * Find a child named search_path[i] at level i in the XML fragment where i=0
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/crm.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/crm.h
--- heartbeat-2.1.3/include/crm/crm.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/crm/crm.h	2008-08-18 13:32:19.000000000 +0100
@@ -68,6 +68,8 @@
 		crm_abort(__FILE__,__PRETTY_FUNCTION__,__LINE__, #expr, FALSE, TRUE); \
 	}
 
+extern const char *crm_system_name;
+
 #define CRM_CHECK(expr, failure_action) if((expr) == FALSE) {		\
 	crm_abort(__FILE__,__PRETTY_FUNCTION__,__LINE__, #expr, FALSE, TRUE); \
 	failure_action;							\
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/Makefile
--- heartbeat-2.1.3/include/crm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/crm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,685 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/crm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/crm
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
+#
+# 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., 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
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(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
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/Makefile.in
--- heartbeat-2.1.3/include/crm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/crm/Makefile.in	2008-08-18 23:37:58.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -99,6 +99,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -116,24 +117,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -195,12 +184,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -487,8 +477,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -513,8 +503,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -524,13 +514,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/pengine/complex.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/pengine/complex.h
--- heartbeat-2.1.3/include/crm/pengine/complex.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/crm/pengine/complex.h	2008-08-18 13:32:19.000000000 +0100
@@ -116,5 +116,6 @@
 				node_t *node, pe_working_set_t *data_set);
 
 typedef struct resource_alloc_functions_s resource_alloc_functions_t;
+extern resource_t *uber_parent(resource_t *rsc);
 
 #endif
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/pengine/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/pengine/Makefile
--- heartbeat-2.1.3/include/crm/pengine/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/crm/pengine/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,570 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/crm/pengine/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm/pengine
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/crm/pengine
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/crm/pengine
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = common.h complex.h rules.h status.h
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/pengine/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/pengine/Makefile.in
--- heartbeat-2.1.3/include/crm/pengine/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/crm/pengine/Makefile.in	2008-08-18 23:37:59.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -406,8 +396,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -419,8 +409,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -430,13 +420,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/crm/pengine/status.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/crm/pengine/status.h
--- heartbeat-2.1.3/include/crm/pengine/status.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/crm/pengine/status.h	2008-08-18 13:32:19.000000000 +0100
@@ -192,6 +192,7 @@
 		gboolean pseudo;
 		gboolean runnable;
 		gboolean optional;
+		gboolean print_always;
 		gboolean failure_is_fatal;
 		gboolean implied_by_stonith;
 		gboolean allow_reload_conversion;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/fencing/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/fencing/Makefile
--- heartbeat-2.1.3/include/fencing/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/fencing/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,571 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/fencing/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/fencing
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/fencing
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/fencing
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = stonithd_api.h stonithd_msg.h
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/fencing/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/fencing/Makefile.in
--- heartbeat-2.1.3/include/fencing/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/fencing/Makefile.in	2008-08-18 23:37:59.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -407,8 +397,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -420,8 +410,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -431,13 +421,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/ha_msg.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/ha_msg.h
--- heartbeat-2.1.3/include/ha_msg.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/ha_msg.h	2008-08-18 13:32:19.000000000 +0100
@@ -310,7 +310,12 @@
 /* Return value associated with particular name */
 #define ha_msg_value(m,name) cl_get_string(m, name)
 
+/* Call wait(in|out) but only for a finite time */
+int cl_ipc_wait_timeout(
+    IPC_Channel * chan, int (*waitfun)(IPC_Channel * chan), unsigned int timeout);
+
 /* Reads an IPC stream -- converts it into a message */
+struct ha_msg * msgfromIPC_timeout(IPC_Channel *ch, int flag, unsigned int timeout, int *rc_out);
 struct ha_msg *	msgfromIPC(IPC_Channel * f, int flag);
 
 IPC_Message * ipcmsgfromIPC(IPC_Channel * ch);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/ha_version.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/ha_version.h
--- heartbeat-2.1.3/include/ha_version.h	2007-12-21 20:46:28.000000000 +0000
+++ heartbeat-2.1.4/include/ha_version.h	2008-08-18 23:39:05.000000000 +0100
@@ -1,2 +1,2 @@
-/* node: 552305612591183b1628baa5bc6e903e0f1e26a3 */
-#define HA_HG_VERSION "node: 552305612591183b1628baa5bc6e903e0f1e26a3"
+/* node: aa909246edb386137b986c5773344b98c6969999 */
+#define HA_HG_VERSION "node: aa909246edb386137b986c5773344b98c6969999"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/hb_config.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/hb_config.h
--- heartbeat-2.1.3/include/hb_config.h	2007-12-21 20:45:54.000000000 +0000
+++ heartbeat-2.1.4/include/hb_config.h	2008-12-29 22:12:09.000000000 +0000
@@ -31,23 +31,23 @@
 #define MGMT_ENABLED 1
 
 /* $malloc_desc */
-/* #undef CL_USE_LIBC_MALLOC */
+#define CL_USE_LIBC_MALLOC 1
 
 /* Set if CLOCK_T is adequate by itself for the "indefinite future" (>= 100
    years) */
-/* #undef CLOCK_T_IS_LONG_ENOUGH */
+#define CLOCK_T_IS_LONG_ENOUGH 1
 
 /* Group to own API fifos */
 #define HA_APIGROUP "haclient"
 
 /* GID to own API fifos */
-#define HA_APIGID 496
+#define HA_APIGID 65
 
 /* User to own CCM fifos */
 #define HA_CCMUSER "hacluster"
 
 /* UID to own CCM fifos */
-#define HA_CCMUID 498
+#define HA_CCMUID 17
 
 /* Web site base URL */
 #define HA_URLBASE "http://linux-ha.org/"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/lrm/lrm_api.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/lrm/lrm_api.h
--- heartbeat-2.1.3/include/lrm/lrm_api.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/lrm/lrm_api.h	2008-08-18 13:32:19.000000000 +0100
@@ -144,6 +144,7 @@
 	char*			output;
 	char*			rsc_id;
 	char*			app_name;
+	char*			fail_reason;
 	unsigned long		t_run; /* when did the op run (as age) */
 	unsigned long		t_rcchange; /* last rc change (as age) */
 	unsigned long		exec_time; /* time it took the op to run */
@@ -166,6 +167,11 @@
 	LRM_RSC_BUSY
 }state_flag_t;
 
+/* defaults for the asynchronous resource failures */
+enum { DEFAULT_FAIL_RC = EXECRA_UNKNOWN_ERROR };
+#define DEFAULT_FAIL_REASON "asynchronous monitor error"
+#define ASYNC_OP_NAME "asyncmon"
+
 struct rsc_ops
 {
 /*
@@ -377,6 +383,21 @@
 	int	(*delete_rsc)(ll_lrm_t*, const char* rsc_id);
 
 /*
+ *fail_rsc:	fail a resource
+ *		Allow asynchronous monitor failures. Notifies all clients
+ *		which have operations defined for the resource.
+ *		The fail_rc parameter should be set to one of the OCF
+ *		return codes (if non-positive it defaults to
+ *		OCF_ERR_GENERIC). The fail_reason parameter should
+ *		contain the description of the failure (i.e. "daemon
+ *		panicked" or similar). If NULL is passed or empty string,
+ *		it defaults to "asynchronous monitor failure".
+ *
+ *return:	HA_OK for success, HA_FAIL for failure
+ */
+	int (*fail_rsc)(ll_lrm_t* lrm, const char* rsc_id,
+		const int fail_rc, const char* fail_reason);
+/*
  *ipcchan:	Return the IPC channel which can be used for determining
  *		when messages are ready to be read.
  *return:	the IPC Channel
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/lrm/lrm_msg.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/lrm/lrm_msg.h
--- heartbeat-2.1.3/include/lrm/lrm_msg.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/lrm/lrm_msg.h	2008-08-18 13:32:19.000000000 +0100
@@ -74,6 +74,8 @@
 #define F_LRM_T_RCCHANGE	"lrm_t_rcchange"
 #define F_LRM_EXEC_TIME		"lrm_exec_time"
 #define F_LRM_QUEUE_TIME	"lrm_queue_time"
+#define F_LRM_FAIL_REASON	"lrm_fail_reason"
+#define F_LRM_ASYNCMON_RC	"lrm_asyncmon_rc"
 
 #define	PRINT 	printf("file:%s,line:%d\n",__FILE__,__LINE__);
 
@@ -93,6 +95,7 @@
 #define FLUSHRSC		"flush"
 #define ADDRSC			"addrsc"
 #define DELRSC			"delrsc"
+#define FAILRSC			"failrsc"
 #define PERFORMOP		"op"
 #define ISOPSUPPORT		"opspt"
 #define OPDONE			"opdone"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/lrm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/lrm/Makefile
--- heartbeat-2.1.3/include/lrm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/lrm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,571 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/lrm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/lrm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/lrm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/lrm
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/lrm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/lrm/Makefile.in
--- heartbeat-2.1.3/include/lrm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/lrm/Makefile.in	2008-08-18 23:37:59.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -407,8 +397,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -420,8 +410,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -431,13 +421,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/lrm/racommon.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/lrm/racommon.h
--- heartbeat-2.1.3/include/lrm/racommon.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/lrm/racommon.h	2008-08-18 13:32:19.000000000 +0100
@@ -23,5 +23,6 @@
 void get_ra_pathname(const char* class_path, const char* type, const char* provider, char pathname[]);
 gboolean filtered(char * file_name);
 int get_runnable_list(const char* class_path, GList ** rsc_info);
+void closefiles(void);
 
 #endif /* RACOMMON_H */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/Makefile
--- heartbeat-2.1.3/include/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#                    This instance created by Horms
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+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_DIR)
+
+HG_LIVE_VERSION = `$(HG) -R "$(top_srcdir)" id`
+ARCHIVE_VERSION = "$(top_srcdir)/.hg_archival.txt"
+HG_TAR_VERSION = `$(EGREP) node: "$(ARCHIVE_VERSION)"`
+all: config.h hb_config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+$(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
+.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) $(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:  $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+hb_config.h: stamp-h2
+	@if test ! -f $@; then \
+	  rm -f 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
+
+distclean-hdr:
+	-rm -f config.h stamp-h1 hb_config.h stamp-h2
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(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
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.h.in hb_config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS) config.h.in hb_config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(HEADERS) config.h hb_config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-includeHEADERS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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)
+	if [ -r ha_version.h -a ! -w ha_version.h ]; then	\
+		hgv="";						\
+		echo "Saved Version";	 			\
+	elif [ -f $(ARCHIVE_VERSION) ]; then			\
+		hgv="$(HG_TAR_VERSION)";			\
+		echo "Hg Archived Version: $${hgv}";		\
+	elif [ -x $(HG) -a -d $(top_srcdir)/.hg ]; then		\
+		hgv="$(HG_LIVE_VERSION)";			\
+		echo "Hg Live Version: $${hgv}";	 	\
+	elif [ -r ha_version.h ]; then				\
+		hgv="";						\
+		echo "Hg Saved Live Version"; 			\
+		cat ha_version.h; 				\
+	else							\
+		hgv="Unknown";					\
+		echo "Unknown Hg Version";			\
+	fi ;							\
+	if [ X"$${hgv}" != "X" ]; then					\
+	  echo "/* $${hgv} */" > ha_version.h; 				\
+	  echo "#define HA_HG_VERSION \"$${hgv}\"" >> ha_version.h; 	\
+	fi
+
+.PHONY: $(ARCHIVE_VERSION)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/Makefile.am
--- heartbeat-2.1.3/include/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -32,7 +32,7 @@
 			  recoverymgr.h replace_uuid.h compress.h
 
 SUBDIRS                 = clplumbing ocf pils saf 			\
-			  stonith fencing lrm $(CRM_DIR) mgmt	
+			  stonith fencing lrm $(CRM_DIR) $(MGMT_DIR)
 
 ## The backtick commands are not executed here,
 ## but rather as macro-expansions at use within the rules.
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/Makefile.in
--- heartbeat-2.1.3/include/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/Makefile.in	2008-08-18 23:37:58.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -62,7 +62,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h hb_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -120,6 +120,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -137,24 +138,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -216,12 +205,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -364,7 +354,7 @@
 			  recoverymgr.h replace_uuid.h compress.h
 
 SUBDIRS = clplumbing ocf pils saf 			\
-			  stonith fencing lrm $(CRM_DIR) mgmt	
+			  stonith fencing lrm $(CRM_DIR) $(MGMT_DIR)
 
 HG_LIVE_VERSION = `$(HG) -R "$(top_srcdir)" id`
 ARCHIVE_VERSION = "$(top_srcdir)/.hg_archival.txt"
@@ -528,8 +518,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -554,8 +544,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -565,13 +555,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in hb_config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in hb_config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/mgmt/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/mgmt/Makefile
--- heartbeat-2.1.3/include/mgmt/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/mgmt/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,576 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/mgmt/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/mgmt
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/mgmt
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/heartbeat/mgmt
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/mgmt/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/mgmt/Makefile.in
--- heartbeat-2.1.3/include/mgmt/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/mgmt/Makefile.in	2008-08-18 23:37:59.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -412,8 +402,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -425,8 +415,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -436,13 +426,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/mgmt/mgmt_common.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/mgmt/mgmt_common.h
--- heartbeat-2.1.3/include/mgmt/mgmt_common.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/include/mgmt/mgmt_common.h	2008-08-18 13:32:19.000000000 +0100
@@ -104,6 +104,18 @@
 
 /*
 description:
+	return the dtd of crm
+format:
+	MSG_CRM_DTD
+return:
+	MSG_OK LINE1 LINE2 ... LINEn
+or
+	MSG_FAIL
+*/
+#define MSG_CRM_DTD	"crm_dtd"
+
+/*
+description:
 	return the metadata of crm
 format:
 	MSG_CRM_METADATA CRM_CMD
@@ -428,7 +440,7 @@
 description:
 	clean up a unmanaged resource
 format:
-	MSG_CLEANUP_RSC resource
+	MSG_CLEANUP_RSC node resource
 return:
 	MSG_OK
 or
@@ -781,6 +793,17 @@
 */
 #define MSG_RSC_METADATA	"rsc_metadata"
 
+/*
+description:
+	generate cluster report and return the list of files
+format:
+	MSG_GEN_CLUSTER_REPORT ftime ttime
+return:
+	MSG_OK filename base64_str1 base64_str2 ... base64_strn
+or
+	MSG_FAIL
+*/
+#define MSG_GEN_CLUSTER_REPORT	"gen_cluster_report"
 
 /*************************EVENTS*********************************************/
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/ocf/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/ocf/Makefile
--- heartbeat-2.1.3/include/ocf/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/ocf/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,578 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/ocf/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/ocf
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/ocf
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(base_includedir)/ocf
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2002 International Business Machines.
+# Author:	Alan Robertson <alanr@unix.sh>
+#
+#
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = \
+	oc_event.h		\
+	oc_membership.h
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/ocf/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/ocf/Makefile.in
--- heartbeat-2.1.3/include/ocf/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/ocf/Makefile.in	2008-08-18 23:37:59.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -414,8 +404,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -427,8 +417,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -438,13 +428,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/pils/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/pils/Makefile
--- heartbeat-2.1.3/include/pils/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/pils/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,575 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/pils/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/pils
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/pils
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(pils_includedir)
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#                    This instance created by Horms
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+include_HEADERS = generic.h interface.h plugin.h
+all: all-am
+
+.SUFFIXES:
+$(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
+.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:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/pils/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/pils/Makefile.in
--- heartbeat-2.1.3/include/pils/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/pils/Makefile.in	2008-08-18 23:38:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = plugin.h
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -411,8 +401,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -424,8 +414,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -435,13 +425,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/saf/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/saf/Makefile
--- heartbeat-2.1.3/include/saf/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/saf/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/saf/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/saf
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/saf
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include/saf
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#                    This instance created by alanr
+#
+# 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., 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
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/saf/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/saf/Makefile.in
--- heartbeat-2.1.3/include/saf/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/saf/Makefile.in	2008-08-18 23:38:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -409,8 +399,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -422,8 +412,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -433,13 +423,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/stamp-h1 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/stamp-h1
--- heartbeat-2.1.3/include/stamp-h1	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/stamp-h1	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1 @@
+timestamp for include/config.h
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/stamp-h2 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/stamp-h2
--- heartbeat-2.1.3/include/stamp-h2	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/stamp-h2	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1 @@
+timestamp for include/hb_config.h
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/stonith/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/stonith/Makefile
--- heartbeat-2.1.3/include/stonith/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/include/stonith/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# include/stonith/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/stonith
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/include/stonith
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = $(stonith_includedir)
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# linux-ha: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#                    This instance created by Horms
+#
+# 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., 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
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/include/stonith/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/include/stonith/Makefile.in
--- heartbeat-2.1.3/include/stonith/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/include/stonith/Makefile.in	2008-08-18 23:38:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -409,8 +399,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -422,8 +412,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -433,13 +423,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/install-sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/install-sh
--- heartbeat-2.1.3/install-sh	2007-12-21 20:44:16.000000000 +0000
+++ heartbeat-2.1.4/install-sh	2008-08-18 23:37:49.000000000 +0100
@@ -1,7 +1,8 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-#
+
+scriptversion=2006-12-25.00
+
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
@@ -38,257 +39,481 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
 
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
+stripcmd=
 
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
+src=
+dst=
+dir_arg=
+dst_arg=
 
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
+copy_on_change=false
+no_target_directory=
 
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
 
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
 
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
 
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
 
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
 
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
+    -C) copy_on_change=true;;
 
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
+    -d) dir_arg=true;;
 
-	pathcomp=$pathcomp/
-done
-fi
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
 
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
+    --help) echo "$usage"; exit $?;;
 
-# If we're going to rename the final executable, determine the name now.
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
+    -o) chowncmd="$chownprog $2"
+	shift;;
 
-# don't allow the sed command to completely eliminate the filename
+    -s) stripcmd=$stripprog;;
 
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
+    -t) dst_arg=$2
+	shift;;
 
-# Make a couple of temp file names in the proper directory.
+    -T) no_target_directory=true;;
 
-	dsttmp=$dstdir/_inst.$$_
-	rmtmp=$dstdir/_rm.$$_
+    --version) echo "$0 $scriptversion"; exit $?;;
 
-# Trap to clean up temp files at exit.
+    --)	shift
+	break;;
 
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
 
-# Move or copy the file name to the temp name
+    *)  break;;
+  esac
+  shift
+done
 
-	$doit $instcmd "$src" "$dsttmp" &&
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
 
-# and set any options; do chmod last to preserve setuid bits
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
 
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
 
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
 	else
-		:
+	  mkdir_mode=
 	fi
-} &&
 
-# Now rename the file to the real destination.
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
 
-fi &&
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
+  fi
+done
 
-{
-	(exit 0); exit
-}
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/init.d/ldirectord /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/init.d/ldirectord
--- heartbeat-2.1.3/ldirectord/init.d/ldirectord	2007-12-21 20:45:48.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/init.d/ldirectord	2008-08-18 23:38:56.000000000 +0100
@@ -25,12 +25,12 @@
 #	running outside a heartbeat managed environment.
 #	ldirectord manages the Linux Virtual Server component for
 #	TCP/UDP load-balancing.
-#	It uses the config file /etc/ha.d/ldirectord.cf.
+#	It uses the config file /usr/local/etc/ha.d/ldirectord.cf.
 ### END INIT INFO
 
-DAEMON=/usr/sbin/ldirectord
+DAEMON=/usr/local/sbin/ldirectord
 
-. /etc/ha.d/shellfuncs
+. /usr/local/etc/ha.d/shellfuncs
 
 # Source function library.
 if
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/init.d/ldirectord.debian
--- heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian	2007-12-21 20:45:48.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/init.d/ldirectord.debian	2008-08-18 23:38:56.000000000 +0100
@@ -1,12 +1,21 @@
 #!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          ldirectord
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+#
 # Author: Horms <horms@verge.net.au>
 #
 # Debian init script for ldirectord
 #
 
 NAME=ldirectord
-DAEMON="/usr/sbin/$NAME"
-CONFIG="/etc/default/$NAME"
+DAEMON="/usr/local/sbin/$NAME"
+CONFIG="/usr/local/etc/default/$NAME"
 
 test -x $DAEMON || exit 0
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/init.d/ldirectord.debian.in
--- heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/init.d/ldirectord.debian.in	2008-08-18 13:32:19.000000000 +0100
@@ -1,4 +1,13 @@
 #!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          ldirectord
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+#
 # Author: Horms <horms@verge.net.au>
 #
 # Debian init script for ldirectord
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/init.d/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/init.d/Makefile.in
--- heartbeat-2.1.3/ldirectord/init.d/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/init.d/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ldirectord ldirectord.debian \
@@ -83,6 +83,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -100,24 +101,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -179,12 +168,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/ldirectord /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/ldirectord
--- heartbeat-2.1.3/ldirectord/ldirectord	2007-12-21 20:45:48.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/ldirectord	2008-08-18 23:38:56.000000000 +0100
@@ -56,7 +56,7 @@
 B<ldirectord> is a daemon to monitor and administer real servers in a
 cluster of load balanced virtual servers. B<ldirectord> typically is
 started from heartbeat but can also be run from the command line. On
-startup B<ldirectord> reads the file B</etc/ha.d/conf/>I<configuration>.
+startup B<ldirectord> reads the file B</usr/local/etc/ha.d/conf/>I<configuration>.
 After parsing the file, entries for virtual servers are created on the LVS.
 Now at regular intervals the specified real servers are monitored and if
 they are considered alive, added to a list for each virtual server. If a
@@ -64,7 +64,7 @@
 B<ldirectord> can be started for each configuration, but more instances of
 B<ldirectord> may be started for different configurations. This helps to
 group clusters of services.  Normally one would put an entry inside
-B</etc/ha.d/haresources>
+B</usr/local/etc/ha.d/haresources>
 
 I<nodename virtual-ip-address ldirectord::configuration>
 
@@ -75,7 +75,7 @@
 
 I<configuration>:
 This is the name for the configuration as specified in the file
-B</etc/ha.d/conf/>I<configuration>
+B</usr/local/etc/ha.d/conf/>I<configuration>
 
 B<-d|--debug> Don't start as daemon and log verbosly. 
 
@@ -426,7 +426,7 @@
 For a DNS check this should the name of an A record, or the address
 of a PTR record to look up.
 
-For a MySQL, Oracle or PostgeSQL check, this should be an SQL query.
+For a MySQL, Oracle or PostgeSQL check, this should be an SQL SELECT query.
 The data returned is not checked, only that the
 answer is one or more rows.  This is a required setting.
 
@@ -557,10 +557,20 @@
 
 =back 4
 
+B<monitorfile = ">I</path/to/monitorfile>B<">
+
+File to continuously log the real service checks to for this virtual
+service. This is useful for monitoring when and why real services were down
+or for statistics.
+
+The log format is:
+[timestamp|pid|real_service_id|status|message]
+
+Default: no separate logging of service checks.
 
 =head1 FILES
 
-B</etc/ha.d/ldirectord.cf>
+B</usr/local/etc/ha.d/ldirectord.cf>
 
 B</var/log/ldirectord.log>
 
@@ -635,7 +645,7 @@
 	    $CRLF
 );
 
-$VERSION_STR = "Linux Director v1.186-ha-2.1.3";
+$VERSION_STR = "Linux Director v1.186-ha-2.1.4";
 
 $DAEMON_STATUS_STARTING  = 0x1;
 $DAEMON_STATUS_RUNNING   = 0x2;
@@ -659,7 +669,7 @@
 $CHECKCOUNT       = 1;
 $LDIRECTORD       = ld_find_cmd("ldirectord", 1);
 if (! defined $LDIRECTORD) {
-	$LDIRECTORD = "/usr/sbin/ldirectord";
+	$LDIRECTORD = "/usr/local/sbin/ldirectord";
 }
 $LDIRLOG          = "/var/log/ldirectord.log";
 $NEGOTIATETIMEOUT = -1;
@@ -803,10 +813,10 @@
 			and $CMD ne "reload" and $CMD ne "force-reload") {
 		usage();
 	}
-	if ( -f "/etc/ha.d/$CONFIG" ) {
-		$CONFIG = "/etc/ha.d/$CONFIG";
-	} elsif ( -f "/etc/ha.d/conf/$CONFIG" ) {
-		$CONFIG = "/etc/ha.d/conf/$CONFIG";
+	if ( -f "/usr/local/etc/ha.d/$CONFIG" ) {
+		$CONFIG = "/usr/local/etc/ha.d/$CONFIG";
+	} elsif ( -f "/usr/local/etc/ha.d/conf/$CONFIG" ) {
+		$CONFIG = "/usr/local/etc/ha.d/conf/$CONFIG";
 	} elsif ( ! -f "$CONFIG" ) {
 		init_error("Config file $CONFIG not found");
 	}
@@ -965,6 +975,7 @@
 sub reread_config
 {
 	@OLDVIRTUAL = @VIRTUAL;
+	@VIRTUAL = ();
 	my %OLD_INSTANCE = %LD_INSTANCE;
 	my %RELOAD;
 	my %STOP;
@@ -1304,6 +1315,12 @@
 					$vsrv{emailalertfreq} = $1;
 				} elsif  ($rcmd =~ /^emailalertstatus\s*=\s*(.*)/) {
 					$vsrv{emailalertstatus} = &parse_emailalertstatus($line, $1);
+				} elsif  ($rcmd =~ /^monitorfile\s*=\s*(.*)/) {
+					my $monitorfile = $1;
+					unless (open(MONITORFILE, ">>$monitorfile") and close(MONITORFILE)) {
+						&config_error($line, "unable to open monitorfile $monitorfile: $!");
+					}
+					$vsrv{monitorfile} = $monitorfile;
 				} else {
 					&config_error($line, "Unknown command \"$linedata\"");
 				}
@@ -2132,13 +2149,13 @@
 			if (! defined($or->{$real_str}) or
 					$or->{$real_str}->{weight} == 0) {
 				$server_down->{$real_str} = [$nv, $nr];
-				#service_set($nv, $nr, "down", "force");
+				#service_set($nv, $nr, "down", {force => 1});
 			}
 			else {
 				if (defined $server_down->{$real_str}) {
 					delete($server_down->{$real_str});
 				}
-				service_set($nv, $nr, "up", "force");
+				service_set($nv, $nr, "up", {force => 1});
 			}
 			delete($or->{$real_str});
 		}
@@ -2155,7 +2172,7 @@
 
 	for my $k (keys (%$server_down)) {
 	        my $v = $server_down->{$k};
-		service_set(@$v[0], @$v[1], "down", "force");
+		service_set(@$v[0], @$v[1], "down", {force => 1});
 		delete($server_down->{$k});
 		#sleep 5;
 	}
@@ -2233,6 +2250,7 @@
                         check_signal();
                         
                 } else {
+			local $SIG{CHLD} = 'IGNORE';
                         my @real_checked;
                         foreach my $v (@VIRTUAL) {
                                 my $real = $$v{real};
@@ -2290,7 +2308,7 @@
         my $virtual_id = get_virtual_id_str($v);
         $0 = $virtual_id;
         foreach my $r (@$real) {
-                service_set($v, $r, "down", "force");
+                service_set($v, $r, "down", {force => 1});
         }
         while (1) {
                 foreach my $r (@$real) {
@@ -2435,12 +2453,14 @@
 	my $recstr = $$r{receive};
 	if ($res->is_success && (!($recstr =~ /.+/) || 
 				$res->content =~ /$recstr/)) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1}, $res->status_line);
 		&ld_debug(2, "check_http: $$r{url} is up\n");
 		return $SERVICE_UP;
 	}
 
-	service_set($v, $r, "down");
+	my $log_message = $res->is_success ? $res->content : $res->status_line;
+	service_set($v, $r, "down", {do_log => 1}, $log_message);
+
 	&ld_debug(3, "Headers " .  $res->headers->as_string);
 	&ld_debug(2, "check_http: $$r{url} is down\n");
 	return $SERVICE_DOWN;
@@ -2459,10 +2479,10 @@
 			Timeout => $$v{negotiatetimeout});
 	if ($smtp) {
 		$smtp->quit;
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1});
 		return $SERVICE_UP;
 	} else {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1});
 		return $SERVICE_DOWN;
 	}
 }
@@ -2484,7 +2504,7 @@
                                         TIMEOUT => $$v{negotiatetimeout});
 
         if (!$pop) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_UP;
         }
 
@@ -2492,13 +2512,13 @@
                 my $authres = $pop->login();
                 $pop->close();
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
         $pop->close();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2518,7 +2538,7 @@
                                         DEBUG => 0,
                                         TIMEOUT => $$v{negotiatetimeout});
         if (!$pops) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
 
@@ -2526,14 +2546,14 @@
                 my $authres = $pops->login();
                 $pops->close();
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
 
         $pops->close();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2550,7 +2570,7 @@
                                         timeout => $$v{negotiatetimeout});
         
         if (!$imap) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
         
@@ -2558,13 +2578,13 @@
                 my $authres = $imap->login($$v{login},$$v{passwd});
                 $imap->quit;
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
         
         $imap->quit();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2580,7 +2600,7 @@
                                         port => $port,
                                         timeout => $$v{negotiatetimeout});
         if (!$imaps) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
 
@@ -2588,13 +2608,13 @@
                 my $authres = $imaps->login($$v{login},$$v{passwd});
                 $imaps->quit;
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
         $imaps->quit();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2610,7 +2630,7 @@
 	my $ldap = Net::LDAP->new("$$r{server}", port => $port,
 					timeout => $$v{negotiatetimeout});
 	if(!$ldap) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Connection failed");
 		&ld_debug(4, "Connection failed");
 		return $SERVICE_DOWN;
 	}
@@ -2623,7 +2643,7 @@
 		$mesg = $ldap->bind ;
 	}
 	if ($mesg->is_error) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Bind failed");
 		&ld_debug(4, "Bind failed");
 		return $SERVICE_DOWN;
 	}
@@ -2636,7 +2656,7 @@
 		);
 
 	if($result->count != 1) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "No answer received");
 		&ld_debug(2, "Count failed : " . $result->count);
 		return $SERVICE_DOWN;
 	}
@@ -2644,10 +2664,10 @@
 	my $href = $result->as_struct;
 	my @arrayOfDNs  = keys %$href ;
 	if (!($recstr =~ /.+/) || $arrayOfDNs[0] =~ /$recstr/) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1}, "Success");
 		return $SERVICE_UP;
 	} else {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Response mismatch");
 		&ld_debug(4,"Message differs : " . ", " . $$r{receive} 
 				. ", " . $arrayOfDNs[0] . ".");
 		return $SERVICE_DOWN;
@@ -2671,20 +2691,20 @@
         unless ($sock = IO::Socket::INET->new(PeerAddr => $$r{server},
                 PeerPort => $port, Proto => 'tcp',
                 TimeOut => $$v{negotiatetimeout})) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
         $s = IO::Select->new();
         $s->add($sock);
         if (scalar($s->can_read($$v{negotiatetimeout})) == 0) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
         } else {
                 sysread($sock, $buf, 64);
                 if ($buf =~ /^2/) {
-                        service_set($v, $r, "up");
+                        service_set($v, $r, "up", {do_log => 1});
 			$status = 0;
                 } else {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                 }
         }
         $s->remove($sock);
@@ -2723,12 +2743,12 @@
                 alarm 0; # Cancel the alarm
         };
         if ($result eq "") {
-                &service_set($v, $r, "down");
+                &service_set($v, $r, "down", {do_log => 1});
                 &ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
                 &ld_debug(3, "Radius Error: ".$radius->get_error);
                 return $SERVICE_DOWN;
         } else {
-                &service_set($v, $r, "up");
+                &service_set($v, $r, "up", {do_log => 1});
                 &ld_debug(3, "Activated service $$r{server}:$$r{port}");
                 return $SERVICE_UP;
         }
@@ -2765,7 +2785,7 @@
 	require DBI;
 	my ($v, $r, $dbd, $dbname) = @_;
 	my $port = ld_checkport($v, $r);
-	my ($dbh, $sth, $query, $row, $result);
+	my ($dbh, $sth, $query, $rows, $result);
 	$result = $SERVICE_DOWN;
 	$query = $$r{request};
 	$query =~ s#^/##;
@@ -2803,44 +2823,33 @@
 		goto err_finish;
 	}
 
-	# After calling "execute" $sth->{NUM_OF_FIELDS} will be greater
-	# than zero for SELECT statements, and 0 for all other statements.
-	#
-	# For non-SELECT statements a non-undef value returned by
-	# "execcute" inticates the number of rows returned.  "0E0" (Some
-	# garbage to make 0 true) or > 1.  But testing for this isn't
-	# particularly interesting as its quite valid for operations to
-	# affect 0 rows. So for non-SELECT statements, if "execute"
-	# doesn't return undef, consider the test a success.
-	unless ($sth->{NUM_OF_FIELDS}) {
-		goto out;
-	}
-
-	# For SELECT staements "execute" will always return a true
-	# value unless an error occurs. A "fetch" operation is performed
-	# to obtain the row returned by the SELECT statement. Again 0
-	# rows is valid.
+	# On error "execute" will return undef.
 	#
-	# I suspect that for at leaast some DB engines "execute" will
-	# always succeed unless there is some bizzare internal error.
-	# So it seems that in order to have a reasonable test "fetch"
-	# needs to be called.
+	# Assuming you're using 'SELECT' you will get the number of rows
+	# returned from the db when running execute: the 'rows' method is
+	# only used when doing something that is NOT a select.  I cannot
+	# imagine that you would ever want to insert or update from a
+	# regular polling on this system, so we will assume you are using
+	# SELECT here.
 	#
-	# I also wonder if having a table missing
-	# will result in an error or just 0 rows returned. If the
-	# latter is true then I guess we need to consider 0 rows an
-	# error state. But I'll have the code consider 0 rows a success
-	# for now leave this to be changed if testing proves it neccessary.
+	# Ideally you will do something like this: 'select * from
+	# director_slave where enabled=1' This way you can have, say, a
+	# MEMORY table in MySQL where you insert a value into a row
+	# (enabled) that says whether or not you want to actually use this
+	# in the pool from ldirector / ipvs, and disable them without
+	# actually turning off your sql server.
 
-	# As it is important that the SELECT succeeded, rather than
-	# how may rows it returns, just call "fetchrow_arrayref" once.
-	#
-	# I guess that in a pathalogical case the query may fail
-	# at a particular row. But I'm not going to worry about that for
-	# now.
-	$row = $sth->fetchrow_arrayref;
-	unless ($row && !$sth->err) {
-		check_sql_log_errstr("Error fetching row:", $dbh->errstr);
+	unless ($rows = $sth->execute) {
+		check_sql_log_errstr("Error executing statement:",
+				     $dbh->errstr, $dbh->err);
+		goto err_finish;
+	}
+
+	# Actually look to see if there was data returned in this statement,
+	# else disable node
+	if($rows > 0) {
+		goto out;
+	} else {
 		goto err_finish;
 	}
 
@@ -2851,7 +2860,7 @@
 err_disconnect:
 	$dbh->disconnect();
 err_down:
-	service_set($v, $r, $result == $SERVICE_UP ? "up" : "down");
+	service_set($v, $r, $result == $SERVICE_UP ? "up" : "down", {do_log => 1});
 	return $result;
 }
 
@@ -2877,11 +2886,11 @@
 		alarm 0; # Cancel the alarm
 	};
 	if ($@) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 		return $SERVICE_DOWN;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return $SERVICE_UP;
 	}
@@ -2909,13 +2918,13 @@
 		$result >>= 8;
 	};
 	if ($@ or $result != 0) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: " .
 			  "$@ after calling $$v{checkcommand} with result " .
 			  "$result");
 		return 0;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return 1;
 	}
@@ -2963,7 +2972,7 @@
 		"Max-Forwards: 70\r\n" .
 		"To: <sip:" . $$v{login} . ">\r\n" .
 		"From: <sip:" . $$v{login} . ">;tag=1928301774\r\n" .
-		"Call-ID: a84b4c76e66710\r\n" .
+		"Call-ID: " . (join "", map { unpack "H*", chr(rand(256)) } 1..8) . "\r\n" .
 		"CSeq: 63104 OPTIONS\r\n" .
 		"Contact: <sip:" . $$v{login} . ">\r\n" .
 		"Accept: application/sdp\r\n" .
@@ -3007,11 +3016,11 @@
 	};
 
 	if ($@) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 		return $SERVICE_DOWN;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return $SERVICE_UP;
 	}
@@ -3075,11 +3084,11 @@
        };
 
        if ($@) {
-	       &service_set($v, $r, "down");
+	       &service_set($v, $r, "down", {do_log => 1});
 	       &ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 	       return $SERVICE_DOWN;
        } else {
-	       &service_set($v, $r, "up");
+	       &service_set($v, $r, "up", {do_log => 1});
 	       &ld_debug(3, "Activated service $$r{server}:$$r{port}");
 	       return $SERVICE_UP;
        }
@@ -3123,11 +3132,11 @@
 	close TMP;
 
 	if ($memory =~ /$$r{receive}/) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1});
 		return $SERVICE_UP;
 	}
 
-	service_set($v, $r, "down");
+	service_set($v, $r, "down", {do_log => 1});
 	return $SERVICE_DOWN;
 }
 
@@ -3170,19 +3179,19 @@
 	};
  
 	if (@$ eq "timeout\n" or ! $query) {
-		 service_set($v,$r,"down");
+		 service_set($v, $r, "down", {do_log => 1}, "Connection timed out");
 		 return $SERVICE_DOWN;
 	}
  
 	foreach $rr ($query->answer) {
 	        if (($rr->type eq "A" and $rr->address eq $$r{"receive"}) or
 	            ($rr->type eq "PTR" and $rr->ptrdname eq $$r{"receive"})) {
-	         	service_set($v,$r,"up");
+			service_set($v, $r, "up", {do_log => 1}, "Success");
 			return $SERVICE_UP;
 		}
 	}
  
-	service_set($v,$r,"down");
+	service_set($v, $r, "down", {do_log => 1}, "Response mismatch");
 	return $SERVICE_DOWN;
 }
 
@@ -3201,7 +3210,7 @@
 	for (my $attempt = 0; $attempt < $$v{"checkcount"}; $attempt++) {
 		if ($p->ping($$r{server}, $$v{"checktimeout"})) {
     			&ld_debug(2, "pong from $$r{server}\n");
-			service_set($v,$r,"up");
+			service_set($v, $r, "up", {do_log => 1});
 			return $SERVICE_UP;
 		}
   		&ld_debug(2, "ping to $$r{server} timed out " .
@@ -3209,7 +3218,7 @@
 					$$v{"checkcount"} . ")\n");
 	}
 
-	service_set($v,$r,"down");
+	service_set($v, $r, "down");
 	return $SERVICE_DOWN;
 }
 
@@ -3224,11 +3233,10 @@
 
 	&ld_debug(2, "Checking none");
 	
-	service_set($v, $r, "up");
+	service_set($v, $r, "up", {do_log => 1});
 	return $SERVICE_UP;
 }
 
-
 # service_set
 # Used to bring up and down real servers.
 # This is the function you should call if you want to bring a real 
@@ -3242,15 +3250,30 @@
 #      state: up or down
 #             up to bring the real service up
 #             down to bring the real service up
+#      flags: hash with the following (optional) keys:
+#             force => 1  - force setting of the specified state
+#             do_log => 1 - log the state to the monitorfile
+#                           (when called as the result of a check)
 # post: The real server is brough up or down for each virtual service
 #       it belongs to.
 # return: none
 
 sub service_set()
 {
-	my ($v, $r, $state, $force) = @_;
+	my ($v, $r, $state, $flags, $log_msg) = @_;
 
-	my ($real, $virtual, $virt);
+	my ($real, $virtual, $virt, $now);
+	
+	if ($$flags{'do_log'}) {
+		$now = localtime();
+		
+		if (!defined($log_msg)) {
+			$log_msg = "-";
+		}
+
+		# URI-escape special log characters ('|' and newlines)
+		$log_msg =~ s/([%|\r\n])/sprintf("%%%.2x", ord($1))/eg;
+	}
 
         # Find the real server in @REAL
 	foreach $real (@REAL) {
@@ -3270,7 +3293,8 @@
 	        my $found = 0;
 		my $tmp_id;
 		my $virtual_id = get_virtual_id_str($v);
-		my $log_str = "real server=" . get_real_id_str($r, $v) .
+		my $real_id = get_real_id_str($r, $v);
+		my $log_str = "real server=$real_id" .
 			      " (virtual=$virtual_id)";
 		foreach $tmp_id (@$virtual) {
 			if($virtual_id eq $tmp_id) {
@@ -3280,12 +3304,23 @@
 		}
 		if ($found == 1) {
 			if ($state=~/up/i) {
-				_service_up($v, $r, $force);
+				_service_up($v, $r, $$flags{"force"});
 				&ld_debug(2, "Enabled  $log_str");
 			} elsif ($state=~/down/i) {
-				_service_down($v, $r, $force);
+				_service_down($v, $r, $$flags{"force"});
 				&ld_debug(2, "Disabled $log_str");
 			}
+			
+			if ($$v{"monitorfile"} and $$flags{"do_log"}) {
+				my $real_log_msg = $real_id;
+				$real_log_msg =~ tr/:/ /s;
+				$real_log_msg =~ s/\\//g;
+				unless(
+					open(CHECKLOG, ">>$$v{monitorfile}") and
+					print CHECKLOG "[$now] [$$] $real_log_msg [$state] $log_msg\n" and
+					close(CHECKLOG)
+				) { die("Error writing to monitorfile '$$v{monitorfile}': $!"); }
+			}
 		}
 	}
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/ldirectord.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/ldirectord.in
--- heartbeat-2.1.3/ldirectord/ldirectord.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/ldirectord.in	2008-08-18 13:32:19.000000000 +0100
@@ -426,7 +426,7 @@
 For a DNS check this should the name of an A record, or the address
 of a PTR record to look up.
 
-For a MySQL, Oracle or PostgeSQL check, this should be an SQL query.
+For a MySQL, Oracle or PostgeSQL check, this should be an SQL SELECT query.
 The data returned is not checked, only that the
 answer is one or more rows.  This is a required setting.
 
@@ -557,6 +557,16 @@
 
 =back 4
 
+B<monitorfile = ">I</path/to/monitorfile>B<">
+
+File to continuously log the real service checks to for this virtual
+service. This is useful for monitoring when and why real services were down
+or for statistics.
+
+The log format is:
+[timestamp|pid|real_service_id|status|message]
+
+Default: no separate logging of service checks.
 
 =head1 FILES
 
@@ -965,6 +975,7 @@
 sub reread_config
 {
 	@OLDVIRTUAL = @VIRTUAL;
+	@VIRTUAL = ();
 	my %OLD_INSTANCE = %LD_INSTANCE;
 	my %RELOAD;
 	my %STOP;
@@ -1304,6 +1315,12 @@
 					$vsrv{emailalertfreq} = $1;
 				} elsif  ($rcmd =~ /^emailalertstatus\s*=\s*(.*)/) {
 					$vsrv{emailalertstatus} = &parse_emailalertstatus($line, $1);
+				} elsif  ($rcmd =~ /^monitorfile\s*=\s*(.*)/) {
+					my $monitorfile = $1;
+					unless (open(MONITORFILE, ">>$monitorfile") and close(MONITORFILE)) {
+						&config_error($line, "unable to open monitorfile $monitorfile: $!");
+					}
+					$vsrv{monitorfile} = $monitorfile;
 				} else {
 					&config_error($line, "Unknown command \"$linedata\"");
 				}
@@ -2132,13 +2149,13 @@
 			if (! defined($or->{$real_str}) or
 					$or->{$real_str}->{weight} == 0) {
 				$server_down->{$real_str} = [$nv, $nr];
-				#service_set($nv, $nr, "down", "force");
+				#service_set($nv, $nr, "down", {force => 1});
 			}
 			else {
 				if (defined $server_down->{$real_str}) {
 					delete($server_down->{$real_str});
 				}
-				service_set($nv, $nr, "up", "force");
+				service_set($nv, $nr, "up", {force => 1});
 			}
 			delete($or->{$real_str});
 		}
@@ -2155,7 +2172,7 @@
 
 	for my $k (keys (%$server_down)) {
 	        my $v = $server_down->{$k};
-		service_set(@$v[0], @$v[1], "down", "force");
+		service_set(@$v[0], @$v[1], "down", {force => 1});
 		delete($server_down->{$k});
 		#sleep 5;
 	}
@@ -2233,6 +2250,7 @@
                         check_signal();
                         
                 } else {
+			local $SIG{CHLD} = 'IGNORE';
                         my @real_checked;
                         foreach my $v (@VIRTUAL) {
                                 my $real = $$v{real};
@@ -2290,7 +2308,7 @@
         my $virtual_id = get_virtual_id_str($v);
         $0 = $virtual_id;
         foreach my $r (@$real) {
-                service_set($v, $r, "down", "force");
+                service_set($v, $r, "down", {force => 1});
         }
         while (1) {
                 foreach my $r (@$real) {
@@ -2435,12 +2453,14 @@
 	my $recstr = $$r{receive};
 	if ($res->is_success && (!($recstr =~ /.+/) || 
 				$res->content =~ /$recstr/)) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1}, $res->status_line);
 		&ld_debug(2, "check_http: $$r{url} is up\n");
 		return $SERVICE_UP;
 	}
 
-	service_set($v, $r, "down");
+	my $log_message = $res->is_success ? $res->content : $res->status_line;
+	service_set($v, $r, "down", {do_log => 1}, $log_message);
+
 	&ld_debug(3, "Headers " .  $res->headers->as_string);
 	&ld_debug(2, "check_http: $$r{url} is down\n");
 	return $SERVICE_DOWN;
@@ -2459,10 +2479,10 @@
 			Timeout => $$v{negotiatetimeout});
 	if ($smtp) {
 		$smtp->quit;
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1});
 		return $SERVICE_UP;
 	} else {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1});
 		return $SERVICE_DOWN;
 	}
 }
@@ -2484,7 +2504,7 @@
                                         TIMEOUT => $$v{negotiatetimeout});
 
         if (!$pop) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_UP;
         }
 
@@ -2492,13 +2512,13 @@
                 my $authres = $pop->login();
                 $pop->close();
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
         $pop->close();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2518,7 +2538,7 @@
                                         DEBUG => 0,
                                         TIMEOUT => $$v{negotiatetimeout});
         if (!$pops) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
 
@@ -2526,14 +2546,14 @@
                 my $authres = $pops->login();
                 $pops->close();
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
 
         $pops->close();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2550,7 +2570,7 @@
                                         timeout => $$v{negotiatetimeout});
         
         if (!$imap) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
         
@@ -2558,13 +2578,13 @@
                 my $authres = $imap->login($$v{login},$$v{passwd});
                 $imap->quit;
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
         
         $imap->quit();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2580,7 +2600,7 @@
                                         port => $port,
                                         timeout => $$v{negotiatetimeout});
         if (!$imaps) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
 
@@ -2588,13 +2608,13 @@
                 my $authres = $imaps->login($$v{login},$$v{passwd});
                 $imaps->quit;
                 if (!$authres) {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                         return $SERVICE_DOWN;
                 }
         }
 
         $imaps->quit();
-        service_set($v, $r, "up");
+        service_set($v, $r, "up", {do_log => 1});
         return $SERVICE_UP;
 }
 
@@ -2610,7 +2630,7 @@
 	my $ldap = Net::LDAP->new("$$r{server}", port => $port,
 					timeout => $$v{negotiatetimeout});
 	if(!$ldap) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Connection failed");
 		&ld_debug(4, "Connection failed");
 		return $SERVICE_DOWN;
 	}
@@ -2623,7 +2643,7 @@
 		$mesg = $ldap->bind ;
 	}
 	if ($mesg->is_error) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Bind failed");
 		&ld_debug(4, "Bind failed");
 		return $SERVICE_DOWN;
 	}
@@ -2636,7 +2656,7 @@
 		);
 
 	if($result->count != 1) {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "No answer received");
 		&ld_debug(2, "Count failed : " . $result->count);
 		return $SERVICE_DOWN;
 	}
@@ -2644,10 +2664,10 @@
 	my $href = $result->as_struct;
 	my @arrayOfDNs  = keys %$href ;
 	if (!($recstr =~ /.+/) || $arrayOfDNs[0] =~ /$recstr/) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1}, "Success");
 		return $SERVICE_UP;
 	} else {
-		service_set($v, $r, "down");
+		service_set($v, $r, "down", {do_log => 1}, "Response mismatch");
 		&ld_debug(4,"Message differs : " . ", " . $$r{receive} 
 				. ", " . $arrayOfDNs[0] . ".");
 		return $SERVICE_DOWN;
@@ -2671,20 +2691,20 @@
         unless ($sock = IO::Socket::INET->new(PeerAddr => $$r{server},
                 PeerPort => $port, Proto => 'tcp',
                 TimeOut => $$v{negotiatetimeout})) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
                 return $SERVICE_DOWN;
         }
         $s = IO::Select->new();
         $s->add($sock);
         if (scalar($s->can_read($$v{negotiatetimeout})) == 0) {
-                service_set($v, $r, "down");
+                service_set($v, $r, "down", {do_log => 1});
         } else {
                 sysread($sock, $buf, 64);
                 if ($buf =~ /^2/) {
-                        service_set($v, $r, "up");
+                        service_set($v, $r, "up", {do_log => 1});
 			$status = 0;
                 } else {
-                        service_set($v, $r, "down");
+                        service_set($v, $r, "down", {do_log => 1});
                 }
         }
         $s->remove($sock);
@@ -2723,12 +2743,12 @@
                 alarm 0; # Cancel the alarm
         };
         if ($result eq "") {
-                &service_set($v, $r, "down");
+                &service_set($v, $r, "down", {do_log => 1});
                 &ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
                 &ld_debug(3, "Radius Error: ".$radius->get_error);
                 return $SERVICE_DOWN;
         } else {
-                &service_set($v, $r, "up");
+                &service_set($v, $r, "up", {do_log => 1});
                 &ld_debug(3, "Activated service $$r{server}:$$r{port}");
                 return $SERVICE_UP;
         }
@@ -2765,7 +2785,7 @@
 	require DBI;
 	my ($v, $r, $dbd, $dbname) = @_;
 	my $port = ld_checkport($v, $r);
-	my ($dbh, $sth, $query, $row, $result);
+	my ($dbh, $sth, $query, $rows, $result);
 	$result = $SERVICE_DOWN;
 	$query = $$r{request};
 	$query =~ s#^/##;
@@ -2803,44 +2823,33 @@
 		goto err_finish;
 	}
 
-	# After calling "execute" $sth->{NUM_OF_FIELDS} will be greater
-	# than zero for SELECT statements, and 0 for all other statements.
-	#
-	# For non-SELECT statements a non-undef value returned by
-	# "execcute" inticates the number of rows returned.  "0E0" (Some
-	# garbage to make 0 true) or > 1.  But testing for this isn't
-	# particularly interesting as its quite valid for operations to
-	# affect 0 rows. So for non-SELECT statements, if "execute"
-	# doesn't return undef, consider the test a success.
-	unless ($sth->{NUM_OF_FIELDS}) {
-		goto out;
-	}
-
-	# For SELECT staements "execute" will always return a true
-	# value unless an error occurs. A "fetch" operation is performed
-	# to obtain the row returned by the SELECT statement. Again 0
-	# rows is valid.
+	# On error "execute" will return undef.
 	#
-	# I suspect that for at leaast some DB engines "execute" will
-	# always succeed unless there is some bizzare internal error.
-	# So it seems that in order to have a reasonable test "fetch"
-	# needs to be called.
+	# Assuming you're using 'SELECT' you will get the number of rows
+	# returned from the db when running execute: the 'rows' method is
+	# only used when doing something that is NOT a select.  I cannot
+	# imagine that you would ever want to insert or update from a
+	# regular polling on this system, so we will assume you are using
+	# SELECT here.
 	#
-	# I also wonder if having a table missing
-	# will result in an error or just 0 rows returned. If the
-	# latter is true then I guess we need to consider 0 rows an
-	# error state. But I'll have the code consider 0 rows a success
-	# for now leave this to be changed if testing proves it neccessary.
+	# Ideally you will do something like this: 'select * from
+	# director_slave where enabled=1' This way you can have, say, a
+	# MEMORY table in MySQL where you insert a value into a row
+	# (enabled) that says whether or not you want to actually use this
+	# in the pool from ldirector / ipvs, and disable them without
+	# actually turning off your sql server.
 
-	# As it is important that the SELECT succeeded, rather than
-	# how may rows it returns, just call "fetchrow_arrayref" once.
-	#
-	# I guess that in a pathalogical case the query may fail
-	# at a particular row. But I'm not going to worry about that for
-	# now.
-	$row = $sth->fetchrow_arrayref;
-	unless ($row && !$sth->err) {
-		check_sql_log_errstr("Error fetching row:", $dbh->errstr);
+	unless ($rows = $sth->execute) {
+		check_sql_log_errstr("Error executing statement:",
+				     $dbh->errstr, $dbh->err);
+		goto err_finish;
+	}
+
+	# Actually look to see if there was data returned in this statement,
+	# else disable node
+	if($rows > 0) {
+		goto out;
+	} else {
 		goto err_finish;
 	}
 
@@ -2851,7 +2860,7 @@
 err_disconnect:
 	$dbh->disconnect();
 err_down:
-	service_set($v, $r, $result == $SERVICE_UP ? "up" : "down");
+	service_set($v, $r, $result == $SERVICE_UP ? "up" : "down", {do_log => 1});
 	return $result;
 }
 
@@ -2877,11 +2886,11 @@
 		alarm 0; # Cancel the alarm
 	};
 	if ($@) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 		return $SERVICE_DOWN;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return $SERVICE_UP;
 	}
@@ -2909,13 +2918,13 @@
 		$result >>= 8;
 	};
 	if ($@ or $result != 0) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: " .
 			  "$@ after calling $$v{checkcommand} with result " .
 			  "$result");
 		return 0;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return 1;
 	}
@@ -2963,7 +2972,7 @@
 		"Max-Forwards: 70\r\n" .
 		"To: <sip:" . $$v{login} . ">\r\n" .
 		"From: <sip:" . $$v{login} . ">;tag=1928301774\r\n" .
-		"Call-ID: a84b4c76e66710\r\n" .
+		"Call-ID: " . (join "", map { unpack "H*", chr(rand(256)) } 1..8) . "\r\n" .
 		"CSeq: 63104 OPTIONS\r\n" .
 		"Contact: <sip:" . $$v{login} . ">\r\n" .
 		"Accept: application/sdp\r\n" .
@@ -3007,11 +3016,11 @@
 	};
 
 	if ($@) {
-		&service_set($v, $r, "down");
+		&service_set($v, $r, "down", {do_log => 1});
 		&ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 		return $SERVICE_DOWN;
 	} else {
-		&service_set($v, $r, "up");
+		&service_set($v, $r, "up", {do_log => 1});
 		&ld_debug(3, "Activated service $$r{server}:$$r{port}");
 		return $SERVICE_UP;
 	}
@@ -3075,11 +3084,11 @@
        };
 
        if ($@) {
-	       &service_set($v, $r, "down");
+	       &service_set($v, $r, "down", {do_log => 1});
 	       &ld_debug(3, "Deactivated service $$r{server}:$$r{port}: $@");
 	       return $SERVICE_DOWN;
        } else {
-	       &service_set($v, $r, "up");
+	       &service_set($v, $r, "up", {do_log => 1});
 	       &ld_debug(3, "Activated service $$r{server}:$$r{port}");
 	       return $SERVICE_UP;
        }
@@ -3123,11 +3132,11 @@
 	close TMP;
 
 	if ($memory =~ /$$r{receive}/) {
-		service_set($v, $r, "up");
+		service_set($v, $r, "up", {do_log => 1});
 		return $SERVICE_UP;
 	}
 
-	service_set($v, $r, "down");
+	service_set($v, $r, "down", {do_log => 1});
 	return $SERVICE_DOWN;
 }
 
@@ -3170,19 +3179,19 @@
 	};
  
 	if (@$ eq "timeout\n" or ! $query) {
-		 service_set($v,$r,"down");
+		 service_set($v, $r, "down", {do_log => 1}, "Connection timed out");
 		 return $SERVICE_DOWN;
 	}
  
 	foreach $rr ($query->answer) {
 	        if (($rr->type eq "A" and $rr->address eq $$r{"receive"}) or
 	            ($rr->type eq "PTR" and $rr->ptrdname eq $$r{"receive"})) {
-	         	service_set($v,$r,"up");
+			service_set($v, $r, "up", {do_log => 1}, "Success");
 			return $SERVICE_UP;
 		}
 	}
  
-	service_set($v,$r,"down");
+	service_set($v, $r, "down", {do_log => 1}, "Response mismatch");
 	return $SERVICE_DOWN;
 }
 
@@ -3201,7 +3210,7 @@
 	for (my $attempt = 0; $attempt < $$v{"checkcount"}; $attempt++) {
 		if ($p->ping($$r{server}, $$v{"checktimeout"})) {
     			&ld_debug(2, "pong from $$r{server}\n");
-			service_set($v,$r,"up");
+			service_set($v, $r, "up", {do_log => 1});
 			return $SERVICE_UP;
 		}
   		&ld_debug(2, "ping to $$r{server} timed out " .
@@ -3209,7 +3218,7 @@
 					$$v{"checkcount"} . ")\n");
 	}
 
-	service_set($v,$r,"down");
+	service_set($v, $r, "down");
 	return $SERVICE_DOWN;
 }
 
@@ -3224,11 +3233,10 @@
 
 	&ld_debug(2, "Checking none");
 	
-	service_set($v, $r, "up");
+	service_set($v, $r, "up", {do_log => 1});
 	return $SERVICE_UP;
 }
 
-
 # service_set
 # Used to bring up and down real servers.
 # This is the function you should call if you want to bring a real 
@@ -3242,15 +3250,30 @@
 #      state: up or down
 #             up to bring the real service up
 #             down to bring the real service up
+#      flags: hash with the following (optional) keys:
+#             force => 1  - force setting of the specified state
+#             do_log => 1 - log the state to the monitorfile
+#                           (when called as the result of a check)
 # post: The real server is brough up or down for each virtual service
 #       it belongs to.
 # return: none
 
 sub service_set()
 {
-	my ($v, $r, $state, $force) = @_;
+	my ($v, $r, $state, $flags, $log_msg) = @_;
 
-	my ($real, $virtual, $virt);
+	my ($real, $virtual, $virt, $now);
+	
+	if ($$flags{'do_log'}) {
+		$now = localtime();
+		
+		if (!defined($log_msg)) {
+			$log_msg = "-";
+		}
+
+		# URI-escape special log characters ('|' and newlines)
+		$log_msg =~ s/([%|\r\n])/sprintf("%%%.2x", ord($1))/eg;
+	}
 
         # Find the real server in @REAL
 	foreach $real (@REAL) {
@@ -3270,7 +3293,8 @@
 	        my $found = 0;
 		my $tmp_id;
 		my $virtual_id = get_virtual_id_str($v);
-		my $log_str = "real server=" . get_real_id_str($r, $v) .
+		my $real_id = get_real_id_str($r, $v);
+		my $log_str = "real server=$real_id" .
 			      " (virtual=$virtual_id)";
 		foreach $tmp_id (@$virtual) {
 			if($virtual_id eq $tmp_id) {
@@ -3280,12 +3304,23 @@
 		}
 		if ($found == 1) {
 			if ($state=~/up/i) {
-				_service_up($v, $r, $force);
+				_service_up($v, $r, $$flags{"force"});
 				&ld_debug(2, "Enabled  $log_str");
 			} elsif ($state=~/down/i) {
-				_service_down($v, $r, $force);
+				_service_down($v, $r, $$flags{"force"});
 				&ld_debug(2, "Disabled $log_str");
 			}
+			
+			if ($$v{"monitorfile"} and $$flags{"do_log"}) {
+				my $real_log_msg = $real_id;
+				$real_log_msg =~ tr/:/ /s;
+				$real_log_msg =~ s/\\//g;
+				unless(
+					open(CHECKLOG, ">>$$v{monitorfile}") and
+					print CHECKLOG "[$now] [$$] $real_log_msg [$state] $log_msg\n" and
+					close(CHECKLOG)
+				) { die("Error writing to monitorfile '$$v{monitorfile}': $!"); }
+			}
 		}
 	}
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/logrotate.d/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/logrotate.d/Makefile.in
--- heartbeat-2.1.3/ldirectord/logrotate.d/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/logrotate.d/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -86,6 +86,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -103,24 +104,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -182,12 +171,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/Makefile.in
--- heartbeat-2.1.3/ldirectord/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/Makefile.in	2008-08-18 23:38:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ldirectord
@@ -96,6 +96,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -113,24 +114,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -192,12 +181,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -539,8 +529,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -565,8 +555,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -576,13 +566,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/OCF/ldirectord /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/OCF/ldirectord
--- heartbeat-2.1.3/ldirectord/OCF/ldirectord	2007-12-21 20:45:49.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/OCF/ldirectord	2008-08-18 23:38:57.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#   ldirectord OCF RA. Wrapper around /usr/sbin/ldirectord to
+#   ldirectord OCF RA. Wrapper around /usr/local/sbin/ldirectord to
 #   be OCF RA compliant and therefore to get the possibility
 #   to monitor ldirectord by HAv2.
 #   Tested on SuSE Linux Enterprise Server 10.
@@ -50,8 +50,8 @@
 
 #######################################################################
 
-# LDIRECTORD=/usr/sbin/ldirectord
-# LDIRCONF=/etc/ldirectord.cf
+# LDIRECTORD=/usr/local/sbin/ldirectord
+# LDIRCONF=/usr/local/etc/ldirectord.cf
 
 meta_data() {
         cat <<END
@@ -74,7 +74,7 @@
 The full pathname of the ldirectord configuration file.
 </longdesc>
 <shortdesc lang="en">configuration file path</shortdesc>
-<content type="string" default="/etc/ldirectord.cf" />
+<content type="string" default="/usr/local/etc/ldirectord.cf" />
 </parameter>
 
 <parameter name="ldirectord">
@@ -82,7 +82,7 @@
 The full pathname of the ldirectord.
 </longdesc>
 <shortdesc lang="en">ldirectord binary path</shortdesc>
-<content type="string" default="/usr/sbin/ldirectord" />
+<content type="string" default="/usr/local/sbin/ldirectord" />
 </parameter>
 
 </parameters>
@@ -92,7 +92,7 @@
 <action name="stop"    timeout="15" />
 <action name="monitor" depth="0"  timeout="10" interval="20" />
 <action name="meta-data"  timeout="10" />
-<action name="verify-all"  timeout="10" />
+<action name="validate-all"  timeout="10" />
 </actions>
 </resource-agent>
 END
@@ -106,7 +106,7 @@
 
   LDIRCONF=$OCF_RESKEY_configfile
   if [ x"${LDIRCONF}" = "x" ]; then
-    LDIRCONF=/etc/ldirectord.cf
+    LDIRCONF=/usr/local/etc/ldirectord.cf
   fi
 
   if [ ! -f $LDIRCONF ]; then
@@ -122,7 +122,7 @@
 
   LDIRECTORD=$OCF_RESKEY_ldirectord
   if [ x"${LDIRECTORD}" = x ]; then
-    LDIRECTORD="/usr/sbin/ldirectord"
+    LDIRECTORD="/usr/local/sbin/ldirectord"
   fi
 
   if [ ! -x $LDIRECTORD ]; then
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/OCF/ldirectord.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/OCF/ldirectord.in
--- heartbeat-2.1.3/ldirectord/OCF/ldirectord.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/OCF/ldirectord.in	2008-08-18 13:32:19.000000000 +0100
@@ -92,7 +92,7 @@
 <action name="stop"    timeout="15" />
 <action name="monitor" depth="0"  timeout="10" interval="20" />
 <action name="meta-data"  timeout="10" />
-<action name="verify-all"  timeout="10" />
+<action name="validate-all"  timeout="10" />
 </actions>
 </resource-agent>
 END
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ldirectord/OCF/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ldirectord/OCF/Makefile.in
--- heartbeat-2.1.3/ldirectord/OCF/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ldirectord/OCF/Makefile.in	2008-08-18 23:38:00.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ldirectord
@@ -81,6 +81,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -98,24 +99,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -177,12 +166,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/apphb/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/apphb/Makefile
--- heartbeat-2.1.3/lib/apphb/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/apphb/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,653 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/apphb/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/apphb
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/apphb
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# apphb: OCF application heartbeat library
+#
+# Copyright (C) 2002 Alan Robertson, International Business Machines
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+lib_LTLIBRARIES = libapphb.la
+libapphb_la_SOURCES = apphb.c	
+libapphb_la_CFLAGS = -lpthread
+#libapphb_la_CFLAGS = -DTHREAD_SAFE -D_REENTRANT
+libapphb_la_LDFLAGS = -version-info 0:0:0 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libapphb.la: $(libapphb_la_OBJECTS) $(libapphb_la_DEPENDENCIES) 
+	$(libapphb_la_LINK) -rpath $(libdir) $(libapphb_la_OBJECTS) $(libapphb_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/libapphb_la-apphb.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+libapphb_la-apphb.lo: apphb.c
+	$(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
+	mv -f $(DEPDIR)/libapphb_la-apphb.Tpo $(DEPDIR)/libapphb_la-apphb.Plo
+#	source='apphb.c' object='libapphb_la-apphb.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/apphb/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/apphb/Makefile.in
--- heartbeat-2.1.3/lib/apphb/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/apphb/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,6 +106,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -123,24 +124,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -202,12 +191,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -412,8 +402,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -421,8 +411,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -483,8 +473,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -496,8 +486,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -507,13 +497,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/clplumbing/cl_log.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/clplumbing/cl_log.c
--- heartbeat-2.1.3/lib/clplumbing/cl_log.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/clplumbing/cl_log.c	2008-08-18 13:32:19.000000000 +0100
@@ -103,6 +103,18 @@
 }
 /*************************/
 
+/**************************
+ * check if the fd is in use for logging
+ **************************/
+int
+cl_log_is_logd_fd(int fd)
+{
+	return logging_daemon_chan && (
+		fd == logging_daemon_chan->ops->get_send_select_fd(logging_daemon_chan)
+		||
+		fd == logging_daemon_chan->ops->get_recv_select_fd(logging_daemon_chan)
+		);
+}
 
 void
 cl_log_enable_stderr(int truefalse)
@@ -566,7 +578,6 @@
 	va_list		ap;
 	char		buf[MAXLINE];
 	ssize_t		nbytes;
-	int	needprivs = !cl_have_full_privs();
 
 	cl_process_pid = (int)getpid();
 
@@ -581,10 +592,6 @@
 		nbytes =  sizeof(buf) -1 ;
 	}
 
-	if (needprivs) {
-		return_to_orig_privs();
-	}
-
 	if (stderr_enabled) {
 		print_logline(stderr, cl_log_entity,cl_process_pid,
 			NULLTIME, prio2str(priority), buf);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/clplumbing/cl_msg.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/clplumbing/cl_msg.c
--- heartbeat-2.1.3/lib/clplumbing/cl_msg.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/clplumbing/cl_msg.c	2008-08-18 13:32:19.000000000 +0100
@@ -38,6 +38,8 @@
 #include <glib.h>
 #include <clplumbing/cl_uuid.h>
 #include <compress.h>
+#include <clplumbing/timers.h>
+#include <clplumbing/cl_signal.h>
 
 #define		MAXMSGLINE	512
 #define		MINFIELDS	30
@@ -145,7 +147,7 @@
 		return -1;
 	}
 	
-	return open(filename, O_WRONLY|O_CREAT|O_APPEND, 0755);
+	return open(filename, O_WRONLY|O_CREAT|O_APPEND, 0644);
 
 }
 
@@ -1768,12 +1770,43 @@
 
 }
 
+static gboolean ipc_timer_expired = FALSE;
 
+static void cl_sigalarm_handler(int signum)
+{
+        if (signum == SIGALRM) {
+                ipc_timer_expired = TRUE;
+        }
+}
+
+int
+cl_ipc_wait_timeout(
+    IPC_Channel *chan, int (*waitfun)(IPC_Channel *chan), unsigned int timeout)
+{
+        int rc = IPC_FAIL;
+        struct sigaction old_action;
+
+	memset(&old_action, 0, sizeof(old_action));
+	cl_signal_set_simple_handler(SIGALRM, cl_sigalarm_handler, &old_action);
+
+	ipc_timer_expired = FALSE;
+
+	alarm(timeout);
+	rc = waitfun(chan);
+	if (rc == IPC_INTR && ipc_timer_expired) {
+	    rc = IPC_TIMEOUT;
+	}
+
+	alarm(0); /* ensure it expires */
+	cl_signal_set_simple_handler(SIGALRM, old_action.sa_handler, &old_action);
 
 
+        return rc;
+}
+
 /* Return the next message found in the IPC channel */
 static struct ha_msg*
-msgfromIPC_ll(IPC_Channel * ch, int flag)
+msgfromIPC_ll(IPC_Channel * ch, int flag, unsigned int timeout, int *rc_out)
 {
 	int		rc;
 	IPC_Message*	ipcmsg;
@@ -1782,13 +1815,24 @@
 	int		allow_intr = flag & MSG_ALLOWINTR;
 	
  startwait:
-	rc = ch->ops->waitin(ch);
+	if(timeout > 0) {
+	    rc = cl_ipc_wait_timeout(ch, ch->ops->waitin, timeout);
+	} else {
+	    rc = ch->ops->waitin(ch);
+	}
+
+	if(rc_out) {
+	    *rc_out = rc;
+	}
 	
 	switch(rc) {
 	default:
 	case IPC_FAIL:
 		cl_perror("msgfromIPC: waitin failure");
 		return NULL;
+
+	case IPC_TIMEOUT:
+		return NULL;
 		
 	case IPC_BROKEN:
 		sleep(1);
@@ -1814,11 +1858,14 @@
 		,	rc, (unsigned long)ipcmsg);
 	}
 #endif
+	if(rc_out) {
+	    *rc_out = rc;
+	}
+
 	if (rc != IPC_OK) {
 		return NULL;
 	}
 
-
 	hmsg = wirefmt2msg_ll((char *)ipcmsg->msg_body, ipcmsg->msg_len, need_auth);
 	if (ipcmsg->msg_done) {
 		ipcmsg->msg_done(ipcmsg);
@@ -1828,13 +1875,17 @@
 	return hmsg;
 }
 
-
-
 /* Return the next message found in the IPC channel */
 struct ha_msg*
+msgfromIPC_timeout(IPC_Channel *ch, int flag, unsigned int timeout, int *rc_out)
+{
+    return msgfromIPC_ll(ch, flag, timeout, rc_out);
+}
+
+struct ha_msg*
 msgfromIPC(IPC_Channel * ch, int flag)
 {
-	return msgfromIPC_ll(ch, flag);
+	return msgfromIPC_ll(ch, flag, 0, NULL);
 }
 
 
@@ -1844,13 +1895,9 @@
 	int flag = 0;
 	
 	flag |= MSG_ALLOWINTR;
-	return msgfromIPC_ll(ch, flag);
+	return msgfromIPC_ll(ch, flag, 0, NULL);
 }
 
-
-
-
-
 /* Return the next message found in the IPC channel */
 IPC_Message *
 ipcmsgfromIPC(IPC_Channel * ch)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/clplumbing/GSource.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/clplumbing/GSource.c
--- heartbeat-2.1.3/lib/clplumbing/GSource.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/clplumbing/GSource.c	2008-08-18 13:32:19.000000000 +0100
@@ -989,10 +989,10 @@
 	
 	CL_SIGNAL(sig_src->signal, NULL);
 
-	sig_src->gsourceid = 0;
 	sig_src->signal_triggered = FALSE;
 	g_source_remove(sig_src->gsourceid);
 	G_main_signal_list[sig_src->signal] = NULL;
+	sig_src->gsourceid = 0;
 	g_source_unref(source);
 	
 	return TRUE;
@@ -1436,9 +1436,9 @@
 Gmain_timeout_dispatch(GSource* src, GSourceFunc func, gpointer user_data);
 
 static GSourceFuncs Gmain_timeout_funcs = {
-	prepare: Gmain_timeout_prepare,
-	check: Gmain_timeout_check,
-	dispatch: Gmain_timeout_dispatch,
+	Gmain_timeout_prepare,
+	Gmain_timeout_check,
+	Gmain_timeout_dispatch,
 };
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/clplumbing/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/clplumbing/Makefile
--- heartbeat-2.1.3/lib/clplumbing/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/clplumbing/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,862 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/clplumbing/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/clplumbing
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/clplumbing
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# plumbing: OCF general plumbing libraries
+#
+# Copyright (C) 2002 Alan Robertson, International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+halibdir = $(libdir)/heartbeat
+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
+
+
+# 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char  -DALIGNFUNC= -DMSGHDR_TYPE=msghdr
+lib_LTLIBRARIES = libplumb.la libplumbgpl.la
+libplumb_la_SOURCES = \
+			base64.c	\
+			cl_compress.c	\
+			cl_log.c	\
+			cl_malloc.c	\
+			cl_misc.c 	\
+			cl_msg.c	\
+			cl_msg_types.c  \
+			cl_netstring.c	\
+			cl_pidfile.c	\
+			cl_poll.c	\
+			cl_random.c	\
+			cl_signal.c	\
+			cl_syslog.c	\
+			cl_uuid.c	\
+			cl_plugin.c	\
+			cl_reboot.c	\
+			coredumps.c	\
+			cpulimits.c	\
+			Gmain_timeout.c	\
+			GSource.c	\
+			ipcsocket.c	\
+			longclock.c	\
+			md5.c		\
+			mkstemp_mode.c	\
+			ocf_ipc.c	\
+			proctrack.c	\
+			realtime.c	\
+			replytrack.c	\
+			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)/heartbeat
+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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libplumb.la: $(libplumb_la_OBJECTS) $(libplumb_la_DEPENDENCIES) 
+	$(libplumb_la_LINK) -rpath $(libdir) $(libplumb_la_OBJECTS) $(libplumb_la_LIBADD) $(LIBS)
+libplumbgpl.la: $(libplumbgpl_la_OBJECTS) $(libplumbgpl_la_DEPENDENCIES) 
+	$(libplumbgpl_la_LINK) -rpath $(libdir) $(libplumbgpl_la_OBJECTS) $(libplumbgpl_la_LIBADD) $(LIBS)
+install-testPROGRAMS: $(test_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(testdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-testPROGRAMS:
+	@$(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"; \
+	done
+
+clean-testPROGRAMS:
+	@list='$(test_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+base64_md5_test$(EXEEXT): $(base64_md5_test_OBJECTS) $(base64_md5_test_DEPENDENCIES) 
+	@rm -f base64_md5_test$(EXEEXT)
+	$(LINK) $(base64_md5_test_OBJECTS) $(base64_md5_test_LDADD) $(LIBS)
+ipctest$(EXEEXT): $(ipctest_OBJECTS) $(ipctest_DEPENDENCIES) 
+	@rm -f ipctest$(EXEEXT)
+	$(LINK) $(ipctest_OBJECTS) $(ipctest_LDADD) $(LIBS)
+ipctransientclient$(EXEEXT): $(ipctransientclient_OBJECTS) $(ipctransientclient_DEPENDENCIES) 
+	@rm -f ipctransientclient$(EXEEXT)
+	$(LINK) $(ipctransientclient_OBJECTS) $(ipctransientclient_LDADD) $(LIBS)
+ipctransientserver$(EXEEXT): $(ipctransientserver_OBJECTS) $(ipctransientserver_DEPENDENCIES) 
+	@rm -f ipctransientserver$(EXEEXT)
+	$(LINK) $(ipctransientserver_OBJECTS) $(ipctransientserver_LDADD) $(LIBS)
+install-testSCRIPTS: $(test_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-testSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/GSource.Plo
+include ./$(DEPDIR)/Gmain_timeout.Plo
+include ./$(DEPDIR)/base64.Plo
+include ./$(DEPDIR)/base64_md5_test.Po
+include ./$(DEPDIR)/cl_compress.Plo
+include ./$(DEPDIR)/cl_log.Plo
+include ./$(DEPDIR)/cl_malloc.Plo
+include ./$(DEPDIR)/cl_misc.Plo
+include ./$(DEPDIR)/cl_msg.Plo
+include ./$(DEPDIR)/cl_msg_types.Plo
+include ./$(DEPDIR)/cl_netstring.Plo
+include ./$(DEPDIR)/cl_pidfile.Plo
+include ./$(DEPDIR)/cl_plugin.Plo
+include ./$(DEPDIR)/cl_poll.Plo
+include ./$(DEPDIR)/cl_random.Plo
+include ./$(DEPDIR)/cl_reboot.Plo
+include ./$(DEPDIR)/cl_signal.Plo
+include ./$(DEPDIR)/cl_syslog.Plo
+include ./$(DEPDIR)/cl_uuid.Plo
+include ./$(DEPDIR)/coredumps.Plo
+include ./$(DEPDIR)/cpulimits.Plo
+include ./$(DEPDIR)/ipcsocket.Plo
+include ./$(DEPDIR)/ipctest.Po
+include ./$(DEPDIR)/ipctransientclient.Po
+include ./$(DEPDIR)/ipctransientlib.Po
+include ./$(DEPDIR)/ipctransientserver.Po
+include ./$(DEPDIR)/longclock.Plo
+include ./$(DEPDIR)/md5.Plo
+include ./$(DEPDIR)/mkstemp_mode.Plo
+include ./$(DEPDIR)/ocf_ipc.Plo
+include ./$(DEPDIR)/proctrack.Plo
+include ./$(DEPDIR)/realtime.Plo
+include ./$(DEPDIR)/replytrack.Plo
+include ./$(DEPDIR)/setproctitle.Plo
+include ./$(DEPDIR)/timers.Plo
+include ./$(DEPDIR)/uids.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-testPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/clplumbing/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/clplumbing/Makefile.in
--- heartbeat-2.1.3/lib/clplumbing/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/clplumbing/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -45,7 +45,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -105,7 +105,7 @@
 	$(top_builddir)/lib/pils/libpils.la
 testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(test_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -158,6 +158,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -175,24 +176,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -254,12 +243,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -529,8 +519,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -538,8 +528,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -563,8 +553,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(testdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(testPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(testdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -689,8 +679,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -702,8 +692,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -713,13 +703,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/cib/cib_client.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/cib/cib_client.c
--- heartbeat-2.1.3/lib/crm/cib/cib_client.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/cib/cib_client.c	2008-08-18 13:32:19.000000000 +0100
@@ -1131,12 +1131,19 @@
 		if(xml_has_child(dest, "status")) {
 			cl_msg_remove(dest, "status");
 		}
+
+		xml_prop_iter(dest, name, value,
+			      if(safe_str_neq(name, XML_ATTR_NUMUPDATES)) {
+				  config_changes = TRUE;
+				  break;
+			      }
+		    );
+		
 		if(xml_has_children(dest)) {
 			config_changes = TRUE;
 		}
 	}
 
-	/* TODO: Check cib attributes */
 	
 	if(result) {
 		*result = diff;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/cib/cib_native.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/cib/cib_native.c
--- heartbeat-2.1.3/lib/crm/cib/cib_native.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/cib/cib_native.c	2008-08-18 13:32:19.000000000 +0100
@@ -530,6 +530,11 @@
 		rc = cib_return_code;
 	}	
 
+	if(rc == cib_diff_resync) {
+	    /* This is an internal value that clients do not and should not care about */
+	    rc = cib_ok;
+	}
+	
 	if(rc == cib_ok || rc == cib_not_master || rc == cib_master_timeout) {
 		crm_log_message(LOG_MSG, op_reply);
 
@@ -706,6 +711,11 @@
 	}
 
 	ha_msg_value_int(msg, F_CIB_RC, &rc);
+	if(rc == cib_diff_resync) {
+	    /* This is an internal value that clients do not and should not care about */
+	    rc = cib_ok;
+	}
+
 	output = get_message_xml(msg, F_CIB_CALLDATA);
 	
 	if(local_blob.callback != NULL
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/cib/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/cib/Makefile
--- heartbeat-2.1.3/lib/crm/cib/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/crm/cib/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,699 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/crm/cib/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/cib
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/cib
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+crmdir = $(havarlibdir)/crm
+XML_FLAGS = `xml2-config --cflags`
+XML_LIBS = `xml2-config --libs`
+
+# sockets with path
+apigid = 65
+crmuid = 17
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libcib.la: $(libcib_la_OBJECTS) $(libcib_la_DEPENDENCIES) 
+	$(libcib_la_LINK) -rpath $(libdir) $(libcib_la_OBJECTS) $(libcib_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/libcib_la-cib_attrs.Plo
+include ./$(DEPDIR)/libcib_la-cib_client.Plo
+include ./$(DEPDIR)/libcib_la-cib_native.Plo
+include ./$(DEPDIR)/libcib_la-cib_version.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+libcib_la-cib_client.lo: cib_client.c
+	$(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
+	mv -f $(DEPDIR)/libcib_la-cib_client.Tpo $(DEPDIR)/libcib_la-cib_client.Plo
+#	source='cib_client.c' object='libcib_la-cib_client.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libcib_la-cib_native.Tpo $(DEPDIR)/libcib_la-cib_native.Plo
+#	source='cib_native.c' object='libcib_la-cib_native.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libcib_la-cib_attrs.Tpo $(DEPDIR)/libcib_la-cib_attrs.Plo
+#	source='cib_attrs.c' object='libcib_la-cib_attrs.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libcib_la-cib_version.Tpo $(DEPDIR)/libcib_la-cib_version.Plo
+#	source='cib_version.c' object='libcib_la-cib_version.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-libLTLIBRARIES \
+	uninstall-local
+
+
+clean-generic:
+	rm -f *.log *.debug *.xml *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/cib/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/cib/Makefile.in
--- heartbeat-2.1.3/lib/crm/cib/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/cib/Makefile.in	2008-08-18 23:38:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -61,7 +61,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -110,6 +110,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -127,24 +128,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -206,12 +195,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -428,8 +418,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -437,8 +427,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -523,8 +513,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -536,8 +526,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -547,13 +537,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/common/iso8601.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/common/iso8601.c
--- heartbeat-2.1.3/lib/crm/common/iso8601.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/common/iso8601.c	2008-08-18 13:32:19.000000000 +0100
@@ -280,8 +280,16 @@
 	CRM_CHECK(date_str != NULL, return NULL);
 	CRM_CHECK(strlen(*date_str) > 0, return NULL);
 	
-	crm_malloc0(new_time, sizeof(ha_time_t));
-	crm_malloc0(new_time->has, sizeof(ha_has_time_t));
+	if((*date_str)[0] == 'T' || (*date_str)[2] == ':') {
+	    /* Just a time supplied - Infer current date */
+	    new_time = new_ha_date(TRUE);
+	    parse_time(date_str, new_time, TRUE);
+	    is_done = TRUE;
+
+	} else {
+	    crm_malloc0(new_time, sizeof(ha_time_t));
+	    crm_malloc0(new_time->has, sizeof(ha_has_time_t));
+	}
 
 	while(is_done == FALSE) {
 		char ch = (*date_str)[0];
@@ -641,13 +649,14 @@
 
 gboolean ordinal_to_gregorian(ha_time_t *a_date) 
 {
+	/* Day of the year this month ends on */
+	int m_end = 0;
+
 	CRM_CHECK(a_date->has->years, return FALSE);
 	CRM_CHECK(a_date->has->yeardays, return FALSE);
 
 	CRM_CHECK(a_date->yeardays > 0, return FALSE);
 	
-	a_date->days = a_date->yeardays;
-	a_date->months = 11;
 	if(is_leap_year(a_date->years) && a_date->yeardays > 366) {
 		crm_err("Year %.4d only has 366 days (supplied %.3d)",
 			a_date->years, a_date->yeardays);
@@ -659,27 +668,21 @@
 		a_date->yeardays = 365;
 	}
 	
-	while(a_date->months > 0
-	      && a_date->yeardays <= month2days[a_date->months]) {
-		crm_debug_6("month %d: %d vs. %d",
+	a_date->days = a_date->yeardays;
+	a_date->months = 0;
+	do {
+		a_date->months++;
+		m_end += days_per_month(a_date->months, a_date->years);
+		a_date->days -= days_per_month(a_date->months-1, a_date->years);
+	
+		crm_debug_6("month %d: %d vs. %d - current day: %d",
 			    a_date->months, a_date->yeardays,
-			    month2days[a_date->months]);
-		(a_date->months)--;
-	}
+			    m_end, a_date->days);
+	} while (a_date->months < 12 && m_end < a_date->yeardays);
 
-	a_date->days -= month2days[a_date->months];
-	(a_date->months)++;
-	
 	CRM_CHECK(a_date->months > 0, return FALSE);
-
-	if(is_leap_year(a_date->years) && a_date->months > 2) {
-		(a_date->days)--;
-	}
-	if(a_date->days == 0) {
-		/* annoying underflow */
-		a_date->days = days_per_month(a_date->months, a_date->years);
-		(a_date->months)--;
-	}
+	CRM_CHECK(a_date->days <= days_per_month(a_date->months, a_date->years), 
+			return FALSE);
 
 	a_date->has->days = TRUE;
 	a_date->has->months = TRUE;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/common/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/common/Makefile
--- heartbeat-2.1.3/lib/crm/common/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/crm/common/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,698 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/crm/common/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/common
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/common
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(CRM_DEBUG_FLAGS)
+hadir = $(sysconfdir)/ha.d
+halibdir = $(libdir)/heartbeat
+lib_LTLIBRARIES = libcrmcommon.la
+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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libcrmcommon.la: $(libcrmcommon_la_OBJECTS) $(libcrmcommon_la_DEPENDENCIES) 
+	$(libcrmcommon_la_LINK) -rpath $(libdir) $(libcrmcommon_la_OBJECTS) $(libcrmcommon_la_LIBADD) $(LIBS)
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/ctrl.Plo
+include ./$(DEPDIR)/ipc.Plo
+include ./$(DEPDIR)/iso8601.Plo
+include ./$(DEPDIR)/iso8601_fields.Plo
+include ./$(DEPDIR)/msg.Plo
+include ./$(DEPDIR)/utils.Plo
+include ./$(DEPDIR)/xml.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-halibPROGRAMS clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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
+
+
+clean-generic:
+	rm -f *.log *.debug *.xml *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/common/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/common/Makefile.in
--- heartbeat-2.1.3/lib/crm/common/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/common/Makefile.in	2008-08-18 23:38:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -43,7 +43,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -65,7 +65,7 @@
 	$(libcrmcommon_la_LDFLAGS) $(LDFLAGS) -o $@
 halibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(halib_PROGRAMS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -114,6 +114,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -131,24 +132,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -210,12 +199,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -422,8 +412,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -431,8 +421,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -454,8 +444,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -520,8 +510,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -533,8 +523,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -544,13 +534,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/common/utils.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/common/utils.c
--- heartbeat-2.1.3/lib/crm/common/utils.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/common/utils.c	2008-08-18 13:32:19.000000000 +0100
@@ -63,6 +63,7 @@
 unsigned int crm_log_level = LOG_INFO;
 gboolean crm_config_error = FALSE;
 gboolean crm_config_warning = FALSE;
+const char *crm_system_name = "unknown";
 
 void crm_set_env_options(void);
 
@@ -182,8 +183,8 @@
 	}
 
 	if(value == NULL) {
-		crm_debug("Using default value '%s' for cluster option '%s'",
-			  def_value, name);
+		crm_debug_2("Using default value '%s' for cluster option '%s'",
+			    def_value, name);
 
 		if(options == NULL) {
 			return def_value;
@@ -440,6 +441,7 @@
 	/* and for good measure... - this enum is a bit field (!) */
 	g_log_set_always_fatal((GLogLevelFlags)0); /*value out of range*/
 	
+	crm_system_name = entity;
 	cl_log_set_entity(entity);
 	cl_log_set_facility(HA_LOG_FACILITY);
 
@@ -515,6 +517,11 @@
 }
 
 
+/*
+ * version1 < version2 : -1
+ * version1 = version2 :  0
+ * version1 > version2 :  1
+ */
 int
 compare_version(const char *version1, const char *version2)
 {
@@ -1158,47 +1165,35 @@
 gboolean
 decode_transition_magic(
 	const char *magic, char **uuid, int *transition_id, int *action_id,
-	int *op_status, int *op_rc)
+	int *op_status, int *op_rc, int *target_rc)
 {
-	char *rc = NULL;
-	char *key = NULL;
-	char *magic2 = NULL;
-	char *status = NULL;
-
-	gboolean result = TRUE;
-	
-	if(decodeNVpair(magic, ':', &status, &magic2) == FALSE) {
-		crm_err("Couldn't find ':' in: %s", magic);
-		result = FALSE;
-		goto bail;
-	}
-
-	if(decodeNVpair(magic2, ';', &rc, &key) == FALSE) {
-		crm_err("Couldn't find ';' in: %s", magic2);
-		result = FALSE;
-		goto bail;
-	}
-
-	
-	CRM_CHECK(decode_transition_key(key, uuid, transition_id, action_id),
-		  result = FALSE;
-		  goto bail;
-		);
-	
-	*op_rc = crm_parse_int(rc, NULL);
-	*op_status = crm_parse_int(status, NULL);
-
+    int res = 0;
+    char *key = NULL;
+    gboolean result = TRUE;
+
+    CRM_CHECK(magic != NULL, return FALSE);
+    CRM_CHECK(op_rc != NULL, return FALSE);
+    CRM_CHECK(op_status != NULL, return FALSE);
+    
+    crm_malloc0(key, strlen(magic));
+    res = sscanf(magic, "%d:%d;%s", op_status, op_rc, key);
+    if(res != 3) {
+	crm_crit("Only found %d items in: %s", res, magic);
+	return FALSE;
+    }
+    
+    CRM_CHECK(decode_transition_key(key, uuid, transition_id, action_id, target_rc),
+	      result = FALSE;
+	      goto bail;
+	);
+    
   bail:
-	crm_free(rc);
-	crm_free(key);
-	crm_free(magic2);
-	crm_free(status);
-	
-	return result;
+    crm_free(key);
+    return result;
 }
 
 char *
-generate_transition_key(int transition_id, int action_id, const char *node)
+generate_transition_key(int transition_id, int action_id, int target_rc, const char *node)
 {
 	int len = 40;
 	char *fail_state = NULL;
@@ -1209,8 +1204,8 @@
 	
 	crm_malloc0(fail_state, len);
 	if(fail_state != NULL) {
-		snprintf(fail_state, len, "%d:%d:%s",
-			 action_id, transition_id, node);
+		snprintf(fail_state, len, "%d:%d:%d:%s",
+			 action_id, transition_id, target_rc, node);
 	}
 	return fail_state;
 }
@@ -1218,38 +1213,69 @@
 
 gboolean
 decode_transition_key(
-	const char *key, char **uuid, int *transition_id, int *action_id)
+	const char *key, char **uuid, int *transition_id, int *action_id, int *target_rc)
 {
-	char *tmp = NULL;
-	char *action = NULL;
-	char *transition = NULL;
-
-	*uuid = NULL;
-	*action_id = -1;
-	*transition_id = -1;
-	
-	if(decodeNVpair(key, ':', &action, &tmp) == FALSE) {
-		crm_err("Couldn't find ':' in: %s", key);
-		return FALSE;
-	}
+	int res = 0;
+	gboolean done = FALSE;
 
-	*action_id = crm_parse_int(action, NULL);
-	crm_free(action);
+	CRM_CHECK(uuid != NULL, return FALSE);
+	CRM_CHECK(target_rc != NULL, return FALSE);
+	CRM_CHECK(action_id != NULL, return FALSE);
+	CRM_CHECK(transition_id != NULL, return FALSE);
+	
+	crm_malloc0(*uuid, strlen(key));
+	res = sscanf(key, "%d:%d:%d:%s", action_id, transition_id, target_rc, *uuid);
+	switch(res) {
+	    case 4:
+		/* Post Pacemaker 0.6 */
+		done = TRUE;
+		break;
+	    case 3:
+	    case 2:
+		/* this can be tricky - the UUID might start with an integer */
+
+		/* Until Pacemaker 0.6 */
+		done = TRUE;
+		*target_rc = -1;
+		res = sscanf(key, "%d:%d:%s", action_id, transition_id, *uuid);
+		if(res == 2) {
+		    *action_id = -1;
+		    res = sscanf(key, "%d:%s", transition_id, *uuid);
+		    CRM_CHECK(res == 2, done = FALSE);
 
-	if(decodeNVpair(tmp, ':', &transition, uuid) == FALSE) {
-		/* this would be an error but some versions dont
-		 * have the action
-		 */
-		*transition_id = *action_id;
+		} else if(res != 3) {
+		    CRM_CHECK(res == 3, done = FALSE);
+		}
+		break;
+		
+	    case 1:
+		/* Prior to Heartbeat 2.0.8 */
+		done = TRUE;
 		*action_id = -1;
-		*uuid = tmp;
+		*target_rc = -1;
+		res = sscanf(key, "%d:%s", transition_id, *uuid);
+		CRM_CHECK(res == 2, done = FALSE);
+		break;
+	    default:
+		crm_crit("Unhandled sscanf result (%d) for %s", res, key);
+		
+	}
 
-	} else {
-		*transition_id = crm_parse_int(transition, NULL);
-		crm_free(transition);
-		crm_free(tmp);
+	if(strlen(*uuid) != 36) {
+	    crm_warn("Bad UUID (%s) in sscanf result (%d) for %s", *uuid, res, key);		    
 	}
-	return TRUE;
+	
+	if(done == FALSE) {
+	    crm_err("Cannot decode '%s' rc=%d", key, res);
+	    
+	    crm_free(*uuid);
+	    *uuid = NULL;
+	    *target_rc = -1;
+	    *action_id = -1;
+	    *transition_id = -1;
+	}
+	
+	return done;
 }
 
 void
@@ -1321,7 +1347,7 @@
 	}
 
 #if CRM_DEPRECATED_SINCE_2_0_5
- 	if(version == NULL || compare_version("1.0.5", version)) {
+ 	if(version == NULL || compare_version("1.0.5", version) > 0) {
 		for(lpc = 0; lpc < DIMOF(filter_205); lpc++) {
 			xml_remove_prop(param_set, filter_205[lpc]); 
 		}
@@ -1349,7 +1375,7 @@
 		      }
 		);
 
-	if(crm_get_msec(interval) && compare_version(version, "1.0.8")) {
+	if(crm_get_msec(interval) && compare_version(version, "1.0.8") > 0) {
 		/* Re-instate the operation's timeout value */
 		if(timeout != NULL) {
 			crm_xml_add(param_set, CRM_META"_timeout", timeout);
@@ -1411,7 +1437,7 @@
 	    pid=fork();
 
 	} else {
-	    do_crm_log(LOG_ERR, "%s: Triggered non-fatal assert at %s:%d : %s",
+	    do_crm_log(LOG_ERR, "%s: Triggered fatal assert at %s:%d : %s",
 		       function, file, line, assert_condition);
 	}
 	
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/common/xml.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/common/xml.c
--- heartbeat-2.1.3/lib/crm/common/xml.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/common/xml.c	2008-08-18 13:32:19.000000000 +0100
@@ -228,10 +228,6 @@
 void
 copy_in_properties(crm_data_t* target, const crm_data_t *src)
 {
-	int value_len = 0;
-	char *incr_value = NULL;
-	char *new_value = NULL;
-	
 	crm_validate_data(src);
 	crm_validate_data(target);
 
@@ -244,32 +240,7 @@
 	} else {
 		xml_prop_iter(
 			src, local_prop_name, local_prop_value,
-
-			/* if the value is name followed by "++" we need
-			 *   to increment the existing value
-			 */
-			new_value = NULL;
-			incr_value = NULL;
-
-			if(strstr(local_prop_value, "++") > local_prop_value) {
-				int old_int = 0;
-				const char *old_value = NULL;
-				value_len = strlen(local_prop_value);
-				crm_malloc0(incr_value, value_len+2);
-				sprintf(incr_value, "%s++", local_prop_name);
-
-				if(safe_str_eq(local_prop_value, incr_value)) {
-					old_value = crm_element_value(
-						target, local_prop_name);
-					old_int = crm_parse_int(old_value, "0");
-					new_value = crm_itoa(old_int + 1);
-					local_prop_value = new_value;
-				}
-			}
-
-			crm_xml_add(target, local_prop_name, local_prop_value);
-			crm_free(incr_value);
-			crm_free(new_value);
+			expand_plus_plus(target, local_prop_name, local_prop_value)
 			);
 		crm_validate_data(target);
 	}
@@ -277,6 +248,52 @@
 	return;
 }
 
+void fix_plus_plus_recursive(crm_data_t* target)
+{
+    xml_prop_iter(target, name, value, expand_plus_plus(target, name, value));
+    xml_child_iter(target, child, fix_plus_plus_recursive(child));
+}
+
+
+void
+expand_plus_plus(crm_data_t* target, const char *name, const char *value)
+{
+    int int_value = 0;
+    int value_len = 0;
+    char *incr_value = NULL;
+    const char *old_value = crm_element_value(target, name);
+    
+    /* if no previous value, set unexpanded */
+    if(old_value == NULL
+       || strstr(value, "++") <= value) {
+	crm_xml_add(target, name, value);
+	return;
+    }
+    
+    value_len = strlen(value);
+    crm_malloc0(incr_value, value_len+2);
+    sprintf(incr_value, "%s++", name);
+    
+    /* if the value is name followed by "++" we need
+     *   to increment the existing value
+     */
+    if(safe_str_eq(value, incr_value)) {
+	if(safe_str_eq(value, old_value)) {
+	    int_value = 0;
+
+	} else {
+	    int_value = crm_parse_int(old_value, "0");
+	}
+	crm_xml_add_int(target, name, int_value+1);
+	
+    } else {
+	crm_xml_add(target, name, value);
+    }
+    
+    crm_free(incr_value);
+    return;
+}
+
 crm_data_t*
 add_node_copy(crm_data_t *parent, const crm_data_t *src_node) 
 {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/Makefile
--- heartbeat-2.1.3/lib/crm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/crm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,652 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/crm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = common pengine cib transition
+DIST_SUBDIRS = common pengine cib transition
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/Makefile.in
--- heartbeat-2.1.3/lib/crm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -87,6 +87,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -104,24 +105,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -183,12 +172,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -458,8 +448,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/clone.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/clone.c
--- heartbeat-2.1.3/lib/crm/pengine/clone.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/clone.c	2008-08-18 13:32:19.000000000 +0100
@@ -29,14 +29,24 @@
 void clone_create_notifications(
 	resource_t *rsc, action_t *action, action_t *action_complete,
 	pe_working_set_t *data_set);
+gboolean create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set);
 
+static void mark_as_orphan(resource_t *rsc) 
+{
+    set_bit(rsc->flags, pe_rsc_orphan);
+    slist_iter(
+	child, resource_t, rsc->children, lpc,
+	mark_as_orphan(child);
+	);
+}
 
-static gboolean
+gboolean
 create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set) 
 {
 	gboolean rc = TRUE;
 	char *inc_num = NULL;
 	char *inc_max = NULL;
+	gboolean as_orphan = FALSE;
 	resource_t *child_rsc = NULL;
 	crm_data_t * child_copy = NULL;
 	clone_variant_data_t *clone_data = NULL;
@@ -44,6 +54,10 @@
 
 	CRM_CHECK(clone_data->xml_obj_child != NULL, return FALSE);
 
+	if(sub_id < 0) {
+	    as_orphan = TRUE;
+	    sub_id = clone_data->total_clones;
+	}
 	inc_num = crm_itoa(sub_id);
 	inc_max = crm_itoa(clone_data->clone_max);	
 
@@ -58,9 +72,13 @@
 		goto bail;
 	}
 /* 	child_rsc->globally_unique = rsc->globally_unique; */
-	
-	crm_debug_3("Setting clone attributes for: %s", child_rsc->id);
+
+	clone_data->total_clones += 1;
+	crm_debug_2("Setting clone attributes for: %s", child_rsc->id);
 	rsc->children = g_list_append(rsc->children, child_rsc);
+	if(as_orphan) {
+	    mark_as_orphan(child_rsc);
+	}
 	
 	add_hash_param(child_rsc->meta, XML_RSC_ATTR_INCARNATION_MAX, inc_max);
 	
@@ -133,6 +151,11 @@
 	if(crm_is_true(ordered)) {
 		clone_data->ordered = TRUE;
 	}
+	if((rsc->flags & pe_rsc_unique) == 0 && clone_data->clone_node_max > 1) {
+	    crm_config_err("Anonymous clones (%s) may only support one copy"
+			   " per node", rsc->id);
+	    clone_data->clone_node_max = 1;
+	}
 
 	crm_debug_2("Options for %s", rsc->id);
 	crm_debug_2("\tClone max: %d", clone_data->clone_max);
@@ -248,6 +271,11 @@
 	
 	slist_iter(
 		child_rsc, resource_t, rsc->children, lpc,
+
+		if(is_set(child_rsc->flags, pe_rsc_orphan)
+		   && child_rsc->fns->active(child_rsc, TRUE) == FALSE) {
+		    continue;
+		}
 		
 		if(options & pe_print_html) {
 			status_print("<li>\n");
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/common.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/common.c
--- heartbeat-2.1.3/lib/crm/pengine/common.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/common.c	2008-08-18 13:32:19.000000000 +0100
@@ -192,6 +192,8 @@
 		return no_action;
 	} else if(safe_str_eq(task, CRM_OP_LRM_REFRESH)) {
 		return no_action;	
+	} else if(safe_str_eq(task, CRMD_ACTION_MIGRATE)) {
+		return no_action;    
 	} else if(safe_str_eq(task, CRMD_ACTION_MIGRATED)) {
 		return no_action;	
 	} else if(safe_str_eq(task, "fail")) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/complex.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/complex.c
--- heartbeat-2.1.3/lib/crm/pengine/complex.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/complex.c	2008-08-18 13:32:19.000000000 +0100
@@ -222,7 +222,9 @@
 	    cl_str_to_boolean(value, &bool_value);
 	    if(bool_value == FALSE) {
 		clear_bit((*rsc)->flags, pe_rsc_managed); 
-	    } 
+	    } else {
+		set_bit((*rsc)->flags, pe_rsc_managed); 
+	    }
 	}
 
 	crm_debug_2("Options for %s", (*rsc)->id);
@@ -315,6 +317,15 @@
     }
 }
 
+resource_t *uber_parent(resource_t *rsc) 
+{
+	resource_t *parent = rsc;
+	while(parent != NULL && parent->parent != NULL) {
+		parent = parent->parent;
+	}
+	return parent;
+}
+
 void
 common_apply_stickiness(resource_t *rsc, node_t *node, pe_working_set_t *data_set) 
 {
@@ -356,16 +367,25 @@
 	value = g_hash_table_lookup(node->details->attrs, fail_attr);
 	if(value != NULL) {
 		crm_debug("%s: %s", fail_attr, value);
-		fail_count = crm_parse_int(value, "0");
+		fail_count = char2score(value);
 	}
 	crm_free(fail_attr);
 	
 	if(fail_count > 0 && rsc->fail_stickiness != 0) {
-		resource_location(rsc, node, fail_count * rsc->fail_stickiness,
-				  "fail_stickiness", data_set);
+		resource_t *failed = rsc;
+		int score = fail_count * rsc->fail_stickiness;
+		if(is_not_set(rsc->flags, pe_rsc_unique)) {
+		    failed = uber_parent(rsc);
+		}
+
+		/* detect and prevent score underflows */
+		if(rsc->fail_stickiness < 0 && (score > 0 || score < -INFINITY)) {
+		    score = -INFINITY;
+		}
+
+		resource_location(failed, node, score, "fail_stickiness", data_set);
 		crm_info("Setting failure stickiness for %s on %s: %d",
-			  rsc->id, node->details->uname,
-			  fail_count * rsc->fail_stickiness);
+			  failed->id, node->details->uname, score);
 	}
 	g_hash_table_destroy(meta_hash);
 }
@@ -387,7 +407,7 @@
 	if(rsc->meta != NULL) {
 		g_hash_table_destroy(rsc->meta);
 	}
-	if(is_set(rsc->flags, pe_rsc_orphan)) {
+	if(rsc->parent == NULL && is_set(rsc->flags, pe_rsc_orphan)) {
 		free_xml(rsc->xml);
 	}
 	if(rsc->running_on) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/Makefile
--- heartbeat-2.1.3/lib/crm/pengine/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/crm/pengine/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,686 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/crm/pengine/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/pengine
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/pengine
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+pe_varlibdir = $(HA_VARLIBDIR)/$(HB_PKG)/pengine
+
+# sockets with path
+crmdir = $(havarlibdir)/crm
+apigid = 65
+crmuid = 17
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libpe_rules.la: $(libpe_rules_la_OBJECTS) $(libpe_rules_la_DEPENDENCIES) 
+	$(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) 
+	$(libpe_status_la_LINK) -rpath $(libdir) $(libpe_status_la_OBJECTS) $(libpe_status_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/clone.Plo
+include ./$(DEPDIR)/common.Plo
+include ./$(DEPDIR)/complex.Plo
+include ./$(DEPDIR)/group.Plo
+include ./$(DEPDIR)/native.Plo
+include ./$(DEPDIR)/rules.Plo
+include ./$(DEPDIR)/status.Plo
+include ./$(DEPDIR)/unpack.Plo
+include ./$(DEPDIR)/utils.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-libLTLIBRARIES \
+	uninstall-local
+
+
+clean-generic:
+	rm -f *.log *.debug *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/Makefile.in
--- heartbeat-2.1.3/lib/crm/pengine/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/Makefile.in	2008-08-18 23:38:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -69,7 +69,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -118,6 +118,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -135,24 +136,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -214,12 +203,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -436,8 +426,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -445,8 +435,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -510,8 +500,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -523,8 +513,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -534,13 +524,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/native.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/native.c
--- heartbeat-2.1.3/lib/crm/pengine/native.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/native.c	2008-08-18 13:32:19.000000000 +0100
@@ -264,16 +264,16 @@
 		desc = crm_element_value(rsc->xml, XML_ATTR_DESC);
 		status_print("%s%s\t(%s%s%s:%s%s)%s%s",
 			     pre_text?pre_text:"", rsc->id,
-			     prov?prov:"", prov?"::":"",
-			     class, crm_element_value(rsc->xml, XML_ATTR_TYPE),
+			     class, prov?"::":"", prov?prov:"", 
+			     crm_element_value(rsc->xml, XML_ATTR_TYPE),
 			     is_set(rsc->flags, pe_rsc_orphan)?" ORPHANED":"",
 			     desc?": ":"", desc?desc:"");
 
 	} else {
 		status_print("%s%s\t(%s%s%s:%s%s):\t%s %s%s%s",
 			     pre_text?pre_text:"", rsc->id,
-			     prov?prov:"", prov?"::":"",
-			     class, crm_element_value(rsc->xml, XML_ATTR_TYPE),
+			     class, prov?"::":"", prov?prov:"", 
+			     crm_element_value(rsc->xml, XML_ATTR_TYPE),
 			     is_set(rsc->flags, pe_rsc_orphan)?" ORPHANED":"",
 			     (rsc->variant!=pe_native)?"":role2text(rsc->role),
 			     (rsc->variant!=pe_native)?"":node!=NULL?node->details->uname:"",
@@ -382,7 +382,7 @@
 	if(current) {
 		role = rsc->role;
 	}
-	crm_debug_2("%s state: %s", rsc->id, role2text(role));
+	crm_debug_4("%s state: %s", rsc->id, role2text(role));
 	return role;
 }
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/rules.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/rules.c
--- heartbeat-2.1.3/lib/crm/pengine/rules.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/rules.c	2008-08-18 13:32:19.000000000 +0100
@@ -367,6 +367,8 @@
 	int value_low_i = 0;
 	int value_high_i = 0;
 
+	CRM_CHECK(now != NULL, return FALSE);
+	
 	cron_check("seconds",	now->seconds);
 	cron_check("minutes",	now->minutes);
 	cron_check("hours",	now->hours);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/status.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/status.c
--- heartbeat-2.1.3/lib/crm/pengine/status.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/status.c	2008-08-18 13:32:19.000000000 +0100
@@ -286,31 +286,23 @@
 node_t *
 pe_find_node_id(GListPtr nodes, const char *id)
 {
-	unsigned lpc = 0;
-	node_t *node = NULL;
-  
-	for(lpc = 0; lpc < g_list_length(nodes); lpc++) {
-		node = g_list_nth_data(nodes, lpc);
-		if(safe_str_eq(node->details->id, id)) {
-			return node;
-		}
-	}
-	/* error */
-	return NULL;
+    slist_iter(node, node_t, nodes, lpc,
+	       if(node && safe_str_eq(node->details->id, id)) {
+		   return node;
+	       }
+	);
+    /* error */
+    return NULL;
 }
 
 node_t *
 pe_find_node(GListPtr nodes, const char *uname)
 {
-	unsigned lpc = 0;
-	node_t *node = NULL;
-  
-	for(lpc = 0; lpc < g_list_length(nodes); lpc++) {
-		node = g_list_nth_data(nodes, lpc);
-		if(safe_str_eq(node->details->uname, uname)) {
-			return node;
-		}
-	}
-	/* error */
-	return NULL;
+    slist_iter(node, node_t, nodes, lpc,
+	       if(node && safe_str_eq(node->details->uname, uname)) {
+		   return node;
+	       }
+	);
+    /* error */
+    return NULL;
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/unpack.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/unpack.c
--- heartbeat-2.1.3/lib/crm/pengine/unpack.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/unpack.c	2008-08-18 13:32:19.000000000 +0100
@@ -617,11 +617,14 @@
 	return rsc;
 }
 
+extern gboolean create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set);
+
 static resource_t *
 unpack_find_resource(
 	pe_working_set_t *data_set, node_t *node, const char *rsc_id, crm_data_t *rsc_entry)
 {
 	resource_t *rsc = NULL;
+	resource_t *clone_parent = NULL;
 	gboolean is_duped_clone = FALSE;
 	char *alt_rsc_id = crm_strdup(rsc_id);
 	
@@ -631,14 +634,23 @@
 		/* no match */
 		if(rsc == NULL) {
 			crm_debug_2("%s not found: %d", alt_rsc_id, is_duped_clone);
-			if(is_duped_clone) {
-				/* create one */
-				rsc = create_fake_resource(alt_rsc_id, rsc_entry, data_set);
-				crm_info("Making sure orphan %s/%s is stopped on %s",
-					 rsc_id, rsc->id, node->details->uname);
-				resource_location(rsc, NULL, -INFINITY, "__orphan_clone_dont_run__", data_set);
+			if(is_duped_clone == FALSE) {
+			    break;
 			}
+			    
+			/* create one */
+#if 1
+			create_child_clone(clone_parent, -1, data_set);
+			crm_debug("Looking again for %s", alt_rsc_id);
+			rsc = pe_find_resource(data_set->resources, alt_rsc_id);
+			CRM_CHECK(rsc != NULL, crm_err("%s stil not found", alt_rsc_id); continue);
+#else
+			rsc = create_fake_resource(alt_rsc_id, rsc_entry, data_set);
+			crm_info("Making sure orphan %s/%s of %s is stopped on %s",
+				 rsc_id, rsc->id, clone_parent->id, node->details->uname);
+			resource_location(rsc, NULL, -INFINITY, "__orphan_clone_dont_run__", data_set);
 			break;
+#endif
 			
 			/* not running anywhere else */
 		} else if(rsc->running_on == NULL) {
@@ -655,6 +667,7 @@
 			 */
 		} else {
 			crm_debug_3("find another one");
+			clone_parent = uber_parent(rsc);
 			rsc = NULL;
 			is_duped_clone = TRUE;
 			alt_rsc_id = increment_clone(alt_rsc_id);
@@ -734,11 +747,23 @@
 		native_add_running(rsc, node, data_set);
 
 		if(is_set(rsc->flags, pe_rsc_managed) && rsc->stickiness != 0) {
-			resource_location(rsc, node, rsc->stickiness,
+		    node_t *match = pe_find_node_id(rsc->allowed_nodes, node->details->id);
+
+		    if(match != NULL || data_set->symmetric_cluster) {
+			resource_t *sticky_rsc = rsc;
+			if(rsc->parent && rsc->parent->variant == pe_group) {
+			    sticky_rsc = rsc->parent;
+			}
+			
+			resource_location(sticky_rsc, node, rsc->stickiness,
 					  "stickiness", data_set);
 			crm_debug_2("Resource %s: preferring current location"
-				    " (node=%s, weight=%d)", rsc->id,
+				    " (node=%s, weight=%d)", sticky_rsc->id,
 				    node->details->uname, rsc->stickiness);
+		    } else {
+			crm_debug("Ignoring stickiness for %s: the cluster is asymmetric and node %s is no longer explicitly allowed",
+				  rsc->id, node->details->uname);
+		    }
 		}
 	
 		if(on_fail == action_fail_ignore) {
@@ -994,8 +1019,9 @@
 unpack_rsc_op(resource_t *rsc, node_t *node, crm_data_t *xml_op,
 	      int *max_call_id, enum action_fail_response *on_fail,
 	      pe_working_set_t *data_set) 
-{
+{    
 	const char *id          = NULL;
+	const char *key        = NULL;
 	const char *task        = NULL;
  	const char *task_id     = NULL;
  	const char *actual_rc   = NULL;
@@ -1009,10 +1035,13 @@
 	int task_id_i = -1;
 	int task_status_i = -2;
 	int actual_rc_i = 0;
+	int target_rc = -1;
 	
 	action_t *action = NULL;
+	node_t *effective_node = NULL;
+	resource_t *failed = NULL;
+
 	gboolean is_probe = FALSE;
-	gboolean is_stop_action = FALSE;
 	
 	CRM_CHECK(rsc    != NULL, return FALSE);
 	CRM_CHECK(node   != NULL, return FALSE);
@@ -1024,6 +1053,7 @@
 	task_status = crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS);
 	op_digest   = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
 	op_version  = crm_element_value(xml_op, XML_ATTR_CRM_VERSION);
+	key	    = crm_element_value(xml_op, XML_ATTR_TRANSITION_KEY);
 
 	CRM_CHECK(id != NULL, return FALSE);
 	CRM_CHECK(task != NULL, return FALSE);
@@ -1050,10 +1080,6 @@
 		is_probe = TRUE;
 	}
 	
-	if(safe_str_eq(task, CRMD_ACTION_STOP)) {
-		is_stop_action = TRUE;
-	}
-	
 	if(task_status_i != LRM_OP_PENDING) {
 		task_id_i = crm_parse_int(task_id, "-1");
 
@@ -1076,61 +1102,140 @@
 	CRM_CHECK(actual_rc != NULL, return FALSE);	
 	actual_rc_i = crm_parse_int(actual_rc, NULL);
 
-	if(EXECRA_NOT_INSTALLED == actual_rc_i) {
-		resource_location(rsc, node, -INFINITY, "not-installed", data_set);
-		if(is_probe) {
-			/* treat these like stops */
-			is_stop_action = TRUE;
-			task_status_i = LRM_OP_DONE;
-			actual_rc_i = EXECRA_NOT_RUNNING;
-			
- 		} else {
-			task_status_i = LRM_OP_ERROR;
+	if(key) {
+	    int dummy = 0;
+	    char *dummy_string = NULL;
+	    decode_transition_key(key, &dummy_string, &dummy, &dummy, &target_rc);
+	    crm_free(dummy_string);
+	}
+	
+	if(task_status_i == LRM_OP_DONE && target_rc >= 0) {
+	    if(target_rc == actual_rc_i) {
+		task_status_i = LRM_OP_DONE;
+		
+	    } else {
+		task_status_i = LRM_OP_ERROR;
+		crm_info("Remapping %s (rc=%d) on %s to an ERROR (expected %d)",
+			 id, actual_rc_i, node->details->uname, target_rc);
+	    }
+
+	} else if(task_status_i == LRM_OP_ERROR) {
+	    /* let us decide that */
+	    crm_debug("Remapping %s (rc=%d, status=%d) on %s to DONE",
+		      id, actual_rc_i, task_status_i, node->details->uname);
+ 	    task_status_i = LRM_OP_DONE;
+	}
+	
+	if(task_status_i == LRM_OP_NOTSUPPORTED) {
+	    actual_rc_i = EXECRA_UNIMPLEMENT_FEATURE;
+	}
+
+	/* we could clean this up significantly except for old LRMs and CRMs that
+	 * didnt include target_rc and liked to remap status
+	 */
+	switch(actual_rc_i) {
+	    case EXECRA_NOT_RUNNING:
+		if(is_probe || target_rc == actual_rc_i) {
+		    task_status_i = LRM_OP_DONE;
+		    rsc->role = RSC_ROLE_STOPPED;
+		    
+		    /* clear any previous failure actions */
+		    *on_fail = action_fail_ignore;
+		    rsc->next_role = RSC_ROLE_UNKNOWN;
+		    
+		} else if(safe_str_neq(task, CRMD_ACTION_STOP)) {
+		    task_status_i = LRM_OP_ERROR;
 		}
+		break;
 		
-	} else if(EXECRA_NOT_RUNNING == actual_rc_i) {
+	    case EXECRA_RUNNING_MASTER:
 		if(is_probe) {
-			/* treat these like stops */
-			is_stop_action = TRUE;
-		}
-		if(is_stop_action) {
-			task_status_i = LRM_OP_DONE;
- 		} else {
-			task_status_i = LRM_OP_ERROR;
+		    task_status_i = LRM_OP_DONE;
+		    crm_warn("%s found active %s in master mode on %s",
+			     id, rsc->id, node->details->uname);
+
+		} else if(target_rc == actual_rc_i) {
+		    /* nothing to do */
+
+		} else if(target_rc >= 0) {
+		    task_status_i = LRM_OP_ERROR;
+
+		    /* legacy code for pre-0.6.5 operations */
+		} else if(safe_str_neq(task, CRMD_ACTION_STATUS)
+			  || rsc->role != RSC_ROLE_MASTER) {
+		    task_status_i = LRM_OP_ERROR;
+		    if(rsc->role != RSC_ROLE_MASTER) {
+			crm_err("%s reported %s in master mode on %s",
+				id, rsc->id,
+				node->details->uname);
+		    }
 		}
+		rsc->role = RSC_ROLE_MASTER;
+		break;
 		
-	} else if(EXECRA_RUNNING_MASTER == actual_rc_i) {
-		if(is_probe
-		   || (rsc->role == RSC_ROLE_MASTER
-		       && safe_str_eq(task, CRMD_ACTION_STATUS))) {
-			task_status_i = LRM_OP_DONE;
+	    case EXECRA_FAILED_MASTER:
+		rsc->role = RSC_ROLE_MASTER;
+		task_status_i = LRM_OP_ERROR;
+		break;
 
+	    case EXECRA_UNIMPLEMENT_FEATURE:
+		if(interval > 0) {
+		    task_status_i = LRM_OP_NOTSUPPORTED;
+		    break;
+		}
+		/* else: fall through */
+	    case EXECRA_INSUFFICIENT_PRIV:
+	    case EXECRA_NOT_INSTALLED:
+	    case EXECRA_INVALID_PARAM:
+		effective_node = node;
+		/* fall through */
+	    case EXECRA_NOT_CONFIGURED:
+		failed = rsc;
+		if(is_not_set(rsc->flags, pe_rsc_unique)) {
+		    failed = uber_parent(failed);
+		}
+		
+		crm_err("Hard error: %s failed with rc=%d.", id, actual_rc_i);
+		if(effective_node) {
+		    crm_err("  Preventing %s from re-starting on %s",
+			    failed->id, effective_node->details->uname);
 		} else {
-			task_status_i = LRM_OP_ERROR;
-			if(rsc->role != RSC_ROLE_MASTER) {
-				crm_err("%s reported %s in master mode on %s",
-					id, rsc->id,
-					node->details->uname);
-			}
+		    crm_err("  Preventing %s from re-starting anywhere in the cluster",
+			    failed->id);
 		}
-		rsc->role = RSC_ROLE_MASTER;
 
-	} else if(EXECRA_FAILED_MASTER == actual_rc_i) {
-		rsc->role = RSC_ROLE_MASTER;
-		task_status_i = LRM_OP_ERROR;
-
-	} else if(EXECRA_OK == actual_rc_i
-		  && interval > 0
-		  && rsc->role == RSC_ROLE_MASTER) {
-		/* catch status ops that return 0 instead of 8 while they
-		 *   are supposed to be in master mode
-		 */
-		task_status_i = LRM_OP_ERROR;
+		resource_location(failed, effective_node, -INFINITY, "hard-error", data_set);
+		if(is_probe) {
+			/* treat these like stops */
+			task = CRMD_ACTION_STOP;
+			task_status_i = LRM_OP_DONE;
+		}
+		break;
 
-	} else if(task_status_i == LRM_OP_DONE && EXECRA_OK != actual_rc_i) {
-		crm_err("Remapping %s (rc=%d) on %s to an ERROR",
-			id, actual_rc_i, node->details->uname);
-		task_status_i = LRM_OP_ERROR;
+	    case EXECRA_OK:
+		if(is_probe && target_rc == 7) {
+		    task_status_i = LRM_OP_DONE;
+		    crm_warn("%s found active %s on %s",
+			     id, rsc->id, node->details->uname);
+
+		    /* legacy code for pre-0.6.5 operations */
+		} else if(target_rc < 0
+		   && interval > 0
+		   && rsc->role == RSC_ROLE_MASTER) {
+		    /* catch status ops that return 0 instead of 8 while they
+		     *   are supposed to be in master mode
+		     */
+		    task_status_i = LRM_OP_ERROR;
+		}
+		
+		break;
+		
+	    default:
+		if(task_status_i == LRM_OP_DONE) {
+		    crm_info("Remapping %s (rc=%d) on %s to an ERROR",
+			     id, actual_rc_i, node->details->uname);
+		    task_status_i = LRM_OP_ERROR;
+		}
 	}
 
 	if(task_status_i == LRM_OP_ERROR
@@ -1158,13 +1263,16 @@
 			crm_debug_3("%s/%s completed on %s",
 				    rsc->id, task, node->details->uname);
 
-			if(is_stop_action) {
+			if(actual_rc_i == EXECRA_NOT_RUNNING) {
+			    /* nothing to do */
+			    
+			} else if(safe_str_eq(task, CRMD_ACTION_STOP)) {
 				rsc->role = RSC_ROLE_STOPPED;
-
+			    
 				/* clear any previous failure actions */
 				*on_fail = action_fail_ignore;
 				rsc->next_role = RSC_ROLE_UNKNOWN;
-				
+
 			} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
 				rsc->role = RSC_ROLE_MASTER;
 
@@ -1191,28 +1299,35 @@
 				*on_fail = action->on_fail;
 			}
 
-			if(task_status_i == LRM_OP_NOTSUPPORTED) {
+			if(safe_str_eq(task, CRMD_ACTION_STOP)) {
 			    resource_location(
-				rsc, node, -INFINITY, "__not_supported__", data_set);
-
-			} else if(data_set->start_failure_fatal
-				  || compare_version("2.0", op_version)) {			    
-			    if(is_stop_action || safe_str_eq(task, CRMD_ACTION_START)) {
-				crm_warn("Compatability handling for failed op %s on %s",
-					 id, node->details->uname);
-				resource_location(
-				    rsc, node, -INFINITY, "__legacy_stopstart__", data_set);
-			    }
-			}
-
-			if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
-				rsc->role = RSC_ROLE_MASTER;
+				rsc, node, -INFINITY, "__stop_fail__", data_set);
+			    
+			} else if(safe_str_eq(task, CRMD_ACTION_PROMOTE)) {
+			    rsc->role = RSC_ROLE_MASTER;
 
 			} else if(safe_str_eq(task, CRMD_ACTION_DEMOTE)) {
-				rsc->role = RSC_ROLE_MASTER;
+			    /*
+			     * staying in role=master ends up putting the PE/TE into a loop
+			     * setting role=slave is not dangerous because no master will be
+			     * promoted until the failed resource has been fully stopped
+			     */
+			    crm_warn("Forcing %s to stop after a failed demote action", rsc->id);
+			    rsc->next_role = RSC_ROLE_STOPPED;
+			    rsc->role = RSC_ROLE_SLAVE;
 				
-			} else if(rsc->role < RSC_ROLE_STARTED) {
-				rsc->role = RSC_ROLE_STARTED;
+			} else if((data_set->start_failure_fatal
+				   || compare_version("2.0", op_version) > 0)
+				  && safe_str_eq(task, CRMD_ACTION_START)) {
+			    crm_warn("Compatability handling for failed op %s on %s",
+				     id, node->details->uname);
+			    resource_location(
+				rsc, node, -INFINITY, "__legacy_start__", data_set);
+
+			}
+
+			if(rsc->role < RSC_ROLE_STARTED) {
+			    rsc->role = RSC_ROLE_STARTED;
 			}
 
 			crm_debug_2("Resource %s: role=%s, unclean=%s, on_fail=%s, fail_role=%s",
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/utils.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/utils.c
--- heartbeat-2.1.3/lib/crm/pengine/utils.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/utils.c	2008-08-18 13:32:19.000000000 +0100
@@ -135,8 +135,43 @@
 	return TRUE;
 }
 
-/* the intersection of list1 and list2 
- */
+/* any node in list1 or list2 and not in the other gets a score of -INFINITY */
+GListPtr
+node_list_exclude(GListPtr list1, GListPtr list2)
+{
+    node_t *other_node = NULL;
+    GListPtr result = NULL;
+    
+    result = node_list_dup(list1, FALSE, FALSE);
+    
+    slist_iter(
+	node, node_t, result, lpc,
+	
+	other_node = pe_find_node_id(list2, node->details->id);
+	
+	if(other_node == NULL) {
+	    node->weight = -INFINITY;
+	} else {
+	    node->weight = merge_weights(node->weight, other_node->weight);
+	}
+	);
+    
+    slist_iter(
+	node, node_t, list2, lpc,
+	
+	other_node = pe_find_node_id(result, node->details->id);
+	
+	if(other_node == NULL) {
+	    node_t *new_node = node_copy(node);
+	    new_node->weight = -INFINITY;
+	    result = g_list_append(result, new_node);
+	}
+	);
+
+    return result;
+}
+
+/* the intersection of list1 and list2 */
 GListPtr
 node_list_and(GListPtr list1, GListPtr list2, gboolean filter)
 {
@@ -315,14 +350,27 @@
 
 void dump_node_scores(int level, resource_t *rsc, const char *comment, GListPtr nodes) 
 {
+    GListPtr list = nodes;
+    if(rsc) {
+	list = rsc->allowed_nodes;
+    }
+    
     slist_iter(
-	node, node_t, nodes, lpc,
+	node, node_t, list, lpc,
 	if(rsc) {
-	    do_crm_log(level, "%s: %s.%s = %d", comment, rsc->id, node->details->uname, node->weight);
+	    do_crm_log(level, "%s: %s allocation score on %s: %d",
+		       comment, rsc->id, node->details->uname, node->weight);
 	} else {
 	    do_crm_log(level, "%s: %s = %d", comment, node->details->uname, node->weight);
 	}
 	);
+
+    if(rsc && rsc->children) {
+	slist_iter(
+	    child, resource_t, rsc->children, lpc,
+	    dump_node_scores(level, child, comment, nodes);
+	    );
+    }
 }
 
 gint sort_rsc_index(gconstpointer a, gconstpointer b)
@@ -398,7 +446,7 @@
 
 	if(action == NULL) {
 		if(save_action) {
-			crm_debug_2("Creating%s action %d: %s for %s on %s",
+			crm_debug_4("Creating%s action %d: %s for %s on %s",
 				    optional?"":" manditory", data_set->action_id, key, rsc?rsc->id:"<NULL>",
 				    on_node?on_node->details->uname:"<NULL>");
 		}
@@ -482,7 +530,8 @@
 		} else if(action->node == NULL) {
 			action->runnable = FALSE;
 			
-		} else if(is_not_set(rsc->flags, pe_rsc_managed)) {
+		} else if(g_hash_table_lookup(action->meta, XML_LRM_ATTR_INTERVAL) == NULL
+			  && is_not_set(rsc->flags, pe_rsc_managed)) {
 			do_crm_log(warn_level, "Action %s (unmanaged)",
 				 action->uuid);
 			action->optional = TRUE;
@@ -654,7 +703,8 @@
 		    value = "stop resource";
 		}
 		
-	} else if(safe_str_eq(value, "ignore")) {
+	} else if(safe_str_eq(value, "ignore")
+		|| safe_str_eq(value, "nothing")) {
 		action->on_fail = action_fail_ignore;
 		value = "ignore";
 
@@ -667,8 +717,7 @@
 		action->fail_role = RSC_ROLE_STOPPED;
 		value = "stop resource";
 		
-	} else if(safe_str_eq(value, "restart")
-		|| safe_str_eq(value, "nothing")) {
+	} else if(safe_str_eq(value, "restart")) {
 		action->on_fail = action_fail_recover;
 		value = "restart (and possibly migrate)";
 		
@@ -1033,6 +1082,14 @@
 resource_node_score(resource_t *rsc, node_t *node, int score, const char *tag) 
 {
 	node_t *match = NULL;
+
+	if(rsc->children) {
+	    slist_iter(
+		child_rsc, resource_t, rsc->children, lpc,
+		resource_node_score(child_rsc, node, score, tag);
+		);
+	}
+	
 	crm_debug_2("Setting %s for %s on %s: %d",
 		    tag, rsc->id, node->details->uname, score);
 	match = pe_find_node_id(rsc->allowed_nodes, node->details->id);
@@ -1139,10 +1196,10 @@
 	/* now process pending ops */
 	CRM_CHECK(a_key != NULL && b_key != NULL, sort_return(0));
 	CRM_CHECK(decode_transition_magic(
-			  a_key, &a_uuid, &a_id, &dummy, &a_status, &a_rc),
+		      a_key, &a_uuid, &a_id, &dummy, &a_status, &a_rc, &dummy),
 		  sort_return(0));
 	CRM_CHECK(decode_transition_magic(
-			  b_key, &b_uuid, &b_id, &dummy, &b_status, &b_rc),
+		      b_key, &b_uuid, &b_id, &dummy, &b_status, &b_rc, &dummy),
 		  sort_return(0));
 
 	/* try and determin the relative age of the operation...
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/utils.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/utils.h
--- heartbeat-2.1.3/lib/crm/pengine/utils.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/utils.h	2008-08-18 13:32:19.000000000 +0100
@@ -25,6 +25,7 @@
 
 
 /* Binary like operators for lists of nodes */
+extern GListPtr node_list_exclude(GListPtr list1, GListPtr list2);
 extern GListPtr node_list_dup(GListPtr list1, gboolean reset, gboolean filter);
 
 extern GListPtr node_list_and(GListPtr list1, GListPtr list2, gboolean filter);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/pengine/variant.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/pengine/variant.h
--- heartbeat-2.1.3/lib/crm/pengine/variant.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/pengine/variant.h	2008-08-18 13:32:19.000000000 +0100
@@ -29,6 +29,7 @@
 		int master_max;
 		int master_node_max;
 
+		int total_clones;
 		int active_clones;
 		int max_nodes;
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/transition/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/transition/Makefile
--- heartbeat-2.1.3/lib/crm/transition/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/crm/transition/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,680 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/crm/transition/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/transition
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/crm/transition
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Copyright (C) 2004 Andrew Beekhof
+#
+# 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., 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)/heartbeat
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char $(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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libtransitioner.la: $(libtransitioner_la_OBJECTS) $(libtransitioner_la_DEPENDENCIES) 
+	$(libtransitioner_la_LINK) -rpath $(libdir) $(libtransitioner_la_OBJECTS) $(libtransitioner_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/libtransitioner_la-graph.Plo
+include ./$(DEPDIR)/libtransitioner_la-unpack.Plo
+include ./$(DEPDIR)/libtransitioner_la-utils.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+libtransitioner_la-unpack.lo: unpack.c
+	$(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
+	mv -f $(DEPDIR)/libtransitioner_la-unpack.Tpo $(DEPDIR)/libtransitioner_la-unpack.Plo
+#	source='unpack.c' object='libtransitioner_la-unpack.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libtransitioner_la-graph.Tpo $(DEPDIR)/libtransitioner_la-graph.Plo
+#	source='graph.c' object='libtransitioner_la-graph.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libtransitioner_la-utils.Tpo $(DEPDIR)/libtransitioner_la-utils.Plo
+#	source='utils.c' object='libtransitioner_la-utils.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-libLTLIBRARIES \
+	uninstall-local
+
+
+clean-generic:
+	rm -f *~
+
+install-exec-local:
+
+uninstall-local:
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/transition/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/transition/Makefile.in
--- heartbeat-2.1.3/lib/crm/transition/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/transition/Makefile.in	2008-08-18 23:38:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -62,7 +62,7 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libtransitioner_la_CFLAGS) $(CFLAGS) \
 	$(libtransitioner_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -111,6 +111,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -128,24 +129,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -207,12 +196,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -417,8 +407,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -426,8 +416,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -504,8 +494,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -517,8 +507,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -528,13 +518,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/crm/transition/unpack.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/crm/transition/unpack.c
--- heartbeat-2.1.3/lib/crm/transition/unpack.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/crm/transition/unpack.c	2008-08-18 13:32:19.000000000 +0100
@@ -29,6 +29,7 @@
 /* #include <lrm/lrm_api.h> */
 #include <sys/stat.h>
 #include <clplumbing/cl_misc.h>
+#include <clplumbing/Gmain_timeout.h>
 
 static crm_action_t*
 unpack_action(synapse_t *parent, crm_data_t *xml_action) 
@@ -221,9 +222,10 @@
 static void
 destroy_action(crm_action_t *action)
 {
-	if(action->timer) {
-		CRM_CHECK(action->timer->source_id == 0, ;);
-/*  		Gmain_timeout_remove(action->timer->source_id); */
+	if(action->timer && action->timer->source_id != 0) {
+	    crm_warn("Cancelling timer for action %d (src=%d)",
+		     action->id, action->timer->source_id);
+	    Gmain_timeout_remove(action->timer->source_id);
 	}
 	g_hash_table_destroy(action->params);
 	free_xml(action->xml);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/fencing/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/fencing/Makefile
--- heartbeat-2.1.3/lib/fencing/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/fencing/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,651 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/fencing/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/fencing
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/fencing
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#  File: Makefile.am
+#  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+#  Copyright (c) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+havarlibdir = $(localstatedir)/lib/heartbeat
+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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libstonithd.la: $(libstonithd_la_OBJECTS) $(libstonithd_la_DEPENDENCIES) 
+	$(libstonithd_la_LINK) -rpath $(libdir) $(libstonithd_la_OBJECTS) $(libstonithd_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/stonithd_lib.Plo
+include ./$(DEPDIR)/stonithd_msg.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/fencing/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/fencing/Makefile.in
--- heartbeat-2.1.3/lib/fencing/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/fencing/Makefile.in	2008-08-18 23:38:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,6 +106,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -123,24 +124,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -202,12 +191,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -416,8 +406,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -425,8 +415,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -481,8 +471,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -494,8 +484,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -505,13 +495,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/hbclient/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/hbclient/Makefile
--- heartbeat-2.1.3/lib/hbclient/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/hbclient/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,706 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/hbclient/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/hbclient
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/hbclient
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# hbclient library: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+# Copyright (C) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+havarrundir = $(localstatedir)/run/
+apidir = $(havarlibdir)/api
+apicasualdir = $(havarlibdir)/casual
+# fifos with path
+hafifo = $(havarlibdir)/fifo
+apigid = 65
+gliblib = -lglib-2.0  
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+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  
+api_test_SOURCES = api_test.c
+api_test_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
+			libhbclient.la $(gliblib) \
+			$(top_builddir)/lib/pils/libpils.la
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libhbclient.la: $(libhbclient_la_OBJECTS) $(libhbclient_la_DEPENDENCIES) 
+	$(libhbclient_la_LINK) -rpath $(libdir) $(libhbclient_la_OBJECTS) $(libhbclient_la_LIBADD) $(LIBS)
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+api_test$(EXEEXT): $(api_test_OBJECTS) $(api_test_DEPENDENCIES) 
+	@rm -f api_test$(EXEEXT)
+	$(LINK) $(api_test_OBJECTS) $(api_test_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/api_test.Po
+include ./$(DEPDIR)/client_lib.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-halibPROGRAMS clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/hbclient/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/hbclient/Makefile.in
--- heartbeat-2.1.3/lib/hbclient/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/hbclient/Makefile.in	2008-08-18 23:38:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -68,7 +68,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -116,6 +116,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -133,24 +134,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -212,12 +201,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -438,8 +428,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -447,8 +437,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -470,8 +460,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -534,8 +524,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -547,8 +537,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -558,13 +548,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/lrm/clientlib.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/lrm/clientlib.c
--- heartbeat-2.1.3/lib/lrm/clientlib.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/lrm/clientlib.c	2008-08-18 13:32:19.000000000 +0100
@@ -93,6 +93,8 @@
 			,const char* type, const char* provider
 			,GHashTable* parameter);
 static int lrm_delete_rsc (ll_lrm_t*, const char* id);
+static int lrm_fail_rsc (ll_lrm_t* lrm, const char* rsc_id, const int fail_rc
+			,const char* fail_reason);
 static IPC_Channel* lrm_ipcchan (ll_lrm_t*);
 static int lrm_msgready (ll_lrm_t*);
 static int lrm_rcvmsg (ll_lrm_t*, int blocking);
@@ -111,6 +113,7 @@
 	lrm_get_rsc,
 	lrm_add_rsc,
 	lrm_delete_rsc,
+	lrm_fail_rsc,
 	lrm_ipcchan,
 	lrm_msgready,
 	lrm_rcvmsg
@@ -689,6 +692,53 @@
 }
 
 static int
+lrm_fail_rsc (ll_lrm_t* lrm, const char* rsc_id, const int fail_rc
+,		 const char* fail_reason)
+{
+	struct ha_msg* msg;
+
+	/* check whether the rsc_id is available */
+	if (NULL == rsc_id || RID_LEN <= strlen(rsc_id))	{
+		cl_log(LOG_ERR, "%s: wrong parameter rsc_id.", __FUNCTION__);
+		return HA_FAIL;
+	}
+
+	/* check whether the channel to lrmd is available */
+	if (NULL == ch_cmd)	{
+		cl_log(LOG_ERR, "%s: ch_mod is null.", __FUNCTION__);
+		return HA_FAIL;
+	}
+
+	/* create the message */
+	msg = create_lrm_rsc_msg(rsc_id,FAILRSC);
+	if (NULL == msg) {
+		LOG_FAIL_create_lrm_rsc_msg(FAILRSC);
+		return HA_FAIL;
+	}
+	if ((fail_reason && HA_OK != ha_msg_add(msg,F_LRM_FAIL_REASON,fail_reason))
+		|| HA_OK != ha_msg_add_int(msg, F_LRM_ASYNCMON_RC, fail_rc)
+	) {
+		ha_msg_del(msg);
+		LOG_BASIC_ERROR("ha_msg_add");
+		return HA_FAIL;
+	}
+	/* send to lrmd */
+	if (HA_OK != msg2ipcchan(msg,ch_cmd)) {
+		ha_msg_del(msg);
+		LOG_FAIL_SEND_MSG(FAILRSC, "ch_cmd");
+		return HA_FAIL;
+	}
+	ha_msg_del(msg);
+	/* check the result */
+	if (HA_OK != get_ret_from_ch(ch_cmd)) {
+		LOG_GOT_FAIL_RET(LOG_ERR, FAILRSC);
+		return HA_FAIL;
+	}
+
+	return HA_OK;
+}
+
+static int
 lrm_add_rsc (ll_lrm_t* lrm, const char* rsc_id, const char* class
 , 	     const char* type, const char* provider, GHashTable* parameter)
 {
@@ -1151,6 +1201,7 @@
 	const char* op_type;
 	const char* app_name;
 	const char* rsc_id;
+	const char* fail_reason;
 	const char* output;
 	const void* user_data;
 
@@ -1190,10 +1241,6 @@
 		else {
 			op->output = NULL;
 		}
-		/* check the rc to revise the op_status */
-		if (0 != op->rc) {
-			op->op_status = LRM_OP_ERROR;
-		}
 	} else if(op->op_status == LRM_OP_PENDING) {
 		op->rc = EXECRA_STATUS_UNKNOWN;
 		
@@ -1228,9 +1275,14 @@
 		free_op(op);
 		return NULL;
 	}
-
 	op->rsc_id = g_strdup(rsc_id);
 
+	/* op->fail_reason present only on async failures */
+	fail_reason = ha_msg_value(msg, F_LRM_FAIL_REASON);
+	if (fail_reason) {
+		op->fail_reason = g_strdup(fail_reason);
+	}
+
 	/* op->user_data */
 	user_data = cl_get_string(msg, F_LRM_USERDATA);
 	
@@ -1243,9 +1295,10 @@
 	   || ha_msg_value_ul(msg, F_LRM_T_RCCHANGE, &op->t_rcchange) != HA_OK
 	   || ha_msg_value_ul(msg, F_LRM_EXEC_TIME, &op->exec_time) != HA_OK
 	   || ha_msg_value_ul(msg, F_LRM_QUEUE_TIME, &op->queue_time) != HA_OK) {
-		cl_log(LOG_WARNING
-		, "%s(%d): failed to get the timing information"
+		/* cl_log(LOG_WARNING
+		, "%s:%d: failed to get the timing information"
 		, __FUNCTION__, __LINE__);
+		*/
 	}
 	
 	/* op->params */
@@ -1435,6 +1488,10 @@
 		case EXECRA_NOT_RUNNING:
 			return "not running";
 		/* For status command only */
+		case EXECRA_RUNNING_MASTER:
+			return "master";
+		case EXECRA_FAILED_MASTER:
+			return "master (failed)";
 		case EXECRA_RA_DEAMON_DEAD1:
 			return "status: deamon dead";
 		case EXECRA_RA_DEAMON_DEAD2:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/lrm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/lrm/Makefile
--- heartbeat-2.1.3/lib/lrm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/lrm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,671 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/lrm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/lrm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/lrm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+havarlibdir = $(localstatedir)/lib/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
+                        		$(GLIBLIB)
+
+LRM_DIR = lrm
+lrmdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(LRM_DIR)
+apigid = 65
+lib_LTLIBRARIES = liblrm.la
+liblrm_la_SOURCES = lrm_msg.c clientlib.c
+liblrm_la_LDFLAGS = $(COMMONLIBS)
+liblrm_la_CFLAGS = $(INCLUDES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+liblrm.la: $(liblrm_la_OBJECTS) $(liblrm_la_DEPENDENCIES) 
+	$(liblrm_la_LINK) -rpath $(libdir) $(liblrm_la_OBJECTS) $(liblrm_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/liblrm_la-clientlib.Plo
+include ./$(DEPDIR)/liblrm_la-lrm_msg.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+liblrm_la-lrm_msg.lo: lrm_msg.c
+	$(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
+	mv -f $(DEPDIR)/liblrm_la-lrm_msg.Tpo $(DEPDIR)/liblrm_la-lrm_msg.Plo
+#	source='lrm_msg.c' object='liblrm_la-lrm_msg.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/liblrm_la-clientlib.Tpo $(DEPDIR)/liblrm_la-clientlib.Plo
+#	source='clientlib.c' object='liblrm_la-clientlib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-libLTLIBRARIES
+
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
+	-chgrp $(apigid) $(DESTDIR)/$(lrmdir)
+	chmod 770 $(DESTDIR)/$(lrmdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/lrm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/lrm/Makefile.in
--- heartbeat-2.1.3/lib/lrm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/lrm/Makefile.in	2008-08-18 23:38:03.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,6 +106,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -123,24 +124,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -202,12 +191,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -417,8 +407,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -426,8 +416,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -496,8 +486,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -509,8 +499,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -520,13 +510,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/Makefile
--- heartbeat-2.1.3/lib/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,677 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 lrm mgmt mgmt
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+
+#
+#	PILS is supposed to be an independent library
+#	Stonith should rely only on PILS
+#
+#	The rest can use clplumbing, and the plugins should be able
+#	to use any of the libraries (nothing can be linked against them)
+#
+#
+MGMT_DIR = mgmt
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat library directory: Linux-HA code
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = \
+	pils			\
+	stonith 		\
+	clplumbing		\
+	hbclient		\
+	apphb			\
+	recoverymgr		\
+	fencing			\
+	plugins 		\
+	$(CRM_DIR)		\
+	lrm			\
+	$(MGMT_DIR)
+
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/Makefile.in
--- heartbeat-2.1.3/lib/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/Makefile.in	2008-08-18 23:38:01.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -56,7 +56,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = pils stonith clplumbing hbclient apphb recoverymgr \
-	fencing plugins @CRM_DIR@ lrm mgmt
+	fencing plugins @CRM_DIR@ lrm mgmt @MGMT_DIR@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIGN = @ALIGN@
@@ -89,6 +89,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -106,24 +107,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -185,12 +174,23 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+
+#
+#	PILS is supposed to be an independent library
+#	Stonith should rely only on PILS
+#
+#	The rest can use clplumbing, and the plugins should be able
+#	to use any of the libraries (nothing can be linked against them)
+#
+#
+@MGMT_BUILD_TRUE@MGMT_DIR = mgmt
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -346,16 +346,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-
-#
-#	PILS is supposed to be an independent library
-#	Stonith should rely only on PILS
-#
-#	The rest can use clplumbing, and the plugins should be able
-#	to use any of the libraries (nothing can be linked against them)
-#
-#
-@MGMT_BUILD_TRUE@MGMT_DIR = mgmt
 SUBDIRS = \
 	pils			\
 	stonith 		\
@@ -483,8 +473,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -509,8 +499,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -520,13 +510,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/Makefile
--- heartbeat-2.1.3/lib/mgmt/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/mgmt/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,816 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/mgmt/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/mgmt
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/mgmt
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2005 International Business Machines
+#
+# 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., 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)/heartbeat
+guilibdir = $(libdir)/heartbeat-gui
+havarlibdir = $(localstatedir)/lib/heartbeat
+COMMONLIBS = $(GLIBLIB)
+mgmtdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(MGMT_DIR)
+apigid = 65
+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 = -I/usr/include/python2.5 -I$(top_builddir)/include -w
+_pymgmt_la_LDFLAGS = -module $(GNUTLSLIBS)
+_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la
+guilib_SCRIPTS = pymgmt.py
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(guilibdir)" || $(MKDIR_P) "$(DESTDIR)$(guilibdir)"
+	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(guilibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+_pymgmt.la: $(_pymgmt_la_OBJECTS) $(_pymgmt_la_DEPENDENCIES) 
+	$(_pymgmt_la_LINK) -rpath $(guilibdir) $(_pymgmt_la_OBJECTS) $(_pymgmt_la_LIBADD) $(LIBS)
+libhbmgmtclient.la: $(libhbmgmtclient_la_OBJECTS) $(libhbmgmtclient_la_DEPENDENCIES) 
+	$(libhbmgmtclient_la_LINK) -rpath $(libdir) $(libhbmgmtclient_la_OBJECTS) $(libhbmgmtclient_la_LIBADD) $(LIBS)
+libhbmgmtcommon.la: $(libhbmgmtcommon_la_OBJECTS) $(libhbmgmtcommon_la_DEPENDENCIES) 
+	$(libhbmgmtcommon_la_LINK) -rpath $(libdir) $(libhbmgmtcommon_la_OBJECTS) $(libhbmgmtcommon_la_LIBADD) $(LIBS)
+libhbmgmttls.la: $(libhbmgmttls_la_OBJECTS) $(libhbmgmttls_la_DEPENDENCIES) 
+	$(libhbmgmttls_la_LINK) -rpath $(libdir) $(libhbmgmttls_la_OBJECTS) $(libhbmgmttls_la_LIBADD) $(LIBS)
+install-guilibSCRIPTS: $(guilib_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-guilibSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo
+include ./$(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo
+include ./$(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo
+include ./$(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo
+include ./$(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo
+include ./$(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo
+include ./$(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+_pymgmt_la-pymgmt_wrap.lo: pymgmt_wrap.c
+	$(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
+	mv -f $(DEPDIR)/_pymgmt_la-pymgmt_wrap.Tpo $(DEPDIR)/_pymgmt_la-pymgmt_wrap.Plo
+#	source='pymgmt_wrap.c' object='_pymgmt_la-pymgmt_wrap.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/_pymgmt_la-mgmt_client_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_client_lib.Plo
+#	source='mgmt_client_lib.c' object='_pymgmt_la-mgmt_client_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_tls_lib.Plo
+#	source='mgmt_tls_lib.c' object='_pymgmt_la-mgmt_tls_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/_pymgmt_la-mgmt_common_lib.Tpo $(DEPDIR)/_pymgmt_la-mgmt_common_lib.Plo
+#	source='mgmt_common_lib.c' object='_pymgmt_la-mgmt_common_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Tpo $(DEPDIR)/libhbmgmtclient_la-mgmt_client_lib.Plo
+#	source='mgmt_client_lib.c' object='libhbmgmtclient_la-mgmt_client_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Tpo $(DEPDIR)/libhbmgmtcommon_la-mgmt_common_lib.Plo
+#	source='mgmt_common_lib.c' object='libhbmgmtcommon_la-mgmt_common_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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
+	mv -f $(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Tpo $(DEPDIR)/libhbmgmttls_la-mgmt_tls_lib.Plo
+#	source='mgmt_tls_lib.c' object='libhbmgmttls_la-mgmt_tls_lib.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-guilibLTLIBRARIES clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-guilibLTLIBRARIES uninstall-guilibSCRIPTS \
+	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 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
+	$(SWIG) -python $^
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(mgmtdir)
+	-chgrp $(apigid) $(DESTDIR)/$(mgmtdir)
+	chmod 770 $(DESTDIR)/$(mgmtdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/Makefile.in
--- heartbeat-2.1.3/lib/mgmt/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/mgmt/Makefile.in	2008-08-18 23:38:04.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -89,7 +89,7 @@
 	$(CFLAGS) $(libhbmgmttls_la_LDFLAGS) $(LDFLAGS) -o $@
 guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(guilib_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,6 +139,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -156,24 +157,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -235,12 +224,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = mgmt
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -404,7 +394,6 @@
 guilibdir = $(libdir)/heartbeat-gui
 havarlibdir = $(localstatedir)/lib/@HB_PKG@
 COMMONLIBS = $(GLIBLIB)
-MGMT_DIR = mgmt
 mgmtdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(MGMT_DIR)
 apigid = @HA_APIGID@
 EXTRA_DIST = pymgmt.i
@@ -464,8 +453,8 @@
 	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(guilibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(guilibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(guilibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -473,8 +462,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(guilib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(guilibdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(guilibdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(guilibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(guilibdir)/$$p"; \
 	done
 
 clean-guilibLTLIBRARIES:
@@ -491,8 +480,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -500,8 +489,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -635,8 +624,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -648,8 +637,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -659,13 +648,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/mgmt_client_lib.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/mgmt_client_lib.c
--- heartbeat-2.1.3/lib/mgmt/mgmt_client_lib.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/mgmt/mgmt_client_lib.c	2008-08-18 13:32:19.000000000 +0100
@@ -54,6 +54,7 @@
 	struct sockaddr_in addr;
 	char* msg;
 	char* ret;
+	int rv;
 	
 	/* if it has already connected, return fail */
 	if (ISCONNECTED()) {
@@ -97,20 +98,26 @@
 	/* login to server */
 	msg = mgmt_new_msg(MSG_LOGIN, user, passwd, MGMT_PROTOCOL_VERSION, NULL);
 	ret = mgmt_sendmsg(msg);
-	if (ret == NULL || STRNCMP_CONST(ret,MSG_OK) != 0) {
-		mgmt_del_msg(msg);
-		mgmt_del_msg(ret);
-		close(sock);
-		tls_close_client();
-		if (ret != NULL && STRNCMP_CONST(ret,MSG_FAIL) != 0) {
-			return -3;
-		}
-		return -2;
+	if (ret == NULL) {
+		rv = -1;
+	}
+	else if (STRNCMP_CONST(ret,MSG_OK) == 0) {
+		rv = 0;
+	}
+	else if (STRNCMP_CONST(ret,MSG_FAIL) == 0){
+		rv = -2;
+	}
+	else {
+		rv = -3;
 	}
 	
 	mgmt_del_msg(msg);
 	mgmt_del_msg(ret);
-	return 0;
+	if (rv != 0) {
+		close(sock);
+		tls_close_client();
+	}
+	return rv;
 }
 
 char* 
@@ -163,7 +170,7 @@
 int 
 mgmt_session_sendmsg(void* session, const char* msg)
 {
-	int len;
+	int len, ret, count = 0;
 	if (session == NULL) {
 		return -1;
 	}
@@ -172,8 +179,14 @@
 	if (len == MAX_MSGLEN + 1) {
 		return -2;
 	}
-	if (len != tls_send(session, msg, len)) {
-		return -1;
+	while (count < len) {
+		ret = tls_send(session, msg + count, len - count) ;
+		if (ret < 0) {
+			return -1;
+		}
+		else {
+			count += ret;
+		}
 	}
 	/* get the bytes sent */
 	return len;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/pymgmt.i /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/pymgmt.i
--- heartbeat-2.1.3/lib/mgmt/pymgmt.i	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/mgmt/pymgmt.i	2008-08-18 13:32:19.000000000 +0100
@@ -1,10 +1,20 @@
 %module pymgmt
 %{
 #include "../../include/mgmt/mgmt_client.h"
+
+char* mgmt_thread_sendmsg(const char* msg)
+{
+        char* ret_msg;
+        Py_BEGIN_ALLOW_THREADS
+        ret_msg = mgmt_sendmsg(msg);
+        Py_END_ALLOW_THREADS      
+        return ret_msg;
+}
 %}
 
 int mgmt_connect(const char* server, const char* user, const char*  passwd, const char* port);
 char* mgmt_sendmsg(const char* msg);
 char* mgmt_recvmsg(void);
+char* mgmt_thread_sendmsg(const char* msg);
 int mgmt_inputfd(void);
 int mgmt_disconnect(void);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/pymgmt.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/pymgmt.py
--- heartbeat-2.1.3/lib/mgmt/pymgmt.py	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/mgmt/pymgmt.py	2008-12-29 22:12:09.000000000 +0000
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.36
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -51,6 +51,7 @@
 mgmt_connect = _pymgmt.mgmt_connect
 mgmt_sendmsg = _pymgmt.mgmt_sendmsg
 mgmt_recvmsg = _pymgmt.mgmt_recvmsg
+mgmt_thread_sendmsg = _pymgmt.mgmt_thread_sendmsg
 mgmt_inputfd = _pymgmt.mgmt_inputfd
 mgmt_disconnect = _pymgmt.mgmt_disconnect
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/mgmt/pymgmt_wrap.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/mgmt/pymgmt_wrap.c
--- heartbeat-2.1.3/lib/mgmt/pymgmt_wrap.c	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/mgmt/pymgmt_wrap.c	2008-08-18 23:39:09.000000000 +0100
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.33
+ * Version 1.3.36
  * 
  * 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
@@ -52,6 +52,12 @@
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -126,7 +132,7 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -161,6 +167,7 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -301,10 +308,10 @@
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -431,8 +438,8 @@
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -856,7 +863,7 @@
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1416,7 +1423,7 @@
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1434,12 +1441,13 @@
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1944,7 +1952,7 @@
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
+  if (own == SWIG_POINTER_OWN) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1965,6 +1973,8 @@
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1978,7 +1988,15 @@
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
 	    break;
 	  }
 	}
@@ -1988,7 +2006,8 @@
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2053,8 +2072,13 @@
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2477,7 +2501,7 @@
 
 #define SWIG_name    "_pymgmt"
 
-#define SWIGVERSION 0x010333 
+#define SWIGVERSION 0x010336 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2487,6 +2511,15 @@
 
 #include "../../include/mgmt/mgmt_client.h"
 
+char* mgmt_thread_sendmsg(const char* msg)
+{
+        char* ret_msg;
+        Py_BEGIN_ALLOW_THREADS
+        ret_msg = mgmt_sendmsg(msg);
+        Py_END_ALLOW_THREADS      
+        return ret_msg;
+}
+
 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
@@ -2598,7 +2631,6 @@
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
-  int result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -2615,6 +2647,7 @@
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  int result;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:mgmt_connect",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -2656,11 +2689,11 @@
 SWIGINTERN PyObject *_wrap_mgmt_sendmsg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
-  char *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
   PyObject * obj0 = 0 ;
+  char *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:mgmt_sendmsg",&obj0)) SWIG_fail;
   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
@@ -2691,6 +2724,31 @@
 }
 
 
+SWIGINTERN PyObject *_wrap_mgmt_thread_sendmsg(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:mgmt_thread_sendmsg",&obj0)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mgmt_thread_sendmsg" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = (char *)(buf1);
+  result = (char *)mgmt_thread_sendmsg((char const *)arg1);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_mgmt_inputfd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   int result;
@@ -2721,6 +2779,7 @@
 	 { (char *)"mgmt_connect", _wrap_mgmt_connect, METH_VARARGS, NULL},
 	 { (char *)"mgmt_sendmsg", _wrap_mgmt_sendmsg, METH_VARARGS, NULL},
 	 { (char *)"mgmt_recvmsg", _wrap_mgmt_recvmsg, METH_VARARGS, NULL},
+	 { (char *)"mgmt_thread_sendmsg", _wrap_mgmt_thread_sendmsg, METH_VARARGS, NULL},
 	 { (char *)"mgmt_inputfd", _wrap_mgmt_inputfd, METH_VARARGS, NULL},
 	 { (char *)"mgmt_disconnect", _wrap_mgmt_disconnect, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
@@ -2807,7 +2866,7 @@
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -2817,6 +2876,9 @@
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -2845,6 +2907,12 @@
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/pils/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/pils/Makefile
--- heartbeat-2.1.3/lib/pils/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/pils/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,704 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/pils/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/pils
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/pils
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# pils: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+
+#pkginclude_HEADERS	= $(top_srcdir)/include/pils/plugin.h \
+#			$(top_srcdir)/include/pils/interface.h
+
+#sbin_PROGRAMS		= main
+
+#main_SOURCES		= main.c
+
+#main_LDADD		= libpils.la  \
+#			$(GLIBLIB) \
+#			$(top_builddir)/replace/libreplace.la
+#main_LDFLAGS		= -ldl  -export-dynamic 
+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	\
+			 $(GLIBLIB)
+
+test_la_SOURCES = test.c
+test_la_LDFLAGS = -export-dynamic -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libpils.la: $(libpils_la_OBJECTS) $(libpils_la_DEPENDENCIES) 
+	$(libpils_la_LINK) -rpath $(libdir) $(libpils_la_OBJECTS) $(libpils_la_LIBADD) $(LIBS)
+test.la: $(test_la_OBJECTS) $(test_la_DEPENDENCIES) 
+	$(test_la_LINK) -rpath $(plugindir) $(test_la_OBJECTS) $(test_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/pils.Plo
+include ./$(DEPDIR)/test.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-pluginLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/pils/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/pils/Makefile.in
--- heartbeat-2.1.3/lib/pils/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/pils/Makefile.in	2008-08-18 23:38:04.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -67,7 +67,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -115,6 +115,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -132,24 +133,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -211,12 +200,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -438,8 +428,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -447,8 +437,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -465,8 +455,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -474,8 +464,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -532,8 +522,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -545,8 +535,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -556,13 +546,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/AppHBNotification/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/AppHBNotification/Makefile
--- heartbeat-2.1.3/lib/plugins/AppHBNotification/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/AppHBNotification/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,648 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/AppHBNotification/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/AppHBNotification
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/AppHBNotification
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# RecoveryMgr: Recovery manager plugins for Linux-HA
+#
+# Copyright (C) 2001 Intel Corporation <andrea.l.brugger@intel.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
+# 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., 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)/heartbeat
+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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+recmgr.la: $(recmgr_la_OBJECTS) $(recmgr_la_DEPENDENCIES) 
+	$(recmgr_la_LINK) -rpath $(plugindir) $(recmgr_la_OBJECTS) $(recmgr_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/recmgr.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/AppHBNotification/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/AppHBNotification/Makefile.in
--- heartbeat-2.1.3/lib/plugins/AppHBNotification/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/AppHBNotification/Makefile.in	2008-08-18 23:38:04.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -59,7 +59,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -107,6 +107,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -124,24 +125,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -203,12 +192,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -414,8 +404,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -423,8 +413,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -478,8 +468,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -491,8 +481,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -502,13 +492,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBauth/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBauth/Makefile
--- heartbeat-2.1.3/lib/plugins/HBauth/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/HBauth/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,670 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/HBauth/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBauth
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBauth
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+halibdir = $(libdir)/heartbeat
+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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+crc.la: $(crc_la_OBJECTS) $(crc_la_DEPENDENCIES) 
+	$(crc_la_LINK) -rpath $(plugindir) $(crc_la_OBJECTS) $(crc_la_LIBADD) $(LIBS)
+md5.la: $(md5_la_OBJECTS) $(md5_la_DEPENDENCIES) 
+	$(md5_la_LINK) -rpath $(plugindir) $(md5_la_OBJECTS) $(md5_la_LIBADD) $(LIBS)
+sha1.la: $(sha1_la_OBJECTS) $(sha1_la_DEPENDENCIES) 
+	$(sha1_la_LINK) -rpath $(plugindir) $(sha1_la_OBJECTS) $(sha1_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/crc.Plo
+include ./$(DEPDIR)/md5.Plo
+include ./$(DEPDIR)/sha1.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBauth/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBauth/Makefile.in
--- heartbeat-2.1.3/lib/plugins/HBauth/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/HBauth/Makefile.in	2008-08-18 23:38:04.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -69,7 +69,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -117,6 +117,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -134,24 +135,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -213,12 +202,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -430,8 +420,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -439,8 +429,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -500,8 +490,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -513,8 +503,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -524,13 +514,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBcomm/hbaping.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBcomm/hbaping.c
--- heartbeat-2.1.3/lib/plugins/HBcomm/hbaping.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/HBcomm/hbaping.c	2008-08-18 13:32:19.000000000 +0100
@@ -237,8 +237,8 @@
 
 	ret = (struct hb_media *) MALLOC(sizeof(struct hb_media));
 	if (ret != NULL) {
-		memset(ret, 0, sizeof(*ret));
 		char * name;
+		memset(ret, 0, sizeof(*ret));
 		ret->pd = (void*)ipi;
 		name = MALLOC(strlen(host)+1);
 		strcpy(name, host);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBcomm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBcomm/Makefile
--- heartbeat-2.1.3/lib/plugins/HBcomm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/HBcomm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,871 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/HBcomm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 $@
+#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 $@
+#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 $@
+#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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBcomm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBcomm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+#HBAPING = hbaping.la
+#OPENAIS = openais.la
+#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 \
+                        
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+halibdir = $(libdir)/heartbeat
+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
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+bcast.la: $(bcast_la_OBJECTS) $(bcast_la_DEPENDENCIES) 
+	$(bcast_la_LINK) -rpath $(plugindir) $(bcast_la_OBJECTS) $(bcast_la_LIBADD) $(LIBS)
+hbaping.la: $(hbaping_la_OBJECTS) $(hbaping_la_DEPENDENCIES) 
+	$(hbaping_la_LINK) $(am_hbaping_la_rpath) $(hbaping_la_OBJECTS) $(hbaping_la_LIBADD) $(LIBS)
+mcast.la: $(mcast_la_OBJECTS) $(mcast_la_DEPENDENCIES) 
+	$(mcast_la_LINK) -rpath $(plugindir) $(mcast_la_OBJECTS) $(mcast_la_LIBADD) $(LIBS)
+openais.la: $(openais_la_OBJECTS) $(openais_la_DEPENDENCIES) 
+	$(openais_la_LINK) $(am_openais_la_rpath) $(openais_la_OBJECTS) $(openais_la_LIBADD) $(LIBS)
+ping.la: $(ping_la_OBJECTS) $(ping_la_DEPENDENCIES) 
+	$(ping_la_LINK) -rpath $(plugindir) $(ping_la_OBJECTS) $(ping_la_LIBADD) $(LIBS)
+ping_group.la: $(ping_group_la_OBJECTS) $(ping_group_la_DEPENDENCIES) 
+	$(ping_group_la_LINK) -rpath $(plugindir) $(ping_group_la_OBJECTS) $(ping_group_la_LIBADD) $(LIBS)
+serial.la: $(serial_la_OBJECTS) $(serial_la_DEPENDENCIES) 
+	$(serial_la_LINK) -rpath $(plugindir) $(serial_la_OBJECTS) $(serial_la_LIBADD) $(LIBS)
+tipc.la: $(tipc_la_OBJECTS) $(tipc_la_DEPENDENCIES) 
+	$(tipc_la_LINK) $(am_tipc_la_rpath) $(tipc_la_OBJECTS) $(tipc_la_LIBADD) $(LIBS)
+ucast.la: $(ucast_la_OBJECTS) $(ucast_la_DEPENDENCIES) 
+	$(ucast_la_LINK) -rpath $(plugindir) $(ucast_la_OBJECTS) $(ucast_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/bcast.Plo
+include ./$(DEPDIR)/hbaping.Plo
+include ./$(DEPDIR)/mcast.Plo
+include ./$(DEPDIR)/openais.Plo
+include ./$(DEPDIR)/ping.Plo
+include ./$(DEPDIR)/ping_group.Plo
+include ./$(DEPDIR)/serial.Plo
+include ./$(DEPDIR)/tipc.Plo
+include ./$(DEPDIR)/ucast.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBcomm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBcomm/Makefile.in
--- heartbeat-2.1.3/lib/plugins/HBcomm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/HBcomm/Makefile.in	2008-08-18 23:38:04.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -109,7 +109,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -173,6 +173,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -190,24 +191,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -269,12 +258,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -509,8 +499,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -518,8 +508,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -667,8 +657,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -693,8 +683,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -704,13 +694,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBcompress/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBcompress/Makefile
--- heartbeat-2.1.3/lib/plugins/HBcompress/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/HBcompress/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/HBcompress/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 $@
+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 $@
+am_zlib_la_rpath = -rpath \
+	$(plugindir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBcompress
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/HBcompress
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+zlibmodule = zlib.la
+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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+halibdir = $(libdir)/heartbeat
+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
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+bz2.la: $(bz2_la_OBJECTS) $(bz2_la_DEPENDENCIES) 
+	$(bz2_la_LINK) $(am_bz2_la_rpath) $(bz2_la_OBJECTS) $(bz2_la_LIBADD) $(LIBS)
+zlib.la: $(zlib_la_OBJECTS) $(zlib_la_DEPENDENCIES) 
+	$(zlib_la_LINK) $(am_zlib_la_rpath) $(zlib_la_OBJECTS) $(zlib_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/bz2.Plo
+include ./$(DEPDIR)/zlib.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/HBcompress/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/HBcompress/Makefile.in
--- heartbeat-2.1.3/lib/plugins/HBcompress/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/HBcompress/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -67,7 +67,7 @@
 	$(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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -125,6 +125,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -142,24 +143,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -221,12 +210,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -439,8 +429,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -448,8 +438,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -576,8 +566,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -602,8 +592,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -613,13 +603,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/InterfaceMgr/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/InterfaceMgr/Makefile
--- heartbeat-2.1.3/lib/plugins/InterfaceMgr/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/InterfaceMgr/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,646 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/InterfaceMgr/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/InterfaceMgr
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/InterfaceMgr
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+plugindir = $(pils_plugindir)/InterfaceMgr
+plugin_LTLIBRARIES = generic.la
+generic_la_SOURCES = generic.c
+generic_la_LDFLAGS = -export-dynamic -module -avoid-version
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+generic.la: $(generic_la_OBJECTS) $(generic_la_DEPENDENCIES) 
+	$(generic_la_LINK) -rpath $(plugindir) $(generic_la_OBJECTS) $(generic_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/generic.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/InterfaceMgr/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/InterfaceMgr/Makefile.in
--- heartbeat-2.1.3/lib/plugins/InterfaceMgr/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/InterfaceMgr/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,6 +106,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -123,24 +124,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -202,12 +191,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -412,8 +402,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -421,8 +411,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -476,8 +466,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -489,8 +479,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -500,13 +490,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/Makefile
--- heartbeat-2.1.3/lib/plugins/lrm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/lrm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,696 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/lrm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/lrm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/lrm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+LRM_DIR = lrm
+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)/heartbeat
+havarlibdir = $(localstatedir)/lib/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
+                        		$(GLIBLIB)
+
+lrmdir = $(HA_VARLIBDIR)/$(HB_PKG)/$(LRM_DIR)
+plugindir = $(halibdir)/plugins/RAExec
+apigid = 65
+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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+heartbeat.la: $(heartbeat_la_OBJECTS) $(heartbeat_la_DEPENDENCIES) 
+	$(heartbeat_la_LINK) -rpath $(plugindir) $(heartbeat_la_OBJECTS) $(heartbeat_la_LIBADD) $(LIBS)
+lsb.la: $(lsb_la_OBJECTS) $(lsb_la_DEPENDENCIES) 
+	$(lsb_la_LINK) -rpath $(plugindir) $(lsb_la_OBJECTS) $(lsb_la_LIBADD) $(LIBS)
+ocf.la: $(ocf_la_OBJECTS) $(ocf_la_DEPENDENCIES) 
+	$(ocf_la_LINK) -rpath $(plugindir) $(ocf_la_OBJECTS) $(ocf_la_LIBADD) $(LIBS)
+stonith.la: $(stonith_la_OBJECTS) $(stonith_la_DEPENDENCIES) 
+	$(stonith_la_LINK) -rpath $(plugindir) $(stonith_la_OBJECTS) $(stonith_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/racommon.Plo
+include ./$(DEPDIR)/raexechb.Plo
+include ./$(DEPDIR)/raexeclsb.Plo
+include ./$(DEPDIR)/raexecocf.Plo
+include ./$(DEPDIR)/raexecstonith.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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
+
+
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
+	-chgrp $(apigid) $(DESTDIR)/$(lrmdir)
+	chmod 770 $(DESTDIR)/$(lrmdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/Makefile.in
--- heartbeat-2.1.3/lib/plugins/lrm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/lrm/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -76,7 +76,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -126,6 +126,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -143,24 +144,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -222,12 +211,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -446,8 +436,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -455,8 +445,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -520,8 +510,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -533,8 +523,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -544,13 +534,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/racommon.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/racommon.c
--- heartbeat-2.1.3/lib/plugins/lrm/racommon.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/lrm/racommon.c	2008-08-18 13:32:19.000000000 +0100
@@ -137,3 +137,15 @@
 	}
 	return g_list_length(*rsc_info);
 }
+
+void
+closefiles(void)
+{
+	int fd;
+
+	/* close all descriptors except stdin/out/err and channels to logd */
+	for (fd = getdtablesize(); fd > STDERR_FILENO; fd--) {
+		if (!cl_log_is_logd_fd(fd))
+			close(fd);
+	}
+}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/raexechb.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/raexechb.c
--- heartbeat-2.1.3/lib/plugins/lrm/raexechb.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/lrm/raexechb.c	2008-08-18 13:32:19.000000000 +0100
@@ -242,6 +242,7 @@
 		g_string_free(debug_info, TRUE);
 	} 
 
+	closefiles(); /* don't leak open files */
 	execv(ra_pathname, params_argv);
 	cl_perror("(%s:%s:%d) execv failed for %s"
 		  , __FILE__, __FUNCTION__, __LINE__, ra_pathname);
@@ -319,7 +320,7 @@
 		   * stop_pattern2 = "*not*running*",
 		   * running_pattern1 = "*running*",
 		   * running_pattern2 = "*OK*";
-	const char * lower_std_output = NULL;
+	char * lower_std_output = NULL;
 
 	if(ret_execra == EXECRA_NOT_INSTALLED) {
 		return ret_execra;
@@ -330,7 +331,9 @@
 		if (std_output == NULL ) {
 			cl_log(LOG_WARNING, "No status output from the (hb) resource agent.");
 			return EXECRA_NOT_RUNNING;
-		}else if (idebuglevel) {
+		}
+
+		if (idebuglevel) {
 			cl_log(LOG_DEBUG, "RA output was: [%s]", std_output);
 		}
 
@@ -348,9 +351,8 @@
 				,	stop_pattern1
 				,	stop_pattern2);
 			}
-			return EXECRA_NOT_RUNNING; /* stopped */
-		}
-		if ( TRUE == g_pattern_match_simple(running_pattern1
+			ret_execra = EXECRA_NOT_RUNNING; /* stopped */
+		} else if ( TRUE == g_pattern_match_simple(running_pattern1
 			, lower_std_output) || TRUE ==
 			g_pattern_match_simple(running_pattern2
 			, std_output) ) {
@@ -361,12 +363,14 @@
 				,	std_output, running_pattern1
 				,	running_pattern2);
 			}
-			return EXECRA_OK; /* running */
+			ret_execra = EXECRA_OK; /* running */
+		} else {
+			/* It didn't say it was running - must be stopped */
+			cl_log(LOG_DEBUG, "RA output [%s] didn't match any pattern"
+			,	std_output);
+			ret_execra = EXECRA_NOT_RUNNING; /* stopped */
 		}
-		/* It didn't say it was running - must be stopped */
-		cl_log(LOG_DEBUG, "RA output [%s] didn't match any pattern"
-		,	std_output);
-		return EXECRA_NOT_RUNNING; /* stopped */
+		g_free(lower_std_output);
 	}
 	/* For non-status operation return code */
 	if (ret_execra < 0) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/raexeclsb.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/raexeclsb.c
--- heartbeat-2.1.3/lib/plugins/lrm/raexeclsb.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/lrm/raexeclsb.c	2008-08-18 13:32:19.000000000 +0100
@@ -260,6 +260,7 @@
 		g_string_free(debug_info, TRUE);
 	} 
 
+	closefiles(); /* don't leak open files */
 	execv(ra_pathname, params_argv);
 	cl_perror("(%s:%s:%d) execv failed for %s"
 		  , __FILE__, __FUNCTION__, __LINE__, ra_pathname);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/lrm/raexecocf.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/lrm/raexecocf.c
--- heartbeat-2.1.3/lib/plugins/lrm/raexecocf.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/lrm/raexecocf.c	2008-08-18 13:32:19.000000000 +0100
@@ -171,6 +171,7 @@
 		g_string_free(params_gstring, TRUE);
 	}
 
+	closefiles(); /* don't leak open files */
 	/* execute the RA */
 	execl(ra_pathname, ra_pathname, op_type, (const char *)NULL);
 	cl_perror("(%s:%s:%d) execl failed for %s" 
@@ -314,6 +315,7 @@
 
 	file = popen(ra_pathname, "r");
 	if (NULL==file) {
+		cl_log(LOG_ERR, "%s: popen failed: %s", __FUNCTION__, strerror(errno));
 		return NULL;
 	}
 
@@ -328,8 +330,11 @@
 			nanosleep(&short_sleep,NULL);
 		}
 	}
+	if( pclose(file) ) {
+		cl_log(LOG_ERR, "%s: pclose failed: %s", __FUNCTION__, strerror(errno));
+	}
 	if (0 == g_str_tmp->len) {
-		pclose(file);
+		g_string_free(g_str_tmp, TRUE);
 		return NULL;
 	}
 	data = (char*)g_new(char, g_str_tmp->len+1);
@@ -338,7 +343,6 @@
 
 	g_string_free(g_str_tmp, TRUE);
 	
-	pclose(file);
 	return data;
 }
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/Makefile
--- heartbeat-2.1.3/lib/plugins/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,659 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+# heartbeat lib/plugin directory: Linux-HA code
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+MAINTAINERCLEANFILES = Makefile.in
+LRM_DIR = lrm
+QUORUMD_DIR = quorumd
+SUBDIRS = InterfaceMgr HBauth HBcomm HBcompress stonith AppHBNotification \
+			  $(LRM_DIR)  quorum  tiebreaker $(QUORUMD_DIR)
+
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/Makefile.in
--- heartbeat-2.1.3/lib/plugins/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -58,7 +58,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -109,6 +109,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -126,24 +127,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -205,12 +194,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -465,8 +455,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -491,8 +481,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -502,13 +492,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/quorum/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/quorum/Makefile
--- heartbeat-2.1.3/lib/plugins/quorum/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/quorum/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,820 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/quorum/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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_la_DEPENDENCIES =  \
+	$(top_builddir)/replace/libreplace.la \
+	$(am__DEPENDENCIES_2)
+am__quorumd_la_SOURCES_DIST = quorumd.c
+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 $@
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/quorum
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/quorum
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2005 Guochun Shi <gshi@ncsa.uiuc.edu>
+#
+# 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., 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 
+
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
+			$(GLIBLIB)
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+QUORUMD_PLUGIN = quorumd.la
+halibdir = $(libdir)/heartbeat
+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_la_SOURCES = quorumd.c
+quorumd_la_LDFLAGS = -export-dynamic -module -avoid-version -lz $(GNUTLSLIBS)
+quorumd_la_LIBADD = $(top_builddir)/replace/libreplace.la $(COMMONLIBS)
+quorumd_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+majority.la: $(majority_la_OBJECTS) $(majority_la_DEPENDENCIES) 
+	$(majority_la_LINK) -rpath $(plugindir) $(majority_la_OBJECTS) $(majority_la_LIBADD) $(LIBS)
+quorumd.la: $(quorumd_la_OBJECTS) $(quorumd_la_DEPENDENCIES) 
+	$(quorumd_la_LINK) $(am_quorumd_la_rpath) $(quorumd_la_OBJECTS) $(quorumd_la_LIBADD) $(LIBS)
+twonodes.la: $(twonodes_la_OBJECTS) $(twonodes_la_DEPENDENCIES) 
+	$(twonodes_la_LINK) -rpath $(plugindir) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
+weight.la: $(weight_la_OBJECTS) $(weight_la_DEPENDENCIES) 
+	$(weight_la_LINK) -rpath $(plugindir) $(weight_la_OBJECTS) $(weight_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/majority.Plo
+include ./$(DEPDIR)/quorumd_la-quorumd.Plo
+include ./$(DEPDIR)/twonodes.Plo
+include ./$(DEPDIR)/weight.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+quorumd_la-quorumd.lo: quorumd.c
+	$(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
+	mv -f $(DEPDIR)/quorumd_la-quorumd.Tpo $(DEPDIR)/quorumd_la-quorumd.Plo
+#	source='quorumd.c' object='quorumd_la-quorumd.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/quorum/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/quorum/Makefile.in
--- heartbeat-2.1.3/lib/plugins/quorum/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/quorum/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -83,7 +83,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -143,6 +143,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -160,24 +161,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -239,12 +228,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -466,8 +456,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -475,8 +465,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -616,8 +606,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -642,8 +632,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -653,13 +643,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/quorumd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/quorumd/Makefile
--- heartbeat-2.1.3/lib/plugins/quorumd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/quorumd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,771 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/quorumd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/quorumd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/quorumd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2005 Guochun Shi <gshi@ncsa.uiuc.edu>
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+halibdir = $(libdir)/heartbeat
+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)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  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) 
+	$(2_0_8_la_LINK) -rpath $(plugindir) $(2_0_8_la_OBJECTS) $(2_0_8_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/2_0_8_la-2_0_8.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+2_0_8_la-2_0_8.lo: 2_0_8.c
+	$(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
+	mv -f $(DEPDIR)/2_0_8_la-2_0_8.Tpo $(DEPDIR)/2_0_8_la-2_0_8.Plo
+#	source='2_0_8.c' object='2_0_8_la-2_0_8.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/quorumd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/quorumd/Makefile.in
--- heartbeat-2.1.3/lib/plugins/quorumd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/quorumd/Makefile.in	2008-08-18 23:38:05.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -116,6 +116,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -133,24 +134,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -212,12 +201,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -426,8 +416,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -435,8 +425,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -567,8 +557,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -593,8 +583,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -604,13 +594,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/apcmastersnmp.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/apcmastersnmp.c
--- heartbeat-2.1.3/lib/plugins/stonith/apcmastersnmp.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/apcmastersnmp.c	2008-08-18 13:32:19.000000000 +0100
@@ -144,6 +144,15 @@
 #define OID_OUTLET_COMMAND_PENDING	".1.3.6.1.4.1.318.1.1.12.3.5.1.1.5.%i"
 #define OID_OUTLET_REBOOT_DURATION	".1.3.6.1.4.1.318.1.1.12.3.4.1.1.6.%i"
 
+/*
+	snmpset -c private -v1 172.16.0.32:161
+		".1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.1" i 1
+	The last octet in the OID is the plug number. The value can
+	be 1 thru 8 because there are 8 power plugs on this device.
+	The integer that can be set is as follows: 1=on, 2=off, and
+	3=reset
+*/
+
 /* own defines */
 #define MAX_STRING		128
 #define ST_PORT			"port"
@@ -506,6 +515,8 @@
     char objname[MAX_STRING];
     char value[MAX_STRING];
     char *outlet_name;
+    int req_oid = OUTLET_REBOOT;
+    int expect_state = OUTLET_ON;
     int i, h, num_outlets, outlet, reboot_duration, *state, bad_outlets;
     int outlets[8]; /* Assume that one node is connected to a 
 		       maximum of 8 outlets */
@@ -533,6 +544,9 @@
             ,   __FUNCTION__, outlet);
 	    return (S_ACCESS);
 	}
+	if (Debug) {
+	    LOG(PIL_DEBUG, "%s: found outlet: %s.", __FUNCTION__, outlet_name);
+	}
 	
 	/* found one */
 	if (strcasecmp(outlet_name, host) == 0) {
@@ -553,14 +567,6 @@
 			return (S_ACCESS);
 		}
 
-		if (*state == OUTLET_OFF) {
-			if (Debug) {
-				LOG(PIL_DEBUG, "%s: outlet %d is off."
-				,	__FUNCTION__, outlet);
-			}
-			continue;
-		}
-		
 	        /* prepare oid */
 	        snprintf(objname, MAX_STRING, OID_OUTLET_REBOOT_DURATION
 		,	outlet);
@@ -598,6 +604,24 @@
 	return (S_BADHOST);
     }
 
+
+	/* choose the OID for the stonith request */
+	switch (request) {
+		case ST_POWERON:
+			req_oid = OUTLET_ON;
+			expect_state = OUTLET_ON;
+			break;
+		case ST_POWEROFF:
+			req_oid = OUTLET_OFF;
+			expect_state = OUTLET_OFF;
+			break;
+		case ST_GENERIC_RESET:
+			req_oid = OUTLET_REBOOT;
+			expect_state = OUTLET_ON;
+			break;
+		default: break;
+	}
+
     /* Turn them all off */
 
     for (outlet=outlets[0], i=0 ; i < num_outlets; i++, outlet = outlets[i]) {
@@ -618,7 +642,7 @@
 	    
 	    /* prepare objnames */
 	    snprintf(objname, MAX_STRING, OID_OUTLET_STATE, outlet);
-	    snprintf(value, MAX_STRING, "%i", OUTLET_REBOOT);
+	    snprintf(value, MAX_STRING, "%i", req_oid);
 
 	    /* send reboot cmd */
 	    if (!APC_write(ad->sptr, objname, 'i', value)) {
@@ -650,7 +674,7 @@
 			return (S_ACCESS);
 		}
 
-		if (*state != OUTLET_ON)
+		if (*state != expect_state)
 			bad_outlets++;
 	     }
 	     
@@ -660,13 +684,13 @@
     
     if (bad_outlets == num_outlets) {
 	    /* reset failed */
-	    LOG(PIL_CRIT, "%s: resetting host '%s' failed."
+	    LOG(PIL_CRIT, "%s: stonith operation for '%s' failed."
 	    ,	__FUNCTION__, host);
 	    return (S_RESETFAIL);
     } else {
 	    /* Not all outlets back on, but at least one; implies node was */
 	    /* rebooted correctly */
-	    LOG(PIL_WARN,"%s: Not all outlets came back online!"
+	    LOG(PIL_WARN,"%s: Not all outlets in the expected state!"
 	    ,	__FUNCTION__);
 	    return (S_OK); 
     }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/hmchttp /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/hmchttp
--- heartbeat-2.1.3/lib/plugins/stonith/external/hmchttp	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/hmchttp	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,220 @@
+#!/bin/sh
+# External STONITH module for HMC web console
+#
+# Copyright (c) 2007 Xinwei Hu <hxinwei@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+
+. /etc/ha.d/shellfuncs
+
+#set -x
+hostlist=`echo $hostlist | tr ',' ' '`
+
+trap '[ ! -e "$COOKIEFILE" ] || rmtempfile "$COOKIEFILE"' 0
+COOKIEFILE=`maketempfile` || exit 1
+
+: ${CURLBIN="/usr/bin/curl"}
+: ${user=admin}
+: ${password=admin}
+
+check_parameter() {
+  if [ ! -x $CURLBIN ]
+  then
+    echo "Curl can't be found in normal place. Set CURLBIN to override the default value"
+    exit 1
+  fi
+
+  if [ -z $hmc_ipaddr ]
+  then
+    echo "The address of HMC web console is not specified"
+    exit 1
+  fi
+}
+
+HMCUSERNAME=$user
+HMCPASSWORD=$password
+
+HMC_LOGIN_COMMAND="$CURLBIN -3 -k -c $COOKIEFILE -d user=$HMCUSERNAME -d password=$HMCPASSWORD -d lang=0 -d submit=Log+in "
+HMC_LOGOUT_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d submit=Log+out "
+HMC_TOC_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=2 "
+HMC_POWERON_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=60 -d sp=255 -d is=0 -d om=4 -d id=1 -d ip=2 -d plt=1 -d pm=0 -d on=Save+settings+and+power+on "
+HMC_POWERSTATE_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=60 "
+HMC_POWEROFF_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=30 -d submit=Continue "
+HMC_REBOOT_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=74 -d submit=Continue "
+
+hmc_login() {
+  iamin=0
+  while [ $iamin -eq 0 ]; do
+    $HMC_LOGIN_COMMAND https://$hmc_ipaddr/cgi-bin/cgi >/dev/null 2>&1
+    $HMC_TOC_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null | grep -q "Too many users"
+    iamin=$?
+    sleep 2
+  done 
+}
+hmc_logout() {
+  $HMC_LOGOUT_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+
+hmc_reboot() {
+  check_parameter
+  $HMC_REBOOT_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+hmc_poweron() {
+  r=1
+  while [ 0 -ne $r ]; do
+  $HMC_POWERON_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null | grep -q "Operation completed successfully"
+  r=$?
+  done
+}
+hmc_poweroff() {
+  check_parameter
+  $HMC_POWEROFF_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+hmc_powerstate() {
+  check_parameter
+  r=`$HMC_POWERSTATE_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null| grep "Current system power state:" | sed 's/<br>//g' | awk '{print $5}'`
+  echo $r
+}
+
+hmc_poweroffon() {
+  check_parameter
+  hmc_poweroff
+  while [ 1 ]; do
+    r=`hmc_powerstate`
+    echo $r
+    if [ $r = "Off" ]; then
+      break
+    fi
+    sleep 5
+  done
+  sleep 3
+  hmc_poweron
+}
+
+case $1 in
+gethosts)
+	for h in $hostlist; do
+		echo $h
+	done
+	exit 0
+	;;
+status)
+	if
+          ping -w1 -c1 "$hmc_ipaddr" 2>&1
+        then
+	  exit 0
+	fi
+	exit 1
+	;;
+getconfignames)
+	for f in hostlist hmc_ipaddr user password; do
+		echo $f
+	done
+	exit 0
+	;;
+getinfo-devid)
+	echo "HMC web console STONITH device"
+	exit 0
+	;;
+getinfo-devname)
+	echo "HMC web console STONITH external device"
+	exit 0
+	;;
+getinfo-devdescr)
+	echo "HMC web console based host power control"
+	echo "Use for i5, p5, pSeries and OpenPower systems that are managed via "
+	echo "web console through a direct connection to system's HMC port."
+	exit 0
+	;;
+getinfo-devurl)
+	echo "http://www.ibm.com"
+	exit 0
+	;;
+getinfo-xml)
+	cat << HMCXML
+<parameters>
+
+<parameter name="hostlist" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">Hostlist</shortdesc>
+<longdesc lang="en">
+The list of hosts that the STONITH device controls
+</longdesc>
+</parameter>
+
+<parameter name="hmc_ipaddr" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">HMC IPAddr</shortdesc>
+<longdesc lang="en">
+The IP address of the HMC web console
+</longdesc>
+</parameter>
+
+<parameter name="user" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">User</shortdesc>
+<longdesc lang="en">
+User name to log into HMC web console
+</longdesc>
+</parameter>
+
+<parameter name="password" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">Password</shortdesc>
+<longdesc lang="en">
+The password of user name to log into HMC web console
+</longdesc>
+</parameter>
+
+</parameters>
+HMCXML
+	exit 0
+	;;
+esac
+
+case $1 in
+on|off|reset|powerstate|poweroffon)
+  hmc_login
+  case $1 in
+  on)
+	hmc_poweron $hmc_ipaddr
+	;;
+  off)
+	hmc_poweroff $hmc_ipaddr
+	;;
+  reset)
+#	hmc_reboot $hmc_ipaddr
+	hmc_poweroffon $hmc_ipaddr
+	;;
+  powerstate)
+	hmc_powerstate
+	;;
+  poweroffon)
+	hmc_poweroffon
+	;;
+  esac
+  hmc_logout
+  exit 0
+  ;;
+*)
+	exit 1
+	;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/hmchttp.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/hmchttp.in
--- heartbeat-2.1.3/lib/plugins/stonith/external/hmchttp.in	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/hmchttp.in	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,220 @@
+#!/bin/sh
+# External STONITH module for HMC web console
+#
+# Copyright (c) 2007 Xinwei Hu <hxinwei@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+
+. @HA_HBCONF_DIR@/shellfuncs
+
+#set -x
+hostlist=`echo $hostlist | tr ',' ' '`
+
+trap '[ ! -e "$COOKIEFILE" ] || rmtempfile "$COOKIEFILE"' 0
+COOKIEFILE=`maketempfile` || exit 1
+
+: ${CURLBIN="/usr/bin/curl"}
+: ${user=admin}
+: ${password=admin}
+
+check_parameter() {
+  if [ ! -x $CURLBIN ]
+  then
+    echo "Curl can't be found in normal place. Set CURLBIN to override the default value"
+    exit 1
+  fi
+
+  if [ -z $hmc_ipaddr ]
+  then
+    echo "The address of HMC web console is not specified"
+    exit 1
+  fi
+}
+
+HMCUSERNAME=$user
+HMCPASSWORD=$password
+
+HMC_LOGIN_COMMAND="$CURLBIN -3 -k -c $COOKIEFILE -d user=$HMCUSERNAME -d password=$HMCPASSWORD -d lang=0 -d submit=Log+in "
+HMC_LOGOUT_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d submit=Log+out "
+HMC_TOC_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=2 "
+HMC_POWERON_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=60 -d sp=255 -d is=0 -d om=4 -d id=1 -d ip=2 -d plt=1 -d pm=0 -d on=Save+settings+and+power+on "
+HMC_POWERSTATE_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=60 "
+HMC_POWEROFF_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=30 -d submit=Continue "
+HMC_REBOOT_COMMAND="$CURLBIN -3 -k -b $COOKIEFILE -d form=74 -d submit=Continue "
+
+hmc_login() {
+  iamin=0
+  while [ $iamin -eq 0 ]; do
+    $HMC_LOGIN_COMMAND https://$hmc_ipaddr/cgi-bin/cgi >/dev/null 2>&1
+    $HMC_TOC_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null | grep -q "Too many users"
+    iamin=$?
+    sleep 2
+  done 
+}
+hmc_logout() {
+  $HMC_LOGOUT_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+
+hmc_reboot() {
+  check_parameter
+  $HMC_REBOOT_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+hmc_poweron() {
+  r=1
+  while [ 0 -ne $r ]; do
+  $HMC_POWERON_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null | grep -q "Operation completed successfully"
+  r=$?
+  done
+}
+hmc_poweroff() {
+  check_parameter
+  $HMC_POWEROFF_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null
+}
+hmc_powerstate() {
+  check_parameter
+  r=`$HMC_POWERSTATE_COMMAND https://$hmc_ipaddr/cgi-bin/cgi 2>/dev/null| grep "Current system power state:" | sed 's/<br>//g' | awk '{print $5}'`
+  echo $r
+}
+
+hmc_poweroffon() {
+  check_parameter
+  hmc_poweroff
+  while [ 1 ]; do
+    r=`hmc_powerstate`
+    echo $r
+    if [ $r = "Off" ]; then
+      break
+    fi
+    sleep 5
+  done
+  sleep 3
+  hmc_poweron
+}
+
+case $1 in
+gethosts)
+	for h in $hostlist; do
+		echo $h
+	done
+	exit 0
+	;;
+status)
+	if
+          ping -w1 -c1 "$hmc_ipaddr" 2>&1
+        then
+	  exit 0
+	fi
+	exit 1
+	;;
+getconfignames)
+	for f in hostlist hmc_ipaddr user password; do
+		echo $f
+	done
+	exit 0
+	;;
+getinfo-devid)
+	echo "HMC web console STONITH device"
+	exit 0
+	;;
+getinfo-devname)
+	echo "HMC web console STONITH external device"
+	exit 0
+	;;
+getinfo-devdescr)
+	echo "HMC web console based host power control"
+	echo "Use for i5, p5, pSeries and OpenPower systems that are managed via "
+	echo "web console through a direct connection to system's HMC port."
+	exit 0
+	;;
+getinfo-devurl)
+	echo "http://www.ibm.com"
+	exit 0
+	;;
+getinfo-xml)
+	cat << HMCXML
+<parameters>
+
+<parameter name="hostlist" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">Hostlist</shortdesc>
+<longdesc lang="en">
+The list of hosts that the STONITH device controls
+</longdesc>
+</parameter>
+
+<parameter name="hmc_ipaddr" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">HMC IPAddr</shortdesc>
+<longdesc lang="en">
+The IP address of the HMC web console
+</longdesc>
+</parameter>
+
+<parameter name="user" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">User</shortdesc>
+<longdesc lang="en">
+User name to log into HMC web console
+</longdesc>
+</parameter>
+
+<parameter name="password" unique="1" required="1">
+<content type="string"/>
+<shortdesc lang="en">Password</shortdesc>
+<longdesc lang="en">
+The password of user name to log into HMC web console
+</longdesc>
+</parameter>
+
+</parameters>
+HMCXML
+	exit 0
+	;;
+esac
+
+case $1 in
+on|off|reset|powerstate|poweroffon)
+  hmc_login
+  case $1 in
+  on)
+	hmc_poweron $hmc_ipaddr
+	;;
+  off)
+	hmc_poweroff $hmc_ipaddr
+	;;
+  reset)
+#	hmc_reboot $hmc_ipaddr
+	hmc_poweroffon $hmc_ipaddr
+	;;
+  powerstate)
+	hmc_powerstate
+	;;
+  poweroffon)
+	hmc_poweroffon
+	;;
+  esac
+  hmc_logout
+  exit 0
+  ;;
+*)
+	exit 1
+	;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa
--- heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,171 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Dejan Muhamedagic <dmuhamedagic@at.ibm.com>, IBM Austria
+#
+# External STONITH module for IBM RSA adapters.
+# External STONITH module for IBM BMC.
+# This STONITH module depends on IBMmpcli.
+#
+# See
+# http://www-307.ibm.com/pc/support/site.wss/MIGR-54214.html
+# and
+# http://www.redbooks.ibm.com/abstracts/sg246495.html
+# for documentation about IBM management processors and the
+# IBMmpcli utility.
+# 
+#
+
+#DEBUGF=/var/log/ha-ibmrsa.log
+#touch $DEBUGF
+#chmod 600 $DEBUGF
+
+#exec 2>>$DEBUGF
+
+#debug() {
+#	cat >&2
+#}
+
+#echo "started with: $@" | debug
+
+. /etc/ha.d/shellfuncs
+trap 'if [ -n "$outf" ]; then cat "$outf" >&2; rmtempfile "$outf"; fi' 0
+outf=`maketempfile` || exit 1
+
+chkmpcli() {
+	test -x /opt/IBMmpcli/bin/MPCLI.sh
+}
+mpcli() {
+	chkmpcli || {
+		echo "IBM mpcli not installed"
+		return 1
+	}
+	if [ x = "x$ipaddr" -o x = "x$userid" -o x = "x$passwd" ]
+	then
+		echo "ipaddr, userid, or passwd missing; check configuration"
+		return 1
+	fi
+	type=${type:-"ibm"}
+
+	test -f /etc/ha.d/ibmrsa.debug && set -x
+	goodstg="SUCCESS"
+	failstg="FAILURE"
+	(
+	echo "logonip -h $ipaddr -u $userid -p $passwd -t $type"
+	echo "outputfile $outf"
+	cat
+	) | /opt/IBMmpcli/bin/MPCLI.sh | grep -w $goodstg >/dev/null 2>&1
+	rc=$?
+	grep -w $failstg $outf
+	test $rc -eq 0 -a $? -eq 1
+}
+ibmrsa_reboot() {
+	echo restart -now | mpcli
+}
+ibmrsa_poweron() {
+	echo poweron | mpcli
+}
+ibmrsa_poweroff() {
+	echo poweroff | mpcli
+}
+ibmrsa_status() {
+	echo | mpcli
+}
+
+hostname=`echo ${hostname} | tr ',' ' '`
+
+case $1 in
+gethosts)
+	echo $hostname
+	;;
+on)
+	ibmrsa_poweron
+	;;
+off)
+	ibmrsa_poweroff
+	;;
+reset)
+	ibmrsa_reboot
+	;;
+status)
+	ibmrsa_status
+	;;
+getconfignames)
+	for i in hostname ipaddr userid passwd type; do
+		echo $i
+	done
+	;;
+getinfo-devid)
+	echo "IBM MP STONITH device"
+	;;
+getinfo-devname)
+	echo "IBM MP STONITH device"
+	;;
+getinfo-devdescr)
+	echo "IBM MP host reboot/poweron/poweroff"
+	;;
+getinfo-devurl)
+	echo "http://www.ibm.com"
+	;;
+getinfo-xml)
+	cat <<EOF
+<parameters>
+
+<parameter name="hostname" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostname
+</shortdesc>
+<longdesc lang="en">
+The hostname of the host to be managed by this STONITH device
+</longdesc>
+</parameter>
+
+<parameter name="ipaddr" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+IP Address
+</shortdesc>
+<longdesc lang="en">
+The IP address of the STONITH device
+</longdesc>
+</parameter>
+
+<parameter name="userid" unique="0" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Login
+</shortdesc>
+<longdesc lang="en">
+The username used to login into the STONITH device
+</longdesc>
+</parameter>
+
+<parameter name="passwd" unique="0" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Password
+</shortdesc>
+<longdesc lang="en">
+The password used to login into the STONITH device
+</longdesc>
+</parameter>
+
+<parameter name="type" unique="0" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Management processor type
+</shortdesc>
+<longdesc lang="en">
+The type of the management processor. Possible values are
+"ibm" (default, typically used for RSA) and "ipmi"
+(for IPMI compliant processors such as BMC).
+</longdesc>
+</parameter>
+
+</parameters>
+EOF
+	;;
+*)
+	exit 1
+	;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa.in
--- heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa.in	2008-08-18 13:32:19.000000000 +0100
@@ -28,8 +28,8 @@
 #echo "started with: $@" | debug
 
 . @HA_HBCONF_DIR@/shellfuncs
-outf=`maketempfile`
-trap "cat $outf >&2; rm -f $outf" EXIT
+trap 'if [ -n "$outf" ]; then cat "$outf" >&2; rmtempfile "$outf"; fi' 0
+outf=`maketempfile` || exit 1
 
 chkmpcli() {
 	test -x /opt/IBMmpcli/bin/MPCLI.sh
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa-telnet /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa-telnet
--- heartbeat-2.1.3/lib/plugins/stonith/external/ibmrsa-telnet	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/ibmrsa-telnet	2008-08-18 13:32:19.000000000 +0100
@@ -9,6 +9,7 @@
 # Author: Andreas Mock (andreas.mock@web.de)
 #
 # History:
+#   2007-10-19  Fixed bad commandline handling in case of stonithing
 #   2007-10-11  First release.
 #
 # Comment: Please send bug fixes and enhancements.
@@ -31,8 +32,8 @@
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
+# it under the terms of version 2 or later of the GNU General Public
+# License as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -314,8 +315,8 @@
 
     def process(self, argv):
         self._echo_debug("========== Start =============")
-        if len(argv) <> 1:
-            self.echo_log("ERROR", 'Exactly one commandline argument required.')
+        if len(argv) < 1:
+            self.echo_log("ERROR", 'At least one commandline argument required.')
             self.echo(self.usage())
             return(1)
         cmd = argv[0]
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/ipmi /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/ipmi
--- heartbeat-2.1.3/lib/plugins/stonith/external/ipmi	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/ipmi	2008-08-18 13:32:19.000000000 +0100
@@ -35,11 +35,11 @@
 STATUS="power status"
 IPMITOOL=`which ipmitool 2>/dev/null`
 
-function have_ipmi() {
+have_ipmi() {
 	test -x "${IPMITOOL}"
 }
 
-function do_ipmi() {
+do_ipmi() {
 	have_ipmi || {
 		echo "ipmitool not installed"
 		return 1
@@ -49,7 +49,12 @@
 		return 1
 	fi
 
-	${IPMITOOL} -I lan -H ${ipaddr} -U ${userid} -P ${passwd} ${1} || {
+	if [ -z "${interface}" ]; then
+		# default to "lan" interface
+		interface="lan"
+	fi
+
+	${IPMITOOL} -I ${interface} -H ${ipaddr} -U ${userid} -P ${passwd} ${1} || {
 		echo "error executing ipmi command"
 		return 1
 	}
@@ -103,7 +108,7 @@
 	exit $?
 	;;
 getconfignames)
-	for i in hostname ipaddr userid passwd; do
+	for i in hostname ipaddr userid passwd interface; do
 		echo $i
 	done
 	exit 0
@@ -166,6 +171,17 @@
 The password used for logging in to the STONITH device
 </longdesc>
 </parameter>
+
+<parameter name="interface" unique="1">
+<content type="string"/>
+<shortdesc lang="en">
+IPMI interface
+</shortdesc>
+<longdesc lang="en">
+IPMI interface to use, such as "lan" or "lanplus"
+</longdesc>
+</parameter>
+
 </parameters>
 IPMIXML
 	exit 0
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/Makefile
--- heartbeat-2.1.3/lib/plugins/stonith/external/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,564 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/stonith/external/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+subdir = lib/plugins/stonith/external
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/hmchttp.in $(srcdir)/ibmrsa.in $(srcdir)/riloe.in \
+	$(srcdir)/ssh.in $(srcdir)/xen0-ha.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 = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES = ibmrsa riloe ssh hmchttp xen0-ha
+am__installdirs = "$(DESTDIR)$(extdir)" "$(DESTDIR)$(helperdir)"
+extSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+helperSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(ext_SCRIPTS) $(helper_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/stonith/external
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/stonith/external
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../../..
+top_srcdir = ../../../..
+
+# Makefile.am for OCF RAs
+#
+# Author: Sun Jing Dong
+# Copyright (C) 2004 IBM
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = ibmrsa-telnet ipmi rackpdu vmware xen0 \
+			xen0-ha-dom0-stonith-helper
+
+extdir = $(stonith_ext_plugindir)
+helperdir = $(stonith_plugindir)
+ext_SCRIPTS = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu xen0 hmchttp \
+			xen0-ha
+
+helper_SCRIPTS = xen0-ha-dom0-stonith-helper
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/riloe.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ssh: $(top_builddir)/config.status $(srcdir)/ssh.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hmchttp: $(top_builddir)/config.status $(srcdir)/hmchttp.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+xen0-ha: $(top_builddir)/config.status $(srcdir)/xen0-ha.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-extSCRIPTS: $(ext_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-extSCRIPTS:
+	@$(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"; \
+	done
+install-helperSCRIPTS: $(helper_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(helperdir)" || $(MKDIR_P) "$(DESTDIR)$(helperdir)"
+	@list='$(helper_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 " $(helperSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(helperdir)/$$f'"; \
+	    $(helperSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(helperdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-helperSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(helper_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(helperdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(helperdir)/$$f"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(extdir)" "$(DESTDIR)$(helperdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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-helperSCRIPTS
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-extSCRIPTS uninstall-helperSCRIPTS
+
+.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 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-helperSCRIPTS 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 uninstall-helperSCRIPTS
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/Makefile.am
--- heartbeat-2.1.3/lib/plugins/stonith/external/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -19,8 +19,14 @@
 #
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST           = ibmrsa-telnet ipmi rackpdu vmware
+EXTRA_DIST           = ibmrsa-telnet ipmi rackpdu vmware xen0 \
+			xen0-ha-dom0-stonith-helper
 
 extdir		     = $(stonith_ext_plugindir)
 
-ext_SCRIPTS	     = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu
+helperdir	     = $(stonith_plugindir)
+
+ext_SCRIPTS	     = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu xen0 hmchttp \
+			xen0-ha
+
+helper_SCRIPTS	     = xen0-ha-dom0-stonith-helper
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/Makefile.in
--- heartbeat-2.1.3/lib/plugins/stonith/external/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/Makefile.in	2008-08-18 23:38:06.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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,19 +34,21 @@
 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
+	$(srcdir)/hmchttp.in $(srcdir)/ibmrsa.in $(srcdir)/riloe.in \
+	$(srcdir)/ssh.in $(srcdir)/xen0-ha.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
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
-CONFIG_CLEAN_FILES = ibmrsa riloe ssh
-am__installdirs = "$(DESTDIR)$(extdir)"
+CONFIG_CLEAN_FILES = ibmrsa riloe ssh hmchttp xen0-ha
+am__installdirs = "$(DESTDIR)$(extdir)" "$(DESTDIR)$(helperdir)"
 extSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(ext_SCRIPTS)
+helperSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(ext_SCRIPTS) $(helper_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -81,6 +83,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -98,24 +101,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -177,12 +168,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -338,9 +330,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = ibmrsa-telnet ipmi rackpdu vmware
+EXTRA_DIST = ibmrsa-telnet ipmi rackpdu vmware xen0 \
+			xen0-ha-dom0-stonith-helper
+
 extdir = $(stonith_ext_plugindir)
-ext_SCRIPTS = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu
+helperdir = $(stonith_plugindir)
+ext_SCRIPTS = ibmrsa ibmrsa-telnet ipmi riloe ssh vmware rackpdu xen0 hmchttp \
+			xen0-ha
+
+helper_SCRIPTS = xen0-ha-dom0-stonith-helper
 all: all-am
 
 .SUFFIXES:
@@ -379,6 +377,10 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 ssh: $(top_builddir)/config.status $(srcdir)/ssh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hmchttp: $(top_builddir)/config.status $(srcdir)/hmchttp.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+xen0-ha: $(top_builddir)/config.status $(srcdir)/xen0-ha.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-extSCRIPTS: $(ext_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(extdir)" || $(MKDIR_P) "$(DESTDIR)$(extdir)"
@@ -398,6 +400,25 @@
 	  echo " rm -f '$(DESTDIR)$(extdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(extdir)/$$f"; \
 	done
+install-helperSCRIPTS: $(helper_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(helperdir)" || $(MKDIR_P) "$(DESTDIR)$(helperdir)"
+	@list='$(helper_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 " $(helperSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(helperdir)/$$f'"; \
+	    $(helperSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(helperdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-helperSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(helper_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(helperdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(helperdir)/$$f"; \
+	done
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -441,7 +462,7 @@
 check: check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
-	for dir in "$(DESTDIR)$(extdir)"; do \
+	for dir in "$(DESTDIR)$(extdir)" "$(DESTDIR)$(helperdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -487,7 +508,7 @@
 
 info-am:
 
-install-data-am: install-extSCRIPTS
+install-data-am: install-extSCRIPTS install-helperSCRIPTS
 
 install-dvi: install-dvi-am
 
@@ -521,7 +542,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-extSCRIPTS
+uninstall-am: uninstall-extSCRIPTS uninstall-helperSCRIPTS
 
 .MAKE: install-am install-strip
 
@@ -529,13 +550,14 @@
 	distclean distclean-generic distclean-libtool 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-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
+	install-exec install-exec-am install-extSCRIPTS \
+	install-helperSCRIPTS 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 uninstall-helperSCRIPTS
 
 # 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.
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/rackpdu /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/rackpdu
--- heartbeat-2.1.3/lib/plugins/stonith/external/rackpdu	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external/rackpdu	2008-08-18 13:32:19.000000000 +0100
@@ -1,8 +1,12 @@
 #!/bin/sh
 #
-# External STONITH module for APC Switched Rack PDU (software version 3.x)
+# External STONITH module for APC Switched Rack PDU
 #
-# Copyright (c) 2007 Sergey Maznichenko <msergeyb@gmail.com>
+# Copyright (c) 2008 Sergey Maznichenko <msergeyb@gmail.com> <inbox@it-consultant.su>
+# Version 1.2
+#
+# See http://www.it-consultant.su/rackpdu
+# for additional information
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -24,45 +28,152 @@
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
-OID=".1.3.6.1.4.1.318.1.1.4.4.2.1.3."
+. /etc/ha.d/shellfuncs
 
 SWITCH_ON="1"
 SWITCH_OFF="2"
 SWITCH_RESET="3"
 
-COMMAND="snmpset -v1 -c $community $host $OID$outlet i "
+DEFAULT_NAMES_OID=".1.3.6.1.4.1.318.1.1.12.3.3.1.1.2"
+DEFAULT_COMMAND_OID=".1.3.6.1.4.1.318.1.1.12.3.3.1.1.4"
+
+if [ -z "$oid" ]; then
+    oid=$DEFAULT_COMMAND_OID
+fi
+
+if [ -z "$names_oid" ]; then
+    names_oid=$DEFAULT_NAMES_OID
+fi
+
+if [ -z "$outlet_config" ]; then
+    outlet_config="none"
+fi
+
+GetOutletNumber() {
+    local nodename=$1
+
+    if [ "$outlet_config" != "none" ]; then
+	# Get outlet number from file
+
+	if [ -f "$outlet_config" ]; then
+    	    local outlet_num=`grep $nodename $outlet_config | tr -d ' ' | cut -f2 -d'='`
+	    if [ -z "$outlet_num" ]; then
+		ha_log "ERROR: Outlet number not found for node $nodename. Check configuration file $outlet_config"
+		return 0
+	    fi
+	    return $outlet_num
+	else
+	    ha_log "ERROR: File $outlet_config not found."
+	    return 0
+	fi
+    else
+	# Get outlet number from device
+    
+	local outlet_num=1
+	local snmp_result=`snmpwalk -v1 -c $community $pduip $names_oid 2>&1`
+
+	local names=`echo "$snmp_result" | cut -f2 -d'"' | tr ' ' '_' | tr '\012' ' '`
+
+	for name in $names; do
+	    if [ "$name" != "$nodename" ]; then
+		local outlet_num=`expr $outlet_num + 1`
+		continue
+    	    fi
+
+	    return $outlet_num
+	done
+	
+	ha_log "ERROR: Outlet number not found for node $nodename. Result: $snmp_result"
+	return 0
+    fi
+}
+
+SendCommand() {
+
+    local host=$1
+    local command=$2
+    
+    GetOutletNumber $host
+    local outlet=$?
+
+    if [ $outlet -gt 0 ]; then
+        local set_result=`snmpset -v1 -c $community $pduip $oid.$outlet i $command 2>&1`
+        local check_result=`echo "$set_result" | grep "Timeout"`	    
+
+        if [ ! -z "$check_result" ]; then
+    	    ha_log "ERROR: Write SNMP value $oid.$outlet=$command. Result: $set_result"
+	fi
+	    
+	return 0
+    else
+        return 1
+    fi
+}
 
 hostlist=`echo $hostlist | tr ',' ' '`
+incommand=$1
+innode=$2
 
-case $1 in
+case $incommand in
 gethosts)
-	echo $host
+	if [ "$hostlist" = "AUTO" ]; then
+	    snmp_result=`snmpwalk -v1 -c $community $pduip $names_oid 2>&1`
+	    snmp_check=`echo "$snmp_result" | grep "Timeout"`
+
+	    if [ ! -z "$snmp_check" ]; then
+		ha_log "ERROR: Cannot read list of nodes from device. Result: $snmp_result"
+		exit 1
+	    else
+		hostlist=`echo "$snmp_result" | cut -f2 -d'"' | tr ' ' '_' | tr '\012' ' '`
+	    fi
+	fi
+	
+	for h in $hostlist ; do
+    	    echo $h
+	done
+
 	exit 0
 	;;
 on)
-	$COMMAND$SWITCH_ON
-	exit 0
+	if
+	    SendCommand $innode $SWITCH_ON
+	then
+	    exit 0
+	else
+	    exit 1
+	fi
 	;;
 off)
-	$COMMAND$SWITCH_OFF
-	exit 0
+	if
+	    SendCommand $innode $SWITCH_OFF
+	then
+	    exit 0
+	else
+	    exit 1
+	fi
 	;;
 reset)
-	$COMMAND$SWITCH_RESET
-	exit 0
+	if
+	    SendCommand $innode $SWITCH_RESET
+	then
+	    exit 0
+	else
+	    exit 1
+	fi
 	;;
 status)
-        if [ -z "$host" ]; then
+        if [ -z "$pduip" ]; then
     	    exit 1
 	fi
-	if ping -w1 -c1 "$host" 2>&1 | grep "unknown host"; then
-    	    exit 1
+
+	if ping -w1 -c1 $pduip >/dev/null 2>&1; then
+    	    exit 0
 	else
-	    exit 0
+	    exit 1
 	fi
 	;;
 getconfignames)
-	echo "host community outlet"
+	echo "hostlist pduip community"
 	exit 0
 	;;
 getinfo-devid)
@@ -74,43 +185,83 @@
 	exit 0
 	;;
 getinfo-devdescr)
-	echo "APC Switched Rack PDU AP7952"
+	echo "APC Switched Rack PDU"
 	exit 0
 	;;
 getinfo-devurl)
-	echo "http://www.apc.com/products/family/index.cfm?id=70"
+	echo "http://www.it-consultant.su/rackpdu"
 	exit 0
 	;;
 getinfo-xml)
 	cat << PDUXML
 <parameters>
-<parameter name="host" unique="1" required="1">
-<content type="string" />
-<shortdesc lang="en">
-Name or IP address of Rack PDU host.
-</shortdesc>
-<longdesc lang="en">
-Name or IP address of Rack PDU host.
-</longdesc>
-</parameter>
-<parameter name="community" unique="1" required="1">
-<content type="string" />
-<shortdesc lang="en">
-Name of write community.
-</shortdesc>
-<longdesc lang="en">
-Name of write community.
-</longdesc>
-</parameter>
-<parameter name="outlet" unique="1" required="1">
-<content type="string" />
-<shortdesc lang="en">
-Number of outlet
-</shortdesc>
-<longdesc lang="en">
-Number of outlet.
-</longdesc>
-</parameter>
+    <parameter name="hostlist" unique="1" required="1">
+	<content type="string" default="AUTO" />
+	<shortdesc lang="en">Hostlist</shortdesc>
+	<longdesc lang="en">
+The list of hosts that the STONITH device controls (comma or space separated).
+If you set value of this parameter to AUTO, list of hosts will be get from Rack PDU device.
+	</longdesc>
+    </parameter>
+
+    <parameter name="pduip" unique="1" required="1">
+	<content type="string" />
+	<shortdesc lang="en">Name or IP address of Rack PDU device.</shortdesc>
+	<longdesc lang="en">Name or IP address of Rack PDU device.</longdesc>
+    </parameter>
+
+    <parameter name="community" unique="1" required="1">
+	<content type="string" default="private" />
+	<shortdesc lang="en">Name of write community.</shortdesc>
+	<longdesc lang="en">Name of write community.</longdesc>
+    </parameter>
+
+    <parameter name="oid" unique="1" required="0">
+    <content type="string" />
+    <shortdesc lang="en">
+	The OID without the outlet number.
+    </shortdesc>
+    <longdesc lang="en">
+The SNMP OID for the PDU. minus the outlet number.
+Try .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4 (default value)
+or use mib from ftp://ftp.apcc.com/apc/public/software/pnetmib/mib/
+Varies on different APC hardware and firmware.
+Warning! No dot at the end of OID
+    </longdesc>
+    </parameter>
+
+    <parameter name="names_oid" unique="1" required="0">
+	<content type="string" />
+	<shortdesc lang="en">The OID for getting names of outlets.</shortdesc>
+	<longdesc lang="en">
+The SNMP OID for getting names of outlets.
+It is required to recognize outlet number by nodename.
+Try ".1.3.6.1.4.1.318.1.1.12.3.3.1.1.2" (default value)
+or use mib from ftp://ftp.apcc.com/apc/public/software/pnetmib/mib/
+Names of nodes must be equal names of outlets, in other way use outlet_config parameter.
+If you set 'names_oid' parameter then parameter outlet_config must not be use.
+Varies on different APC hardware and firmware.
+Warning! No dot at the end of OID
+	</longdesc>
+    </parameter>
+
+    <parameter name="outlet_config" unique="1" required="0">
+    <content type="string" />
+    <shortdesc lang="en">Configuration file. Other way to recognize outlet number by nodename.</shortdesc>
+    <longdesc lang="en">
+Configuration file. Other way to recognize outlet number by nodename.
+Configuration file which contains
+node_name=outlet_number
+strings.
+
+Example:
+server1=1
+server2=2
+
+If you use outlet_config parameter then names_oid parameter can have any value and it is not uses.
+    </longdesc>
+    </parameter>
+
 </parameters>
 PDUXML
 	exit 0
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/riloe /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/riloe
--- heartbeat-2.1.3/lib/plugins/stonith/external/riloe	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/riloe	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,206 @@
+#!/usr/bin/python
+#
+# Stonith module for RILOE Stonith device
+#
+# Copyright (c) 2004 Alain St-Denis <alain.st-denis@ec.gc.ca>
+#
+# Modified by Alan Robertson <alanr@unix.sh> for STONITH external compatibility.
+#
+# Extended and merged by Tijl Van den broeck <subspawn@gmail.com>
+#  with ilo-v2 script from Guy Coates
+#
+# Cleanup by Andrew Beekhof <abeekhof@suse.de>
+#
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library 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
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+import sys
+import os
+import socket
+from httplib import *
+from time import sleep
+
+
+argv = sys.argv
+
+try:
+        cmd = argv[1]
+except IndexError:
+        print "Not enough arguments"
+        sys.exit(1)
+
+legacy_RI_HOST     = os.environ.get('RI_HOST',     '')
+legacy_RI_HOSTRI   = os.environ.get('RI_HOSTRI',   '')
+legacy_RI_LOGIN    = os.environ.get('RI_LOGIN',    'Administrator')
+legacy_RI_PASSWORD = os.environ.get('RI_PASSWORD', '')
+
+reset_ok     = os.environ.get('ilo_can_reset',        '0')
+ilo_protocol = os.environ.get('ilo_protocol',         '1.2')
+power_method = os.environ.get('ilo_powerdown_method', 'power')
+
+realhost = os.environ.get('hostlist',     legacy_RI_HOST)
+rihost   = os.environ.get('ilo_hostname', legacy_RI_HOSTRI)
+ilouser  = os.environ.get('ilo_user',     legacy_RI_LOGIN)
+ilopass  = os.environ.get('ilo_password', legacy_RI_PASSWORD)
+
+login = [ '<RIBCL VERSION="'+ilo_protocol+'">',
+          '<LOGIN USER_LOGIN="' + ilouser + '" PASSWORD="' + ilopass + '">' ]
+
+logout = [ '</LOGIN>', '</RIBCL>' ]
+
+
+status = [ '<SERVER_INFO MODE="read">', '<GET_HOST_POWER_STATUS/>', '</SERVER_INFO>' ]
+
+reset = [ '<SERVER_INFO MODE="write">', '<RESET_SERVER/>', '</SERVER_INFO>' ]
+
+if power_method == 'button':
+  off = [ '<SERVER_INFO MODE="write">', '<HOLD_PWR_BTN/>', '</SERVER_INFO>' ]
+else:
+  off = [ '<SERVER_INFO MODE = "write">', '<SET_HOST_POWER HOST_POWER  = "N"/>', '</SERVER_INFO>' ]
+
+on = [ '<SERVER_INFO MODE = "write">', '<SET_HOST_POWER HOST_POWER  = "Y"/>', '</SERVER_INFO>' ]
+
+
+todo = { 'reset':reset, 'on':on, 'off':off, 'status':status }
+
+
+xmlinfo = '''<parameters>
+ <parameter name="hostlist" unique="1" required="1">
+  <content type="string"/>
+  <shortdesc lang="en">ilo target hostname</shortdesc>
+  <longdesc lang="en">
+   Contains the hostname that the ilo controls
+  </longdesc>
+ </parameter>
+<parameter name="ilo_hostname" unique="1" required="1">
+  <content type="string"/>
+  <shortdesc lang="en">ilo device hostname</shortdesc>
+  <longdesc lang="en">
+   The hostname of the ilo device
+  </longdesc>
+ </parameter>
+<parameter name="ilo_user" unique="0" required="1">
+  <content type="string" default="Administrator"/>
+  <shortdesc lang="en">ilo user</shortdesc>
+  <longdesc lang="en">
+   The user for connecting to the ilo device
+  </longdesc>
+ </parameter>
+<parameter name="ilo_password" unique="0" required="1">
+  <content type="string" default=""/>
+  <shortdesc lang="en">password</shortdesc>
+  <longdesc lang="en">
+   The password for the ilo device user
+  </longdesc>
+ </parameter>
+<parameter name="ilo_can_reset" unique="0" required="0">
+  <content type="string" default="0"/>
+  <shortdesc lang="en">Device can reset</shortdesc>
+  <longdesc lang="en">
+   Does the ILO device support RESET commands (hint: older ones cannot)
+  </longdesc>
+ </parameter>
+<parameter name="ilo_protocol" unique="0" required="0">
+  <content type="string" default="1.2"/>
+  <shortdesc lang="en">ILO Protocol</shortdesc>
+  <longdesc lang="en">
+   Protocol version supported by the ILO device.
+   Known supported versions: 1.2, 2.0
+  </longdesc>
+ </parameter>
+<parameter name="ilo_powerdown_method" unique="0" required="0">
+  <content type="string" default="power"/>
+  <shortdesc lang="en">Power down method</shortdesc>
+  <longdesc lang="en">
+   The method to powerdown the host in question.
+   * button - Emulate holding down the power button
+   * power  - Emulate turning off the machines power 
+
+   NB: In case acpid is not running on the node to be fenced and
+   the method is set to power (which is the default) "on" and
+   "off" requests are not going to work. "reset" should work in
+   any case.
+  </longdesc>
+ </parameter>
+</parameters>'''
+
+info = {
+        'getinfo-devid':	'RILOE',
+        'getinfo-devname':	'riloe ' + rihost,
+        'getinfo-devdescr':	'COMPAQ RILOE STONITH device',
+        'getinfo-devurl':	'http://www.hp.com/',
+	      'gethosts':	 realhost,
+        'getinfo-xml':		xmlinfo
+}
+
+try:
+        print info[cmd]
+        sys.exit(0)
+except KeyError:
+        None
+
+if cmd == 'getconfignames':
+	for arg in [ "hostlist", "ilo_hostname", "ilo_user", "ilo_password", "ilo_can_reset", "ilo_protocol", "ilo_powerdown_method"]:
+            print arg
+        sys.exit(0)
+
+#
+#	All remaining commands need host and password to succeed...
+#
+
+if not rihost:
+        print "ILO device hostname not specified"
+        sys.exit(1)
+
+if not realhost:
+        print "Host controlled by this ILO device not specified"
+        sys.exit(1)
+
+
+acmds=[]
+try:
+        if cmd == 'reset' and not reset_ok:
+                acmds.append(login + todo['off'] + logout)
+                acmds.append(login + todo['on'] + logout)
+        else:   
+                acmds.append(login + todo[cmd] + logout)
+except KeyError:
+        print 'Invalid command: '+ cmd
+        sys.exit(1)
+
+
+try:
+        for cmds in acmds:
+
+                c=HTTPSConnection(rihost)
+                c.send('<?xml version="1.0"?>\r\n')
+                c.sock.recv(1024)
+
+                for line in cmds:
+                        c.send(line+'\r\n')
+                        c.sock.recv(1024)
+
+                c.close()
+                sleep(1)
+
+except socket.gaierror, msg:
+        print "ERROR: " + str(msg) + ": " + rihost
+        sys.exit(1)
+except socket.sslerror, msg:
+        print "ERROR: " + str(msg) + "for " + rihost
+        sys.exit(1)
+except socket.error, msg:
+        print "ERROR: " + str(msg) + "talking to " + rihost
+        sys.exit(1)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/ssh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/ssh
--- heartbeat-2.1.3/lib/plugins/stonith/external/ssh	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/ssh	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,176 @@
+#!/bin/sh
+#
+# External STONITH module for ssh.
+#
+# Copyright (c) 2004 SUSE LINUX AG - Lars Marowsky-Bree <lmb@suse.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+#
+
+SSH_COMMAND="/usr/bin/ssh -q -x -o PasswordAuthentication=no -o StrictHostKeyChecking=no -n -l root" 
+#SSH_COMMAND="/usr/bin/ssh -q -x -n -l root"
+
+REBOOT_COMMAND="echo 'sleep 2; /sbin/reboot -nf' | SHELL=/bin/sh at now >/dev/null 2>&1"
+
+# Warning: If you select this poweroff command, it'll physically
+# power-off the machine, and quite a number of systems won't be remotely
+# revivable.
+# TODO: Probably should touch a file on the server instead to just
+# prevent heartbeat et al from being started after the reboot.
+# POWEROFF_COMMAND="echo 'sleep 2; /sbin/poweroff -nf' | SHELL=/bin/sh at now >/dev/null 2>&1"
+POWEROFF_COMMAND="echo 'sleep 2; /sbin/reboot -nf' | SHELL=/bin/sh at now >/dev/null 2>&1"
+
+# Rewrite the hostlist to accept "," as a delimeter for hostnames too.
+hostlist=`echo $hostlist | tr ',' ' '`
+
+is_host_up() {
+  for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+  do
+    if
+      ping -w1 -c1 "$1" >/dev/null 2>&1
+    then
+      sleep 1
+    else
+      return 1
+    fi
+  done
+  return 0
+}
+
+
+case $1 in
+gethosts)
+	for h in $hostlist ; do
+		echo $h
+	done
+	exit 0
+	;;
+on)
+	# Can't really be implemented because ssh cannot power on a system
+	# when it is powered off.
+	exit 1
+	;;
+off)
+	# Shouldn't really be implemented because if ssh cannot power on a 
+	# system, it shouldn't be allowed to power it off.
+	exit 1
+	;;
+reset)
+	for h in $hostlist
+	do
+	  if
+            [ "$h" != "$2" ]
+          then
+            continue
+          fi
+          if
+            case ${livedangerously} in
+              [Yy]*)	is_host_up $h;;
+	      *)	true;;
+             esac
+          then
+	    $SSH_COMMAND "$2" "$REBOOT_COMMAND"
+	    # Good thing this is only for testing...
+            if
+              is_host_up $h
+            then
+              exit 1
+            else
+              exit 0
+            fi
+          else
+            # well... Let's call it successful, after all this is only for testing...
+            exit 0
+          fi
+	done
+	exit 1
+	;;
+status)
+	if
+	  [ -z "$hostlist" ]
+	then
+	  exit 1
+	fi
+	for h in $hostlist
+	do
+	  if
+            ping -w1 -c1 "$h" 2>&1 | grep "unknown host"
+          then
+	    exit 1
+	  fi
+	done
+	exit 0
+	;;
+getconfignames)
+	echo "hostlist"
+	exit 0
+	;;
+getinfo-devid)
+	echo "ssh STONITH device"
+	exit 0
+	;;
+getinfo-devname)
+	echo "ssh STONITH external device"
+	exit 0
+	;;
+getinfo-devdescr)
+	echo "ssh-based Linux host reset"
+	echo "Fine for testing, but not suitable for production!"
+	exit 0
+	;;
+getinfo-devurl)
+	echo "http://openssh.org"
+	exit 0
+	;;
+getinfo-xml)
+	cat << SSHXML
+<parameters>
+<parameter name="hostlist" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostlist
+</shortdesc>
+<longdesc lang="en">
+The list of hosts that the STONITH device controls
+</longdesc>
+</parameter>
+
+<parameter name="livedangerously" unique="0" required="0">
+<content type="enum" />
+<shortdesc lang="en">
+Live Dangerously!!
+</shortdesc>
+<longdesc lang="en">
+Set to "yes" if you want to risk your system's integrity.
+Of course, since this plugin isn't for production, using it
+in production at all is a bad idea.  On the other hand,
+setting this parameter to yes makes it an even worse idea.
+Viva la Vida Loca!
+</longdesc>
+</parameter>
+
+</parameters>
+SSHXML
+	exit 0
+	;;
+*)
+	exit 1
+	;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/xen0 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/xen0
--- heartbeat-2.1.3/lib/plugins/stonith/external/xen0	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/xen0	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,216 @@
+#!/bin/sh
+#
+# External STONITH module for Xen Dom0 through ssh.
+#
+# Description:  Uses Xen Dom0 Domain as a STONITH device
+#               to control DomUs.
+#
+#
+# Author:       Serge Dubrouski (sergeyfd@gmail.com)
+#               Inspired by Lars Marowsky-Bree's external/ssh agent.
+#
+# Copyright 2007 Serge Dubrouski <sergeyfd@gmail.com>
+# License:      GNU General Public License (GPL)
+#
+
+STOP_COMMAND="xm destroy"
+START_COMMAND="xm create"
+DEFAULT_XEN_DIR="/etc/xen"
+SSH_COMMAND="/usr/bin/ssh -q -x -n"
+
+# Rewrite the hostlist to accept "," as a delimeter for hostnames too.
+hostlist=`echo $hostlist | tr ',' ' '`
+
+CheckIfDead() {
+    for j in 1 2 3 4 5
+    do
+        if ! ping -w1 -c1 "$1" >/dev/null 2>&1
+        then
+            return 0
+        fi
+        sleep 1
+    done
+    
+    return 1
+}
+
+CheckHostList() {
+    if [ "x" = "x$hostlist" ]
+    then
+        echo "hostlist isn't set"
+        exit 1
+    fi
+}
+
+CheckDom0() {
+    if [ "x" = "x$dom0" ]
+    then
+        echo "dom0 isn't set"
+        exit 1
+    fi
+}
+
+RunCommand() {
+    CheckHostList
+    CheckDom0
+    
+    for h in $hostlist
+    do
+        CIFS=$IFS
+        IFS=:
+        read node cfg << -!
+$h
+-!
+        IFS=$CIFS
+
+        if [ "x" = "x$node" ]
+        then
+            echo "Syntax error in host list"
+            exit 1
+        fi
+        
+        if [ "x" = "x$cfg" ]
+        then
+            cfg="${DEFAULT_XEN_DIR}/${node}.cfg"
+        fi
+        
+        if [ "$node" != "$1" ]
+        then
+            continue
+        fi
+          
+        case $2 in
+            stop)
+                 kill_node=`$SSH_COMMAND $dom0 "grep ^[[:space:]]*name $cfg" | cut -f 2 -d '=' |  sed -e 's,",,g'`
+                 if [ "x" = "x$kill_node" ]
+                 then
+                     echo "Couldn't find a node name to stop"
+                     exit 1
+                 fi
+                 $SSH_COMMAND $dom0 "(sleep 2; $STOP_COMMAND $kill_node) >/dev/null 2>&1 &"
+                break;;
+            start)
+                $SSH_COMMAND $dom0 "(sleep 2; $START_COMMAND $cfg) >/dev/null 2>&1 &"
+                break;;
+        esac
+        exit 0
+    done
+}
+
+
+# Main code
+
+case $1 in
+gethosts)
+    CheckHostList
+    
+    for h in $hostlist ; do
+        CIFS=$IFS
+        IFS=:
+        read node cfg << -!
+$h
+-!
+        IFS=$CIFS
+
+        echo $node
+    done
+    exit 0
+    ;;
+on)
+    RunCommand $2 start
+    exit $?
+    ;;
+off)
+    if RunCommand $2 stop
+    then
+        if CheckIfDead $2
+        then 
+            exit 0
+        fi
+    fi
+           
+    exit 1
+    ;;
+reset)
+    RunCommand $2 stop
+        
+    if CheckIfDead $2
+    then
+        RunCommand $2 start 
+        exit 0
+    fi
+
+    exit 1
+    ;;
+status)
+    CheckHostList
+    
+    for h in $hostlist
+    do
+        CIFS=$IFS
+        IFS=:
+        read node cfg << -!
+$h
+-!
+        IFS=$CIFS
+        
+        echo $node
+        if ping -w1 -c1 "$node" 2>&1 | grep "unknown host"
+        then
+            exit 1
+	fi
+    done
+    exit 0
+    ;;
+getconfignames)
+    echo "hostlist dom0"
+    exit 0
+    ;;
+getinfo-devid)
+    echo "xen0 STONITH device"
+    exit 0
+    ;;
+getinfo-devname)
+    echo "xen0 STONITH external device"
+    exit 0
+    ;;
+getinfo-devdescr)
+    echo "ssh-based Linux host reset for Xen DomU trough Dom0"
+    echo "Fine for testing, but not really suitable for production!"
+    exit 0
+    ;;
+getinfo-devurl)
+    echo "http://openssh.org http://www.xensource.com/ http://www.linux-ha.org"
+    exit 0
+    ;;
+getinfo-xml)
+    cat << SSHXML
+<parameters>
+<parameter name="hostlist" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostlist
+</shortdesc>
+<longdesc lang="en">
+The list of controlled nodes in a format node[:config_file].
+For example: "node1:/opt/xen/node1.cfg node2"
+If config file isn't set it defaults to /etc/xen/{node_name}.cfg
+</longdesc>
+</parameter>
+<parameter name="dom0" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Dom0
+</shortdesc>
+<longdesc lang="en">
+Name of the Dom0 Xen node. Root user shall be able to ssh to that node.
+</longdesc>
+</parameter>
+</parameters>
+SSHXML
+    exit 0
+    ;;
+*)
+    exit 1
+    ;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha
--- heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# This STONITH script integrates a cluster running within DomUs
+# with the CRM/Pacemaker cluster running in Dom0.
+#
+# Author:	Lars Marowsky-Bree
+# Copyright:	2008 Lars Marowsky-Bree
+# License:      GNU General Public License (GPL)
+#
+
+SSH_COMMAND="/usr/bin/ssh -q -x -n"
+HVM_HELPER="/usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper"
+
+# Rewrite the hostlist to accept "," as a delimeter for hostnames too.
+hostlist=`echo $hostlist | tr ',' ' '`
+
+# Runs a command on the host, waiting for it to return
+RunHVMCommand() {
+    $SSH_COMMAND $dom0_cluster_ip "$HVM_HELPER $1 $2 $stop_timeout"
+}
+
+# Main code
+case $1 in
+gethosts)
+    echo $hostlist
+    exit 0
+    ;;
+on|off|reset|status)
+    RunHVMCommand $1 $2
+    exit $?
+    ;;
+getconfignames)
+    echo "hostlist dom0_cluster_ip timeout"
+    exit 0
+    ;;
+getinfo-devid)
+    echo "xen0-ha DomU/Dom0 device"
+    exit 0
+    ;;
+getinfo-devname)
+    echo "xen0-ha DomU/Dom0 external device"
+    exit 0
+    ;;
+getinfo-devdescr)
+    echo "Allows STONITH to control DomUs managed by a CRM/Pacemaker Dom0."
+    echo "Requires Xen + CRM/Pacemaker at both layers."
+    echo "Proof-of-concept code!"
+    exit 0
+    ;;
+getinfo-devurl)
+    echo "http://www.linux-ha.org/DomUClusters"
+    exit 0
+    ;;
+getinfo-xml)
+    cat << SSHXML
+<parameters>
+<parameter name="hostlist" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostlist
+</shortdesc>
+<longdesc lang="en">
+The list of controlled DomUs, separated by whitespace.
+These must be configured as Xen RA resources with a name with a matching
+id.
+For example: "xen-1 xen-2 xen-3"
+</longdesc>
+</parameter>
+<parameter name="dom0_cluster_ip" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Dom0 cluster ip
+</shortdesc>
+<longdesc lang="en">
+The cluster IP address associated with Dom0. 
+Root user must be able to ssh to that node.
+</longdesc>
+</parameter>
+<parameter name="stop_timeout">
+<content type="integer" />
+<shortdesc lang="en">
+Stop timeout
+</shortdesc>
+<longdesc lang="en">
+The timeout, in seconds, for which to wait for Dom0 to report that the
+DomU has been stopped, before aborting with a failure.
+</longdesc>
+</parameter>
+</parameters>
+SSHXML
+    exit 0
+    ;;
+*)
+    exit 1
+    ;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper
--- heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Author:      Lars Marowsky-Bree
+#
+# Copyright 2008 Lars Marowsky-Bree
+# License:      GNU General Public License (GPL)
+
+# This is not an external/stonith plugin by itself, but instead a helper
+# script which gets installed in Dom0.
+
+# TODO:
+# - Error handling
+#   - How to handle if the DomU resource doesn't exist?
+#   - Does this truly work with split-brain?
+#   - Is the handling of non-existent resources adequate?
+#   ...
+# Basically: more testing. This is proof-of-concept and works, but deserves
+# validation.
+
+CMD="$1"
+DOMU="$2"
+TIMEOUT="$3"
+
+# Make sure the timeout is an integer:
+if [ "0$TIMEOUT" -eq 0 ]; then
+	TIMEOUT=300
+fi
+
+SetTargetRole() {
+	local new_role="$1"
+	crm_resource -r $DOMU --meta -p target_role -v $new_role
+
+	local timeout="$TIMEOUT"
+
+	# We only need to wait for "stopped".
+	if [ "$new_role" != "stopped" ]; then
+		return 0
+	fi
+
+	while [ $timeout -gt 0 ]; do
+		local rc
+		crm_resource -W -r $DOMU 2>&1 | grep -q "is NOT running"
+		rc=$?
+		if [ $rc -eq 0 ]; then
+			return 0
+		fi
+		timeout=$[timeout-1];
+		sleep 1
+	done
+	return 1
+}
+
+
+case $CMD in
+on)	SetTargetRole started
+	exit $?
+	;;
+off)	SetTargetRole stopped
+	exit $?
+	;;
+reset)	SetTargetRole stopped || exit 1
+	SetTargetRole started
+	exit $?
+	;;
+status) exit 0
+	;;
+*)	logger "$0: Called with unknown command: $CMD"
+   	exit 1
+	;;
+esac
+
+exit 1
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha.in
--- heartbeat-2.1.3/lib/plugins/stonith/external/xen0-ha.in	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/external/xen0-ha.in	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# This STONITH script integrates a cluster running within DomUs
+# with the CRM/Pacemaker cluster running in Dom0.
+#
+# Author:	Lars Marowsky-Bree
+# Copyright:	2008 Lars Marowsky-Bree
+# License:      GNU General Public License (GPL)
+#
+
+SSH_COMMAND="@SSH@ -q -x -n"
+HVM_HELPER="@stonith_plugindir@/xen0-ha-dom0-stonith-helper"
+
+# Rewrite the hostlist to accept "," as a delimeter for hostnames too.
+hostlist=`echo $hostlist | tr ',' ' '`
+
+# Runs a command on the host, waiting for it to return
+RunHVMCommand() {
+    $SSH_COMMAND $dom0_cluster_ip "$HVM_HELPER $1 $2 $stop_timeout"
+}
+
+# Main code
+case $1 in
+gethosts)
+    echo $hostlist
+    exit 0
+    ;;
+on|off|reset|status)
+    RunHVMCommand $1 $2
+    exit $?
+    ;;
+getconfignames)
+    echo "hostlist dom0_cluster_ip timeout"
+    exit 0
+    ;;
+getinfo-devid)
+    echo "xen0-ha DomU/Dom0 device"
+    exit 0
+    ;;
+getinfo-devname)
+    echo "xen0-ha DomU/Dom0 external device"
+    exit 0
+    ;;
+getinfo-devdescr)
+    echo "Allows STONITH to control DomUs managed by a CRM/Pacemaker Dom0."
+    echo "Requires Xen + CRM/Pacemaker at both layers."
+    echo "Proof-of-concept code!"
+    exit 0
+    ;;
+getinfo-devurl)
+    echo "http://www.linux-ha.org/DomUClusters"
+    exit 0
+    ;;
+getinfo-xml)
+    cat << SSHXML
+<parameters>
+<parameter name="hostlist" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostlist
+</shortdesc>
+<longdesc lang="en">
+The list of controlled DomUs, separated by whitespace.
+These must be configured as Xen RA resources with a name with a matching
+id.
+For example: "xen-1 xen-2 xen-3"
+</longdesc>
+</parameter>
+<parameter name="dom0_cluster_ip" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Dom0 cluster ip
+</shortdesc>
+<longdesc lang="en">
+The cluster IP address associated with Dom0. 
+Root user must be able to ssh to that node.
+</longdesc>
+</parameter>
+<parameter name="stop_timeout">
+<content type="integer" />
+<shortdesc lang="en">
+Stop timeout
+</shortdesc>
+<longdesc lang="en">
+The timeout, in seconds, for which to wait for Dom0 to report that the
+DomU has been stopped, before aborting with a failure.
+</longdesc>
+</parameter>
+</parameters>
+SSHXML
+    exit 0
+    ;;
+*)
+    exit 1
+    ;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/external.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/external.c
--- heartbeat-2.1.3/lib/plugins/stonith/external.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/external.c	2008-08-18 13:32:19.000000000 +0100
@@ -585,7 +585,7 @@
 	}
 
 	if (rc == 0) {
-		if (sd->outputbuf == NULL) {
+		if (sd->outputbuf != NULL) {
 			FREE(sd->outputbuf);
 		}
 		sd->outputbuf =  ret;
@@ -762,7 +762,7 @@
 		LOG(PIL_INFO, "%s: Calling '%s' returned %d", __FUNCTION__, cmd, rc);
 	}
 	if (Debug && data) {
-		LOG(PIL_INFO, "%s: '%s' output: %s", __FUNCTION__, cmd, data);
+		LOG(PIL_DEBUG, "%s: '%s' output: %s", __FUNCTION__, cmd, data);
 	}
 
 	if (output) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/ipmilan.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/ipmilan.c
--- heartbeat-2.1.3/lib/plugins/stonith/ipmilan.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/ipmilan.c	2008-08-18 13:32:19.000000000 +0100
@@ -119,6 +119,7 @@
 #define ST_PORT		"port"
 #define ST_AUTH		"auth"
 #define ST_PRIV		"priv"
+#define ST_RESET_METHOD		"reset_method"
 
 #include "stonith_config_xml.h"
 
@@ -186,6 +187,22 @@
 	  XML_PRIV_LONGDESC \
 	XML_PARAMETER_END
 
+#define XML_RESET_METHOD_SHORTDESC \
+	XML_PARM_SHORTDESC_BEGIN("en") \
+	ST_RESET_METHOD \
+	XML_PARM_SHORTDESC_END
+
+#define XML_RESET_METHOD_LONGDESC \
+	XML_PARM_LONGDESC_BEGIN("en") \
+	"How to reset the host (\"power_cycle\" or \"hard_reset\")" \
+	XML_PARM_LONGDESC_END
+
+#define XML_RESET_METHOD_PARM \
+	XML_PARAMETER_BEGIN(ST_RESET_METHOD, "string", "0") \
+	  XML_RESET_METHOD_SHORTDESC \
+	  XML_RESET_METHOD_LONGDESC \
+	XML_PARAMETER_END
+
 static const char *ipmilanXML = 
   XML_PARAMETERS_BEGIN
     XML_HOSTNAME_PARM
@@ -217,18 +234,18 @@
 {
 	struct pluginDevice * nd;
 	struct ipmilanHostInfo * node;
-	int ret;
+	int ret, rv;
+	int i;
 
 	ERRIFWRONGDEV(s,S_OOPS);
 
 	ret = S_OK;
 
 	nd = (struct pluginDevice *)s;
-	node = nd->hostlist;
-#if 0
-	do {
-		ret = send_ipmi_msg(node, ST_IPMI_STATUS);
-		if (ret) {
+	for( i=0, node = nd->hostlist;
+			i < nd->hostcount; i++, node = node->next ) {
+		rv = do_ipmi_cmd(node, ST_IPMI_STATUS);
+		if (rv) {
 			LOG(PIL_INFO, "Host %s ipmilan status failure."
 			,	node->hostname);
 			ret = S_ACCESS;
@@ -236,10 +253,9 @@
 			LOG(PIL_INFO, "Host %s ipmilan status OK."
 			,	node->hostname);
 		}
-		node = node->next;
 
-	} while (node);
-#endif
+	}
+
 	return ret;
 }
 
@@ -332,20 +348,19 @@
 	int rc = 0;
 	struct pluginDevice * nd;
 	struct ipmilanHostInfo * node;
+	int i;
 
 	ERRIFWRONGDEV(s,S_OOPS);
 	
 	nd = (struct pluginDevice *)s;
-	node = nd->hostlist;
-	do {
+	for( i=0, node = nd->hostlist;
+			i < nd->hostcount; i++, node = node->next ) {
 		if (strcasecmp(node->hostname, host) == 0) {
 			break;
-		};
+		}
+	}
 
-		node = node->next;
-	} while (node);
-	
-	if (!node) {
+	if (i >= nd->hostcount) {
 		LOG(PIL_CRIT, "Host %s is not configured in this STONITH "
 		" module. Please check your configuration file.", host);
 		return (S_OOPS);
@@ -369,7 +384,7 @@
 {
 	static const char * ret[] = 
 		{ ST_HOSTNAME, ST_IPADDR, ST_PORT, ST_AUTH,
-		  ST_PRIV, ST_LOGIN, ST_PASSWD, NULL};
+		  ST_PRIV, ST_LOGIN, ST_PASSWD, ST_RESET_METHOD, NULL};
 	return ret;
 }
 
@@ -382,6 +397,7 @@
 	struct pluginDevice* nd;
 	int		rc;
 	struct ipmilanHostInfo *  tmp;
+	const char *reset_opt;
 
 	StonithNamesToGet	namestocopy [] =
 	{	{ST_HOSTNAME,	NULL}
@@ -421,9 +437,9 @@
 		tmp->authtype = 1;
 	} else if (strcmp(namestocopy[3].s_value, "md5") == 0) {
 		tmp->authtype = 2;
-	} else if (strcmp(namestocopy[3].s_value, "key") == 0) {
-		tmp->authtype = 4;
-	} else if (strcmp(namestocopy[3].s_value, "password") == 0) {
+	} else if (strcmp(namestocopy[3].s_value, "key") == 0 ||
+			strcmp(namestocopy[3].s_value, "password") == 0 ||
+			strcmp(namestocopy[3].s_value, "straight") == 0) {
 		tmp->authtype = 4;
 	} else {
 		LOG(PIL_CRIT, "ipmilan auth type '%s' invalid.  See "
@@ -435,10 +451,9 @@
 		LOG(PIL_CRIT, "ipmilan priv value is NULL.  See "
 		"README.ipmilan for allowed values");
 		return S_OOPS;
-	if (strcmp(namestocopy[4].s_value, "operator") == 0) {
+	} else if (strcmp(namestocopy[4].s_value, "operator") == 0) {
 		tmp->privilege = 3;
-		}
-	if (strcmp(namestocopy[4].s_value, "admin") == 0) {
+	} else if (strcmp(namestocopy[4].s_value, "admin") == 0) {
 		tmp->privilege = 4;
 	} else {
 		LOG(PIL_CRIT, "ipmilan priv value '%s' invalid.  See "
@@ -448,7 +463,16 @@
 	FREE(namestocopy[4].s_value);
 	tmp->username = namestocopy[5].s_value;
 	tmp->password = namestocopy[6].s_value;
-	
+	reset_opt = OurImports->GetValue(list, ST_RESET_METHOD);
+	if (!reset_opt || !strcmp(reset_opt, "power_cycle")) {
+		tmp->reset_method = 0;
+	} else if (!strcmp(reset_opt, "hard_reset")) {
+		tmp->reset_method = 1;
+	} else {
+		LOG(PIL_CRIT, "ipmilan reset_method '%s' invalid", reset_opt);
+		return S_OOPS;
+	}
+
 	if (nd->hostlist == NULL ) {
 		nd->hostlist = tmp;
 		nd->hostlist->prev = tmp;
@@ -539,6 +563,7 @@
 
 	nd->hostcount = -1;
 	FREE(nd);
+	ipmi_leave();
 }
 
 /* Create a new ipmilan StonithPlugin device.  Too bad this function can't be static */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/ipmilan_command.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/ipmilan_command.c
--- heartbeat-2.1.3/lib/plugins/stonith/ipmilan_command.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/ipmilan_command.c	2008-08-18 13:32:19.000000000 +0100
@@ -35,6 +35,7 @@
 #include <OpenIPMI/ipmi_auth.h>
 #include <OpenIPMI/ipmi_msgbits.h>
 #include <OpenIPMI/ipmi_posix.h>
+#include <OpenIPMI/ipmi_debug.h>
 
 #include "ipmilan.h"
 #include <stonith/stonith.h>
@@ -46,9 +47,14 @@
 /* #define DUMP_MSG 0 */
 #define OPERATION_TIME_OUT 10
 
-os_handler_t *os_hnd;
+os_handler_t *os_hnd=NULL;
 selector_t *os_sel;
+static ipmi_con_t *con;
 extern os_handler_t ipmi_os_cb_handlers;
+static int reset_method;
+
+static int request_done = 0;
+static int op_done = 0;
 
 typedef enum ipmi_status {
 	/*
@@ -72,8 +78,8 @@
 	SOFT_SHUTDOWN = 0X05
 } chassis_control_request_t;
 
-void dump_msg_data(ipmi_msg_t *msg, ipmi_addr_t *addr, char *type);
-int rsp_handler(ipmi_con_t *ipmi, ipmi_msg_t *rsp);
+void dump_msg_data(ipmi_msg_t *msg, ipmi_addr_t *addr, const char *type);
+int rsp_handler(ipmi_con_t *ipmi, ipmi_msgi_t *rspi);
 
 void send_ipmi_cmd(ipmi_con_t *con, int request);
 
@@ -87,7 +93,7 @@
 }
 
 void
-dump_msg_data(ipmi_msg_t *msg, ipmi_addr_t *addr, char *type)
+dump_msg_data(ipmi_msg_t *msg, ipmi_addr_t *addr, const char *type)
 {
 	ipmi_system_interface_addr_t *smi_addr = NULL;
 	int i;
@@ -139,34 +145,35 @@
  */
 
 int
-rsp_handler(ipmi_con_t *ipmi, ipmi_msg_t *rsp)
+rsp_handler(ipmi_con_t *ipmi, ipmi_msgi_t *rspi)
 {
-
-/*  This code causes segmentation faults in the "rv = " line, and the
- *  "free(" line seems to be freeing invalid memory  */
-#if 0
 	int rv;
-	int * request;
+	long request;
 
-	request = (void *) rsp->data;
+	/*dump_msg_data(&rspi->msg, &rspi->addr, "response");*/
+	request = (long) rspi->data1;
 
-	rv = rsp->data[0];  
+	op_done = 1;
+	if( !rspi || !(rspi->msg.data) ) {
+		PILCallLog(PluginImports->log,PIL_CRIT, "No data received\n");
+		gstatus = S_RESETFAIL;
+		return IPMI_MSG_ITEM_NOT_USED;
+	}
+	rv = rspi->msg.data[0];
 	/* some IPMI device might not issue 0x00, success, for reset command.
 	   instead, a 0xc3, timeout, is returned. */
-	if (rv == 0x00 || 
-		(rv == 0xc3 && *request <= ST_POWEROFF && *request >= ST_GENERIC_RESET ) ) {
+	if (rv == 0x00) {
+		gstatus = S_OK;
+	} else if((rv == 0xc3 || rv == 0xff) && request == ST_GENERIC_RESET) {
+		PILCallLog(PluginImports->log,PIL_WARN ,
+		"IPMI reset request failed: %x, but we assume that it succeeded\n", rv);
 		gstatus = S_OK;
 	} else {
+		PILCallLog(PluginImports->log,PIL_INFO
+		, "IPMI request %ld failed: %x\n", request, rv);
 		gstatus = S_RESETFAIL;
 	}
-
-	free(request);
-#else
-	/*  so, until this code can be fixed, we'll just assume it's ok  */
-	gstatus = S_OK;
-#endif
-
-	return gstatus;
+	return IPMI_MSG_ITEM_NOT_USED;
 }
 
 void
@@ -177,7 +184,7 @@
 	ipmi_msg_t msg;
 	struct ipmi_system_interface_addr *si;
 	int rv;
-	ipmi_msg_t msgi;
+	ipmi_msgi_t *rspi;
 	/* chassis control command request is only 1 byte long */
 	unsigned char cc_data = POWER_CYCLE; 
 
@@ -194,21 +201,20 @@
 
 	switch (request) {
 		case ST_POWERON:
-			cc_data = POWER_DOWN;
+			cc_data = POWER_UP;
 			break;
 
 		case ST_POWEROFF:
-			cc_data = POWER_UP;
+			cc_data = POWER_DOWN;
 			break;
 
 		case ST_GENERIC_RESET:
-			cc_data = POWER_CYCLE;
+			cc_data = (reset_method ? POWER_CYCLE : HARD_RESET);
 			break;
 
 		case ST_IPMI_STATUS:
 			msg.netfn = IPMI_APP_NETFN;
 			msg.cmd = IPMI_GET_DEVICE_ID_CMD;
-			msg.data = NULL;
 			msg.data_len = 0;
 			break;
 
@@ -217,37 +223,42 @@
 			return;
 	}
 
-	msgi.data = (void *) malloc(sizeof(int));
-	*((unsigned char *)msgi.data) = request;
-	rv = con->send_command(con, &addr, addr_len, &msg, (ipmi_ll_rsp_handler_t) rsp_handler, (void *) &msgi);
-	if (rv == -1) {
-		PILCallLog(PluginImports->log,PIL_CRIT, "Error sending IPMI command: %x\n", rv);
-		gstatus = S_ACCESS;
+ 	gstatus = S_ACCESS;
+	rspi = calloc(1, sizeof(ipmi_msgi_t));
+	if (NULL == rspi) {
+		PILCallLog(PluginImports->log,PIL_CRIT, "Error sending IPMI command: Out of memory\n");
+	} else {
+		rspi->data1 = (void *) (long) request;
+		rv = con->send_command(con, &addr, addr_len, &msg, rsp_handler, rspi);
+		if (rv == -1) {
+			PILCallLog(PluginImports->log,PIL_CRIT, "Error sending IPMI command: %x\n", rv);
+		} else {
+			request_done = 1;
+		}
 	}
 
 	return;
 }
 
 static void
-con_changed_handler(ipmi_con_t *ipmi,
-			int err,
-			unsigned int port_num,
-			int still_connected,
-			void *cb_data)
+con_changed_handler(ipmi_con_t *ipmi, int err, unsigned int port_num,
+			int still_connected, void *cb_data)
 {
 	int * request;
+
 	if (err) {
 		PILCallLog(PluginImports->log,PIL_CRIT, "Unable to setup connection: %x\n", err);
 		return;
 	}
 
-	request = (int *) cb_data;
-	send_ipmi_cmd(ipmi, *request);
+	if( !request_done ) {
+		request = (int *) cb_data;
+		send_ipmi_cmd(ipmi, *request);
+	}
 }
 
-
 static int
-setup_ipmi_conn(struct ipmilanHostInfo * host, int request)
+setup_ipmi_conn(struct ipmilanHostInfo * host, int *request)
 {
 	int rv;
 
@@ -260,24 +271,21 @@
 	char username[17];
 	char password[17];
 
-	static ipmi_con_t *con;
-
-	sel_timer_t * timer;
-	struct timeval timeout;
+	/*DEBUG_MSG_ENABLE();*/
 
 	os_hnd = ipmi_posix_get_os_handler();
 	if (!os_hnd) {
-	    	PILCallLog(PluginImports->log,PIL_CRIT, "ipmi_smi_setup_con: Unable to allocate os handler");
+			PILCallLog(PluginImports->log,PIL_CRIT, "ipmi_smi_setup_con: Unable to allocate os handler");
 		return 1;
 	}
 
 	rv = sel_alloc_selector(os_hnd, &os_sel);
 	if (rv) {
-		PILCallLog(PluginImports->log,PIL_CRIT, "Could not alloctate selector\n");
+		PILCallLog(PluginImports->log,PIL_CRIT, "Could not allocate selector\n");
 		return rv;
 	}
 
-    	ipmi_posix_os_handler_set_sel(os_hnd, os_sel);
+	ipmi_posix_os_handler_set_sel(os_hnd, os_sel);
 
 	rv = ipmi_init(os_hnd);
 	if (rv) {
@@ -301,6 +309,8 @@
 	memcpy(username, host->username, sizeof(username));
 	memcpy(password, host->password, sizeof(password));
 
+	reset_method = host->reset_method;
+
 	rv = ipmi_lan_setup_con(lan_addr, lan_port, num_addr, 
 				authtype, privilege,
 				username, strlen(username),
@@ -313,13 +323,11 @@
 		return S_ACCESS;
 	}
 
-	/* in the OpenIPMI 1.3.x implementation the callback function was
-	 * called set_con_change_handler(), now with the OpenIPMI 2.0.x
-	 * implementation it has changed to add_con_change_handler(). Check out:
-	 *
-	 * http://cvs.sourceforge.net/viewcvs.py/openipmi/OpenIPMI/include/OpenIPMI/ipmi_conn.h?r1=1.27&r2=1.28
-	 */
-	con->add_con_change_handler(con, con_changed_handler, &request);
+#if OPENIPMI_VERSION_MAJOR < 2
+	con->set_con_change_handler(con, con_changed_handler, request);
+#else
+	con->add_con_change_handler(con, con_changed_handler, request);
+#endif
 
 	gstatus = IPMI_RUNNING;
 
@@ -329,6 +337,40 @@
 		gstatus = S_BADCONFIG;
 		return rv;
 	}
+	return S_OK;
+}
+
+void
+ipmi_leave()
+{
+	if( con && con->close_connection ) {
+		con->close_connection(con);
+		con = NULL;
+	}
+	if( os_sel ) {
+		sel_free_selector(os_sel);
+		os_sel = NULL;
+	}
+}
+
+int
+do_ipmi_cmd(struct ipmilanHostInfo * host, int request)
+{
+	int rv;
+	sel_timer_t * timer;
+	struct timeval timeout;
+
+	request_done = 0;
+	op_done = 0;
+
+	if( !os_hnd ) {
+		rv = setup_ipmi_conn(host, &request);
+		if( rv ) {
+			return rv;
+		}
+	} else {
+		send_ipmi_cmd(con, request);
+	}
 
 	gettimeofday(&timeout, NULL);
 	timeout.tv_sec += OPERATION_TIME_OUT;
@@ -337,23 +379,20 @@
 	sel_alloc_timer(os_sel, timed_out, NULL, &timer);
 	sel_start_timer(timer, &timeout);
 
-        while (1) {
-                rv = sel_select(os_sel, NULL, 0, NULL, NULL);
-		if (gstatus != IPMI_RUNNING) {
+	while (!op_done) {
+		rv = sel_select(os_sel, NULL, 0, NULL, NULL);
+		if (rv == -1) {
 			break;
 		}
-        }
+	}
 
 	sel_free_timer(timer);
-
-	con->close_connection(con);
-	ipmi_shutdown();
 	return gstatus;
 }
 
-int
-do_ipmi_cmd(struct ipmilanHostInfo * host, int request)
+#if OPENIPMI_VERSION_MAJOR < 2
+void
+posix_vlog(char *format, enum ipmi_log_type_e log_type, va_list ap)
 {
-	return setup_ipmi_conn(host, request);
 }
-
+#endif
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/ipmilan.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/ipmilan.h
--- heartbeat-2.1.3/lib/plugins/stonith/ipmilan.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/ipmilan.h	2008-08-18 13:32:19.000000000 +0100
@@ -31,11 +31,11 @@
 	int		privilege;
 	char * 		username;
 	char *		password;
+	int		reset_method;
 
 	struct ipmilanHostInfo *  prev;
 	struct ipmilanHostInfo *  next;
 };
 
-int
-do_ipmi_cmd(struct ipmilanHostInfo * host, int request);
-
+int do_ipmi_cmd(struct ipmilanHostInfo * host, int request);
+void ipmi_leave(void);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/Makefile
--- heartbeat-2.1.3/lib/plugins/stonith/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,1128 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/stonith/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 $@
+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 $@
+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 $@
+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 $@
+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 $@
+#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 $@
+am__EXEEXT_1 = ipmilantest$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am_ipmilantest_OBJECTS = ipmilan_test.$(OBJEXT)
+ipmilantest_OBJECTS = $(am_ipmilantest_OBJECTS)
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/stonith
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/stonith
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# stonith: STONITH plugins for Linux-HA
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing -DST_TEXTDOMAIN='"stonith"' \
+			-DSTONITH_MODULES='"$(stonithlibdir)"' \
+			-DLOCALEDIR='"/usr/share/locale"' 		
+
+EXTRA_DIST = README.meatware README.rcd_serial README.vacm README.drac3 README.ipmilan README.cyclades README.bladehpi
+vacm_LIB = 
+
+#
+#       We need "vacmclient_api.h" and -lvacmclient to make the VACM
+#       plugin work.
+#
+#vacm_LIB = vacm.la
+#apcmastersnmp_LIB = 
+
+#
+#       We need <ucd-snmp/asn1.h>, <ucd-snmp/snmp_api.h>, <ucd-snmp/snmp.h>
+#       <ucd-snmp/snmp_client.h>, <ucd-snmp/mib.h>, -lsnmp and -lcrypto
+#       for the apcmastersnmp plugin to work
+#
+apcmastersnmp_LIB = apcmastersnmp.la
+#OPENIPMI_LIB = 
+OPENIPMI_LIB = -lOpenIPMI -lOpenIPMIposix -lOpenIPMIutils
+#ipmilan_LIB = 
+ipmilan_LIB = ipmilan.la
+ipmilan_TEST = ipmilantest
+#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
+#
+drac3_LIB = drac3.la
+#bladehpi_LIB = 
+
+#
+#       We need OpenHPI to make the IBM BladeCenter plugin work.
+#
+bladehpi_LIB = bladehpi.la
+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		\
+			baytech.la		\
+			$(bladehpi_LIB)		\
+			cyclades.la		\
+			$(drac3_LIB)		\
+			external.la		\
+			ibmhmc.la		\
+			$(ipmilan_LIB)		\
+			meatware.la		\
+			null.la			\
+			nw_rpc100s.la		\
+			rcd_serial.la		\
+			rps10.la		\
+			ssh.la			\
+			suicide.la		\
+			$(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 -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp \
+			  -lcrypto
+
+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 
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)/$@
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+apcmaster.la: $(apcmaster_la_OBJECTS) $(apcmaster_la_DEPENDENCIES) 
+	$(apcmaster_la_LINK) -rpath $(plugindir) $(apcmaster_la_OBJECTS) $(apcmaster_la_LIBADD) $(LIBS)
+apcmastersnmp.la: $(apcmastersnmp_la_OBJECTS) $(apcmastersnmp_la_DEPENDENCIES) 
+	$(apcmastersnmp_la_LINK) $(am_apcmastersnmp_la_rpath) $(apcmastersnmp_la_OBJECTS) $(apcmastersnmp_la_LIBADD) $(LIBS)
+apcsmart.la: $(apcsmart_la_OBJECTS) $(apcsmart_la_DEPENDENCIES) 
+	$(apcsmart_la_LINK) -rpath $(plugindir) $(apcsmart_la_OBJECTS) $(apcsmart_la_LIBADD) $(LIBS)
+baytech.la: $(baytech_la_OBJECTS) $(baytech_la_DEPENDENCIES) 
+	$(baytech_la_LINK) -rpath $(plugindir) $(baytech_la_OBJECTS) $(baytech_la_LIBADD) $(LIBS)
+bladehpi.la: $(bladehpi_la_OBJECTS) $(bladehpi_la_DEPENDENCIES) 
+	$(bladehpi_la_LINK) $(am_bladehpi_la_rpath) $(bladehpi_la_OBJECTS) $(bladehpi_la_LIBADD) $(LIBS)
+cyclades.la: $(cyclades_la_OBJECTS) $(cyclades_la_DEPENDENCIES) 
+	$(cyclades_la_LINK) -rpath $(plugindir) $(cyclades_la_OBJECTS) $(cyclades_la_LIBADD) $(LIBS)
+drac3.la: $(drac3_la_OBJECTS) $(drac3_la_DEPENDENCIES) 
+	$(drac3_la_LINK) $(am_drac3_la_rpath) $(drac3_la_OBJECTS) $(drac3_la_LIBADD) $(LIBS)
+external.la: $(external_la_OBJECTS) $(external_la_DEPENDENCIES) 
+	$(external_la_LINK) -rpath $(plugindir) $(external_la_OBJECTS) $(external_la_LIBADD) $(LIBS)
+ibmhmc.la: $(ibmhmc_la_OBJECTS) $(ibmhmc_la_DEPENDENCIES) 
+	$(ibmhmc_la_LINK) -rpath $(plugindir) $(ibmhmc_la_OBJECTS) $(ibmhmc_la_LIBADD) $(LIBS)
+ipmilan.la: $(ipmilan_la_OBJECTS) $(ipmilan_la_DEPENDENCIES) 
+	$(ipmilan_la_LINK) $(am_ipmilan_la_rpath) $(ipmilan_la_OBJECTS) $(ipmilan_la_LIBADD) $(LIBS)
+meatware.la: $(meatware_la_OBJECTS) $(meatware_la_DEPENDENCIES) 
+	$(meatware_la_LINK) -rpath $(plugindir) $(meatware_la_OBJECTS) $(meatware_la_LIBADD) $(LIBS)
+null.la: $(null_la_OBJECTS) $(null_la_DEPENDENCIES) 
+	$(null_la_LINK) -rpath $(plugindir) $(null_la_OBJECTS) $(null_la_LIBADD) $(LIBS)
+nw_rpc100s.la: $(nw_rpc100s_la_OBJECTS) $(nw_rpc100s_la_DEPENDENCIES) 
+	$(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) 
+	$(rcd_serial_la_LINK) -rpath $(plugindir) $(rcd_serial_la_OBJECTS) $(rcd_serial_la_LIBADD) $(LIBS)
+rps10.la: $(rps10_la_OBJECTS) $(rps10_la_DEPENDENCIES) 
+	$(rps10_la_LINK) -rpath $(plugindir) $(rps10_la_OBJECTS) $(rps10_la_LIBADD) $(LIBS)
+ssh.la: $(ssh_la_OBJECTS) $(ssh_la_DEPENDENCIES) 
+	$(ssh_la_LINK) -rpath $(plugindir) $(ssh_la_OBJECTS) $(ssh_la_LIBADD) $(LIBS)
+suicide.la: $(suicide_la_OBJECTS) $(suicide_la_DEPENDENCIES) 
+	$(suicide_la_LINK) -rpath $(plugindir) $(suicide_la_OBJECTS) $(suicide_la_LIBADD) $(LIBS)
+vacm.la: $(vacm_la_OBJECTS) $(vacm_la_DEPENDENCIES) 
+	$(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) 
+	$(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 \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+ipmilantest$(EXEEXT): $(ipmilantest_OBJECTS) $(ipmilantest_DEPENDENCIES) 
+	@rm -f ipmilantest$(EXEEXT)
+	$(LINK) $(ipmilantest_OBJECTS) $(ipmilantest_LDADD) $(LIBS)
+install-stonithscriptSCRIPTS: $(stonithscript_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-stonithscriptSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/apcmaster.Plo
+include ./$(DEPDIR)/apcmastersnmp.Plo
+include ./$(DEPDIR)/apcsmart.Plo
+include ./$(DEPDIR)/baytech.Plo
+include ./$(DEPDIR)/bladehpi.Plo
+include ./$(DEPDIR)/cyclades.Plo
+include ./$(DEPDIR)/drac3.Plo
+include ./$(DEPDIR)/drac3_command.Plo
+include ./$(DEPDIR)/drac3_hash.Plo
+include ./$(DEPDIR)/external.Plo
+include ./$(DEPDIR)/ibmhmc.Plo
+include ./$(DEPDIR)/ipmilan.Plo
+include ./$(DEPDIR)/ipmilan_command.Plo
+include ./$(DEPDIR)/ipmilan_test.Po
+include ./$(DEPDIR)/meatware.Plo
+include ./$(DEPDIR)/null.Plo
+include ./$(DEPDIR)/nw_rpc100s.Plo
+include ./$(DEPDIR)/rcd_serial.Plo
+include ./$(DEPDIR)/rps10.Plo
+include ./$(DEPDIR)/ssh.Plo
+include ./$(DEPDIR)/suicide.Plo
+include ./$(DEPDIR)/vacm.Plo
+include ./$(DEPDIR)/wti_nps.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	clean-pluginLTLIBRARIES mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES \
+	uninstall-stonithscriptSCRIPTS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/Makefile.in
--- heartbeat-2.1.3/lib/plugins/stonith/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/Makefile.in	2008-08-18 23:38:06.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -43,7 +43,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ribcl.py
@@ -193,7 +193,7 @@
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 stonithscriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(stonithscript_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -269,6 +269,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -286,24 +287,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -365,12 +354,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -700,8 +690,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -709,8 +699,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -921,8 +911,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -947,8 +937,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -958,13 +948,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/README.ipmilan /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/README.ipmilan
--- heartbeat-2.1.3/lib/plugins/stonith/README.ipmilan	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/README.ipmilan	2008-08-18 13:32:19.000000000 +0100
@@ -20,8 +20,8 @@
 
 3. Software Requirement
 
-This module needs OpenIPMI (http://openipmi.sf.net) to compile.  By the time
-of this writing, the version for OpenIPMI is 1.0.3.  
+This module needs OpenIPMI (http://openipmi.sf.net) to compile.
+Version 1.4.x or 2.0.x is supported.
 
 4. Hardware Configuration
 
@@ -36,8 +36,8 @@
 
 The configuration file syntax looks like this:
 
-	<node1> <ip> <port> <auth> <priv> <user> <pass>
-	<node2> <ip> <port> <auth> <priv> <user> <pass>
+	<node1> <ip> <port> <auth> <priv> <user> <pass> <reset_method>
+	<node2> <ip> <port> <auth> <priv> <user> <pass> <reset_method>
 	...
 
 	node: the hostname.  
@@ -59,6 +59,10 @@
 
 	pass: the password. use "" if it is empty.  Cannot exceed 16 characters.
 
+	reset_method: (optional) which IPMI chassis control to send
+	to reset the host. Possible values are power_cycle (default)
+	and hard_reset.
+
 Each line is white-space delimited and lines begins with '#' are ignored. 
 
 6. IPMI v1.5 without IPMI over LAN Support
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/ribcl.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/ribcl.py
--- heartbeat-2.1.3/lib/plugins/stonith/ribcl.py	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/stonith/ribcl.py	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+
+
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library 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
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+import sys
+import socket
+from httplib import *
+from time import sleep
+
+
+argv = sys.argv
+
+
+try:
+        host = argv[1].split('.')[0]+'-rm'
+        cmd = argv[2]
+except IndexError:
+        print "Not enough arguments"
+        sys.exit(1)
+
+
+login = [ '<RIBCL VERSION="1.2">',
+          '<LOGIN USER_LOGIN="Administrator" PASSWORD="********">' ]
+
+
+logout = [ '</LOGIN>', '</RIBCL>' ]
+
+
+status = [ '<SERVER_INFO MODE="read">', '<GET_HOST_POWER_STATUS/>',
+           '</SERVER_INFO>' ]
+
+
+reset = [ '<SERVER_INFO MODE="write">', '<RESET_SERVER/>', '</SERVER_INFO>' ]
+
+
+off = [ '<SERVER_INFO MODE = "write">', '<SET_HOST_POWER HOST_POWER  = "N"/>',
+          '</SERVER_INFO>' ]
+
+
+on = [ '<SERVER_INFO MODE = "write">', '<SET_HOST_POWER HOST_POWER  = "Y"/>',
+          '</SERVER_INFO>' ]
+
+
+todo = { 'reset':reset, 'on':on, 'off':off, 'status':status }
+
+
+acmds=[]
+try:
+        if cmd == 'reset' and host.startswith('gfxcl'):
+                acmds.append(login + todo['off'] + logout)
+                acmds.append(login + todo['on'] + logout)
+        else:   
+                acmds.append(login + todo[cmd] + logout)
+except KeyError:
+        print "Invalid command: "+ cmd
+        sys.exit(1)
+
+
+try:
+        for cmds in acmds:
+
+
+                c=HTTPSConnection(host)
+                c.send('<?xml version="1.0"?>\r\n')
+                c.sock.recv(1024)
+
+
+                for line in cmds:
+                        c.send(line+'\r\n')
+                        c.sock.recv(1024)
+
+
+                c.close()
+                sleep(1)
+
+
+except socket.gaierror, msg:
+        print msg
+        sys.exit(1)
+except socket.sslerror, msg:
+        print msg
+        sys.exit(1)
+except socket.error, msg:
+        print msg
+        sys.exit(1)
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/stonith/suicide.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/stonith/suicide.c
--- heartbeat-2.1.3/lib/plugins/stonith/suicide.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/stonith/suicide.c	2008-08-18 13:32:19.000000000 +0100
@@ -83,8 +83,12 @@
 	,	&interfprivate); 
 }
 
+#define REBOOT_COMMAND "nohup sh -c 'sleep 2; " REBOOT " " REBOOT_OPTIONS " </dev/null >/dev/null 2>&1' &"
+#define POWEROFF_COMMAND "nohup sh -c 'sleep 2; " POWEROFF_CMD " " POWEROFF_OPTIONS " </dev/null >/dev/null 2>&1' &"
+/*
 #define REBOOT_COMMAND "echo 'sleep 2; "  REBOOT " " REBOOT_OPTIONS "' | SHELL=/bin/sh at now >/dev/null 2>&1"
 #define POWEROFF_COMMAND "echo 'sleep 2; "  POWEROFF_CMD " " POWEROFF_OPTIONS "' | SHELL=/bin/sh at now >/dev/null 2>&1"
+*/
 
 /*
  *    Suicide STONITH device
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/tiebreaker/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/tiebreaker/Makefile
--- heartbeat-2.1.3/lib/plugins/tiebreaker/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/plugins/tiebreaker/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,763 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/plugins/tiebreaker/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/tiebreaker
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/plugins/tiebreaker
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# InterfaceMgr: Interface manager plugins for Linux-HA
+#
+# Copyright (C) 2005 Guochun Shi <gshi@ncsa.uiuc.edu>
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+halibdir = $(libdir)/heartbeat
+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 
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+twonodes.la: $(twonodes_la_OBJECTS) $(twonodes_la_DEPENDENCIES) 
+	$(twonodes_la_LINK) -rpath $(plugindir) $(twonodes_la_OBJECTS) $(twonodes_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/twonodes.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pluginLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/plugins/tiebreaker/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/plugins/tiebreaker/Makefile.in
--- heartbeat-2.1.3/lib/plugins/tiebreaker/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/plugins/tiebreaker/Makefile.in	2008-08-18 23:38:06.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -116,6 +116,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -133,24 +134,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -212,12 +201,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -425,8 +415,8 @@
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -434,8 +424,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
 	done
 
 clean-pluginLTLIBRARIES:
@@ -559,8 +549,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -585,8 +575,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -596,13 +586,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/recoverymgr/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/recoverymgr/Makefile
--- heartbeat-2.1.3/lib/recoverymgr/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/recoverymgr/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,646 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/recoverymgr/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/recoverymgr
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/recoverymgr
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# recoverymgr: Library that facilitates connecting to apphbd 
+# 	       RecoveryMgr plugin
+#
+# Copyright (C) 2002 Intel Corporation, 
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+lib_LTLIBRARIES = librecoverymgr.la
+librecoverymgr_la_SOURCES = \
+				recoverymgr.c	
+
+librecoverymgr_la_LDFLAGS = -version-info 1:0:0 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+librecoverymgr.la: $(librecoverymgr_la_OBJECTS) $(librecoverymgr_la_DEPENDENCIES) 
+	$(librecoverymgr_la_LINK) -rpath $(libdir) $(librecoverymgr_la_OBJECTS) $(librecoverymgr_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/recoverymgr.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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-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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/recoverymgr/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/recoverymgr/Makefile.in
--- heartbeat-2.1.3/lib/recoverymgr/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/recoverymgr/Makefile.in	2008-08-18 23:38:06.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -39,7 +39,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -58,7 +58,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -106,6 +106,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -123,24 +124,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -202,12 +191,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -412,8 +402,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -421,8 +411,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -476,8 +466,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -489,8 +479,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -500,13 +490,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/stonith/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/stonith/Makefile
--- heartbeat-2.1.3/lib/stonith/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lib/stonith/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,768 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lib/stonith/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/stonith
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lib/stonith
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Stonith: Shoot The Node In The Head
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 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 = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char -DST_TEXTDOMAIN='"stonith"' \
+			-DSTONITH_MODULES='"/usr/lib/stonith/plugins"' \
+			-DLOCALEDIR='"/usr/share/locale"'
+
+stonith_SOURCES = main.c
+stonith_LDADD = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB)
+stonith_LDFLAGS = -ldl  -export-dynamic   
+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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libstonith.la: $(libstonith_la_OBJECTS) $(libstonith_la_DEPENDENCIES) 
+	$(libstonith_la_LINK) -rpath $(libdir) $(libstonith_la_OBJECTS) $(libstonith_la_LIBADD) $(LIBS)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+meatclient$(EXEEXT): $(meatclient_OBJECTS) $(meatclient_DEPENDENCIES) 
+	@rm -f meatclient$(EXEEXT)
+	$(LINK) $(meatclient_OBJECTS) $(meatclient_LDADD) $(LIBS)
+stonith$(EXEEXT): $(stonith_OBJECTS) $(stonith_DEPENDENCIES) 
+	@rm -f stonith$(EXEEXT)
+	$(stonith_LINK) $(stonith_OBJECTS) $(stonith_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/expect.Plo
+include ./$(DEPDIR)/main.Po
+include ./$(DEPDIR)/meatclient.Po
+include ./$(DEPDIR)/st_ttylock.Plo
+include ./$(DEPDIR)/stonith.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man8: $(man8_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	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 \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  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"; \
+	done
+uninstall-man8:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.8*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    8*) ;; \
+	    *) ext='8' ;; \
+	  esac; \
+	  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"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/stonith/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/stonith/Makefile.in
--- heartbeat-2.1.3/lib/stonith/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lib/stonith/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -75,7 +75,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -128,6 +128,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -145,24 +146,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -224,12 +213,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -446,8 +436,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -455,8 +445,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -478,8 +468,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -593,8 +583,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -606,8 +596,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -617,13 +607,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lib/stonith/stonith.8 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lib/stonith/stonith.8
--- heartbeat-2.1.3/lib/stonith/stonith.8	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lib/stonith/stonith.8	2008-08-18 13:32:19.000000000 +0100
@@ -1,9 +1,8 @@
-.TH STONITH 8 "8th August 2003"
+.TH stonith 8 "February 2008"
 .SH NAME
 stonith \- extensible interface for remotely powering down a node in the cluster
 .SH SYNOPSIS
 .br
-
 \fBstonith\fP -h
 .br
 \fBstonith\fP [-svh] -L
@@ -12,73 +11,202 @@
 .br
 \fBstonith\fP [-svh] -t stonith-device-type {-p stonith-device-parameters | -F stonith-device-parameters-file | name=value...} [-c count] -lS
 .br
-\fBstonith\fP [-svh] -t stonith-device-type {-p stonith-device-parameters | -F stonith-device-parameters-file | name=value...} [-c count] -T {reset|on|off} nodename
+\fBstonith\fP [-svh] -t stonith-device-type {-p stonith-device-parameters | -F stonith-device-parameters-file | name=value...} [-c count] [-lS] [-T {reset|on|off}] nodename
 .SH DESCRIPTION
 The STONITH module (a.k.a. STOMITH) provides an extensible interface for
 remotely powering down a node in the cluster.
 (STONITH = Shoot The Other Node In The Head).
 The idea is quite simple:
-When the software running on one machine wants to make sure another machine
+when the software running on one machine wants to make sure another machine
 in the cluster is not using a resource, pull the plug on the other machine.
-It's simple and reliable, albiet admittedly brutal.
+It's simple and reliable, albeit admittedly brutal.
 .SH OPTIONS
 .TP
-.B \-F options-file:
-Path to file specifying option s for a device. To determine the syntax of
-the options-file for a given device run:
-.nf
-\fBstonith\fP -t <devicetype> <dummy-nodename>
-e.g.
-\fBstonith\fP -t rps10 test
+.B \-c count
+Perform any actions identified by the -l, -S and -T options \fBcount\fP
+times.
+.TP
+.B \-F stonith-device-parameters-file
+Path of file specifying parameters for a stonith device. To determine the
+syntax of the parameters file for a given device type run:
+.nf
+
+\fBstonith\fP -t stonith-device-type -n
+
 .fi
+All of the listed parameters need to appear in order on a single line in the
+parameters file and be delimited by whitespace.
 .TP
-.B \-h:
-Display command line 
-This provides a detailed list of the device types, descriptions of them
-and how to configure them, and other related information.
-If you don't yet own as STONITH device and want to know what
+.B \-h              
+Display detailed information about a stonith device including description,
+configuration information, parameters and any other related information.
+When specified without a stonith-device-type, detailed information on all
+stonith devices is displayed.
+
+If you don't yet own a stonith device and want to know
 more about the ones we support, this information is likely to be
 helpful.
-
 .TP
-.B \-L:
-List the valid devicetypes, suitable for passing as an argument to the
--t option.
-.TP
-.B \-l:
-List the configured nodes.
-.TP
-.B \-t devicetype:
-The type of device to be used to effect STONITH.
-A list of supported devices for an instalation of stonith may be obtained
-using the -L option.
+.B \-L
+List the valid stonith device types, suitable for passing as an argument
+to the -t option.
+.TP
+.B \-l
+List the hosts controlled by the stonith device.
+.TP
+.B \-n
+Output the parameter names of the stonith device.
+.TP
+.B name=value
+Parameter, in the form of a name/value pair, to pass directly to the
+stonith device.
+To determine the syntax of the parameters for a given device type run:
+.nf
+
+\fBstonith\fP -t stonith-device-type -n
+
+.fi
+All of the listed parameter names need to be passed with their
+corresponding values.
 .TP
-.B \-p stonith-parameters:
-Parameters to pass directly to stonith device. These are the same format as
-a line in the options-file for a divice. See notes on determining the
-syntax for the options-file for a divice above.
+.B \-p stonith-device-parameters
+Parameters to pass directly to the stonith device.  To determine the syntax
+of the parameters for a given device type run:
+.nf
+
+\fBstonith\fP -t stonith-device-type -n
+
+.fi
+All of the listed parameter names need to appear in order
+and be delimited by whitespace.
 .TP
-.B \-S:
-Show the status of the STONITH device.
+.B \-S
+Show the status of the stonith device.
 .TP
-.B \-s:
+.B \-s
 Silent operation. Suppress logging of error messages to standard error.
 .TP
-.B \-n:
-Output the config names of stonith-device-parameters
-.TP
-.B \-c count:
-Query the status of the STONITH device \fBcount\fP times.
+.B \-T action
+The stonith action to perform on the node identified by nodename.  Chosen 
+from \fBreset\fP, \fBon\fP, and \fBoff\fP.
+
+\fBNOTE:\fP If a nodename is specified without the -T option, the stonith
+action defaults to \fBreset\fP. 
 .TP
-.B \-T action:
-The action to perform on the node.  Chosen from \fBreset\fP, \fBon\fP, and \fBoff\fP.
+.B \-t stonith-device-type
+The type of the stonith device to be used to effect stonith.
+A list of supported devices for an installation may be obtained
+using the -L option.
 .TP
-.B \-v:
+.B \-v
 Ignored.
+.SH EXAMPLES
+To determine which stonith devices are available on your installation,
+use the -L option:
+.nf
+
+\fBstonith\fP -L
+
+.fi
+All of the supported devices will be displayed one per line.  Choose one
+from this list that is best for your environment - let's use wti_nps
+for the rest of this example.
+.
+To get detailed information about this device, use the -h option:
+.nf
+
+\fBstonith\fP -t wti_nps -h
+
+.fi
+Included in the output is the list of valid parameter names for wti_nps. 
+To get JUST the list of valid parameter names, use the -n option instead:
+.nf
+
+\fBstonith\fP -t wti_nps -n
+
+.fi
+All of the required parameter names will be displayed one per line.  For 
+wti_nps the output is: 
+.nf
+
+ipaddr
+password
+
+.fi
+There are three ways to pass these parameters to the device.  The first
+(and preferred) way is by passing name/value pairs on the stonith command
+line:
+.nf
+
+\fBstonith\fP -t wti_nps ipaddr=my-dev-ip password=my-dev-pw ...
+
+.fi
+The second way, which is maintained only for backward compatibility with
+legacy clusters, is passing the values IN ORDER on the stonith command
+line with the -p option:
+.nf
+
+\fBstonith\fP -t wti_nps -p "my-dev-ip my-dev-pw" ...
+
+.fi
+The third way, which is also maintained only for backward compatibility
+with legacy clusters, is placing the values IN ORDER on a single line
+in a config file:
+.nf
+
+my-dev-ip my-dev-pw
+
+.fi
+and passing the name of the file on the stonith command line with the
+-F option:
+.nf
+
+\fBstonith\fP -t wti_nps -F ~/my-wtinps-config ...
+
+.fi
+To make sure you have the configuration set up correctly and that the
+device is available for stonith operations, use the -S option:
+.nf
+
+\fBstonith\fP -t wti_nps ipaddr=my-dev-ip password=my-dev-pw -S
+
+.fi
+If all is well at this point, you should see something similar to:
+.nf
+
+stonith: wti_nps device OK.
+
+.fi
+If you don't, some debugging may be necessary to determine if the 
+config info is correct, the device is powered on, etc.  The -d option
+can come in handy here - you can add it to any stonith command to
+cause it to generate debug output.
+.PP
+To get the list of hosts controlled by the device, use the -l option:
+.nf
+
+\fBstonith\fP -t wti_nps ipaddr=my-dev-ip password=my-dev-pw -l
+
+.fi
+All of the hosts controlled by the device will be displayed one per 
+line.  For wti_nps the output could be: 
+.nf
+
+node1
+node2
+node3
+
+.fi
+To power off one of these hosts, use the -T option:
+.nf
+
+\fBstonith\fP -t wti_nps ipaddr=my-dev-ip password=my-dev-pw -T off node2
+
+.fi
 .SH "SEE ALSO"
 .PP
-heartbeat (8)
-meatclient (8)
+\fBheartbeat\fP(8),
+\fBmeatclient\fP(8)
 .SH AUTHORS
 .nf
 stonith - Alan Robertson <alanr@unix.sh> et al.
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/acinclude.m4 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/acinclude.m4
--- heartbeat-2.1.3/libltdl/acinclude.m4	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/acinclude.m4	1970-01-01 01:00:00.000000000 +0100
@@ -1,6837 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## 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 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
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# 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
-
-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_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-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
-
-# 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"
-
-# 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_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-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
-
-_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
-  ;;
-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
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _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-%%"`
-])
-
-
-# _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
-
-
-# _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
-
-
-# _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
-
-
-# _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
-
-
-# _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}
-
-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
-
-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
-
-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
-
-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
-
-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.
-
-  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"
-
-  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=:
-
-	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
-
-	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
-
-# 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
-
-
-# _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
-
-# 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*
-  ;;
-
-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
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# 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*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# 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_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"
-
-  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;
-    ;;
-
-  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;
-    ;;
-
-  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
-    ;;
-
-  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
-    ;;
-  *)
-    # 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)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _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"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#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
-
-#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;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    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
-
-
-# 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=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  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
-    ])
-   ;;
-
-  *)
-    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
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    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
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  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
-
-
-# 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*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# 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
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# 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_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])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# 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'`
-  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
-
-# 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
-
-  # 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
-  ;;
-
-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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-
-  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
-    ;;
-
-  *)
-    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'
-  ;;
-
-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
-  ;;
-
-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.
-  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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-# 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
-
-  # 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
-
-  # 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
-
-  # 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'
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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"
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-
-# _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])
-    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'`
-
-  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])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      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
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	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
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# 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
-
-
-# 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],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# 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 ;;
-    *)
-     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_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
-
-
-# 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_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_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
-
-
-# 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 ;;
-	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
-    ;;
-  *)
-    # 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
-  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
-
-
-# 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'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# 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
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-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
-    ;;
-  *)
-    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
-  ;;
-
-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
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-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
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-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
-
-
-# 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
-	    ;;
-	  *)
-	    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_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_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_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_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _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
-
-# _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
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _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
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _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
-
-
-# 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
-
-
-# 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;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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
-  ;;
-
-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])
-
-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])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# 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])
-
-_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)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# 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;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-
-# 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
-
-# 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])
-
-# 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
-
-  AC_PROG_LD
-
-  # 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'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # 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}'
-
-    # 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
-
-  # 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
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# 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
-
-      # 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
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # 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.
-
-    _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
-
-    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
-
-    # 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
-    ;;
-
-  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
-    ;;
-
-  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
-
-    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
-        ;;
-
-  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.
-
-    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)=:
-
-      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
-
-    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'
-
-	# 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
-
-	# 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'
-
-	_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'
-
-	_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)=:
-
-	# 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
-
-	# 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# 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'
-
-	;;
-      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'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $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" | 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'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $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
-	  # 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
-
-	# 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $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'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $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" | 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'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $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
-	  # 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'
-
-	_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
-
-	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'
-	;;
-      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'
-	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'
-
-    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
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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_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_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
-
-  # 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"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -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
-       ;;
-
-    *.$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
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# 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)=
-  ;;
-
-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
-])
-
-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="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# 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
-
-# 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])
-
-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
-  ;;
-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])
-
-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])
-
-_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_F77_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_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# 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="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
-# 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
-
-# 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])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# 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
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# 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
-
-# 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
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# 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
-
-    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
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  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=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# 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)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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)
-
-# 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)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $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)
-
-# 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)
-
-# 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)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# 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])
-
-__EOF__
-
-ifelse([$1],[], [
-  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
-    ;;
-  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)
-
-  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
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  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
-
-
-# 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?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# 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'"
-
-# 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'"
-
-# 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
-
-# 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
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\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'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  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
-
-  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
-
-      # 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
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* 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}
-};
-
-#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*
-
-  # 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'
-      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* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    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'
-      ;;
-    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)=
-      ;;
-    interix3*)
-      # 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* | 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'
-	    ;;
-	  *)
-	    ;;
-	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'
-
-    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* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    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'
-      ;;
-
-    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'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    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
-      ;;
-
-    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
-      ;;
-
-    *)
-      _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
-       ;;
-
-    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'
-      ;;
-
-    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'
-      ;;
-
-    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'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    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
-      ;;
-
-    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'
-      ;;
-
-    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
-      ;;
-
-    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'
-      ;;
-
-    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
-      ;;
-
-    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'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $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
-
-#
-# 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_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
-
-    # 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.
-
-EOF
-      fi
-      ;;
-
-    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
-
-      # 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
-      ;;
-
-    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
-      ;;
-
-    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'
-      ;;
-
-    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'
-
-	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
-      ;;
-
-    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
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** 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.
-
-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
-      ;;
-
-    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
-
-*** 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.
-
-_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
-      ;;
-
-    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 $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
-
-    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
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # 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.
-
-      _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
-
-      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
-
-      # 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*)
-      _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
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    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*)
-      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
-      ;;
-
-    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
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # 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
-      ;;
-
-    # 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
-      ;;
-
-    # 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
-
-      # 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'
-      ;;
-
-    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
-      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)=:
-
-	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*)
-      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*)
-      _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
-      ;;
-
-    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 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
-      ;;
-
-    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???
-	;;
-	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
-      ;;
-
-    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*)
-      _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'
-
-      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
-      ;;
-
-    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
-      ;;
-
-    *)
-      _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
-
-#
-# 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
-
-  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
-
-      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
-
-
-# _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)
-])
-
-############################################################
-# 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])
-])
-## ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
-## Copyright (C) 1999-2000 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 7 AC_LIB_LTDL
-
-# AC_WITH_LTDL
-# ------------
-# Clients of libltdl can use this macro to allow the installer to
-# choose between a shipped copy of the ltdl sources or a preinstalled
-# version of the library.
-AC_DEFUN([AC_WITH_LTDL],
-[AC_REQUIRE([AC_LIB_LTDL])
-AC_SUBST([LIBLTDL])
-AC_SUBST([INCLTDL])
-
-# Unless the user asks us to check, assume no installed ltdl exists.
-use_installed_libltdl=no
-
-AC_ARG_WITH([included_ltdl],
-    [  --with-included-ltdl    use the GNU ltdl sources included here])
-
-if test "x$with_included_ltdl" != xyes; then
-  # We are not being forced to use the included libltdl sources, so
-  # decide whether there is a useful installed version we can use.
-  AC_CHECK_HEADER([ltdl.h],
-      [AC_CHECK_LIB([ltdl], [lt_dlcaller_register],
-          [with_included_ltdl=no],
-          [with_included_ltdl=yes])
-  ])
-fi
-
-if test "x$enable_ltdl_install" != xyes; then
-  # If the user did not specify an installable libltdl, then default
-  # to a convenience lib.
-  AC_LIBLTDL_CONVENIENCE
-fi
-
-if test "x$with_included_ltdl" = xno; then
-  # If the included ltdl is not to be used. then Use the
-  # preinstalled libltdl we found.
-  AC_DEFINE([HAVE_LTDL], [1],
-    [Define this if a modern libltdl is already installed])
-  LIBLTDL=-lltdl
-fi
-
-# Report our decision...
-AC_MSG_CHECKING([whether to use included libltdl])
-AC_MSG_RESULT([$with_included_ltdl])
-
-AC_CONFIG_SUBDIRS([libltdl])
-])# AC_WITH_LTDL
-
-
-# AC_LIB_LTDL
-# -----------
-# Perform all the checks necessary for compilation of the ltdl objects
-#  -- including compiler checks and header checks.
-AC_DEFUN([AC_LIB_LTDL],
-[AC_PREREQ(2.50)
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_C_CONST])
-AC_REQUIRE([AC_HEADER_STDC])
-AC_REQUIRE([AC_HEADER_DIRENT])
-AC_REQUIRE([_LT_AC_CHECK_DLFCN])
-AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
-AC_REQUIRE([AC_LTDL_SHLIBEXT])
-AC_REQUIRE([AC_LTDL_SHLIBPATH])
-AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
-AC_REQUIRE([AC_LTDL_OBJDIR])
-AC_REQUIRE([AC_LTDL_DLPREOPEN])
-AC_REQUIRE([AC_LTDL_DLLIB])
-AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
-AC_REQUIRE([AC_LTDL_DLSYM_USCORE])
-AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
-AC_REQUIRE([AC_LTDL_FUNC_ARGZ])
-
-AC_CHECK_HEADERS([assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
-		  stdio.h unistd.h])
-AC_CHECK_HEADERS([dl.h sys/dl.h dld.h mach-o/dyld.h])
-AC_CHECK_HEADERS([string.h strings.h], [break])
-
-AC_CHECK_FUNCS([strchr index], [break])
-AC_CHECK_FUNCS([strrchr rindex], [break])
-AC_CHECK_FUNCS([memcpy bcopy], [break])
-AC_CHECK_FUNCS([memmove strcmp])
-AC_CHECK_FUNCS([closedir opendir readdir])
-])# AC_LIB_LTDL
-
-
-# AC_LTDL_ENABLE_INSTALL
-# ----------------------
-AC_DEFUN([AC_LTDL_ENABLE_INSTALL],
-[AC_ARG_ENABLE([ltdl-install],
-    [AC_HELP_STRING([--enable-ltdl-install], [install libltdl])])
-
-AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
-AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
-])# AC_LTDL_ENABLE_INSTALL
-
-
-# AC_LTDL_SYS_DLOPEN_DEPLIBS
-# --------------------------
-AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
-  [libltdl_cv_sys_dlopen_deplibs],
-  [# PORTME does your system automatically load deplibs for dlopen?
-  # or its logical equivalent (e.g. shl_load for HP-UX < 11)
-  # For now, we just catch OSes we know something about -- in the
-  # future, we'll try test this programmatically.
-  libltdl_cv_sys_dlopen_deplibs=unknown
-  case "$host_os" in
-  aix3*|aix4.1.*|aix4.2.*)
-    # Unknown whether this is true for these versions of AIX, but
-    # we want this `case' here to explicitly catch those versions.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  aix[[45]]*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  darwin*)
-    # Assuming the user has installed a libdl from somewhere, this is true
-    # If you are looking for one http://www.opendarwin.org/projects/dlcompat
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-    # GNU and its variants, using gnu ld.so (Glibc)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  hpux10*|hpux11*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  interix*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  irix[[12345]]*|irix6.[[01]]*)
-    # Catch all versions of IRIX before 6.2, and indicate that we don't
-    # know how it worked for any of those versions.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  irix*)
-    # The case above catches anything before 6.2, and it's known that
-    # at 6.2 and later dlopen does load deplibs.
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  netbsd*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  openbsd*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  osf[[1234]]*)
-    # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
-    # it did *not* use an RPATH in a shared library to find objects the
-    # library depends on, so we explictly say `no'.
-    libltdl_cv_sys_dlopen_deplibs=no
-    ;;
-  osf5.0|osf5.0a|osf5.1)
-    # dlopen *does* load deplibs and with the right loader patch applied
-    # it even uses RPATH in a shared library to search for shared objects
-    # that the library depends on, but there's no easy way to know if that
-    # patch is installed.  Since this is the case, all we can really
-    # say is unknown -- it depends on the patch being installed.  If
-    # it is, this changes to `yes'.  Without it, it would be `no'.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  osf*)
-    # the two cases above should catch all versions of osf <= 5.1.  Read
-    # the comments above for what we know about them.
-    # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
-    # is used to find them so we can finally say `yes'.
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  solaris*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  esac
-  ])
-if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
- AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
-    [Define if the OS needs help to load dependent libraries for dlopen().])
-fi
-])# AC_LTDL_SYS_DLOPEN_DEPLIBS
-
-
-# AC_LTDL_SHLIBEXT
-# ----------------
-AC_DEFUN([AC_LTDL_SHLIBEXT],
-[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-AC_CACHE_CHECK([which extension is used for loadable modules],
-  [libltdl_cv_shlibext],
-[
-module=yes
-eval libltdl_cv_shlibext=$shrext_cmds
-  ])
-if test -n "$libltdl_cv_shlibext"; then
-  AC_DEFINE_UNQUOTED([LTDL_SHLIB_EXT], ["$libltdl_cv_shlibext"],
-    [Define to the extension used for shared libraries, say, ".so".])
-fi
-])# AC_LTDL_SHLIBEXT
-
-
-# AC_LTDL_SHLIBPATH
-# -----------------
-AC_DEFUN([AC_LTDL_SHLIBPATH],
-[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-AC_CACHE_CHECK([which variable specifies run-time library path],
-  [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
-if test -n "$libltdl_cv_shlibpath_var"; then
-  AC_DEFINE_UNQUOTED([LTDL_SHLIBPATH_VAR], ["$libltdl_cv_shlibpath_var"],
-    [Define to the name of the environment variable that determines the dynamic library search path.])
-fi
-])# AC_LTDL_SHLIBPATH
-
-
-# AC_LTDL_SYSSEARCHPATH
-# ---------------------
-AC_DEFUN([AC_LTDL_SYSSEARCHPATH],
-[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-AC_CACHE_CHECK([for the default library search path],
-  [libltdl_cv_sys_search_path],
-  [libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"])
-if test -n "$libltdl_cv_sys_search_path"; then
-  sys_search_path=
-  for dir in $libltdl_cv_sys_search_path; do
-    if test -z "$sys_search_path"; then
-      sys_search_path="$dir"
-    else
-      sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
-    fi
-  done
-  AC_DEFINE_UNQUOTED([LTDL_SYSSEARCHPATH], ["$sys_search_path"],
-    [Define to the system default library search path.])
-fi
-])# AC_LTDL_SYSSEARCHPATH
-
-
-# AC_LTDL_OBJDIR
-# --------------
-AC_DEFUN([AC_LTDL_OBJDIR],
-[AC_CACHE_CHECK([for objdir],
-  [libltdl_cv_objdir],
-  [libltdl_cv_objdir="$objdir"
-  if test -n "$objdir"; then
-    :
-  else
-    rm -f .libs 2>/dev/null
-    mkdir .libs 2>/dev/null
-    if test -d .libs; then
-      libltdl_cv_objdir=.libs
-    else
-      # MS-DOS does not allow filenames that begin with a dot.
-      libltdl_cv_objdir=_libs
-    fi
-  rmdir .libs 2>/dev/null
-  fi
-  ])
-AC_DEFINE_UNQUOTED([LTDL_OBJDIR], ["$libltdl_cv_objdir/"],
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# AC_LTDL_OBJDIR
-
-
-# AC_LTDL_DLPREOPEN
-# -----------------
-AC_DEFUN([AC_LTDL_DLPREOPEN],
-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
-  [libltdl_cv_preloaded_symbols],
-  [if test -n "$lt_cv_sys_global_symbol_pipe"; then
-    libltdl_cv_preloaded_symbols=yes
-  else
-    libltdl_cv_preloaded_symbols=no
-  fi
-  ])
-if test x"$libltdl_cv_preloaded_symbols" = xyes; then
-  AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
-    [Define if libtool can extract symbol lists from object files.])
-fi
-])# AC_LTDL_DLPREOPEN
-
-
-# AC_LTDL_DLLIB
-# -------------
-AC_DEFUN([AC_LTDL_DLLIB],
-[LIBADD_DL=
-AC_SUBST(LIBADD_DL)
-AC_LANG_PUSH([C])
-
-AC_CHECK_FUNC([shl_load],
-      [AC_DEFINE([HAVE_SHL_LOAD], [1],
-		 [Define if you have the shl_load function.])],
-  [AC_CHECK_LIB([dld], [shl_load],
-	[AC_DEFINE([HAVE_SHL_LOAD], [1],
-		   [Define if you have the shl_load function.])
-	LIBADD_DL="$LIBADD_DL -ldld"],
-    [AC_CHECK_LIB([dl], [dlopen],
-	  [AC_DEFINE([HAVE_LIBDL], [1],
-		     [Define if you have the libdl library or equivalent.])
-	        LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes"],
-      [AC_TRY_LINK([#if HAVE_DLFCN_H
-#  include <dlfcn.h>
-#endif
-      ],
-	[dlopen(0, 0);],
-	    [AC_DEFINE([HAVE_LIBDL], [1],
-		             [Define if you have the libdl library or equivalent.]) libltdl_cv_func_dlopen="yes"],
-	[AC_CHECK_LIB([svld], [dlopen],
-	      [AC_DEFINE([HAVE_LIBDL], [1],
-			 [Define if you have the libdl library or equivalent.])
-	            LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"],
-	  [AC_CHECK_LIB([dld], [dld_link],
-	        [AC_DEFINE([HAVE_DLD], [1],
-			   [Define if you have the GNU dld library.])
-	 	LIBADD_DL="$LIBADD_DL -ldld"],
-	 	[AC_CHECK_FUNC([_dyld_func_lookup],
-	 	       [AC_DEFINE([HAVE_DYLD], [1],
-	 	          [Define if you have the _dyld_func_lookup function.])])
-          ])
-        ])
-      ])
-    ])
-  ])
-])
-
-if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
-then
-  lt_save_LIBS="$LIBS"
-  LIBS="$LIBS $LIBADD_DL"
-  AC_CHECK_FUNCS([dlerror])
-  LIBS="$lt_save_LIBS"
-fi
-AC_LANG_POP
-])# AC_LTDL_DLLIB
-
-
-# AC_LTDL_SYMBOL_USCORE
-# ---------------------
-# does the compiler prefix global symbols with an underscore?
-AC_DEFUN([AC_LTDL_SYMBOL_USCORE],
-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
-AC_CACHE_CHECK([for _ prefix in compiled symbols],
-  [ac_cv_sys_symbol_underscore],
-  [ac_cv_sys_symbol_underscore=no
-  cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-      # See whether the symbols have a leading underscore.
-      if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-        ac_cv_sys_symbol_underscore=yes
-      else
-        if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	  :
-        else
-	  echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-        fi
-      fi
-    else
-      echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
-    fi
-  else
-    echo "configure: failed program was:" >&AC_FD_CC
-    cat conftest.c >&AC_FD_CC
-  fi
-  rm -rf conftest*
-  ])
-])# AC_LTDL_SYMBOL_USCORE
-
-
-# AC_LTDL_DLSYM_USCORE
-# --------------------
-AC_DEFUN([AC_LTDL_DLSYM_USCORE],
-[AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
-if test x"$ac_cv_sys_symbol_underscore" = xyes; then
-  if test x"$libltdl_cv_func_dlopen" = xyes ||
-     test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
-	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
-	  [libltdl_cv_need_uscore],
-	  [libltdl_cv_need_uscore=unknown
-          save_LIBS="$LIBS"
-          LIBS="$LIBS $LIBADD_DL"
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
-	    [],				 [libltdl_cv_need_uscore=cross])
-	  LIBS="$save_LIBS"
-	])
-  fi
-fi
-
-if test x"$libltdl_cv_need_uscore" = xyes; then
-  AC_DEFINE([NEED_USCORE], [1],
-    [Define if dlsym() requires a leading underscore in symbol names.])
-fi
-])# AC_LTDL_DLSYM_USCORE
-
-# AC_LTDL_FUNC_ARGZ
-# -----------------
-AC_DEFUN([AC_LTDL_FUNC_ARGZ],
-[AC_CHECK_HEADERS([argz.h])
-
-AC_CHECK_TYPES([error_t],
-  [],
-  [AC_DEFINE([error_t], [int],
-    [Define to a type to use for `error_t' if it is not otherwise available.])],
-  [#if HAVE_ARGZ_H
-#  include <argz.h>
-#endif])
-
-AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
-])# AC_LTDL_FUNC_ARGZ
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/aclocal.m4 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/aclocal.m4
--- heartbeat-2.1.3/libltdl/aclocal.m4	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
@@ -1,875 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-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])])
-
-# 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 -*-
-
-# 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.
-
-# 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.
-
-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`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# 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.
-
-# serial 8
-
-# 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])])
-
-# 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.
-
-# serial 9
-
-# 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...
-
-
-# _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
-
-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=])
-
-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
-
-  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
-
-    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/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
-
-  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])
-])
-
-
-# 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
-])
-
-
-# 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
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# 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.
-
-#serial 3
-
-# _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
-
-
-# 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"])
-])
-
-# 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.
-
-# serial 8
-
-# 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 -*-
-
-# 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.
-
-# serial 12
-
-# 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.
-
-# 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
-
-# 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])
-
-# 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
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# 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
-])
-])
-
-
-# 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.
-
-# 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])
-
-# 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.
-
-# 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)])
-
-# 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.
-
-# serial 2
-
-# 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])])
-
-# 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
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# 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.
-
-# serial 5
-
-# 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)])
-
-
-# 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
-])
-
-# 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.
-
-# 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
-])
-
-# Helper functions for option handling.                     -*- 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_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _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.    -*- Autoconf -*-
-
-# 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.
-
-# serial 4
-
-# 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
-
-   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.
-
-# 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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# 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.
-
-# serial 2
-
-# _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
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    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
-done
-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])
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/config.guess /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/config.guess
--- heartbeat-2.1.3/libltdl/config.guess	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/config.guess	1970-01-01 01:00:00.000000000 +0100
@@ -1,1500 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-07-02'
-
-# 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
-# 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.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    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 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-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
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/config-h.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/config-h.in
--- heartbeat-2.1.3/libltdl/config-h.in	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/config-h.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,195 +0,0 @@
-/* config-h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `argz_append' function. */
-#undef HAVE_ARGZ_APPEND
-
-/* Define to 1 if you have the `argz_create_sep' function. */
-#undef HAVE_ARGZ_CREATE_SEP
-
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `argz_insert' function. */
-#undef HAVE_ARGZ_INSERT
-
-/* Define to 1 if you have the `argz_next' function. */
-#undef HAVE_ARGZ_NEXT
-
-/* Define to 1 if you have the `argz_stringify' function. */
-#undef HAVE_ARGZ_STRINGIFY
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
-/* Define to 1 if you have the `closedir' function. */
-#undef HAVE_CLOSEDIR
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the GNU dld library. */
-#undef HAVE_DLD
-
-/* Define to 1 if you have the <dld.h> header file. */
-#undef HAVE_DLD_H
-
-/* Define to 1 if you have the `dlerror' function. */
-#undef HAVE_DLERROR
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <dl.h> header file. */
-#undef HAVE_DL_H
-
-/* Define if you have the _dyld_func_lookup function. */
-#undef HAVE_DYLD
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if the system has the type `error_t'. */
-#undef HAVE_ERROR_T
-
-/* Define to 1 if you have the `index' function. */
-#undef HAVE_INDEX
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have the libdl library or equivalent. */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#undef HAVE_MACH_O_DYLD_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the `opendir' function. */
-#undef HAVE_OPENDIR
-
-/* Define if libtool can extract symbol lists from object files. */
-#undef HAVE_PRELOADED_SYMBOLS
-
-/* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
-
-/* Define to 1 if you have the `rindex' function. */
-#undef HAVE_RINDEX
-
-/* Define if you have the shl_load function. */
-#undef HAVE_SHL_LOAD
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcmp' function. */
-#undef HAVE_STRCMP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/dl.h> header file. */
-#undef HAVE_SYS_DL_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if the OS needs help to load dependent libraries for dlopen(). */
-#undef LTDL_DLOPEN_DEPLIBS
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LTDL_OBJDIR
-
-/* Define to the name of the environment variable that determines the dynamic
-   library search path. */
-#undef LTDL_SHLIBPATH_VAR
-
-/* Define to the extension used for shared libraries, say, ".so". */
-#undef LTDL_SHLIB_EXT
-
-/* Define to the system default library search path. */
-#undef LTDL_SYSSEARCHPATH
-
-/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef NEED_USCORE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to a type to use for `error_t' if it is not otherwise available. */
-#undef error_t
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/config.sub /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/config.sub
--- heartbeat-2.1.3/libltdl/config.sub	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/config.sub	1970-01-01 01:00:00.000000000 +0100
@@ -1,1616 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-09-20'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# 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.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-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."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| 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 \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/configure /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/configure
--- heartbeat-2.1.3/libltdl/configure	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/configure	1970-01-01 01:00:00.000000000 +0100
@@ -1,23719 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libltdl 1.2.
-#
-# Report bugs to <bug-libtool@gnu.org>.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-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
-
-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
-
-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
-
-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
-
-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.
-
-  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"
-
-  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=:
-
-	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
-
-	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
-
-# 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
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='libltdl'
-PACKAGE_TARNAME='libltdl'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='libltdl 1.2'
-PACKAGE_BUGREPORT='bug-libtool@gnu.org'
-
-ac_unique_file="ltdl.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-DLLTOOL
-AS
-OBJDUMP
-CPP
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-LIBTOOL_DEPS
-INSTALL_LTDL_TRUE
-INSTALL_LTDL_FALSE
-CONVENIENCE_LTDL_TRUE
-CONVENIENCE_LTDL_FALSE
-LIBADD_DL
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-F77
-FFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libltdl 1.2 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/libltdl]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libltdl 1.2:";;
-   esac
-  cat <<\_ACEOF
-
-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 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]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-ltdl-install   install libltdl
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <bug-libtool@gnu.org>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libltdl configure 1.2
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libltdl $as_me 1.2, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-## ------------------------------- ##
-## Libltdl specific configuration. ##
-## ------------------------------- ##
-
-ac_aux_dir=
-for ac_dir in . "$srcdir"/.; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-
-if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  if test -f ${srcdir}/ltmain.sh; then
-    # if libltdl is libtoolized, it is assumed to be stand-alone and
-    # installed unless the command line overrides it (tested above)
-    enable_ltdl_install=yes
-  else
-    { echo "$as_me:$LINENO: WARNING: *** The top-level configure must select either" >&5
-echo "$as_me: WARNING: *** The top-level configure must select either" >&2;}
-    { echo "$as_me:$LINENO: WARNING: *** A\"\"C_LIBLTDL_INSTALLABLE or A\"\"C_LIBLTDL_CONVENIENCE." >&5
-echo "$as_me: WARNING: *** A\"\"C_LIBLTDL_INSTALLABLE or A\"\"C_LIBLTDL_CONVENIENCE." >&2;}
-    { { echo "$as_me:$LINENO: error: *** Maybe you want to --enable-ltdl-install?" >&5
-echo "$as_me: error: *** Maybe you want to --enable-ltdl-install?" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-## ------------------------ ##
-## Automake Initialisation. ##
-## ------------------------ ##
-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:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL 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.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# 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".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-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`
-
-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=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-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.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-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
-
-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
-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
-
-
-# Define the identity of the package.
- PACKAGE=libltdl
- VERSION=1.2
-
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-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
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-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 -'
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h:config-h.in"
-
-
-
-## ------------------ ##
-## C compiler checks. ##
-## ------------------ ##
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-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.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-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
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-
-  am_cv_CC_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
-
-    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/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_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_inline=$ac_kw
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-
-
-## ----------------------- ##
-## Libtool initialisation. ##
-## ----------------------- ##
-
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; 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
-else
-  enable_shared=yes
-fi
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval=$enable_static; 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
-else
-  enable_static=yes
-fi
-
-
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; 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
-else
-  enable_fast_install=yes
-fi
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # 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
-
-fi
-
-SED=$lt_cv_path_SED
-
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # 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
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-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
-
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-	    ;;
-	  *)
-	    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
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
-
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-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; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-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
-    ;;
-  *)
-    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
-  ;;
-
-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
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-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
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-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
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# 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 { (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
-    *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 4521 "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
-   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*
-  ;;
-
-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
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; 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"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  lt_cv_cc_needs_belf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-  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 { (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.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*
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-echo "${ECHO_T}$OBJDUMP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to bug-libtool@gnu.org ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-
-  am_cv_CXX_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
-
-    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/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_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-fi
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_F77" && break
-done
-
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    F77=$ac_ct_F77
-  fi
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_prog_f77_g=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    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;
-    ;;
-
-  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;
-    ;;
-
-  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
-    ;;
-
-  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
-    ;;
-  *)
-    # 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
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
-fi
-
-
-
-
-# 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; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# 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'"
-
-# 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'"
-
-# 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
-
-# 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
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\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'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  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
-
-  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
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && 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
-
-      # 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
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* 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}
-};
-
-#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_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && 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" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    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
-
-fi
-
-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
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-fi
-
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-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
-
-# 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"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# 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_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-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
-
-for cc_temp in $compiler""; 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-%%"`
-
-
-# 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
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      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 ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      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 ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=yes
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-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*
-
-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*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:7546: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7550: \$? = $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.
-     $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
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    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_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-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*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-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_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
-
-    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_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:7814: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:7818: \$? = $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.
-     $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
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   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>&5
-       $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
-         lt_prog_compiler_static_works=yes
-       fi
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o=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:7918: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:7922: \$? = $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
-     # 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_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$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
-  include_expsyms=
-  # 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'.
-  exclude_expsyms="_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.
-  for cc_temp in $compiler""; 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-%%"`
-
-  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
-
-  ld_shlibs=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
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-    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
-	ld_shlibs=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.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$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)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # 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.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      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'
-
-      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'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='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
-	ld_shlibs=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${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.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      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*)
-      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
-	  whole_archive_flag_spec='${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
-	  whole_archive_flag_spec='${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
-	archive_cmds='$CC -shared'"$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'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** 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.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** 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.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$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.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=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
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$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
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # 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.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=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
-  	  hardcode_direct=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=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
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  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
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=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.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$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
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$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.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${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.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$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*)
-      archive_cmds='$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)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    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.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=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.
-      archive_cmds='$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.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-    else
-      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'
-         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}'
-          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}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # 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*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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
-	archive_cmds='$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
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	hardcode_direct=yes
-	export_dynamic_flag_spec='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$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*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$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
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    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'
-      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
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$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'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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'
-	archive_expsym_cmds='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
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$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=''
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$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
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=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
- 	'')
- 	  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 ;;
-      esac
-      link_all_deplibs=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.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$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.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds 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.
-      { 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
-
-      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); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-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'`
-  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
-
-# 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
-
-  # 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
-  ;;
-
-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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-
-  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
-    ;;
-
-  *)
-    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'
-  ;;
-
-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
-  ;;
-
-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.
-  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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-# 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
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 9383 "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"
-  fi
-
-  # 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'
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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"
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != 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, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
-
-if test "$hardcode_action" = 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
-
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-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"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-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"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
-
-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=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10247 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#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
-
-#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;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10347 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#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
-
-#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;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  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
-
-
-# Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-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
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-# 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 \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    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
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $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=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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_prog_compiler_wl
-
-# 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_prog_compiler_pic
-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_cv_prog_compiler_c_o
-
-# 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_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# 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_old_archive_cmds
-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_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-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_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# 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_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# 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_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# 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=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-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"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  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
-    ;;
-  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)
-
-  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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
-  withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    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'`
-
-  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
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      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_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-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*
-
-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*
-
-
-# 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
-compiler_CXX=$CC
-for cc_temp in $compiler""; 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-%%"`
-
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # 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
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # 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
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # 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}'
-
-    # 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
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    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.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # 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
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=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
-
-      # 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
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # 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.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=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
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=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
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	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
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=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.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$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
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$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.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${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.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX='$convenience'
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	archive_expsym_cmds_CXX="\$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
-      allow_undefined_flag_CXX=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$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...
-      archive_expsym_cmds_CXX='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
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-
-    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
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$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
-        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
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='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
-            archive_expsym_cmds_CXX='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
-            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}'
-      else
-      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'
-          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}'
-          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}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC*)
-      archive_cmds_CXX='$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
-        archive_cmds_CXX='$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
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_CXX=:
-
-      case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
-      *)
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$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*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$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
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    hardcode_direct_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    export_dynamic_flag_spec_CXX='${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.
-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    archive_expsym_cmds_CXX='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++
-	archive_cmds_CXX='$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'
-
-	# 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.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$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
-	    archive_cmds_CXX='$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
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    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.
-	archive_cmds_CXX='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'
-	archive_expsym_cmds_CXX='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'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$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."*)
-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  archive_expsym_cmds_CXX='$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
-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	archive_cmds_need_lc_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$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'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${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++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$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
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# 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
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    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=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=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
-    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'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    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.
-	archive_cmds_CXX='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'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$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'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# 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
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$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'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # 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
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    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.
-	archive_cmds_CXX='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'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$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'
-	archive_expsym_cmds_CXX='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'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# 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
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$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'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # 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
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-	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='$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'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=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?)
-	    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'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	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'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$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.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$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.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$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
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-    no_undefined_flag_CXX='${wl}-z,text'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$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.
-    no_undefined_flag_CXX='${wl}-z,text'
-    allow_undefined_flag_CXX='${wl}-z,nodefs'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$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
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-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
-  # 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
-
-  # 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"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -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 "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$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 "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-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.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-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.
-    postdeps_CXX='-lCstd -lCrun'
-    ;;
-  esac
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    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_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    interix3*)
-      # 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_prog_compiler_pic_CXX=-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_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-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_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--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_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:12687: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:12691: \$? = $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.
-     $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
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-   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>&5
-       $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
-         lt_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=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:12791: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:12795: \$? = $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
-     # 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_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  export_symbols_cmds_CXX='$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
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    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 '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX 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.
-      { 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
-
-      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); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-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'`
-  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
-
-# 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
-
-  # 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
-  ;;
-
-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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-
-  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
-    ;;
-
-  *)
-    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'
-  ;;
-
-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
-  ;;
-
-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.
-  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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-# 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
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 13327 "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"
-  fi
-
-  # 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'
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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"
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = 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
-
-
-# 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 \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    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
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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_prog_compiler_wl_CXX
-
-# 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_prog_compiler_pic_CXX
-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_cv_prog_compiler_c_o_CXX
-
-# 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_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# 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_old_archive_cmds_CXX
-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_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-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_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# 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_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# 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_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# 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=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-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"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-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
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-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*
-
-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*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; 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-%%"`
-
-
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-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
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    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_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-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*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-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_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    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_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:14382: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:14386: \$? = $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.
-     $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
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-   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>&5
-       $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
-         lt_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=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:14486: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:14490: \$? = $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
-     # 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_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$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
-  include_expsyms_F77=
-  # 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'.
-  exclude_expsyms_F77="_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.
-  for cc_temp in $compiler""; 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-%%"`
-
-  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
-
-  ld_shlibs_F77=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
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${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
-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    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
-	ld_shlibs_F77=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.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$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)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # 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.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      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'
-
-      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'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='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
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${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.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      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*)
-      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
-	  whole_archive_flag_spec_F77='${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
-	  whole_archive_flag_spec_F77='${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
-	archive_cmds_F77='$CC -shared'"$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'
-	fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** 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.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_F77=no
-	cat <<_LT_EOF 1>&2
-
-*** 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.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_F77=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$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.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=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
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$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
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # 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.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=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
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=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
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  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
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=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.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$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
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$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.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${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.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$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*)
-      archive_cmds_F77='$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)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    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.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=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.
-      archive_cmds_F77='$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.
-      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'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-    else
-      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'
-         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}'
-          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}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # 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*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$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
-	archive_cmds_F77='$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
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	hardcode_direct_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_F77=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$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*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$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
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	*)
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$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
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    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'
-      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
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$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'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$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
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$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
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$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'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$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'
-	archive_expsym_cmds_F77='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
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$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=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$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
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=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
- 	'')
- 	  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 ;;
-      esac
-      link_all_deplibs_F77=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.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$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.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 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.
-      { 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
-
-      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); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-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'`
-  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
-
-# 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
-
-  # 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
-  ;;
-
-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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-
-  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
-    ;;
-
-  *)
-    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'
-  ;;
-
-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
-  ;;
-
-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.
-  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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-# 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
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 15931 "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"
-  fi
-
-  # 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'
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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"
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != 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, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = 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
-
-
-# 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 \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    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
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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_prog_compiler_wl_F77
-
-# 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_prog_compiler_pic_F77
-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_cv_prog_compiler_c_o_F77
-
-# 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_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# 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_old_archive_cmds_F77
-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_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-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_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# 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_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# 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_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# 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=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-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"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-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*
-
-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*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; 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-%%"`
-
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-old_archive_cmds_GCJ=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:16709: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16713: \$? = $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.
-     $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
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-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_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    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_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    interix3*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-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*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-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_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    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_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-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_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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.
-   # 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:16977: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16981: \$? = $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.
-     $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
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-   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>&5
-       $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
-         lt_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=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:17081: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:17085: \$? = $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
-     # 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_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  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
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$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
-  include_expsyms_GCJ=
-  # 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'.
-  exclude_expsyms_GCJ="_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.
-  for cc_temp in $compiler""; 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-%%"`
-
-  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
-
-  ld_shlibs_GCJ=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
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${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
-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    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
-	ld_shlibs_GCJ=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.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$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)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # 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.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      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'
-
-      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'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='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
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${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.
-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      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*)
-      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
-	  whole_archive_flag_spec_GCJ='${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
-	  whole_archive_flag_spec_GCJ='${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
-	archive_cmds_GCJ='$CC -shared'"$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'
-	fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** 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.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_GCJ=no
-	cat <<_LT_EOF 1>&2
-
-*** 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.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_GCJ=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$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.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=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
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$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
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # 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.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=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
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=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
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  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
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=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.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$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
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$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.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && 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; }
-}'`
-# 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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${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.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ='$convenience'
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$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*)
-      archive_cmds_GCJ='$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)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    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.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=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.
-      archive_cmds_GCJ='$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.
-      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'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
-    else
-      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'
-         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}'
-          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}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # 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*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$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
-	archive_cmds_GCJ='$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
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	hardcode_direct_GCJ=yes
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GCJ=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$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*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$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
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	*)
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$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
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    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'
-      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
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$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'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$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
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$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
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$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'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$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'
-	archive_expsym_cmds_GCJ='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
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$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=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$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
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=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
- 	'')
- 	  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 ;;
-      esac
-      link_all_deplibs_GCJ=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.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$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.
-      no_undefined_flag_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ 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.
-      { 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
-
-      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); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-	pic_flag=$lt_prog_compiler_pic_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-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'`
-  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
-
-# 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
-
-  # 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
-  ;;
-
-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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-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
-
-  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
-    ;;
-
-  *)
-    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'
-  ;;
-
-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
-  ;;
-
-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.
-  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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-# 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
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 18546 "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"
-  fi
-
-  # 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'
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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
-  ;;
-
-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"
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-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'
-  ;;
-
-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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-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
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != 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, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = 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
-
-
-# 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 \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    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
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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_prog_compiler_wl_GCJ
-
-# 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_prog_compiler_pic_GCJ
-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_cv_prog_compiler_c_o_GCJ
-
-# 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_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# 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_old_archive_cmds_GCJ
-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_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-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_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# 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_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# 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_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# 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=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-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"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-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*
-
-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*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; 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-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# 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 \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    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
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# 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_prog_compiler_wl_RC
-
-# 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_prog_compiler_pic_RC
-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_cv_prog_compiler_c_o_RC
-
-# 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_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# 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_old_archive_cmds_RC
-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_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-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_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# 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_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# 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_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# 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
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# 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_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# 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=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-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"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      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"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
-# Check whether --enable-ltdl-install was given.
-if test "${enable_ltdl_install+set}" = set; then
-  enableval=$enable_ltdl_install;
-fi
-
-
- if test x"${enable_ltdl_install-no}" != xno; then
-  INSTALL_LTDL_TRUE=
-  INSTALL_LTDL_FALSE='#'
-else
-  INSTALL_LTDL_TRUE='#'
-  INSTALL_LTDL_FALSE=
-fi
-
- if test x"${enable_ltdl_convenience-no}" != xno; then
-  CONVENIENCE_LTDL_TRUE=
-  CONVENIENCE_LTDL_FALSE='#'
-else
-  CONVENIENCE_LTDL_TRUE='#'
-  CONVENIENCE_LTDL_FALSE=
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5
-echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-module=yes
-eval libltdl_cv_shlibext=$shrext_cmds
-
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
-echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
-if test -n "$libltdl_cv_shlibext"; then
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIB_EXT "$libltdl_cv_shlibext"
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibpath_var+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_shlibpath_var="$shlibpath_var"
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
-if test -n "$libltdl_cv_shlibpath_var"; then
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var"
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for the default library search path" >&5
-echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
-if test "${libltdl_cv_sys_search_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
-echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; }
-if test -n "$libltdl_cv_sys_search_path"; then
-  sys_search_path=
-  for dir in $libltdl_cv_sys_search_path; do
-    if test -z "$sys_search_path"; then
-      sys_search_path="$dir"
-    else
-      sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
-    fi
-  done
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SYSSEARCHPATH "$sys_search_path"
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${libltdl_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_objdir="$objdir"
-  if test -n "$objdir"; then
-    :
-  else
-    rm -f .libs 2>/dev/null
-    mkdir .libs 2>/dev/null
-    if test -d .libs; then
-      libltdl_cv_objdir=.libs
-    else
-      # MS-DOS does not allow filenames that begin with a dot.
-      libltdl_cv_objdir=_libs
-    fi
-  rmdir .libs 2>/dev/null
-  fi
-
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
-echo "${ECHO_T}$libltdl_cv_objdir" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_OBJDIR "$libltdl_cv_objdir/"
-_ACEOF
-
-
-
-{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
-echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
-if test "${libltdl_cv_preloaded_symbols+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$lt_cv_sys_global_symbol_pipe"; then
-    libltdl_cv_preloaded_symbols=yes
-  else
-    libltdl_cv_preloaded_symbols=no
-  fi
-
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
-echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
-if test x"$libltdl_cv_preloaded_symbols" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRELOADED_SYMBOLS 1
-_ACEOF
-
-fi
-
-LIBADD_DL=
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
-
-	LIBADD_DL="$LIBADD_DL -ldld"
-else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-	        LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if HAVE_DLFCN_H
-#  include <dlfcn.h>
-#endif
-
-int
-main ()
-{
-dlopen(0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
- libltdl_cv_func_dlopen="yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-	            LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"
-else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLD 1
-_ACEOF
-
-	 	LIBADD_DL="$LIBADD_DL -ldld"
-else
-  { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
-echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
-if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _dyld_func_lookup innocuous__dyld_func_lookup
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _dyld_func_lookup (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _dyld_func_lookup
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _dyld_func_lookup ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
-choke me
-#endif
-
-int
-main ()
-{
-return _dyld_func_lookup ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__dyld_func_lookup=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__dyld_func_lookup=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
-echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
-if test $ac_cv_func__dyld_func_lookup = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DYLD 1
-_ACEOF
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-
-fi
-
-
-fi
-
-
-fi
-
-
-if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
-then
-  lt_save_LIBS="$LIBS"
-  LIBS="$LIBS $LIBADD_DL"
-
-for ac_func in dlerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-  LIBS="$lt_save_LIBS"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
-echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
-if test "${ac_cv_sys_symbol_underscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_sys_symbol_underscore=no
-  cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-  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
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$ac_nlist"; then
-      # See whether the symbols have a leading underscore.
-      if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-        ac_cv_sys_symbol_underscore=yes
-      else
-        if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	  :
-        else
-	  echo "configure: cannot find nm_test_func in $ac_nlist" >&5
-        fi
-      fi
-    else
-      echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "configure: failed program was:" >&5
-    cat conftest.c >&5
-  fi
-  rm -rf conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
-echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; }
-
-
-if test x"$ac_cv_sys_symbol_underscore" = xyes; then
-  if test x"$libltdl_cv_func_dlopen" = xyes ||
-     test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
-	{ echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
-echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
-if test "${libltdl_cv_need_uscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_need_uscore=unknown
-          save_LIBS="$LIBS"
-          LIBS="$LIBS $LIBADD_DL"
-	  if test "$cross_compiling" = yes; then :
-  libltdl_cv_need_uscore=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 20846 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#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
-
-#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;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
-      x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
-      x$lt_dlunknown|x*)  ;;
-    esac
-  else :
-    # compilation failed
-
-  fi
-fi
-rm -fr conftest*
-
-	  LIBS="$save_LIBS"
-
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
-echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
-  fi
-fi
-
-if test x"$libltdl_cv_need_uscore" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NEED_USCORE 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
-echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
-if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # PORTME does your system automatically load deplibs for dlopen?
-  # or its logical equivalent (e.g. shl_load for HP-UX < 11)
-  # For now, we just catch OSes we know something about -- in the
-  # future, we'll try test this programmatically.
-  libltdl_cv_sys_dlopen_deplibs=unknown
-  case "$host_os" in
-  aix3*|aix4.1.*|aix4.2.*)
-    # Unknown whether this is true for these versions of AIX, but
-    # we want this `case' here to explicitly catch those versions.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  aix[45]*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  darwin*)
-    # Assuming the user has installed a libdl from somewhere, this is true
-    # If you are looking for one http://www.opendarwin.org/projects/dlcompat
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-    # GNU and its variants, using gnu ld.so (Glibc)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  hpux10*|hpux11*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  interix*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  irix[12345]*|irix6.[01]*)
-    # Catch all versions of IRIX before 6.2, and indicate that we don't
-    # know how it worked for any of those versions.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  irix*)
-    # The case above catches anything before 6.2, and it's known that
-    # at 6.2 and later dlopen does load deplibs.
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  netbsd*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  openbsd*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  osf[1234]*)
-    # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
-    # it did *not* use an RPATH in a shared library to find objects the
-    # library depends on, so we explictly say `no'.
-    libltdl_cv_sys_dlopen_deplibs=no
-    ;;
-  osf5.0|osf5.0a|osf5.1)
-    # dlopen *does* load deplibs and with the right loader patch applied
-    # it even uses RPATH in a shared library to search for shared objects
-    # that the library depends on, but there's no easy way to know if that
-    # patch is installed.  Since this is the case, all we can really
-    # say is unknown -- it depends on the patch being installed.  If
-    # it is, this changes to `yes'.  Without it, it would be `no'.
-    libltdl_cv_sys_dlopen_deplibs=unknown
-    ;;
-  osf*)
-    # the two cases above should catch all versions of osf <= 5.1.  Read
-    # the comments above for what we know about them.
-    # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
-    # is used to find them so we can finally say `yes'.
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  solaris*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    libltdl_cv_sys_dlopen_deplibs=yes
-    ;;
-  esac
-
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
-echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; }
-if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define LTDL_DLOPEN_DEPLIBS 1
-_ACEOF
-
-fi
-
-
-for ac_header in argz.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to bug-libtool@gnu.org ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking for error_t" >&5
-echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_error_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if HAVE_ARGZ_H
-#  include <argz.h>
-#endif
-
-typedef error_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_error_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_error_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
-echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
-if test $ac_cv_type_error_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ERROR_T 1
-_ACEOF
-
-
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define error_t int
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
-		  stdio.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to bug-libtool@gnu.org ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to bug-libtool@gnu.org ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in string.h strings.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to bug-libtool@gnu.org ##
-## ---------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-
-done
-
-
-
-
-for ac_func in strchr index
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-
-for ac_func in strrchr rindex
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-
-for ac_func in memcpy bcopy
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-
-for ac_func in memmove strcmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-for ac_func in closedir opendir readdir
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-## -------- ##
-## Outputs. ##
-## -------- ##
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libltdl $as_me 1.2, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-libltdl config.status 1.2
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config-h.in" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-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
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$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
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-AS!$AS$ac_delim
-OBJDUMP!$OBJDUMP$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
-INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
-INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
-CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
-CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
-LIBADD_DL!$LIBADD_DL$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) 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
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-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" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || 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" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  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_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/configure.ac /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/configure.ac
--- heartbeat-2.1.3/libltdl/configure.ac	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/configure.ac	1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-## Process this file with autoconf to create configure. -*- autoconf -*-
-# 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 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
-
-
-dnl FIXME: Is this really new enough?
-AC_PREREQ(2.50)
-
-
-## ------------------------ ##
-## Autoconf initialisation. ##
-## ------------------------ ##
-AC_INIT([libltdl], [1.2], [bug-libtool@gnu.org])
-AC_CONFIG_SRCDIR([ltdl.c])
-
-
-## ------------------------------- ##
-## Libltdl specific configuration. ##
-## ------------------------------- ##
-
-AC_CONFIG_AUX_DIR([.])
-
-if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  if test -f ${srcdir}/ltmain.sh; then
-    # if libltdl is libtoolized, it is assumed to be stand-alone and
-    # installed unless the command line overrides it (tested above)
-    enable_ltdl_install=yes
-  else
-    AC_MSG_WARN([*** The top-level configure must select either])
-    AC_MSG_WARN([*** [A""C_LIBLTDL_INSTALLABLE] or [A""C_LIBLTDL_CONVENIENCE].])
-    AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?])
-  fi
-fi
-
-
-## ------------------------ ##
-## Automake Initialisation. ##
-## ------------------------ ##
-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
-AM_CONFIG_HEADER([config.h:config-h.in])
-
-
-## ------------------ ##
-## C compiler checks. ##
-## ------------------ ##
-AC_PROG_CC
-AC_C_CONST
-AC_C_INLINE
-
-
-## ----------------------- ##
-## Libtool initialisation. ##
-## ----------------------- ##
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST([LIBTOOL_DEPS])
-
-AC_LIB_LTDL
-
-
-## -------- ##
-## Outputs. ##
-## -------- ##
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/COPYING.LIB /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/COPYING.LIB
--- heartbeat-2.1.3/libltdl/COPYING.LIB	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/COPYING.LIB	1970-01-01 01:00:00.000000000 +0100
@@ -1,515 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it
-does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/install-sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/install-sh
--- heartbeat-2.1.3/libltdl/install-sh	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/install-sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,401 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-11-07.23
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-posix_glob=
-posix_mkdir=
-
-# Symbolic mode for testing mkdir with directories.
-# It is the same as 755, but also tests that "u+" works.
-test_mode=u=rwx,g=rx,o=rx,u+wx
-
-# Desired mode of installed file.
-mode=0755
-
-# Desired mode of newly created intermediate directories.
-# It is empty if not known yet.
-intermediate_mode=
-
-chmodcmd=$chmodprog
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| \
-	     .       : '\(.\)' 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-		  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-		  /^X\(\/\/\)$/{ s//\1/; q; }
-		  /^X\(\/\).*/{ s//\1/; q; }
-		  s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	posix_mkdir=false
-	if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
-	  posix_mkdir=true
-	else
-	  # Remove any dirs left behind by ancient mkdir implementations.
-	  rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
-	fi ;;
-    esac
-
-    if
-      $posix_mkdir && {
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, create it using the same intermediate mode that
-	# mkdir -p would use when creating intermediate directories.
-	# POSIX says that this mode is "$(umask -S),u+wx", so use that
-	# if umask -S works.
-
-	if test -n "$dir_arg"; then
-	  mkdir_mode=$mode
-	else
-	  case $intermediate_mode in
-	    '')
-	      if umask_S=`(umask -S) 2>/dev/null`; then
-		intermediate_mode=$umask_S,u+wx
-	      else
-		intermediate_mode=$test_mode
-	      fi ;;
-	  esac
-	  mkdir_mode=$intermediate_mode
-	fi
-
-	$mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
-      }
-    then :
-    else
-
-      # mkdir does not conform to POSIX, or it failed possibly due to
-      # a race condition.  Create the directory the slow way, step by
-      # step, checking for races as we go.
-
-      case $dstdir in
-	/*) pathcomp=/ ;;
-	-*) pathcomp=./ ;;
-	*)  pathcomp= ;;
-      esac
-
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob && set -f
-      set fnord $dstdir
-      shift
-      $posix_glob && set +f
-      IFS=$oIFS
-
-      for d
-      do
-	test "x$d" = x && continue
-
-	pathcomp=$pathcomp$d
-	if test ! -d "$pathcomp"; then
-	  $mkdirprog "$pathcomp"
-	  # Don't fail if two instances are running concurrently.
-	  test -d "$pathcomp" || exit 1
-	fi
-	pathcomp=$pathcomp/
-      done
-      obsolete_mkdir_used=true
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/ltdl.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/ltdl.c
--- heartbeat-2.1.3/libltdl/ltdl.c	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/ltdl.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,4522 +0,0 @@
-/* ltdl.c -- system independent dlopen wrapper
-   Copyright (C) 1998, 1999, 2000, 2004, 2005  Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-
-*/
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#if HAVE_STDIO_H
-#  include <stdio.h>
-#endif
-
-/* Include the header defining malloc.  On K&R C compilers,
-   that's <malloc.h>, on ANSI C and ISO C compilers, that's <stdlib.h>.  */
-#if HAVE_STDLIB_H
-#  include <stdlib.h>
-#else
-#  if HAVE_MALLOC_H
-#    include <malloc.h>
-#  endif
-#endif
-
-#if HAVE_STRING_H
-#  include <string.h>
-#else
-#  if HAVE_STRINGS_H
-#    include <strings.h>
-#  endif
-#endif
-
-#if HAVE_CTYPE_H
-#  include <ctype.h>
-#endif
-
-#if HAVE_MEMORY_H
-#  include <memory.h>
-#endif
-
-#if HAVE_ERRNO_H
-#  include <errno.h>
-#endif
-
-
-#ifndef __WINDOWS__
-#  ifdef __WIN32__
-#    define __WINDOWS__
-#  endif
-#endif
-
-
-#undef LT_USE_POSIX_DIRENT
-#ifdef HAVE_CLOSEDIR
-#  ifdef HAVE_OPENDIR
-#    ifdef HAVE_READDIR
-#      ifdef HAVE_DIRENT_H
-#        define LT_USE_POSIX_DIRENT
-#      endif /* HAVE_DIRENT_H */
-#    endif /* HAVE_READDIR */
-#  endif /* HAVE_OPENDIR */
-#endif /* HAVE_CLOSEDIR */
-
-
-#undef LT_USE_WINDOWS_DIRENT_EMULATION
-#ifndef LT_USE_POSIX_DIRENT
-#  ifdef __WINDOWS__
-#    define LT_USE_WINDOWS_DIRENT_EMULATION
-#  endif /* __WINDOWS__ */
-#endif /* LT_USE_POSIX_DIRENT */
-
-
-#ifdef LT_USE_POSIX_DIRENT
-#  include <dirent.h>
-#  define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#else
-#  ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-#    define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#  else
-#    define dirent direct
-#    define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
-#    if HAVE_SYS_NDIR_H
-#      include <sys/ndir.h>
-#    endif
-#    if HAVE_SYS_DIR_H
-#      include <sys/dir.h>
-#    endif
-#    if HAVE_NDIR_H
-#      include <ndir.h>
-#    endif
-#  endif
-#endif
-
-#if HAVE_ARGZ_H
-#  include <argz.h>
-#endif
-
-#if HAVE_ASSERT_H
-#  include <assert.h>
-#else
-#  define assert(arg)	((void) 0)
-#endif
-
-#include "ltdl.h"
-
-#if WITH_DMALLOC
-#  include <dmalloc.h>
-#endif
-
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-#ifdef DLL_EXPORT
-#  define LT_GLOBAL_DATA	__declspec(dllexport)
-#else
-#  define LT_GLOBAL_DATA
-#endif
-
-/* fopen() mode flags for reading a text file */
-#undef	LT_READTEXT_MODE
-#ifdef __WINDOWS__
-#  define LT_READTEXT_MODE "rt"
-#else
-#  define LT_READTEXT_MODE "r"
-#endif
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-#include <windows.h>
-
-#define dirent lt_dirent
-#define DIR lt_DIR
-
-struct dirent
-{
-  char d_name[2048];
-  int  d_namlen;
-};
-
-typedef struct _DIR
-{
-  HANDLE hSearch;
-  WIN32_FIND_DATA Win32FindData;
-  BOOL firsttime;
-  struct dirent file_info;
-} DIR;
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-
-/* --- MANIFEST CONSTANTS --- */
-
-
-/* Standard libltdl search path environment variable name  */
-#undef  LTDL_SEARCHPATH_VAR
-#define LTDL_SEARCHPATH_VAR	"LTDL_LIBRARY_PATH"
-
-/* Standard libtool archive file extension.  */
-#undef  LTDL_ARCHIVE_EXT
-#define LTDL_ARCHIVE_EXT	".la"
-
-/* max. filename length */
-#ifndef LT_FILENAME_MAX
-#  define LT_FILENAME_MAX	1024
-#endif
-
-/* This is the maximum symbol size that won't require malloc/free */
-#undef	LT_SYMBOL_LENGTH
-#define LT_SYMBOL_LENGTH	128
-
-/* This accounts for the _LTX_ separator */
-#undef	LT_SYMBOL_OVERHEAD
-#define LT_SYMBOL_OVERHEAD	5
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* These are the functions used internally.  In addition to making
-   use of the associated function pointers above, they also perform
-   error handling.  */
-static char   *lt_estrdup	LT_PARAMS((const char *str));
-static lt_ptr lt_emalloc	LT_PARAMS((size_t size));
-static lt_ptr lt_erealloc	LT_PARAMS((lt_ptr addr, size_t size));
-
-/* static lt_ptr rpl_realloc	LT_PARAMS((lt_ptr ptr, size_t size)); */
-#define rpl_realloc realloc
-
-/* These are the pointers that can be changed by the caller:  */
-LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc)	LT_PARAMS((size_t size))
- 			= (lt_ptr (*) LT_PARAMS((size_t))) malloc;
-LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc)	LT_PARAMS((lt_ptr ptr, size_t size))
- 			= (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
-LT_GLOBAL_DATA void   (*lt_dlfree)	LT_PARAMS((lt_ptr ptr))
- 			= (void (*) LT_PARAMS((lt_ptr))) free;
-
-/* The following macros reduce the amount of typing needed to cast
-   assigned memory.  */
-#if WITH_DMALLOC
-
-#define LT_DLMALLOC(tp, n)	((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n)	((tp *) xrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p)						\
-	LT_STMT_START { if (p) (p) = (xfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EMALLOC(tp, n)	((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n)	((tp *) xrealloc ((p), (n) * sizeof(tp)))
-
-#else
-
-#define LT_DLMALLOC(tp, n)	((tp *) lt_dlmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n)	((tp *) lt_dlrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p)						\
-	LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EMALLOC(tp, n)	((tp *) lt_emalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n)	((tp *) lt_erealloc ((p), (n) * sizeof(tp)))
-
-#endif
-
-#define LT_DLMEM_REASSIGN(p, q)			LT_STMT_START {	\
-	if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; }	\
-						} LT_STMT_END
-
-
-/* --- REPLACEMENT FUNCTIONS --- */
-
-
-#undef strdup
-#define strdup rpl_strdup
-
-static char *strdup LT_PARAMS((const char *str));
-
-static char *
-strdup(str)
-     const char *str;
-{
-  char *tmp = 0;
-
-  if (str)
-    {
-      tmp = LT_DLMALLOC (char, 1+ strlen (str));
-      if (tmp)
-	{
-	  strcpy(tmp, str);
-	}
-    }
-
-  return tmp;
-}
-
-
-#if ! HAVE_STRCMP
-
-#undef strcmp
-#define strcmp rpl_strcmp
-
-static int strcmp LT_PARAMS((const char *str1, const char *str2));
-
-static int
-strcmp (str1, str2)
-     const char *str1;
-     const char *str2;
-{
-  if (str1 == str2)
-    return 0;
-  if (str1 == 0)
-    return -1;
-  if (str2 == 0)
-    return 1;
-
-  for (;*str1 && *str2; ++str1, ++str2)
-    {
-      if (*str1 != *str2)
-	break;
-    }
-
-  return (int)(*str1 - *str2);
-}
-#endif
-
-
-#if ! HAVE_STRCHR
-
-#  if HAVE_INDEX
-#    define strchr index
-#  else
-#    define strchr rpl_strchr
-
-static const char *strchr LT_PARAMS((const char *str, int ch));
-
-static const char*
-strchr(str, ch)
-     const char *str;
-     int ch;
-{
-  const char *p;
-
-  for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p)
-    /*NOWORK*/;
-
-  return (*p == (char)ch) ? p : 0;
-}
-
-#  endif
-#endif /* !HAVE_STRCHR */
-
-
-#if ! HAVE_STRRCHR
-
-#  if HAVE_RINDEX
-#    define strrchr rindex
-#  else
-#    define strrchr rpl_strrchr
-
-static const char *strrchr LT_PARAMS((const char *str, int ch));
-
-static const char*
-strrchr(str, ch)
-     const char *str;
-     int ch;
-{
-  const char *p, *q = 0;
-
-  for (p = str; *p != LT_EOS_CHAR; ++p)
-    {
-      if (*p == (char) ch)
-	{
-	  q = p;
-	}
-    }
-
-  return q;
-}
-
-# endif
-#endif
-
-/* NOTE:  Neither bcopy nor the memcpy implementation below can
-          reliably handle copying in overlapping areas of memory.  Use
-          memmove (for which there is a fallback implmentation below)
-	  if you need that behaviour.  */
-#if ! HAVE_MEMCPY
-
-#  if HAVE_BCOPY
-#    define memcpy(dest, src, size)	bcopy (src, dest, size)
-#  else
-#    define memcpy rpl_memcpy
-
-static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memcpy (dest, src, size)
-     lt_ptr dest;
-     const lt_ptr src;
-     size_t size;
-{
-  const char *	s = src;
-  char *	d = dest;
-  size_t	i = 0;
-
-  for (i = 0; i < size; ++i)
-    {
-      d[i] = s[i];
-    }
-
-  return dest;
-}
-
-#  endif /* !HAVE_BCOPY */
-#endif   /* !HAVE_MEMCPY */
-
-#if ! HAVE_MEMMOVE
-#  define memmove rpl_memmove
-
-static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memmove (dest, src, size)
-     lt_ptr dest;
-     const lt_ptr src;
-     size_t size;
-{
-  const char *	s = src;
-  char *	d = dest;
-  size_t	i;
-
-  if (d < s)
-    for (i = 0; i < size; ++i)
-      {
-	d[i] = s[i];
-      }
-  else if (d > s && size > 0)
-    for (i = size -1; ; --i)
-      {
-	d[i] = s[i];
-	if (i == 0)
-	  break;
-      }
-
-  return dest;
-}
-
-#endif /* !HAVE_MEMMOVE */
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-static void closedir LT_PARAMS((DIR *entry));
-
-static void
-closedir(entry)
-  DIR *entry;
-{
-  assert(entry != (DIR *) NULL);
-  FindClose(entry->hSearch);
-  lt_dlfree((lt_ptr)entry);
-}
-
-
-static DIR * opendir LT_PARAMS((const char *path));
-
-static DIR*
-opendir (path)
-  const char *path;
-{
-  char file_specification[LT_FILENAME_MAX];
-  DIR *entry;
-
-  assert(path != (char *) NULL);
-  /* allow space for: path + '\\' '\\' '*' '.' '*' + '\0' */
-  (void) strncpy (file_specification, path, LT_FILENAME_MAX-6);
-  file_specification[LT_FILENAME_MAX-6] = LT_EOS_CHAR;
-  (void) strcat(file_specification,"\\");
-  entry = LT_DLMALLOC (DIR,sizeof(DIR));
-  if (entry != (DIR *) 0)
-    {
-      entry->firsttime = TRUE;
-      entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
-    }
-  if (entry->hSearch == INVALID_HANDLE_VALUE)
-    {
-      (void) strcat(file_specification,"\\*.*");
-      entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
-      if (entry->hSearch == INVALID_HANDLE_VALUE)
-        {
-          LT_DLFREE (entry);
-          return (DIR *) 0;
-        }
-    }
-  return(entry);
-}
-
-
-static struct dirent *readdir LT_PARAMS((DIR *entry));
-
-static struct dirent *readdir(entry)
-  DIR *entry;
-{
-  int
-    status;
-
-  if (entry == (DIR *) 0)
-    return((struct dirent *) 0);
-  if (!entry->firsttime)
-    {
-      status = FindNextFile(entry->hSearch,&entry->Win32FindData);
-      if (status == 0)
-        return((struct dirent *) 0);
-    }
-  entry->firsttime = FALSE;
-  (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
-    LT_FILENAME_MAX-1);
-  entry->file_info.d_name[LT_FILENAME_MAX - 1] = LT_EOS_CHAR;
-  entry->file_info.d_namlen = strlen(entry->file_info.d_name);
-  return(&entry->file_info);
-}
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-/* According to Alexandre Oliva <oliva@lsd.ic.unicamp.br>,
-    ``realloc is not entirely portable''
-   In any case we want to use the allocator supplied by the user without
-   burdening them with an lt_dlrealloc function pointer to maintain.
-   Instead implement our own version (with known boundary conditions)
-   using lt_dlmalloc and lt_dlfree. */
-
-/* #undef realloc
-   #define realloc rpl_realloc
-*/
-#if 0
-  /* You can't (re)define realloc unless you also (re)define malloc.
-     Right now, this code uses the size of the *destination* to decide
-     how much to copy.  That's not right, but you can't know the size
-     of the source unless you know enough about, or wrote malloc.  So
-     this code is disabled... */
-
-static lt_ptr
-realloc (ptr, size)
-     lt_ptr ptr;
-     size_t size;
-{
-  if (size == 0)
-    {
-      /* For zero or less bytes, free the original memory */
-      if (ptr != 0)
-	{
-	  lt_dlfree (ptr);
-	}
-
-      return (lt_ptr) 0;
-    }
-  else if (ptr == 0)
-    {
-      /* Allow reallocation of a NULL pointer.  */
-      return lt_dlmalloc (size);
-    }
-  else
-    {
-      /* Allocate a new block, copy and free the old block.  */
-      lt_ptr mem = lt_dlmalloc (size);
-
-      if (mem)
-	{
-	  memcpy (mem, ptr, size);
-	  lt_dlfree (ptr);
-	}
-
-      /* Note that the contents of PTR are not damaged if there is
-	 insufficient memory to realloc.  */
-      return mem;
-    }
-}
-#endif
-
-
-#if ! HAVE_ARGZ_APPEND
-#  define argz_append rpl_argz_append
-
-static error_t argz_append LT_PARAMS((char **pargz, size_t *pargz_len,
-					const char *buf, size_t buf_len));
-
-static error_t
-argz_append (pargz, pargz_len, buf, buf_len)
-     char **pargz;
-     size_t *pargz_len;
-     const char *buf;
-     size_t buf_len;
-{
-  size_t argz_len;
-  char  *argz;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert ((*pargz && *pargz_len) || (!*pargz && !*pargz_len));
-
-  /* If nothing needs to be appended, no more work is required.  */
-  if (buf_len == 0)
-    return 0;
-
-  /* Ensure there is enough room to append BUF_LEN.  */
-  argz_len = *pargz_len + buf_len;
-  argz = LT_DLREALLOC (char, *pargz, argz_len);
-  if (!argz)
-    return ENOMEM;
-
-  /* Copy characters from BUF after terminating '\0' in ARGZ.  */
-  memcpy (argz + *pargz_len, buf, buf_len);
-
-  /* Assign new values.  */
-  *pargz = argz;
-  *pargz_len = argz_len;
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_APPEND */
-
-
-#if ! HAVE_ARGZ_CREATE_SEP
-#  define argz_create_sep rpl_argz_create_sep
-
-static error_t argz_create_sep LT_PARAMS((const char *str, int delim,
-					    char **pargz, size_t *pargz_len));
-
-static error_t
-argz_create_sep (str, delim, pargz, pargz_len)
-     const char *str;
-     int delim;
-     char **pargz;
-     size_t *pargz_len;
-{
-  size_t argz_len;
-  char *argz = 0;
-
-  assert (str);
-  assert (pargz);
-  assert (pargz_len);
-
-  /* Make a copy of STR, but replacing each occurrence of
-     DELIM with '\0'.  */
-  argz_len = 1+ LT_STRLEN (str);
-  if (argz_len)
-    {
-      const char *p;
-      char *q;
-
-      argz = LT_DLMALLOC (char, argz_len);
-      if (!argz)
-	return ENOMEM;
-
-      for (p = str, q = argz; *p != LT_EOS_CHAR; ++p)
-	{
-	  if (*p == delim)
-	    {
-	      /* Ignore leading delimiters, and fold consecutive
-		 delimiters in STR into a single '\0' in ARGZ.  */
-	      if ((q > argz) && (q[-1] != LT_EOS_CHAR))
-		*q++ = LT_EOS_CHAR;
-	      else
-		--argz_len;
-	    }
-	  else
-	    *q++ = *p;
-	}
-      /* Copy terminating LT_EOS_CHAR.  */
-      *q = *p;
-    }
-
-  /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory.  */
-  if (!argz_len)
-    LT_DLFREE (argz);
-
-  /* Assign new values.  */
-  *pargz = argz;
-  *pargz_len = argz_len;
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_CREATE_SEP */
-
-
-#if ! HAVE_ARGZ_INSERT
-#  define argz_insert rpl_argz_insert
-
-static error_t argz_insert LT_PARAMS((char **pargz, size_t *pargz_len,
-					char *before, const char *entry));
-
-static error_t
-argz_insert (pargz, pargz_len, before, entry)
-     char **pargz;
-     size_t *pargz_len;
-     char *before;
-     const char *entry;
-{
-  assert (pargz);
-  assert (pargz_len);
-  assert (entry && *entry);
-
-  /* No BEFORE address indicates ENTRY should be inserted after the
-     current last element.  */
-  if (!before)
-    return argz_append (pargz, pargz_len, entry, 1+ LT_STRLEN (entry));
-
-  /* This probably indicates a programmer error, but to preserve
-     semantics, scan back to the start of an entry if BEFORE points
-     into the middle of it.  */
-  while ((before > *pargz) && (before[-1] != LT_EOS_CHAR))
-    --before;
-
-  {
-    size_t entry_len	= 1+ LT_STRLEN (entry);
-    size_t argz_len	= *pargz_len + entry_len;
-    size_t offset	= before - *pargz;
-    char   *argz	= LT_DLREALLOC (char, *pargz, argz_len);
-
-    if (!argz)
-      return ENOMEM;
-
-    /* Make BEFORE point to the equivalent offset in ARGZ that it
-       used to have in *PARGZ incase realloc() moved the block.  */
-    before = argz + offset;
-
-    /* Move the ARGZ entries starting at BEFORE up into the new
-       space at the end -- making room to copy ENTRY into the
-       resulting gap.  */
-    memmove (before + entry_len, before, *pargz_len - offset);
-    memcpy  (before, entry, entry_len);
-
-    /* Assign new values.  */
-    *pargz = argz;
-    *pargz_len = argz_len;
-  }
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_INSERT */
-
-
-#if ! HAVE_ARGZ_NEXT
-#  define argz_next rpl_argz_next
-
-static char *argz_next LT_PARAMS((char *argz, size_t argz_len,
-				    const char *entry));
-
-static char *
-argz_next (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  assert ((argz && argz_len) || (!argz && !argz_len));
-
-  if (entry)
-    {
-      /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
-	 within the ARGZ vector.  */
-      assert ((!argz && !argz_len)
-	      || ((argz <= entry) && (entry < (argz + argz_len))));
-
-      /* Move to the char immediately after the terminating
-	 '\0' of ENTRY.  */
-      entry = 1+ strchr (entry, LT_EOS_CHAR);
-
-      /* Return either the new ENTRY, or else NULL if ARGZ is
-	 exhausted.  */
-      return (entry >= argz + argz_len) ? 0 : (char *) entry;
-    }
-  else
-    {
-      /* This should probably be flagged as a programmer error,
-	 since starting an argz_next loop with the iterator set
-	 to ARGZ is safer.  To preserve semantics, handle the NULL
-	 case by returning the start of ARGZ (if any).  */
-      if (argz_len > 0)
-	return argz;
-      else
-	return 0;
-    }
-}
-#endif /* !HAVE_ARGZ_NEXT */
-
-
-
-#if ! HAVE_ARGZ_STRINGIFY
-#  define argz_stringify rpl_argz_stringify
-
-static void argz_stringify LT_PARAMS((char *argz, size_t argz_len,
-				       int sep));
-
-static void
-argz_stringify (argz, argz_len, sep)
-     char *argz;
-     size_t argz_len;
-     int sep;
-{
-  assert ((argz && argz_len) || (!argz && !argz_len));
-
-  if (sep)
-    {
-      --argz_len;		/* don't stringify the terminating EOS */
-      while (--argz_len > 0)
-	{
-	  if (argz[argz_len] == LT_EOS_CHAR)
-	    argz[argz_len] = sep;
-	}
-    }
-}
-#endif /* !HAVE_ARGZ_STRINGIFY */
-
-
-
-
-/* --- TYPE DEFINITIONS -- */
-
-
-/* This type is used for the array of caller data sets in each handler. */
-typedef struct {
-  lt_dlcaller_id	key;
-  lt_ptr		data;
-} lt_caller_data;
-
-
-
-
-/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
-
-
-/* Extract the diagnostic strings from the error table macro in the same
-   order as the enumerated indices in ltdl.h. */
-
-static const char *lt_dlerror_strings[] =
-  {
-#define LT_ERROR(name, diagnostic)	(diagnostic),
-    lt_dlerror_table
-#undef LT_ERROR
-
-    0
-  };
-
-/* This structure is used for the list of registered loaders. */
-struct lt_dlloader {
-  struct lt_dlloader   *next;
-  const char	       *loader_name;	/* identifying name for each loader */
-  const char	       *sym_prefix;	/* prefix for symbols */
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym	       *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data		dlloader_data;
-};
-
-struct lt_dlhandle_struct {
-  struct lt_dlhandle_struct   *next;
-  lt_dlloader	       *loader;		/* dlopening interface */
-  lt_dlinfo		info;
-  int			depcount;	/* number of dependencies */
-  lt_dlhandle	       *deplibs;	/* dependencies */
-  lt_module		module;		/* system module handle */
-  lt_ptr		system;		/* system specific data */
-  lt_caller_data       *caller_data;	/* per caller associated data */
-  int			flags;		/* various boolean stats */
-};
-
-/* Various boolean flags can be stored in the flags field of an
-   lt_dlhandle_struct... */
-#define LT_DLGET_FLAG(handle, flag) (((handle)->flags & (flag)) == (flag))
-#define LT_DLSET_FLAG(handle, flag) ((handle)->flags |= (flag))
-
-#define LT_DLRESIDENT_FLAG	    (0x01 << 0)
-/* ...add more flags here... */
-
-#define LT_DLIS_RESIDENT(handle)    LT_DLGET_FLAG(handle, LT_DLRESIDENT_FLAG)
-
-
-#define LT_DLSTRERROR(name)	lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
-
-static	const char	objdir[]		= LTDL_OBJDIR;
-static	const char	archive_ext[]		= LTDL_ARCHIVE_EXT;
-#ifdef	LTDL_SHLIB_EXT
-static	const char	shlib_ext[]		= LTDL_SHLIB_EXT;
-#endif
-#ifdef	LTDL_SYSSEARCHPATH
-static	const char	sys_search_path[]	= LTDL_SYSSEARCHPATH;
-#endif
-
-
-
-
-/* --- MUTEX LOCKING --- */
-
-
-/* Macros to make it easier to run the lock functions only if they have
-   been registered.  The reason for the complicated lock macro is to
-   ensure that the stored error message from the last error is not
-   accidentally erased if the current function doesn't generate an
-   error of its own.  */
-#define LT_DLMUTEX_LOCK()			LT_STMT_START {	\
-	if (lt_dlmutex_lock_func) (*lt_dlmutex_lock_func)();	\
-						} LT_STMT_END
-#define LT_DLMUTEX_UNLOCK()			LT_STMT_START { \
-	if (lt_dlmutex_unlock_func) (*lt_dlmutex_unlock_func)();\
-						} LT_STMT_END
-#define LT_DLMUTEX_SETERROR(errormsg)		LT_STMT_START {	\
-	if (lt_dlmutex_seterror_func)				\
-		(*lt_dlmutex_seterror_func) (errormsg);		\
-	else 	lt_dllast_error = (errormsg);	} LT_STMT_END
-#define LT_DLMUTEX_GETERROR(errormsg)		LT_STMT_START {	\
-	if (lt_dlmutex_geterror_func)				\
-		(errormsg) = (*lt_dlmutex_geterror_func) ();	\
-	else	(errormsg) = lt_dllast_error;	} LT_STMT_END
-
-/* The mutex functions stored here are global, and are necessarily the
-   same for all threads that wish to share access to libltdl.  */
-static	lt_dlmutex_lock	    *lt_dlmutex_lock_func     = 0;
-static	lt_dlmutex_unlock   *lt_dlmutex_unlock_func   = 0;
-static	lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
-static	lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
-static	const char	    *lt_dllast_error	      = 0;
-
-
-/* Either set or reset the mutex functions.  Either all the arguments must
-   be valid functions, or else all can be NULL to turn off locking entirely.
-   The registered functions should be manipulating a static global lock
-   from the lock() and unlock() callbacks, which needs to be reentrant.  */
-int
-lt_dlmutex_register (lock, unlock, seterror, geterror)
-     lt_dlmutex_lock *lock;
-     lt_dlmutex_unlock *unlock;
-     lt_dlmutex_seterror *seterror;
-     lt_dlmutex_geterror *geterror;
-{
-  lt_dlmutex_unlock *old_unlock = unlock;
-  int		     errors	= 0;
-
-  /* Lock using the old lock() callback, if any.  */
-  LT_DLMUTEX_LOCK ();
-
-  if ((lock && unlock && seterror && geterror)
-      || !(lock || unlock || seterror || geterror))
-    {
-      lt_dlmutex_lock_func     = lock;
-      lt_dlmutex_unlock_func   = unlock;
-      lt_dlmutex_geterror_func = geterror;
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_MUTEX_ARGS));
-      ++errors;
-    }
-
-  /* Use the old unlock() callback we saved earlier, if any.  Otherwise
-     record any errors using internal storage.  */
-  if (old_unlock)
-    (*old_unlock) ();
-
-  /* Return the number of errors encountered during the execution of
-     this function.  */
-  return errors;
-}
-
-
-
-
-/* --- ERROR HANDLING --- */
-
-
-static	const char    **user_error_strings	= 0;
-static	int		errorcount		= LT_ERROR_MAX;
-
-int
-lt_dladderror (diagnostic)
-     const char *diagnostic;
-{
-  int		errindex = 0;
-  int		result	 = -1;
-  const char  **temp     = (const char **) 0;
-
-  assert (diagnostic);
-
-  LT_DLMUTEX_LOCK ();
-
-  errindex = errorcount - LT_ERROR_MAX;
-  temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
-  if (temp)
-    {
-      user_error_strings		= temp;
-      user_error_strings[errindex]	= diagnostic;
-      result				= errorcount++;
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-int
-lt_dlseterror (errindex)
-     int errindex;
-{
-  int		errors	 = 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  if (errindex >= errorcount || errindex < 0)
-    {
-      /* Ack!  Error setting the error message! */
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_ERRORCODE));
-      ++errors;
-    }
-  else if (errindex < LT_ERROR_MAX)
-    {
-      /* No error setting the error message! */
-      LT_DLMUTEX_SETERROR (lt_dlerror_strings[errindex]);
-    }
-  else
-    {
-      /* No error setting the error message! */
-      LT_DLMUTEX_SETERROR (user_error_strings[errindex - LT_ERROR_MAX]);
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static lt_ptr
-lt_emalloc (size)
-     size_t size;
-{
-  lt_ptr mem = lt_dlmalloc (size);
-  if (size && !mem)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return mem;
-}
-
-static lt_ptr
-lt_erealloc (addr, size)
-     lt_ptr addr;
-     size_t size;
-{
-  lt_ptr mem = lt_dlrealloc (addr, size);
-  if (size && !mem)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return mem;
-}
-
-static char *
-lt_estrdup (str)
-     const char *str;
-{
-  char *copy = strdup (str);
-  if (LT_STRLEN (str) && !copy)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return copy;
-}
-
-
-
-
-/* --- DLOPEN() INTERFACE LOADER --- */
-
-
-#if HAVE_LIBDL
-
-/* dynamic linking with dlopen/dlsym */
-
-#if HAVE_DLFCN_H
-#  include <dlfcn.h>
-#endif
-
-#if HAVE_SYS_DL_H
-#  include <sys/dl.h>
-#endif
-
-#ifdef RTLD_GLOBAL
-#  define LT_GLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_GLOBAL		DL_GLOBAL
-#  endif
-#endif /* !RTLD_GLOBAL */
-#ifndef LT_GLOBAL
-#  define LT_GLOBAL		0
-#endif /* !LT_GLOBAL */
-
-/* We may have to define LT_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_LAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_LAZY_OR_NOW	RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_LAZY_OR_NOW	DL_LAZY
-#    endif
-#  endif /* !RTLD_LAZY */
-#endif
-#ifndef LT_LAZY_OR_NOW
-#  ifdef RTLD_NOW
-#    define LT_LAZY_OR_NOW	RTLD_NOW
-#  else
-#    ifdef DL_NOW
-#      define LT_LAZY_OR_NOW	DL_NOW
-#    endif
-#  endif /* !RTLD_NOW */
-#endif
-#ifndef LT_LAZY_OR_NOW
-#  define LT_LAZY_OR_NOW	0
-#endif /* !LT_LAZY_OR_NOW */
-
-#if HAVE_DLERROR
-#  define DLERROR(arg)	dlerror ()
-#else
-#  define DLERROR(arg)	LT_DLSTRERROR (arg)
-#endif
-
-static lt_module
-sys_dl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_module   module   = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW);
-
-  if (!module)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (CANNOT_OPEN));
-    }
-
-  return module;
-}
-
-static int
-sys_dl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (dlclose (module) != 0)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_dl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = dlsym (module, symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_dl =
-  {
-#  ifdef NEED_USCORE
-    "_",
-#  else
-    0,
-#  endif
-    sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
-
-
-#endif /* HAVE_LIBDL */
-
-
-
-/* --- SHL_LOAD() INTERFACE LOADER --- */
-
-#if HAVE_SHL_LOAD
-
-/* dynamic linking with shl_load (HP-UX) (comments from gmodule) */
-
-#ifdef HAVE_DL_H
-#  include <dl.h>
-#endif
-
-/* some flags are missing on some systems, so we provide
- * harmless defaults.
- *
- * Mandatory:
- * BIND_IMMEDIATE  - Resolve symbol references when the library is loaded.
- * BIND_DEFERRED   - Delay code symbol resolution until actual reference.
- *
- * Optionally:
- * BIND_FIRST	   - Place the library at the head of the symbol search
- * 		     order.
- * BIND_NONFATAL   - The default BIND_IMMEDIATE behavior is to treat all
- * 		     unsatisfied symbols as fatal.  This flag allows
- * 		     binding of unsatisfied code symbols to be deferred
- * 		     until use.
- *		     [Perl: For certain libraries, like DCE, deferred
- *		     binding often causes run time problems. Adding
- *		     BIND_NONFATAL to BIND_IMMEDIATE still allows
- *		     unresolved references in situations like this.]
- * BIND_NOSTART	   - Do not call the initializer for the shared library
- *		     when the library is loaded, nor on a future call to
- *		     shl_unload().
- * BIND_VERBOSE	   - Print verbose messages concerning possible
- *		     unsatisfied symbols.
- *
- * hp9000s700/hp9000s800:
- * BIND_RESTRICTED - Restrict symbols visible by the library to those
- *		     present at library load time.
- * DYNAMIC_PATH	   - Allow the loader to dynamically search for the
- *		     library specified by the path argument.
- */
-
-#ifndef	DYNAMIC_PATH
-#  define DYNAMIC_PATH		0
-#endif
-#ifndef	BIND_RESTRICTED
-#  define BIND_RESTRICTED	0
-#endif
-
-#define	LT_BIND_FLAGS	(BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH)
-
-static lt_module
-sys_shl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  static shl_t self = (shl_t) 0;
-  lt_module module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
-  /* Since searching for a symbol against a NULL module handle will also
-     look in everything else that was already loaded and exported with
-     the -E compiler flag, we always cache a handle saved before any
-     modules are loaded.  */
-  if (!self)
-    {
-      lt_ptr address;
-      shl_findsym (&self, "main", TYPE_UNDEFINED, &address);
-    }
-
-  if (!filename)
-    {
-      module = self;
-    }
-  else
-    {
-      module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
-      if (!module)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-	}
-    }
-
-  return module;
-}
-
-static int
-sys_shl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (module && (shl_unload ((shl_t) (module)) != 0))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_shl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = 0;
-
-  /* sys_shl_open should never return a NULL module handle */
-  if (module == (lt_module) 0)
-  {
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-  }
-  else if (!shl_findsym((shl_t*) &module, symbol, TYPE_UNDEFINED, &address))
-    {
-      if (!address)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-	}
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_shl = {
-  0, sys_shl_open, sys_shl_close, sys_shl_sym, 0, 0
-};
-
-#endif /* HAVE_SHL_LOAD */
-
-
-
-
-/* --- LOADLIBRARY() INTERFACE LOADER --- */
-
-#ifdef __WINDOWS__
-
-/* dynamic linking for Win32 */
-
-#include <windows.h>
-
-/* Forward declaration; required to implement handle search below. */
-static lt_dlhandle handles;
-
-static lt_module
-sys_wll_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_dlhandle	cur;
-  lt_module	module	   = 0;
-  const char   *errormsg   = 0;
-  char	       *searchname = 0;
-  char	       *ext;
-  char		self_name_buf[MAX_PATH];
-
-  if (!filename)
-    {
-      /* Get the name of main module */
-      *self_name_buf = 0;
-      GetModuleFileName (NULL, self_name_buf, sizeof (self_name_buf));
-      filename = ext = self_name_buf;
-    }
-  else
-    {
-      ext = strrchr (filename, '.');
-    }
-
-  if (ext)
-    {
-      /* FILENAME already has an extension. */
-      searchname = lt_estrdup (filename);
-    }
-  else
-    {
-      /* Append a `.' to stop Windows from adding an
-	 implicit `.dll' extension. */
-      searchname = LT_EMALLOC (char, 2+ LT_STRLEN (filename));
-      if (searchname)
-	sprintf (searchname, "%s.", filename);
-    }
-  if (!searchname)
-    return 0;
-
-  {
-    /* Silence dialog from LoadLibrary on some failures.
-       No way to get the error mode, but to set it,
-       so set it twice to preserve any previous flags. */
-    UINT errormode = SetErrorMode(SEM_FAILCRITICALERRORS);
-    SetErrorMode(errormode | SEM_FAILCRITICALERRORS);
-
-#if defined(__CYGWIN__)
-    {
-      char wpath[MAX_PATH];
-      cygwin_conv_to_full_win32_path (searchname, wpath);
-      module = LoadLibrary (wpath);
-    }
-#else
-    module = LoadLibrary (searchname);
-#endif
-
-    /* Restore the error mode. */
-    SetErrorMode(errormode);
-  }
-
-  LT_DLFREE (searchname);
-
-  /* libltdl expects this function to fail if it is unable
-     to physically load the library.  Sadly, LoadLibrary
-     will search the loaded libraries for a match and return
-     one of them if the path search load fails.
-
-     We check whether LoadLibrary is returning a handle to
-     an already loaded module, and simulate failure if we
-     find one. */
-  LT_DLMUTEX_LOCK ();
-  cur = handles;
-  while (cur)
-    {
-      if (!cur->module)
-	{
-	  cur = 0;
-	  break;
-	}
-
-      if (cur->module == module)
-	{
-	  break;
-	}
-
-      cur = cur->next;
-  }
-  LT_DLMUTEX_UNLOCK ();
-
-  if (cur || !module)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      module = 0;
-    }
-
-  return module;
-}
-
-static int
-sys_wll_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int	      errors   = 0;
-
-  if (FreeLibrary(module) == 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_wll_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr      address  = GetProcAddress (module, symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_wll = {
-  0, sys_wll_open, sys_wll_close, sys_wll_sym, 0, 0
-};
-
-#endif /* __WINDOWS__ */
-
-
-
-
-/* --- LOAD_ADD_ON() INTERFACE LOADER --- */
-
-
-#ifdef __BEOS__
-
-/* dynamic linking for BeOS */
-
-#include <kernel/image.h>
-
-static lt_module
-sys_bedl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  image_id image = 0;
-
-  if (filename)
-    {
-      image = load_add_on (filename);
-    }
-  else
-    {
-      image_info info;
-      int32 cookie = 0;
-      if (get_next_image_info (0, &cookie, &info) == B_OK)
-	image = load_add_on (info.name);
-    }
-
-  if (image <= 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      image = 0;
-    }
-
-  return (lt_module) image;
-}
-
-static int
-sys_bedl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (unload_add_on ((image_id) module) != B_OK)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_bedl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = 0;
-  image_id image = (image_id) module;
-
-  if (get_image_symbol (image, symbol, B_SYMBOL_TYPE_ANY, address) != B_OK)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-      address = 0;
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_bedl = {
-  0, sys_bedl_open, sys_bedl_close, sys_bedl_sym, 0, 0
-};
-
-#endif /* __BEOS__ */
-
-
-
-
-/* --- DLD_LINK() INTERFACE LOADER --- */
-
-
-#if HAVE_DLD
-
-/* dynamic linking with dld */
-
-#if HAVE_DLD_H
-#include <dld.h>
-#endif
-
-static lt_module
-sys_dld_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_module module = strdup (filename);
-
-  if (dld_link (filename) != 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      LT_DLFREE (module);
-      module = 0;
-    }
-
-  return module;
-}
-
-static int
-sys_dld_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (dld_unlink_by_file ((char*)(module), 1) != 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-  else
-    {
-      LT_DLFREE (module);
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_dld_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = dld_get_func (symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_dld = {
-  0, sys_dld_open, sys_dld_close, sys_dld_sym, 0, 0
-};
-
-#endif /* HAVE_DLD */
-
-/* --- DYLD() MACOSX/DARWIN INTERFACE LOADER --- */
-#if HAVE_DYLD
-
-
-#if HAVE_MACH_O_DYLD_H
-#if !defined(__APPLE_CC__) && !defined(__MWERKS__) && !defined(__private_extern__)
-/* Is this correct? Does it still function properly? */
-#define __private_extern__ extern
-#endif
-# include <mach-o/dyld.h>
-#endif
-#include <mach-o/getsect.h>
-
-/* We have to put some stuff here that isn't in older dyld.h files */
-#ifndef ENUM_DYLD_BOOL
-# define ENUM_DYLD_BOOL
-# undef FALSE
-# undef TRUE
- enum DYLD_BOOL {
-    FALSE,
-    TRUE
- };
-#endif
-#ifndef LC_REQ_DYLD
-# define LC_REQ_DYLD 0x80000000
-#endif
-#ifndef LC_LOAD_WEAK_DYLIB
-# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
-#endif
-static const struct mach_header * (*ltdl_NSAddImage)(const char *image_name, unsigned long options) = 0;
-static NSSymbol (*ltdl_NSLookupSymbolInImage)(const struct mach_header *image,const char *symbolName, unsigned long options) = 0;
-static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage)(const struct mach_header *image, const char *symbolName) = 0;
-static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
-
-#ifndef NSADDIMAGE_OPTION_NONE
-#define NSADDIMAGE_OPTION_NONE                          0x0
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR               0x1
-#endif
-#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
-#define NSADDIMAGE_OPTION_WITH_SEARCHING                0x2
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED         0x4
-#endif
-#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND            0x0
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW        0x1
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY      0x2
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
-#endif
-
-
-static const char *
-lt_int_dyld_error(othererror)
-	char* othererror;
-{
-/* return the dyld error string, or the passed in error string if none */
-	NSLinkEditErrors ler;
-	int lerno;
-	const char *errstr;
-	const char *file;
-	NSLinkEditError(&ler,&lerno,&file,&errstr);
-	if (!errstr || !strlen(errstr)) errstr = othererror;
-	return errstr;
-}
-
-static const struct mach_header *
-lt_int_dyld_get_mach_header_from_nsmodule(module)
-	NSModule module;
-{
-/* There should probably be an apple dyld api for this */
-	int i=_dyld_image_count();
-	int j;
-	const char *modname=NSNameOfModule(module);
-	const struct mach_header *mh=NULL;
-	if (!modname) return NULL;
-	for (j = 0; j < i; j++)
-	{
-		if (!strcmp(_dyld_get_image_name(j),modname))
-		{
-			mh=_dyld_get_image_header(j);
-			break;
-		}
-	}
-	return mh;
-}
-
-static const char* lt_int_dyld_lib_install_name(mh)
-	const struct mach_header *mh;
-{
-/* NSAddImage is also used to get the loaded image, but it only works if the lib
-   is installed, for uninstalled libs we need to check the install_names against
-   each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
-   different lib was loaded as a result
-*/
-	int j;
-	struct load_command *lc;
-	unsigned long offset = sizeof(struct mach_header);
-	const char* retStr=NULL;
-	for (j = 0; j < mh->ncmds; j++)
-	{
-		lc = (struct load_command*)(((unsigned long)mh) + offset);
-		if (LC_ID_DYLIB == lc->cmd)
-		{
-			retStr=(char*)(((struct dylib_command*)lc)->dylib.name.offset +
-									(unsigned long)lc);
-		}
-		offset += lc->cmdsize;
-	}
-	return retStr;
-}
-
-static const struct mach_header *
-lt_int_dyld_match_loaded_lib_by_install_name(const char *name)
-{
-	int i=_dyld_image_count();
-	int j;
-	const struct mach_header *mh=NULL;
-	const char *id=NULL;
-	for (j = 0; j < i; j++)
-	{
-		id=lt_int_dyld_lib_install_name(_dyld_get_image_header(j));
-		if ((id) && (!strcmp(id,name)))
-		{
-			mh=_dyld_get_image_header(j);
-			break;
-		}
-	}
-	return mh;
-}
-
-static NSSymbol
-lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh)
-	const char *symbol;
-	const struct mach_header *mh;
-{
-	/* Safe to assume our mh is good */
-	int j;
-	struct load_command *lc;
-	unsigned long offset = sizeof(struct mach_header);
-	NSSymbol retSym = 0;
-	const struct mach_header *mh1;
-	if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined(symbol) )
-	{
-		for (j = 0; j < mh->ncmds; j++)
-		{
-			lc = (struct load_command*)(((unsigned long)mh) + offset);
-			if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
-			{
-				mh1=lt_int_dyld_match_loaded_lib_by_install_name((char*)(((struct dylib_command*)lc)->dylib.name.offset +
-										(unsigned long)lc));
-				if (!mh1)
-				{
-					/* Maybe NSAddImage can find it */
-					mh1=ltdl_NSAddImage((char*)(((struct dylib_command*)lc)->dylib.name.offset +
-										(unsigned long)lc),
-										NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
-										NSADDIMAGE_OPTION_WITH_SEARCHING +
-										NSADDIMAGE_OPTION_RETURN_ON_ERROR );
-				}
-				if (mh1)
-				{
-					retSym = ltdl_NSLookupSymbolInImage(mh1,
-											symbol,
-											NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-											| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-											);
-					if (retSym) break;
-				}
-			}
-			offset += lc->cmdsize;
-		}
-	}
-	return retSym;
-}
-
-static int
-sys_dyld_init()
-{
-	int retCode = 0;
-	int err = 0;
-	if (!_dyld_present()) {
-		retCode=1;
-	}
-	else {
-      err = _dyld_func_lookup("__dyld_NSAddImage",(unsigned long*)&ltdl_NSAddImage);
-      err = _dyld_func_lookup("__dyld_NSLookupSymbolInImage",(unsigned long*)&ltdl_NSLookupSymbolInImage);
-      err = _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",(unsigned long*)&ltdl_NSIsSymbolNameDefinedInImage);
-      err = _dyld_func_lookup("__dyld_NSMakePrivateModulePublic",(unsigned long*)&ltdl_NSMakePrivateModulePublic);
-    }
- return retCode;
-}
-
-static lt_module
-sys_dyld_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-	lt_module   module   = 0;
-	NSObjectFileImage ofi = 0;
-	NSObjectFileImageReturnCode ofirc;
-
-  	if (!filename)
-  		return (lt_module)-1;
-	ofirc = NSCreateObjectFileImageFromFile(filename, &ofi);
-	switch (ofirc)
-	{
-		case NSObjectFileImageSuccess:
-			module = NSLinkModule(ofi, filename,
-						NSLINKMODULE_OPTION_RETURN_ON_ERROR
-						 | NSLINKMODULE_OPTION_PRIVATE
-						 | NSLINKMODULE_OPTION_BINDNOW);
-			NSDestroyObjectFileImage(ofi);
-			if (module)
-				ltdl_NSMakePrivateModulePublic(module);
-			break;
-		case NSObjectFileImageInappropriateFile:
-		    if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-		    {
-				module = (lt_module)ltdl_NSAddImage(filename, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-				break;
-			}
-		default:
-			LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
-			return 0;
-	}
-	if (!module) LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
-  return module;
-}
-
-static int
-sys_dyld_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-	int retCode = 0;
-	int flags = 0;
-	if (module == (lt_module)-1) return 0;
-#ifdef __BIG_ENDIAN__
-  	if (((struct mach_header *)module)->magic == MH_MAGIC)
-#else
-    if (((struct mach_header *)module)->magic == MH_CIGAM)
-#endif
-	{
-	  LT_DLMUTEX_SETERROR("Can not close a dylib");
-	  retCode = 1;
-	}
-	else
-	{
-#if 1
-/* Currently, if a module contains c++ static destructors and it is unloaded, we
-   get a segfault in atexit(), due to compiler and dynamic loader differences of
-   opinion, this works around that.
-*/
-		if ((const struct section *)NULL !=
-		   getsectbynamefromheader(lt_int_dyld_get_mach_header_from_nsmodule(module),
-		   "__DATA","__mod_term_func"))
-		{
-			flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
-		}
-#endif
-#ifdef __ppc__
-			flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
-#endif
-		if (!NSUnLinkModule(module,flags))
-		{
-			retCode=1;
-			LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_CLOSE)));
-		}
-	}
-
- return retCode;
-}
-
-static lt_ptr
-sys_dyld_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-	lt_ptr address = 0;
-  	NSSymbol *nssym = 0;
-  	void *unused;
-  	const struct mach_header *mh=NULL;
-  	char saveError[256] = "Symbol not found";
-  	if (module == (lt_module)-1)
-  	{
-  		_dyld_lookup_and_bind(symbol,(unsigned long*)&address,&unused);
-  		return address;
-  	}
-#ifdef __BIG_ENDIAN__
-  	if (((struct mach_header *)module)->magic == MH_MAGIC)
-#else
-    if (((struct mach_header *)module)->magic == MH_CIGAM)
-#endif
-  	{
-  	    if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-  	    {
-  	    	mh=module;
-			if (ltdl_NSIsSymbolNameDefinedInImage((struct mach_header*)module,symbol))
-			{
-				nssym = ltdl_NSLookupSymbolInImage((struct mach_header*)module,
-											symbol,
-											NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-											| NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-											);
-			}
-	    }
-
-  	}
-  else {
-	nssym = NSLookupSymbolInModule(module, symbol);
-	}
-	if (!nssym)
-	{
-		strncpy(saveError, lt_int_dyld_error(LT_DLSTRERROR(SYMBOL_NOT_FOUND)), 255);
-		saveError[255] = 0;
-		if (!mh) mh=lt_int_dyld_get_mach_header_from_nsmodule(module);
-		nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh);
-	}
-	if (!nssym)
-	{
-		LT_DLMUTEX_SETERROR (saveError);
-		return NULL;
-	}
-	return NSAddressOfSymbol(nssym);
-}
-
-static struct lt_user_dlloader sys_dyld =
-  { "_", sys_dyld_open, sys_dyld_close, sys_dyld_sym, 0, 0 };
-
-
-#endif /* HAVE_DYLD */
-
-
-/* --- DLPREOPEN() INTERFACE LOADER --- */
-
-
-/* emulate dynamic linking using preloaded_symbols */
-
-typedef struct lt_dlsymlists_t
-{
-  struct lt_dlsymlists_t       *next;
-  const lt_dlsymlist	       *syms;
-} lt_dlsymlists_t;
-
-static	const lt_dlsymlist     *default_preloaded_symbols	= 0;
-static	lt_dlsymlists_t	       *preloaded_symbols		= 0;
-
-static int
-presym_init (loader_data)
-     lt_user_data loader_data;
-{
-  int errors = 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  preloaded_symbols = 0;
-  if (default_preloaded_symbols)
-    {
-      errors = lt_dlpreload (default_preloaded_symbols);
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static int
-presym_free_symlists ()
-{
-  lt_dlsymlists_t *lists;
-
-  LT_DLMUTEX_LOCK ();
-
-  lists = preloaded_symbols;
-  while (lists)
-    {
-      lt_dlsymlists_t	*tmp = lists;
-
-      lists = lists->next;
-      LT_DLFREE (tmp);
-    }
-  preloaded_symbols = 0;
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return 0;
-}
-
-static int
-presym_exit (loader_data)
-     lt_user_data loader_data;
-{
-  presym_free_symlists ();
-  return 0;
-}
-
-static int
-presym_add_symlist (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  lt_dlsymlists_t *tmp;
-  lt_dlsymlists_t *lists;
-  int		   errors   = 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  lists = preloaded_symbols;
-  while (lists)
-    {
-      if (lists->syms == preloaded)
-	{
-	  goto done;
-	}
-      lists = lists->next;
-    }
-
-  tmp = LT_EMALLOC (lt_dlsymlists_t, 1);
-  if (tmp)
-    {
-      memset (tmp, 0, sizeof(lt_dlsymlists_t));
-      tmp->syms = preloaded;
-      tmp->next = preloaded_symbols;
-      preloaded_symbols = tmp;
-    }
-  else
-    {
-      ++errors;
-    }
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-  return errors;
-}
-
-static lt_module
-presym_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_dlsymlists_t *lists;
-  lt_module	   module = (lt_module) 0;
-
-  LT_DLMUTEX_LOCK ();
-  lists = preloaded_symbols;
-
-  if (!lists)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_SYMBOLS));
-      goto done;
-    }
-
-  /* Can't use NULL as the reflective symbol header, as NULL is
-     used to mark the end of the entire symbol list.  Self-dlpreopened
-     symbols follow this magic number, chosen to be an unlikely
-     clash with a real module name.  */
-  if (!filename)
-    {
-      filename = "@PROGRAM@";
-    }
-
-  while (lists)
-    {
-      const lt_dlsymlist *syms = lists->syms;
-
-      while (syms->name)
-	{
-	  if (!syms->address && strcmp(syms->name, filename) == 0)
-	    {
-	      module = (lt_module) syms;
-	      goto done;
-	    }
-	  ++syms;
-	}
-
-      lists = lists->next;
-    }
-
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-  return module;
-}
-
-static int
-presym_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  /* Just to silence gcc -Wall */
-  module = 0;
-  return 0;
-}
-
-static lt_ptr
-presym_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_dlsymlist *syms = (lt_dlsymlist*) module;
-
-  ++syms;
-  while (syms->address)
-    {
-      if (strcmp(syms->name, symbol) == 0)
-	{
-	  return syms->address;
-	}
-
-    ++syms;
-  }
-
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-
-  return 0;
-}
-
-static struct lt_user_dlloader presym = {
-  0, presym_open, presym_close, presym_sym, presym_exit, 0
-};
-
-
-
-
-
-/* --- DYNAMIC MODULE LOADING --- */
-
-
-/* The type of a function used at each iteration of  foreach_dirinpath().  */
-typedef int	foreach_callback_func LT_PARAMS((char *filename, lt_ptr data1,
-						 lt_ptr data2));
-
-static	int	foreach_dirinpath     LT_PARAMS((const char *search_path,
-						 const char *base_name,
-						 foreach_callback_func *func,
-						 lt_ptr data1, lt_ptr data2));
-
-static	int	find_file_callback    LT_PARAMS((char *filename, lt_ptr data,
-						 lt_ptr ignored));
-static	int	find_handle_callback  LT_PARAMS((char *filename, lt_ptr data,
-						 lt_ptr ignored));
-static	int	foreachfile_callback  LT_PARAMS((char *filename, lt_ptr data1,
-						 lt_ptr data2));
-
-
-static	int     canonicalize_path     LT_PARAMS((const char *path,
-						 char **pcanonical));
-static	int	argzize_path 	      LT_PARAMS((const char *path,
-						 char **pargz,
-						 size_t *pargz_len));
-static	FILE   *find_file	      LT_PARAMS((const char *search_path,
-						 const char *base_name,
-						 char **pdir));
-static	lt_dlhandle *find_handle      LT_PARAMS((const char *search_path,
-						 const char *base_name,
-						 lt_dlhandle *handle));
-static	int	find_module	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *dir,
-						 const char *libdir,
-						 const char *dlname,
-						 const char *old_name,
-						 int installed));
-static	int	free_vars	      LT_PARAMS((char *dlname, char *oldname,
-						 char *libdir, char *deplibs));
-static	int	load_deplibs	      LT_PARAMS((lt_dlhandle handle,
-						 char *deplibs));
-static	int	trim		      LT_PARAMS((char **dest,
-						 const char *str));
-static	int	try_dlopen	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *filename));
-static	int	tryall_dlopen	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *filename));
-static	int	unload_deplibs	      LT_PARAMS((lt_dlhandle handle));
-static	int	lt_argz_insert	      LT_PARAMS((char **pargz,
-						 size_t *pargz_len,
-						 char *before,
-						 const char *entry));
-static	int	lt_argz_insertinorder LT_PARAMS((char **pargz,
-						 size_t *pargz_len,
-						 const char *entry));
-static	int	lt_argz_insertdir     LT_PARAMS((char **pargz,
-						 size_t *pargz_len,
-						 const char *dirnam,
-						 struct dirent *dp));
-static	int	lt_dlpath_insertdir   LT_PARAMS((char **ppath,
-						 char *before,
-						 const char *dir));
-static	int	list_files_by_dir     LT_PARAMS((const char *dirnam,
-						 char **pargz,
-						 size_t *pargz_len));
-static	int	file_not_found	      LT_PARAMS((void));
-
-static	char	       *user_search_path= 0;
-static	lt_dlloader    *loaders		= 0;
-static	lt_dlhandle	handles 	= 0;
-static	int		initialized 	= 0;
-
-/* Initialize libltdl. */
-int
-lt_dlinit ()
-{
-  int	      errors   = 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  /* Initialize only at first call. */
-  if (++initialized == 1)
-    {
-      handles = 0;
-      user_search_path = 0; /* empty search path */
-
-#if HAVE_LIBDL
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
-#endif
-#if HAVE_SHL_LOAD
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_shl, "dlopen");
-#endif
-#ifdef __WINDOWS__
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_wll, "dlopen");
-#endif
-#ifdef __BEOS__
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_bedl, "dlopen");
-#endif
-#if HAVE_DLD
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
-#endif
-#if HAVE_DYLD
-       errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
-       errors += sys_dyld_init();
-#endif
-      errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
-
-      if (presym_init (presym.dlloader_data))
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
-	  ++errors;
-	}
-      else if (errors != 0)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
-	  ++errors;
-	}
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-int
-lt_dlpreload (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  int errors = 0;
-
-  if (preloaded)
-    {
-      errors = presym_add_symlist (preloaded);
-    }
-  else
-    {
-      presym_free_symlists();
-
-      LT_DLMUTEX_LOCK ();
-      if (default_preloaded_symbols)
-	{
-	  errors = lt_dlpreload (default_preloaded_symbols);
-	}
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlpreload_default (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  LT_DLMUTEX_LOCK ();
-  default_preloaded_symbols = preloaded;
-  LT_DLMUTEX_UNLOCK ();
-  return 0;
-}
-
-int
-lt_dlexit ()
-{
-  /* shut down libltdl */
-  lt_dlloader *loader;
-  int	       errors   = 0;
-
-  LT_DLMUTEX_LOCK ();
-  loader = loaders;
-
-  if (!initialized)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SHUTDOWN));
-      ++errors;
-      goto done;
-    }
-
-  /* shut down only at last call. */
-  if (--initialized == 0)
-    {
-      int	level;
-
-      while (handles && LT_DLIS_RESIDENT (handles))
-	{
-	  handles = handles->next;
-	}
-
-      /* close all modules */
-      for (level = 1; handles; ++level)
-	{
-	  lt_dlhandle cur = handles;
-	  int saw_nonresident = 0;
-
-	  while (cur)
-	    {
-	      lt_dlhandle tmp = cur;
-	      cur = cur->next;
-	      if (!LT_DLIS_RESIDENT (tmp))
-		saw_nonresident = 1;
-	      if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
-		{
-		  if (lt_dlclose (tmp))
-		    {
-		      ++errors;
-		    }
-		}
-	    }
-	  /* done if only resident modules are left */
-	  if (!saw_nonresident)
-	    break;
-	}
-
-      /* close all loaders */
-      while (loader)
-	{
-	  lt_dlloader *next = loader->next;
-	  lt_user_data data = loader->dlloader_data;
-	  if (loader->dlloader_exit && loader->dlloader_exit (data))
-	    {
-	      ++errors;
-	    }
-
-	  LT_DLMEM_REASSIGN (loader, next);
-	}
-      loaders = 0;
-    }
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-  return errors;
-}
-
-static int
-tryall_dlopen (handle, filename)
-     lt_dlhandle *handle;
-     const char *filename;
-{
-  lt_dlhandle	 cur;
-  lt_dlloader   *loader;
-  const char	*saved_error;
-  int		 errors		= 0;
-
-  LT_DLMUTEX_GETERROR (saved_error);
-  LT_DLMUTEX_LOCK ();
-
-  cur	 = handles;
-  loader = loaders;
-
-  /* check whether the module was already opened */
-  while (cur)
-    {
-      /* try to dlopen the program itself? */
-      if (!cur->info.filename && !filename)
-	{
-	  break;
-	}
-
-      if (cur->info.filename && filename
-	  && strcmp (cur->info.filename, filename) == 0)
-	{
-	  break;
-	}
-
-      cur = cur->next;
-    }
-
-  if (cur)
-    {
-      ++cur->info.ref_count;
-      *handle = cur;
-      goto done;
-    }
-
-  cur = *handle;
-  if (filename)
-    {
-      /* Comment out the check of file permissions using access.
-	 This call seems to always return -1 with error EACCES.
-      */
-      /* We need to catch missing file errors early so that
-	 file_not_found() can detect what happened.
-      if (access (filename, R_OK) != 0)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-	  ++errors;
-	  goto done;
-	} */
-
-      cur->info.filename = lt_estrdup (filename);
-      if (!cur->info.filename)
-	{
-	  ++errors;
-	  goto done;
-	}
-    }
-  else
-    {
-      cur->info.filename = 0;
-    }
-
-  while (loader)
-    {
-      lt_user_data data = loader->dlloader_data;
-
-      cur->module = loader->module_open (data, filename);
-
-      if (cur->module != 0)
-	{
-	  break;
-	}
-      loader = loader->next;
-    }
-
-  if (!loader)
-    {
-      LT_DLFREE (cur->info.filename);
-      ++errors;
-      goto done;
-    }
-
-  cur->loader	= loader;
-  LT_DLMUTEX_SETERROR (saved_error);
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static int
-tryall_dlopen_module (handle, prefix, dirname, dlname)
-     lt_dlhandle *handle;
-     const char *prefix;
-     const char *dirname;
-     const char *dlname;
-{
-  int      error	= 0;
-  char     *filename	= 0;
-  size_t   filename_len	= 0;
-  size_t   dirname_len	= LT_STRLEN (dirname);
-
-  assert (handle);
-  assert (dirname);
-  assert (dlname);
-#ifdef LT_DIRSEP_CHAR
-  /* Only canonicalized names (i.e. with DIRSEP chars already converted)
-     should make it into this function:  */
-  assert (strchr (dirname, LT_DIRSEP_CHAR) == 0);
-#endif
-
-  if (dirname_len > 0)
-    if (dirname[dirname_len -1] == '/')
-      --dirname_len;
-  filename_len = dirname_len + 1 + LT_STRLEN (dlname);
-
-  /* Allocate memory, and combine DIRNAME and MODULENAME into it.
-     The PREFIX (if any) is handled below.  */
-  filename  = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
-  if (!filename)
-    return 1;
-
-  sprintf (filename, "%.*s/%s", (int) dirname_len, dirname, dlname);
-
-  /* Now that we have combined DIRNAME and MODULENAME, if there is
-     also a PREFIX to contend with, simply recurse with the arguments
-     shuffled.  Otherwise, attempt to open FILENAME as a module.  */
-  if (prefix)
-    {
-      error += tryall_dlopen_module (handle,
-				     (const char *) 0, prefix, filename);
-    }
-  else if (tryall_dlopen (handle, filename) != 0)
-    {
-      ++error;
-    }
-
-  LT_DLFREE (filename);
-  return error;
-}
-
-static int
-find_module (handle, dir, libdir, dlname, old_name, installed)
-     lt_dlhandle *handle;
-     const char *dir;
-     const char *libdir;
-     const char *dlname;
-     const char *old_name;
-     int installed;
-{
-  /* Try to open the old library first; if it was dlpreopened,
-     we want the preopened version of it, even if a dlopenable
-     module is available.  */
-  if (old_name && tryall_dlopen (handle, old_name) == 0)
-    {
-      return 0;
-    }
-
-  /* Try to open the dynamic library.  */
-  if (dlname)
-    {
-      /* try to open the installed module */
-      if (installed && libdir)
-	{
-	  if (tryall_dlopen_module (handle,
-				    (const char *) 0, libdir, dlname) == 0)
-	    return 0;
-	}
-
-      /* try to open the not-installed module */
-      if (!installed)
-	{
-	  if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
-	    return 0;
-	}
-
-      /* maybe it was moved to another directory */
-      {
-	  if (dir && (tryall_dlopen_module (handle,
-				    (const char *) 0, dir, dlname) == 0))
-	    return 0;
-      }
-    }
-
-  return 1;
-}
-
-
-static int
-canonicalize_path (path, pcanonical)
-     const char *path;
-     char **pcanonical;
-{
-  char *canonical = 0;
-
-  assert (path && *path);
-  assert (pcanonical);
-
-  canonical = LT_EMALLOC (char, 1+ LT_STRLEN (path));
-  if (!canonical)
-    return 1;
-
-  {
-    size_t dest = 0;
-    size_t src;
-    for (src = 0; path[src] != LT_EOS_CHAR; ++src)
-      {
-	/* Path separators are not copied to the beginning or end of
-	   the destination, or if another separator would follow
-	   immediately.  */
-	if (path[src] == LT_PATHSEP_CHAR)
-	  {
-	    if ((dest == 0)
-		|| (path[1+ src] == LT_PATHSEP_CHAR)
-		|| (path[1+ src] == LT_EOS_CHAR))
-	      continue;
-	  }
-
-	/* Anything other than a directory separator is copied verbatim.  */
-	if ((path[src] != '/')
-#ifdef LT_DIRSEP_CHAR
-	    && (path[src] != LT_DIRSEP_CHAR)
-#endif
-	    )
-	  {
-	    canonical[dest++] = path[src];
-	  }
-	/* Directory separators are converted and copied only if they are
-	   not at the end of a path -- i.e. before a path separator or
-	   NULL terminator.  */
-	else if ((path[1+ src] != LT_PATHSEP_CHAR)
-		 && (path[1+ src] != LT_EOS_CHAR)
-#ifdef LT_DIRSEP_CHAR
-		 && (path[1+ src] != LT_DIRSEP_CHAR)
-#endif
-		 && (path[1+ src] != '/'))
-	  {
-	    canonical[dest++] = '/';
-	  }
-      }
-
-    /* Add an end-of-string marker at the end.  */
-    canonical[dest] = LT_EOS_CHAR;
-  }
-
-  /* Assign new value.  */
-  *pcanonical = canonical;
-
-  return 0;
-}
-
-static int
-argzize_path (path, pargz, pargz_len)
-     const char *path;
-     char **pargz;
-     size_t *pargz_len;
-{
-  error_t error;
-
-  assert (path);
-  assert (pargz);
-  assert (pargz_len);
-
-  if ((error = argz_create_sep (path, LT_PATHSEP_CHAR, pargz, pargz_len)))
-    {
-      switch (error)
-	{
-	case ENOMEM:
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-	  break;
-	default:
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-	  break;
-	}
-
-      return 1;
-    }
-
-  return 0;
-}
-
-/* Repeatedly call FUNC with each LT_PATHSEP_CHAR delimited element
-   of SEARCH_PATH and references to DATA1 and DATA2, until FUNC returns
-   non-zero or all elements are exhausted.  If BASE_NAME is non-NULL,
-   it is appended to each SEARCH_PATH element before FUNC is called.  */
-static int
-foreach_dirinpath (search_path, base_name, func, data1, data2)
-     const char *search_path;
-     const char *base_name;
-     foreach_callback_func *func;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  int	 result		= 0;
-  int	 filenamesize	= 0;
-  size_t lenbase	= LT_STRLEN (base_name);
-  size_t argz_len	= 0;
-  char *argz		= 0;
-  char *filename	= 0;
-  char *canonical	= 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  if (!search_path || !*search_path)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-      goto cleanup;
-    }
-
-  if (canonicalize_path (search_path, &canonical) != 0)
-    goto cleanup;
-
-  if (argzize_path (canonical, &argz, &argz_len) != 0)
-    goto cleanup;
-
-  {
-    char *dir_name = 0;
-    while ((dir_name = argz_next (argz, argz_len, dir_name)))
-      {
-	size_t lendir = LT_STRLEN (dir_name);
-
-	if (lendir +1 +lenbase >= filenamesize)
-	{
-	  LT_DLFREE (filename);
-	  filenamesize	= lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
-	  filename	= LT_EMALLOC (char, filenamesize);
-	  if (!filename)
-	    goto cleanup;
-	}
-
-	assert (filenamesize > lendir);
-	strcpy (filename, dir_name);
-
-	if (base_name && *base_name)
-	  {
-	    if (filename[lendir -1] != '/')
-	      filename[lendir++] = '/';
-	    strcpy (filename +lendir, base_name);
-	  }
-
-	if ((result = (*func) (filename, data1, data2)))
-	  {
-	    break;
-	  }
-      }
-  }
-
- cleanup:
-  LT_DLFREE (argz);
-  LT_DLFREE (canonical);
-  LT_DLFREE (filename);
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-/* If FILEPATH can be opened, store the name of the directory component
-   in DATA1, and the opened FILE* structure address in DATA2.  Otherwise
-   DATA1 is unchanged, but DATA2 is set to a pointer to NULL.  */
-static int
-find_file_callback (filename, data1, data2)
-     char *filename;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  char	     **pdir	= (char **) data1;
-  FILE	     **pfile	= (FILE **) data2;
-  int	     is_done	= 0;
-
-  assert (filename && *filename);
-  assert (pdir);
-  assert (pfile);
-
-  if ((*pfile = fopen (filename, LT_READTEXT_MODE)))
-    {
-      char *dirend = strrchr (filename, '/');
-
-      if (dirend > filename)
-	*dirend   = LT_EOS_CHAR;
-
-      LT_DLFREE (*pdir);
-      *pdir   = lt_estrdup (filename);
-      is_done = (*pdir == 0) ? -1 : 1;
-    }
-
-  return is_done;
-}
-
-static FILE *
-find_file (search_path, base_name, pdir)
-     const char *search_path;
-     const char *base_name;
-     char **pdir;
-{
-  FILE *file = 0;
-
-  foreach_dirinpath (search_path, base_name, find_file_callback, pdir, &file);
-
-  return file;
-}
-
-static int
-find_handle_callback (filename, data, ignored)
-     char *filename;
-     lt_ptr data;
-     lt_ptr ignored;
-{
-  lt_dlhandle  *handle		= (lt_dlhandle *) data;
-  int		notfound	= access (filename, R_OK);
-
-  /* Bail out if file cannot be read...  */
-  if (notfound)
-    return 0;
-
-  /* Try to dlopen the file, but do not continue searching in any
-     case.  */
-  if (tryall_dlopen (handle, filename) != 0)
-    *handle = 0;
-
-  return 1;
-}
-
-/* If HANDLE was found return it, otherwise return 0.  If HANDLE was
-   found but could not be opened, *HANDLE will be set to 0.  */
-static lt_dlhandle *
-find_handle (search_path, base_name, handle)
-     const char *search_path;
-     const char *base_name;
-     lt_dlhandle *handle;
-{
-  if (!search_path)
-    return 0;
-
-  if (!foreach_dirinpath (search_path, base_name, find_handle_callback,
-			  handle, 0))
-    return 0;
-
-  return handle;
-}
-
-static int
-load_deplibs (handle, deplibs)
-     lt_dlhandle handle;
-     char *deplibs;
-{
-#if LTDL_DLOPEN_DEPLIBS
-  char	*p, *save_search_path = 0;
-  int   depcount = 0;
-  int	i;
-  char	**names = 0;
-#endif
-  int	errors = 0;
-
-  handle->depcount = 0;
-
-#if LTDL_DLOPEN_DEPLIBS
-  if (!deplibs)
-    {
-      return errors;
-    }
-  ++errors;
-
-  LT_DLMUTEX_LOCK ();
-  if (user_search_path)
-    {
-      save_search_path = lt_estrdup (user_search_path);
-      if (!save_search_path)
-	goto cleanup;
-    }
-
-  /* extract search paths and count deplibs */
-  p = deplibs;
-  while (*p)
-    {
-      if (!isspace ((int) *p))
-	{
-	  char *end = p+1;
-	  while (*end && !isspace((int) *end))
-	    {
-	      ++end;
-	    }
-
-	  if (strncmp(p, "-L", 2) == 0 || strncmp(p, "-R", 2) == 0)
-	    {
-	      char save = *end;
-	      *end = 0; /* set a temporary string terminator */
-	      if (lt_dladdsearchdir(p+2))
-		{
-		  goto cleanup;
-		}
-	      *end = save;
-	    }
-	  else
-	    {
-	      ++depcount;
-	    }
-
-	  p = end;
-	}
-      else
-	{
-	  ++p;
-	}
-    }
-
-  if (!depcount)
-    {
-      errors = 0;
-      goto cleanup;
-    }
-
-  names = LT_EMALLOC (char *, depcount * sizeof (char*));
-  if (!names)
-    goto cleanup;
-
-  /* now only extract the actual deplibs */
-  depcount = 0;
-  p = deplibs;
-  while (*p)
-    {
-      if (isspace ((int) *p))
-	{
-	  ++p;
-	}
-      else
-	{
-	  char *end = p+1;
-	  while (*end && !isspace ((int) *end))
-	    {
-	      ++end;
-	    }
-
-	  if (strncmp(p, "-L", 2) != 0 && strncmp(p, "-R", 2) != 0)
-	    {
-	      char *name;
-	      char save = *end;
-	      *end = 0; /* set a temporary string terminator */
-	      if (strncmp(p, "-l", 2) == 0)
-		{
-		  size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2);
-		  name = LT_EMALLOC (char, 1+ name_len);
-		  if (name)
-		    sprintf (name, "lib%s", p+2);
-		}
-	      else
-		name = lt_estrdup(p);
-
-	      if (!name)
-		goto cleanup_names;
-
-	      names[depcount++] = name;
-	      *end = save;
-	    }
-	  p = end;
-	}
-    }
-
-  /* load the deplibs (in reverse order)
-     At this stage, don't worry if the deplibs do not load correctly,
-     they may already be statically linked into the loading application
-     for instance.  There will be a more enlightening error message
-     later on if the loaded module cannot resolve all of its symbols.  */
-  if (depcount)
-    {
-      int	j = 0;
-
-      handle->deplibs = (lt_dlhandle*) LT_EMALLOC (lt_dlhandle *, depcount);
-      if (!handle->deplibs)
-	goto cleanup;
-
-      for (i = 0; i < depcount; ++i)
-	{
-	  handle->deplibs[j] = lt_dlopenext(names[depcount-1-i]);
-	  if (handle->deplibs[j])
-	    {
-	      ++j;
-	    }
-	}
-
-      handle->depcount	= j;	/* Number of successfully loaded deplibs */
-      errors		= 0;
-    }
-
- cleanup_names:
-  for (i = 0; i < depcount; ++i)
-    {
-      LT_DLFREE (names[i]);
-    }
-
- cleanup:
-  LT_DLFREE (names);
-  /* restore the old search path */
-  if (user_search_path) {
-    LT_DLFREE (user_search_path);
-    user_search_path = save_search_path;
-  }
-  LT_DLMUTEX_UNLOCK ();
-
-#endif
-
-  return errors;
-}
-
-static int
-unload_deplibs (handle)
-     lt_dlhandle handle;
-{
-  int i;
-  int errors = 0;
-
-  if (handle->depcount)
-    {
-      for (i = 0; i < handle->depcount; ++i)
-	{
-	  if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
-	    {
-	      errors += lt_dlclose (handle->deplibs[i]);
-	    }
-	}
-    }
-
-  return errors;
-}
-
-static int
-trim (dest, str)
-     char **dest;
-     const char *str;
-{
-  /* remove the leading and trailing "'" from str
-     and store the result in dest */
-  const char *end   = strrchr (str, '\'');
-  size_t len	    = LT_STRLEN (str);
-  char *tmp;
-
-  LT_DLFREE (*dest);
-
-  if (!end)
-    return 1;
-
-  if (len > 3 && str[0] == '\'')
-    {
-      tmp = LT_EMALLOC (char, end - str);
-      if (!tmp)
-	return 1;
-
-      strncpy(tmp, &str[1], (end - str) - 1);
-      tmp[len-3] = LT_EOS_CHAR;
-      *dest = tmp;
-    }
-  else
-    {
-      *dest = 0;
-    }
-
-  return 0;
-}
-
-static int
-free_vars (dlname, oldname, libdir, deplibs)
-     char *dlname;
-     char *oldname;
-     char *libdir;
-     char *deplibs;
-{
-  LT_DLFREE (dlname);
-  LT_DLFREE (oldname);
-  LT_DLFREE (libdir);
-  LT_DLFREE (deplibs);
-
-  return 0;
-}
-
-static int
-try_dlopen (phandle, filename)
-     lt_dlhandle *phandle;
-     const char *filename;
-{
-  const char *	ext		= 0;
-  const char *	saved_error	= 0;
-  char *	canonical	= 0;
-  char *	base_name	= 0;
-  char *	dir		= 0;
-  char *	name		= 0;
-  int		errors		= 0;
-  lt_dlhandle	newhandle;
-
-  assert (phandle);
-  assert (*phandle == 0);
-
-  LT_DLMUTEX_GETERROR (saved_error);
-
-  /* dlopen self? */
-  if (!filename)
-    {
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-	return 1;
-
-      memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
-      newhandle	= *phandle;
-
-      /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
-      LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
-
-      if (tryall_dlopen (&newhandle, 0) != 0)
-	{
-	  LT_DLFREE (*phandle);
-	  return 1;
-	}
-
-      goto register_handle;
-    }
-
-  assert (filename && *filename);
-
-  /* Doing this immediately allows internal functions to safely
-     assume only canonicalized paths are passed.  */
-  if (canonicalize_path (filename, &canonical) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  /* If the canonical module name is a path (relative or absolute)
-     then split it into a directory part and a name part.  */
-  base_name = strrchr (canonical, '/');
-  if (base_name)
-    {
-      size_t dirlen = (1+ base_name) - canonical;
-
-      dir = LT_EMALLOC (char, 1+ dirlen);
-      if (!dir)
-	{
-	  ++errors;
-	  goto cleanup;
-	}
-
-      strncpy (dir, canonical, dirlen);
-      dir[dirlen] = LT_EOS_CHAR;
-
-      ++base_name;
-    }
-  else
-    base_name = canonical;
-
-  assert (base_name && *base_name);
-
-  /* Check whether we are opening a libtool module (.la extension).  */
-  ext = strrchr (base_name, '.');
-  if (ext && strcmp (ext, archive_ext) == 0)
-    {
-      /* this seems to be a libtool module */
-      FILE *	file	 = 0;
-      char *	dlname	 = 0;
-      char *	old_name = 0;
-      char *	libdir	 = 0;
-      char *	deplibs	 = 0;
-      char *    line	 = 0;
-      size_t	line_len;
-
-      /* if we can't find the installed flag, it is probably an
-	 installed libtool archive, produced with an old version
-	 of libtool */
-      int	installed = 1;
-
-      /* extract the module name from the file name */
-      name = LT_EMALLOC (char, ext - base_name + 1);
-      if (!name)
-	{
-	  ++errors;
-	  goto cleanup;
-	}
-
-      /* canonicalize the module name */
-      {
-        size_t i;
-        for (i = 0; i < ext - base_name; ++i)
-	  {
-	    if (isalnum ((int)(base_name[i])))
-	      {
-	        name[i] = base_name[i];
-	      }
-	    else
-	      {
-	        name[i] = '_';
-	      }
-	  }
-        name[ext - base_name] = LT_EOS_CHAR;
-      }
-
-      /* Now try to open the .la file.  If there is no directory name
-         component, try to find it first in user_search_path and then other
-         prescribed paths.  Otherwise (or in any case if the module was not
-         yet found) try opening just the module name as passed.  */
-      if (!dir)
-	{
-	  const char *search_path;
-
-	  LT_DLMUTEX_LOCK ();
-	  search_path = user_search_path;
-	  if (search_path)
-	    file = find_file (user_search_path, base_name, &dir);
-	  LT_DLMUTEX_UNLOCK ();
-
-	  if (!file)
-	    {
-	      search_path = getenv (LTDL_SEARCHPATH_VAR);
-	      if (search_path)
-		file = find_file (search_path, base_name, &dir);
-	    }
-
-#ifdef LTDL_SHLIBPATH_VAR
-	  if (!file)
-	    {
-	      search_path = getenv (LTDL_SHLIBPATH_VAR);
-	      if (search_path)
-		file = find_file (search_path, base_name, &dir);
-	    }
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-	  if (!file && sys_search_path)
-	    {
-	      file = find_file (sys_search_path, base_name, &dir);
-	    }
-#endif
-	}
-	if (!file)
-	{
-	  if(strstr(filename,"/") || strcmp((filename + strlen(filename) - 3), ".la") != 0)
-	    file = fopen (filename, LT_READTEXT_MODE);
-	}
-
-      /* If we didn't find the file by now, it really isn't there.  Set
-	 the status flag, and bail out.  */
-      if (!file)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-	  ++errors;
-	  goto cleanup;
-	}
-
-      line_len = LT_FILENAME_MAX;
-      line = LT_EMALLOC (char, line_len);
-      if (!line)
-	{
-	  fclose (file);
-	  ++errors;
-	  goto cleanup;
-	}
-
-      /* read the .la file */
-      while (!feof (file))
-	{
-	  if (!fgets (line, (int) line_len, file))
-	    {
-	      break;
-	    }
-
-	  /* Handle the case where we occasionally need to read a line
-	     that is longer than the initial buffer size.  */
-	  while ((line[LT_STRLEN(line) -1] != '\n') && (!feof (file)))
-	    {
-	      line = LT_DLREALLOC (char, line, line_len *2);
-	      if (!fgets (&line[line_len -1], (int) line_len +1, file))
-		{
-		  break;
-		}
-	      line_len *= 2;
-	    }
-
-	  if (line[0] == '\n' || line[0] == '#')
-	    {
-	      continue;
-	    }
-
-#undef  STR_DLNAME
-#define STR_DLNAME	"dlname="
-	  if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
-	    {
-	      errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
-	    }
-
-#undef  STR_OLD_LIBRARY
-#define STR_OLD_LIBRARY	"old_library="
-	  else if (strncmp (line, STR_OLD_LIBRARY,
-			    sizeof (STR_OLD_LIBRARY) - 1) == 0)
-	    {
-	      errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
-	    }
-#undef  STR_LIBDIR
-#define STR_LIBDIR	"libdir="
-	  else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
-	    {
-	      errors += trim (&libdir, &line[sizeof(STR_LIBDIR) - 1]);
-	    }
-
-#undef  STR_DL_DEPLIBS
-#define STR_DL_DEPLIBS	"dependency_libs="
-	  else if (strncmp (line, STR_DL_DEPLIBS,
-			    sizeof (STR_DL_DEPLIBS) - 1) == 0)
-	    {
-	      errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
-	    }
-	  else if (strcmp (line, "installed=yes\n") == 0)
-	    {
-	      installed = 1;
-	    }
-	  else if (strcmp (line, "installed=no\n") == 0)
-	    {
-	      installed = 0;
-	    }
-
-#undef  STR_LIBRARY_NAMES
-#define STR_LIBRARY_NAMES "library_names="
-	  else if (! dlname && strncmp (line, STR_LIBRARY_NAMES,
-					sizeof (STR_LIBRARY_NAMES) - 1) == 0)
-	    {
-	      char *last_libname;
-	      errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
-	      if (!errors
-		  && dlname
-		  && (last_libname = strrchr (dlname, ' ')) != 0)
-		{
-		  last_libname = lt_estrdup (last_libname + 1);
-		  if (!last_libname)
-		    {
-		      ++errors;
-		      goto cleanup;
-		    }
-		  LT_DLMEM_REASSIGN (dlname, last_libname);
-		}
-	    }
-
-	  if (errors)
-	    break;
-	}
-
-      fclose (file);
-      LT_DLFREE (line);
-
-      /* allocate the handle */
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-	++errors;
-
-      if (errors)
-	{
-	  free_vars (dlname, old_name, libdir, deplibs);
-	  LT_DLFREE (*phandle);
-	  goto cleanup;
-	}
-
-      assert (*phandle);
-
-      memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
-      if (load_deplibs (*phandle, deplibs) == 0)
-	{
-	  newhandle = *phandle;
-	  /* find_module may replace newhandle */
-	  if (find_module (&newhandle, dir, libdir, dlname, old_name, installed))
-	    {
-	      unload_deplibs (*phandle);
-	      ++errors;
-	    }
-	}
-      else
-	{
-	  ++errors;
-	}
-
-      free_vars (dlname, old_name, libdir, deplibs);
-      if (errors)
-	{
-	  LT_DLFREE (*phandle);
-	  goto cleanup;
-	}
-
-      if (*phandle != newhandle)
-	{
-	  unload_deplibs (*phandle);
-	}
-    }
-  else
-    {
-      /* not a libtool module */
-      *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-	{
-	  ++errors;
-	  goto cleanup;
-	}
-
-      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
-      newhandle = *phandle;
-
-      /* If the module has no directory name component, try to find it
-	 first in user_search_path and then other prescribed paths.
-	 Otherwise (or in any case if the module was not yet found) try
-	 opening just the module name as passed.  */
-      if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
-		   && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
-				    &newhandle)
-#ifdef LTDL_SHLIBPATH_VAR
-		   && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
-				    &newhandle)
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-		   && !find_handle (sys_search_path, base_name, &newhandle)
-#endif
-		   )))
-	{
-          if (tryall_dlopen (&newhandle, filename) != 0)
-            {
-              newhandle = NULL;
-            }
-	}
-
-      if (!newhandle)
-	{
-	  LT_DLFREE (*phandle);
-	  ++errors;
-	  goto cleanup;
-	}
-    }
-
- register_handle:
-  LT_DLMEM_REASSIGN (*phandle, newhandle);
-
-  if ((*phandle)->info.ref_count == 0)
-    {
-      (*phandle)->info.ref_count	= 1;
-      LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
-
-      LT_DLMUTEX_LOCK ();
-      (*phandle)->next		= handles;
-      handles			= *phandle;
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  LT_DLMUTEX_SETERROR (saved_error);
-
- cleanup:
-  LT_DLFREE (dir);
-  LT_DLFREE (name);
-  LT_DLFREE (canonical);
-
-  return errors;
-}
-
-lt_dlhandle
-lt_dlopen (filename)
-     const char *filename;
-{
-  lt_dlhandle handle = 0;
-
-  /* Just incase we missed a code path in try_dlopen() that reports
-     an error, but forgets to reset handle... */
-  if (try_dlopen (&handle, filename) != 0)
-    return 0;
-
-  return handle;
-}
-
-/* If the last error messge store was `FILE_NOT_FOUND', then return
-   non-zero.  */
-static int
-file_not_found ()
-{
-  const char *error = 0;
-
-  LT_DLMUTEX_GETERROR (error);
-  if (error == LT_DLSTRERROR (FILE_NOT_FOUND))
-    return 1;
-
-  return 0;
-}
-
-/* If FILENAME has an ARCHIVE_EXT or SHLIB_EXT extension, try to
-   open the FILENAME as passed.  Otherwise try appending ARCHIVE_EXT,
-   and if a file is still not found try again with SHLIB_EXT appended
-   instead.  */
-lt_dlhandle
-lt_dlopenext (filename)
-     const char *filename;
-{
-  lt_dlhandle	handle		= 0;
-  char *	tmp		= 0;
-  char *	ext		= 0;
-  size_t	len;
-  int		errors		= 0;
-
-  if (!filename)
-    {
-      return lt_dlopen (filename);
-    }
-
-  assert (filename);
-
-  len = LT_STRLEN (filename);
-  ext = strrchr (filename, '.');
-
-  /* If FILENAME already bears a suitable extension, there is no need
-     to try appending additional extensions.  */
-  if (ext && ((strcmp (ext, archive_ext) == 0)
-#ifdef LTDL_SHLIB_EXT
-	      || (strcmp (ext, shlib_ext) == 0)
-#endif
-      ))
-    {
-      return lt_dlopen (filename);
-    }
-
-  /* First try appending ARCHIVE_EXT.  */
-  tmp = LT_EMALLOC (char, len + LT_STRLEN (archive_ext) + 1);
-  if (!tmp)
-    return 0;
-
-  strcpy (tmp, filename);
-  strcat (tmp, archive_ext);
-  errors = try_dlopen (&handle, tmp);
-
-  /* If we found FILENAME, stop searching -- whether we were able to
-     load the file as a module or not.  If the file exists but loading
-     failed, it is better to return an error message here than to
-     report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
-     in the module search path.  */
-  if (handle || ((errors > 0) && !file_not_found ()))
-    {
-      LT_DLFREE (tmp);
-      return handle;
-    }
-
-#ifdef LTDL_SHLIB_EXT
-  /* Try appending SHLIB_EXT.   */
-  if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
-    {
-      LT_DLFREE (tmp);
-      tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1);
-      if (!tmp)
-	return 0;
-
-      strcpy (tmp, filename);
-    }
-  else
-    {
-      tmp[len] = LT_EOS_CHAR;
-    }
-
-  strcat(tmp, shlib_ext);
-  errors = try_dlopen (&handle, tmp);
-
-  /* As before, if the file was found but loading failed, return now
-     with the current error message.  */
-  if (handle || ((errors > 0) && !file_not_found ()))
-    {
-      LT_DLFREE (tmp);
-      return handle;
-    }
-#endif
-
-  /* Still here?  Then we really did fail to locate any of the file
-     names we tried.  */
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-  LT_DLFREE (tmp);
-  return 0;
-}
-
-
-static int
-lt_argz_insert (pargz, pargz_len, before, entry)
-     char **pargz;
-     size_t *pargz_len;
-     char *before;
-     const char *entry;
-{
-  error_t error;
-
-  /* Prior to Sep 8, 2005, newlib had a bug where argz_insert(pargz,
-     pargz_len, NULL, entry) failed with EINVAL.  */
-  if (before)
-    error = argz_insert (pargz, pargz_len, before, entry);
-  else
-    error = argz_append (pargz, pargz_len, entry, 1 + LT_STRLEN (entry));
-
-  if (error)
-    {
-      switch (error)
-	{
-	case ENOMEM:
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-	  break;
-	default:
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-	  break;
-	}
-      return 1;
-    }
-
-  return 0;
-}
-
-static int
-lt_argz_insertinorder (pargz, pargz_len, entry)
-     char **pargz;
-     size_t *pargz_len;
-     const char *entry;
-{
-  char *before = 0;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert (entry && *entry);
-
-  if (*pargz)
-    while ((before = argz_next (*pargz, *pargz_len, before)))
-      {
-	int cmp = strcmp (entry, before);
-
-	if (cmp < 0)  break;
-	if (cmp == 0) return 0;	/* No duplicates! */
-      }
-
-  return lt_argz_insert (pargz, pargz_len, before, entry);
-}
-
-static int
-lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
-     char **pargz;
-     size_t *pargz_len;
-     const char *dirnam;
-     struct dirent *dp;
-{
-  char   *buf	    = 0;
-  size_t buf_len    = 0;
-  char   *end	    = 0;
-  size_t end_offset = 0;
-  size_t dir_len    = 0;
-  int    errors	    = 0;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert (dp);
-
-  dir_len = LT_STRLEN (dirnam);
-  end     = dp->d_name + LT_D_NAMLEN(dp);
-
-  /* Ignore version numbers.  */
-  {
-    char *p;
-    for (p = end; p -1 > dp->d_name; --p)
-      if (strchr (".0123456789", p[-1]) == 0)
-	break;
-
-    if (*p == '.')
-      end = p;
-  }
-
-  /* Ignore filename extension.  */
-  {
-    char *p;
-    for (p = end -1; p > dp->d_name; --p)
-      if (*p == '.')
-	{
-	  end = p;
-	  break;
-	}
-  }
-
-  /* Prepend the directory name.  */
-  end_offset	= end - dp->d_name;
-  buf_len	= dir_len + 1+ end_offset;
-  buf		= LT_EMALLOC (char, 1+ buf_len);
-  if (!buf)
-    return ++errors;
-
-  assert (buf);
-
-  strcpy  (buf, dirnam);
-  strcat  (buf, "/");
-  strncat (buf, dp->d_name, end_offset);
-  buf[buf_len] = LT_EOS_CHAR;
-
-  /* Try to insert (in order) into ARGZ/ARGZ_LEN.  */
-  if (lt_argz_insertinorder (pargz, pargz_len, buf) != 0)
-    ++errors;
-
-  LT_DLFREE (buf);
-
-  return errors;
-}
-
-static int
-list_files_by_dir (dirnam, pargz, pargz_len)
-     const char *dirnam;
-     char **pargz;
-     size_t *pargz_len;
-{
-  DIR	*dirp	  = 0;
-  int    errors	  = 0;
-
-  assert (dirnam && *dirnam);
-  assert (pargz);
-  assert (pargz_len);
-  assert (dirnam[LT_STRLEN(dirnam) -1] != '/');
-
-  dirp = opendir (dirnam);
-  if (dirp)
-    {
-      struct dirent *dp	= 0;
-
-      while ((dp = readdir (dirp)))
-	if (dp->d_name[0] != '.')
-	  if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
-	    {
-	      ++errors;
-	      break;
-	    }
-
-      closedir (dirp);
-    }
-  else
-    ++errors;
-
-  return errors;
-}
-
-
-/* If there are any files in DIRNAME, call the function passed in
-   DATA1 (with the name of each file and DATA2 as arguments).  */
-static int
-foreachfile_callback (dirname, data1, data2)
-     char *dirname;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  int (*func) LT_PARAMS((const char *filename, lt_ptr data))
-	= (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1;
-
-  int	  is_done  = 0;
-  char   *argz     = 0;
-  size_t  argz_len = 0;
-
-  if (list_files_by_dir (dirname, &argz, &argz_len) != 0)
-    goto cleanup;
-  if (!argz)
-    goto cleanup;
-
-  {
-    char *filename = 0;
-    while ((filename = argz_next (argz, argz_len, filename)))
-      if ((is_done = (*func) (filename, data2)))
-	break;
-  }
-
- cleanup:
-  LT_DLFREE (argz);
-
-  return is_done;
-}
-
-
-/* Call FUNC for each unique extensionless file in SEARCH_PATH, along
-   with DATA.  The filenames passed to FUNC would be suitable for
-   passing to lt_dlopenext.  The extensions are stripped so that
-   individual modules do not generate several entries (e.g. libfoo.la,
-   libfoo.so, libfoo.so.1, libfoo.so.1.0.0).  If SEARCH_PATH is NULL,
-   then the same directories that lt_dlopen would search are examined.  */
-int
-lt_dlforeachfile (search_path, func, data)
-     const char *search_path;
-     int (*func) LT_PARAMS ((const char *filename, lt_ptr data));
-     lt_ptr data;
-{
-  int is_done = 0;
-
-  if (search_path)
-    {
-      /* If a specific path was passed, search only the directories
-	 listed in it.  */
-      is_done = foreach_dirinpath (search_path, 0,
-				   foreachfile_callback, func, data);
-    }
-  else
-    {
-      /* Otherwise search the default paths.  */
-      is_done = foreach_dirinpath (user_search_path, 0,
-				   foreachfile_callback, func, data);
-      if (!is_done)
-	{
-	  is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0,
-				       foreachfile_callback, func, data);
-	}
-
-#ifdef LTDL_SHLIBPATH_VAR
-      if (!is_done)
-	{
-	  is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
-				       foreachfile_callback, func, data);
-	}
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-      if (!is_done)
-	{
-	  is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
-				       foreachfile_callback, func, data);
-	}
-#endif
-    }
-
-  return is_done;
-}
-
-int
-lt_dlclose (handle)
-     lt_dlhandle handle;
-{
-  lt_dlhandle cur, last;
-  int errors = 0;
-
-  LT_DLMUTEX_LOCK ();
-
-  /* check whether the handle is valid */
-  last = cur = handles;
-  while (cur && handle != cur)
-    {
-      last = cur;
-      cur = cur->next;
-    }
-
-  if (!cur)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      ++errors;
-      goto done;
-    }
-
-  handle->info.ref_count--;
-
-  /* Note that even with resident modules, we must track the ref_count
-     correctly incase the user decides to reset the residency flag
-     later (even though the API makes no provision for that at the
-     moment).  */
-  if (handle->info.ref_count <= 0 && !LT_DLIS_RESIDENT (handle))
-    {
-      lt_user_data data = handle->loader->dlloader_data;
-
-      if (handle != handles)
-	{
-	  last->next = handle->next;
-	}
-      else
-	{
-	  handles = handle->next;
-	}
-
-      errors += handle->loader->module_close (data, handle->module);
-      errors += unload_deplibs(handle);
-
-      /* It is up to the callers to free the data itself.  */
-      LT_DLFREE (handle->caller_data);
-
-      LT_DLFREE (handle->info.filename);
-      LT_DLFREE (handle->info.name);
-      LT_DLFREE (handle);
-
-      goto done;
-    }
-
-  if (LT_DLIS_RESIDENT (handle))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CLOSE_RESIDENT_MODULE));
-      ++errors;
-    }
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_ptr
-lt_dlsym (handle, symbol)
-     lt_dlhandle handle;
-     const char *symbol;
-{
-  size_t lensym;
-  char	lsym[LT_SYMBOL_LENGTH];
-  char	*sym;
-  lt_ptr address;
-  lt_user_data data;
-
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return 0;
-    }
-
-  if (!symbol)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-      return 0;
-    }
-
-  lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix)
-					+ LT_STRLEN (handle->info.name);
-
-  if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH)
-    {
-      sym = lsym;
-    }
-  else
-    {
-      sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
-      if (!sym)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
-	  return 0;
-	}
-    }
-
-  data = handle->loader->dlloader_data;
-  if (handle->info.name)
-    {
-      const char *saved_error;
-
-      LT_DLMUTEX_GETERROR (saved_error);
-
-      /* this is a libtool module */
-      if (handle->loader->sym_prefix)
-	{
-	  strcpy(sym, handle->loader->sym_prefix);
-	  strcat(sym, handle->info.name);
-	}
-      else
-	{
-	  strcpy(sym, handle->info.name);
-	}
-
-      strcat(sym, "_LTX_");
-      strcat(sym, symbol);
-
-      /* try "modulename_LTX_symbol" */
-      address = handle->loader->find_sym (data, handle->module, sym);
-      if (address)
-	{
-	  if (sym != lsym)
-	    {
-	      LT_DLFREE (sym);
-	    }
-	  return address;
-	}
-      LT_DLMUTEX_SETERROR (saved_error);
-    }
-
-  /* otherwise try "symbol" */
-  if (handle->loader->sym_prefix)
-    {
-      strcpy(sym, handle->loader->sym_prefix);
-      strcat(sym, symbol);
-    }
-  else
-    {
-      strcpy(sym, symbol);
-    }
-
-  address = handle->loader->find_sym (data, handle->module, sym);
-  if (sym != lsym)
-    {
-      LT_DLFREE (sym);
-    }
-
-  return address;
-}
-
-const char *
-lt_dlerror ()
-{
-  const char *error;
-
-  LT_DLMUTEX_GETERROR (error);
-  LT_DLMUTEX_SETERROR (0);
-
-  return error ? error : NULL;
-}
-
-static int
-lt_dlpath_insertdir (ppath, before, dir)
-     char **ppath;
-     char *before;
-     const char *dir;
-{
-  int    errors		= 0;
-  char  *canonical	= 0;
-  char  *argz		= 0;
-  size_t argz_len	= 0;
-
-  assert (ppath);
-  assert (dir && *dir);
-
-  if (canonicalize_path (dir, &canonical) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  assert (canonical && *canonical);
-
-  /* If *PPATH is empty, set it to DIR.  */
-  if (*ppath == 0)
-    {
-      assert (!before);		/* BEFORE cannot be set without PPATH.  */
-      assert (dir);		/* Without DIR, don't call this function!  */
-
-      *ppath = lt_estrdup (dir);
-      if (*ppath == 0)
-	++errors;
-
-      return errors;
-    }
-
-  assert (ppath && *ppath);
-
-  if (argzize_path (*ppath, &argz, &argz_len) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  /* Convert BEFORE into an equivalent offset into ARGZ.  This only works
-     if *PPATH is already canonicalized, and hence does not change length
-     with respect to ARGZ.  We canonicalize each entry as it is added to
-     the search path, and don't call this function with (uncanonicalized)
-     user paths, so this is a fair assumption.  */
-  if (before)
-    {
-      assert (*ppath <= before);
-      assert (before - *ppath <= strlen (*ppath));
-
-      before = before - *ppath + argz;
-    }
-
-  if (lt_argz_insert (&argz, &argz_len, before, dir) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  argz_stringify (argz, argz_len, LT_PATHSEP_CHAR);
-  LT_DLMEM_REASSIGN (*ppath,  argz);
-
- cleanup:
-  LT_DLFREE (canonical);
-  LT_DLFREE (argz);
-
-  return errors;
-}
-
-int
-lt_dladdsearchdir (search_dir)
-     const char *search_dir;
-{
-  int errors = 0;
-
-  if (search_dir && *search_dir)
-    {
-      LT_DLMUTEX_LOCK ();
-      if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
-	++errors;
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlinsertsearchdir (before, search_dir)
-     const char *before;
-     const char *search_dir;
-{
-  int errors = 0;
-
-  if (before)
-    {
-      LT_DLMUTEX_LOCK ();
-      if ((before < user_search_path)
-	  || (before >= user_search_path + LT_STRLEN (user_search_path)))
-	{
-	  LT_DLMUTEX_UNLOCK ();
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
-	  return 1;
-	}
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  if (search_dir && *search_dir)
-    {
-      LT_DLMUTEX_LOCK ();
-      if (lt_dlpath_insertdir (&user_search_path,
-			       (char *) before, search_dir) != 0)
-	{
-	  ++errors;
-	}
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlsetsearchpath (search_path)
-     const char *search_path;
-{
-  int   errors	    = 0;
-
-  LT_DLMUTEX_LOCK ();
-  LT_DLFREE (user_search_path);
-  LT_DLMUTEX_UNLOCK ();
-
-  if (!search_path || !LT_STRLEN (search_path))
-    {
-      return errors;
-    }
-
-  LT_DLMUTEX_LOCK ();
-  if (canonicalize_path (search_path, &user_search_path) != 0)
-    ++errors;
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-const char *
-lt_dlgetsearchpath ()
-{
-  const char *saved_path;
-
-  LT_DLMUTEX_LOCK ();
-  saved_path = user_search_path;
-  LT_DLMUTEX_UNLOCK ();
-
-  return saved_path;
-}
-
-int
-lt_dlmakeresident (handle)
-     lt_dlhandle handle;
-{
-  int errors = 0;
-
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      ++errors;
-    }
-  else
-    {
-      LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
-    }
-
-  return errors;
-}
-
-int
-lt_dlisresident	(handle)
-     lt_dlhandle handle;
-{
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return -1;
-    }
-
-  return LT_DLIS_RESIDENT (handle);
-}
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-const lt_dlinfo *
-lt_dlgetinfo (handle)
-     lt_dlhandle handle;
-{
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return 0;
-    }
-
-  return &(handle->info);
-}
-
-lt_dlhandle
-lt_dlhandle_next (place)
-     lt_dlhandle place;
-{
-  return place ? place->next : handles;
-}
-
-int
-lt_dlforeach (func, data)
-     int (*func) LT_PARAMS((lt_dlhandle handle, lt_ptr data));
-     lt_ptr data;
-{
-  int errors = 0;
-  lt_dlhandle cur;
-
-  LT_DLMUTEX_LOCK ();
-
-  cur = handles;
-  while (cur)
-    {
-      lt_dlhandle tmp = cur;
-
-      cur = cur->next;
-      if ((*func) (tmp, data))
-	{
-	  ++errors;
-	  break;
-	}
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_dlcaller_id
-lt_dlcaller_register ()
-{
-  static lt_dlcaller_id last_caller_id = 0;
-  int result;
-
-  LT_DLMUTEX_LOCK ();
-  result = ++last_caller_id;
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-lt_ptr
-lt_dlcaller_set_data (key, handle, data)
-     lt_dlcaller_id key;
-     lt_dlhandle handle;
-     lt_ptr data;
-{
-  int n_elements = 0;
-  lt_ptr stale = (lt_ptr) 0;
-  int i;
-
-  /* This needs to be locked so that the caller data can be updated
-     simultaneously by different threads.  */
-  LT_DLMUTEX_LOCK ();
-
-  if (handle->caller_data)
-    while (handle->caller_data[n_elements].key)
-      ++n_elements;
-
-  for (i = 0; i < n_elements; ++i)
-    {
-      if (handle->caller_data[i].key == key)
-	{
-	  stale = handle->caller_data[i].data;
-	  break;
-	}
-    }
-
-  /* Ensure that there is enough room in this handle's caller_data
-     array to accept a new element (and an empty end marker).  */
-  if (i == n_elements)
-    {
-      lt_caller_data *temp
-	= LT_DLREALLOC (lt_caller_data, handle->caller_data, 2+ n_elements);
-
-      if (!temp)
-	{
-	  stale = 0;
-	  goto done;
-	}
-
-      handle->caller_data = temp;
-
-      /* We only need this if we needed to allocate a new caller_data.  */
-      handle->caller_data[i].key  = key;
-      handle->caller_data[1+ i].key = 0;
-    }
-
-  handle->caller_data[i].data = data;
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return stale;
-}
-
-lt_ptr
-lt_dlcaller_get_data  (key, handle)
-     lt_dlcaller_id key;
-     lt_dlhandle handle;
-{
-  lt_ptr result = (lt_ptr) 0;
-
-  /* This needs to be locked so that the caller data isn't updated by
-     another thread part way through this function.  */
-  LT_DLMUTEX_LOCK ();
-
-  /* Locate the index of the element with a matching KEY.  */
-  {
-    int i;
-    for (i = 0; handle->caller_data[i].key; ++i)
-      {
-	if (handle->caller_data[i].key == key)
-	  {
-	    result = handle->caller_data[i].data;
-	    break;
-	  }
-      }
-  }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-int
-lt_dlloader_add (place, dlloader, loader_name)
-     lt_dlloader *place;
-     const struct lt_user_dlloader *dlloader;
-     const char *loader_name;
-{
-  int errors = 0;
-  lt_dlloader *node = 0, *ptr = 0;
-
-  if ((dlloader == 0)	/* diagnose null parameters */
-      || (dlloader->module_open == 0)
-      || (dlloader->module_close == 0)
-      || (dlloader->find_sym == 0))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-      return 1;
-    }
-
-  /* Create a new dlloader node with copies of the user callbacks.  */
-  node = LT_EMALLOC (lt_dlloader, 1);
-  if (!node)
-    return 1;
-
-  node->next		= 0;
-  node->loader_name	= loader_name;
-  node->sym_prefix	= dlloader->sym_prefix;
-  node->dlloader_exit	= dlloader->dlloader_exit;
-  node->module_open	= dlloader->module_open;
-  node->module_close	= dlloader->module_close;
-  node->find_sym	= dlloader->find_sym;
-  node->dlloader_data	= dlloader->dlloader_data;
-
-  LT_DLMUTEX_LOCK ();
-  if (!loaders)
-    {
-      /* If there are no loaders, NODE becomes the list! */
-      loaders = node;
-    }
-  else if (!place)
-    {
-      /* If PLACE is not set, add NODE to the end of the
-	 LOADERS list. */
-      for (ptr = loaders; ptr->next; ptr = ptr->next)
-	{
-	  /*NOWORK*/;
-	}
-
-      ptr->next = node;
-    }
-  else if (loaders == place)
-    {
-      /* If PLACE is the first loader, NODE goes first. */
-      node->next = place;
-      loaders = node;
-    }
-  else
-    {
-      /* Find the node immediately preceding PLACE. */
-      for (ptr = loaders; ptr->next != place; ptr = ptr->next)
-	{
-	  /*NOWORK*/;
-	}
-
-      if (ptr->next != place)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-	  ++errors;
-	}
-      else
-	{
-	  /* Insert NODE between PTR and PLACE. */
-	  node->next = place;
-	  ptr->next  = node;
-	}
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-int
-lt_dlloader_remove (loader_name)
-     const char *loader_name;
-{
-  lt_dlloader *place = lt_dlloader_find (loader_name);
-  lt_dlhandle handle;
-  int errors = 0;
-
-  if (!place)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-      return 1;
-    }
-
-  LT_DLMUTEX_LOCK ();
-
-  /* Fail if there are any open modules which use this loader. */
-  for  (handle = handles; handle; handle = handle->next)
-    {
-      if (handle->loader == place)
-	{
-	  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
-	  ++errors;
-	  goto done;
-	}
-    }
-
-  if (place == loaders)
-    {
-      /* PLACE is the first loader in the list. */
-      loaders = loaders->next;
-    }
-  else
-    {
-      /* Find the loader before the one being removed. */
-      lt_dlloader *prev;
-      for (prev = loaders; prev->next; prev = prev->next)
-	{
-	  if (!strcmp (prev->next->loader_name, loader_name))
-	    {
-	      break;
-	    }
-	}
-
-      place = prev->next;
-      prev->next = prev->next->next;
-    }
-
-  if (place->dlloader_exit)
-    {
-      errors = place->dlloader_exit (place->dlloader_data);
-    }
-
-  LT_DLFREE (place);
-
- done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_dlloader *
-lt_dlloader_next (place)
-     lt_dlloader *place;
-{
-  lt_dlloader *next;
-
-  LT_DLMUTEX_LOCK ();
-  next = place ? place->next : loaders;
-  LT_DLMUTEX_UNLOCK ();
-
-  return next;
-}
-
-const char *
-lt_dlloader_name (place)
-     lt_dlloader *place;
-{
-  const char *name = 0;
-
-  if (place)
-    {
-      LT_DLMUTEX_LOCK ();
-      name = place ? place->loader_name : 0;
-      LT_DLMUTEX_UNLOCK ();
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-    }
-
-  return name;
-}
-
-lt_user_data *
-lt_dlloader_data (place)
-     lt_dlloader *place;
-{
-  lt_user_data *data = 0;
-
-  if (place)
-    {
-      LT_DLMUTEX_LOCK ();
-      data = place ? &(place->dlloader_data) : 0;
-      LT_DLMUTEX_UNLOCK ();
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-    }
-
-  return data;
-}
-
-lt_dlloader *
-lt_dlloader_find (loader_name)
-     const char *loader_name;
-{
-  lt_dlloader *place = 0;
-
-  LT_DLMUTEX_LOCK ();
-  for (place = loaders; place; place = place->next)
-    {
-      if (strcmp (place->loader_name, loader_name) == 0)
-	{
-	  break;
-	}
-    }
-  LT_DLMUTEX_UNLOCK ();
-
-  return place;
-}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/ltdl.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/ltdl.h
--- heartbeat-2.1.3/libltdl/ltdl.h	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/ltdl.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,366 +0,0 @@
-/* ltdl.h -- generic dlopen functions
-   Copyright (C) 1998-2000 Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301  USA
-*/
-
-/* Only include this header file once. */
-#ifndef LTDL_H
-#define LTDL_H 1
-
-#include <sys/types.h>		/* for size_t declaration */
-
-
-/* --- MACROS FOR PORTABILITY --- */
-
-
-/* Saves on those hard to debug '\0' typos....  */
-#define LT_EOS_CHAR	'\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use LTDL_END_C_DECLS at
-   the end of C declarations. */
-#ifdef __cplusplus
-# define LT_BEGIN_C_DECLS	extern "C" {
-# define LT_END_C_DECLS		}
-#else
-# define LT_BEGIN_C_DECLS	/* empty */
-# define LT_END_C_DECLS		/* empty */
-#endif
-
-LT_BEGIN_C_DECLS
-
-
-/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
-   that don't understand ANSI C prototypes still work, and ANSI C
-   compilers can issue warnings about type mismatches.  */
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define LT_PARAMS(protos)	protos
-# define lt_ptr		void*
-#else
-# define LT_PARAMS(protos)	()
-# define lt_ptr		char*
-#endif
-
-/* LT_STMT_START/END are used to create macros which expand to a
-   a single compound statement in a portable way.  */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define LT_STMT_START        (void)(
-#  define LT_STMT_END          )
-#else
-#  if (defined (sun) || defined (__sun__))
-#    define LT_STMT_START      if (1)
-#    define LT_STMT_END        else (void)0
-#  else
-#    define LT_STMT_START      do
-#    define LT_STMT_END        while (0)
-#  endif
-#endif
-
-/* LT_CONC creates a new concatenated symbol for the compiler
-   in a portable way.  */
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
-#  define LT_CONC(s,t)	s##t
-#else
-#  define LT_CONC(s,t)	s/**/t
-#endif
-
-/* LT_STRLEN can be used safely on NULL pointers.  */
-#define LT_STRLEN(s)	(((s) && (s)[0]) ? strlen (s) : 0)
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-/* Canonicalise Windows and Cygwin recognition macros.  */
-#ifdef __CYGWIN32__
-#  ifndef __CYGWIN__
-#    define __CYGWIN__ __CYGWIN32__
-#  endif
-#endif
-#if defined(_WIN32) || defined(WIN32)
-#  ifndef __WINDOWS__
-#    ifdef _WIN32
-#      define __WINDOWS__ _WIN32
-#    else
-#      ifdef WIN32
-#        define __WINDOWS__ WIN32
-#      endif
-#    endif
-#  endif
-#endif
-
-
-#ifdef __WINDOWS__
-#  ifndef __CYGWIN__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
-   separator when it is set. */
-#    define LT_DIRSEP_CHAR	'\\'
-#    define LT_PATHSEP_CHAR	';'
-#  endif
-#endif
-#ifndef LT_PATHSEP_CHAR
-#  define LT_PATHSEP_CHAR	':'
-#endif
-
-/* DLL building support on win32 hosts;  mostly to workaround their
-   ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-#  ifdef __WINDOWS__
-#    ifdef DLL_EXPORT		/* defined by libtool (if required) */
-#      define LT_SCOPE	__declspec(dllexport)
-#    endif
-#    ifdef LIBLTDL_DLL_IMPORT	/* define if linking with this dll */
-#      define LT_SCOPE	extern __declspec(dllimport)
-#    endif
-#  endif
-#  ifndef LT_SCOPE		/* static linking or !__WINDOWS__ */
-#    define LT_SCOPE	extern
-#  endif
-#endif
-
-
-#if defined(_MSC_VER) /* Visual Studio */
-#  define R_OK 4
-#endif
-
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef	struct lt_dlhandle_struct *lt_dlhandle;	/* A loaded module.  */
-
-/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE	int	    lt_dlinit		LT_PARAMS((void));
-LT_SCOPE	int	    lt_dlexit		LT_PARAMS((void));
-
-/* Module search path manipulation.  */
-LT_SCOPE	int	    lt_dladdsearchdir	 LT_PARAMS((const char *search_dir));
-LT_SCOPE	int	    lt_dlinsertsearchdir LT_PARAMS((const char *before,
-						    const char *search_dir));
-LT_SCOPE	int 	    lt_dlsetsearchpath	 LT_PARAMS((const char *search_path));
-LT_SCOPE	const char *lt_dlgetsearchpath	 LT_PARAMS((void));
-LT_SCOPE	int	    lt_dlforeachfile	 LT_PARAMS((
-			const char *search_path,
-			int (*func) (const char *filename, lt_ptr data),
-			lt_ptr data));
-
-/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE	lt_dlhandle lt_dlopen		LT_PARAMS((const char *filename));
-LT_SCOPE	lt_dlhandle lt_dlopenext	LT_PARAMS((const char *filename));
-LT_SCOPE	lt_ptr	    lt_dlsym		LT_PARAMS((lt_dlhandle handle,
-						     const char *name));
-LT_SCOPE	const char *lt_dlerror		LT_PARAMS((void));
-LT_SCOPE	int	    lt_dlclose		LT_PARAMS((lt_dlhandle handle));
-
-/* Module residency management. */
-LT_SCOPE	int	    lt_dlmakeresident	LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE	int	    lt_dlisresident	LT_PARAMS((lt_dlhandle handle));
-
-
-
-
-/* --- MUTEX LOCKING --- */
-
-
-typedef void	lt_dlmutex_lock		LT_PARAMS((void));
-typedef void	lt_dlmutex_unlock	LT_PARAMS((void));
-typedef void	lt_dlmutex_seterror	LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror	LT_PARAMS((void));
-
-LT_SCOPE	int	lt_dlmutex_register	LT_PARAMS((lt_dlmutex_lock *lock,
-					    lt_dlmutex_unlock *unlock,
-					    lt_dlmutex_seterror *seterror,
-					    lt_dlmutex_geterror *geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
-   realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
-   libltdl relies on a featureful realloc, but if you are sure yours
-   has the right semantics then you can assign it directly.  Generally,
-   it is safe to assign just a malloc() and a free() function.  */
-LT_SCOPE  lt_ptr   (*lt_dlmalloc)	LT_PARAMS((size_t size));
-LT_SCOPE  lt_ptr   (*lt_dlrealloc)	LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE  void	   (*lt_dlfree)		LT_PARAMS((lt_ptr ptr));
-
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
-   symbols for a dlpreopened module. */
-typedef struct {
-  const char *name;
-  lt_ptr      address;
-} lt_dlsymlist;
-
-LT_SCOPE	int	lt_dlpreload	LT_PARAMS((const lt_dlsymlist *preloaded));
-LT_SCOPE	int	lt_dlpreload_default
-				LT_PARAMS((const lt_dlsymlist *preloaded));
-
-#define LTDL_SET_PRELOADED_SYMBOLS() 		LT_STMT_START{	\
-	extern const lt_dlsymlist lt_preloaded_symbols[];		\
-	lt_dlpreload_default(lt_preloaded_symbols);			\
-						}LT_STMT_END
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Read only information pertaining to a loaded module. */
-typedef	struct {
-  char	*filename;		/* file name */
-  char	*name;			/* module name */
-  int	ref_count;		/* number of times lt_dlopened minus
-				   number of times lt_dlclosed. */
-} lt_dlinfo;
-
-LT_SCOPE	const lt_dlinfo	*lt_dlgetinfo	    LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE	lt_dlhandle	lt_dlhandle_next    LT_PARAMS((lt_dlhandle place));
-LT_SCOPE	int		lt_dlforeach	    LT_PARAMS((
-				int (*func) (lt_dlhandle handle, lt_ptr data),
-				lt_ptr data));
-
-/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
-
-LT_SCOPE	lt_dlcaller_id	lt_dlcaller_register  LT_PARAMS((void));
-LT_SCOPE	lt_ptr		lt_dlcaller_set_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle,
-						lt_ptr data));
-LT_SCOPE	lt_ptr		lt_dlcaller_get_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle));
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-typedef	struct lt_dlloader	lt_dlloader;
-typedef lt_ptr			lt_user_data;
-typedef lt_ptr			lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-typedef lt_module   lt_module_open	LT_PARAMS((lt_user_data loader_data,
-					    const char *filename));
-typedef int	    lt_module_close	LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle));
-typedef lt_ptr	    lt_find_sym		LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle,
-					    const char *symbol));
-typedef int	    lt_dlloader_exit	LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
-  const char	       *sym_prefix;
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym	       *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data		dlloader_data;
-};
-
-LT_SCOPE	lt_dlloader    *lt_dlloader_next    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE	lt_dlloader    *lt_dlloader_find    LT_PARAMS((
-						const char *loader_name));
-LT_SCOPE	const char     *lt_dlloader_name    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE	lt_user_data   *lt_dlloader_data    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE	int		lt_dlloader_add     LT_PARAMS((lt_dlloader *place,
-				const struct lt_user_dlloader *dlloader,
-				const char *loader_name));
-LT_SCOPE	int		lt_dlloader_remove  LT_PARAMS((
-						const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
-   this way allows us to expand the macro in different contexts with
-   confidence that the enumeration of symbolic names will map correctly
-   onto the table of error strings.  */
-#define lt_dlerror_table						\
-    LT_ERROR(UNKNOWN,		    "unknown error")			\
-    LT_ERROR(DLOPEN_NOT_SUPPORTED,  "dlopen support not available")	\
-    LT_ERROR(INVALID_LOADER,	    "invalid loader")			\
-    LT_ERROR(INIT_LOADER,	    "loader initialization failed")	\
-    LT_ERROR(REMOVE_LOADER,	    "loader removal failed")		\
-    LT_ERROR(FILE_NOT_FOUND,	    "file not found")			\
-    LT_ERROR(DEPLIB_NOT_FOUND,      "dependency library not found")	\
-    LT_ERROR(NO_SYMBOLS,	    "no symbols defined")		\
-    LT_ERROR(CANNOT_OPEN,	    "can't open the module")		\
-    LT_ERROR(CANNOT_CLOSE,	    "can't close the module")		\
-    LT_ERROR(SYMBOL_NOT_FOUND,      "symbol not found")			\
-    LT_ERROR(NO_MEMORY,		    "not enough memory")		\
-    LT_ERROR(INVALID_HANDLE,	    "invalid module handle")		\
-    LT_ERROR(BUFFER_OVERFLOW,	    "internal buffer overflow")		\
-    LT_ERROR(INVALID_ERRORCODE,     "invalid errorcode")		\
-    LT_ERROR(SHUTDOWN,		    "library already shutdown")		\
-    LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module")	\
-    LT_ERROR(INVALID_MUTEX_ARGS,    "invalid mutex handler registration") \
-    LT_ERROR(INVALID_POSITION,	    "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic)	LT_CONC(LT_ERROR_, name),
-	lt_dlerror_table
-#undef LT_ERROR
-
-	LT_ERROR_MAX
-};
-
-/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE	int	lt_dladderror	LT_PARAMS((const char *diagnostic));
-LT_SCOPE	int	lt_dlseterror	LT_PARAMS((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-#  define lt_ptr_t		lt_ptr
-#  define lt_module_t		lt_module
-#  define lt_module_open_t	lt_module_open
-#  define lt_module_close_t	lt_module_close
-#  define lt_find_sym_t		lt_find_sym
-#  define lt_dlloader_exit_t	lt_dlloader_exit
-#  define lt_dlloader_t		lt_dlloader
-#  define lt_dlloader_data_t	lt_user_data
-#endif
-
-LT_END_C_DECLS
-
-#endif /* !LTDL_H */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/ltmain.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/ltmain.sh
--- heartbeat-2.1.3/libltdl/ltmain.sh	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/ltmain.sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,6909 +0,0 @@
-# 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.
-# 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.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-
-# Check that we have a working $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, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# 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'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-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"
-done
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    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;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      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
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --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."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static | -static-libtool-libs)
-    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
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-    -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
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -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
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # 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
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	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
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  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"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $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
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      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
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     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\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      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'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# 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='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-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
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	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
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # 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"
-      done
-
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/Makefile.am
--- heartbeat-2.1.3/libltdl/Makefile.am	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/Makefile.am	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-if INSTALL_LTDL
-include_HEADERS = ltdl.h
-lib_LTLIBRARIES = libltdl.la
-else
-noinst_HEADERS = ltdl.h
-endif
-
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-endif
-
-## Make sure these will be cleaned even when they're not built by
-## default.
-CLEANFILES = libltdl.la libltdlc.la
-
-libltdl_la_SOURCES = ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-
-libltdlc_la_SOURCES = ltdl.c
-libltdlc_la_LIBADD = $(LIBADD_DL)
-
-## Because we do not have automatic dependency tracking:
-ltdl.lo: ltdl.h config.h
-
-$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/Makefile.in
--- heartbeat-2.1.3/libltdl/Makefile.in	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,656 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
-	$(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config-h.in \
-	$(top_srcdir)/configure COPYING.LIB config.guess config.sub \
-	install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-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 = $(install_sh) -d
-CONFIG_HEADER = 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)$(includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libltdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libltdl_la_OBJECTS = ltdl.lo
-libltdl_la_OBJECTS = $(am_libltdl_la_OBJECTS)
-libltdl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libltdl_la_LDFLAGS) $(LDFLAGS) -o $@
-@INSTALL_LTDL_TRUE@am_libltdl_la_rpath = -rpath $(libdir)
-libltdlc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libltdlc_la_OBJECTS = ltdl.lo
-libltdlc_la_OBJECTS = $(am_libltdlc_la_OBJECTS)
-@CONVENIENCE_LTDL_TRUE@am_libltdlc_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp =
-am__depfiles_maybe =
-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 = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
-DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
-am__include_HEADERS_DIST = ltdl.h
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-am__noinst_HEADERS_DIST = ltdl.h
-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-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@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBADD_DL = @LIBADD_DL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = no-dependencies foreign
-@INSTALL_LTDL_TRUE@include_HEADERS = ltdl.h
-@INSTALL_LTDL_TRUE@lib_LTLIBRARIES = libltdl.la
-@INSTALL_LTDL_FALSE@noinst_HEADERS = ltdl.h
-@CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = libltdlc.la
-CLEANFILES = libltdl.la libltdlc.la
-libltdl_la_SOURCES = ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-libltdlc_la_SOURCES = ltdl.c
-libltdlc_la_LIBADD = $(LIBADD_DL)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-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
-.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: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f 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 config.h
-$(srcdir)/config-h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    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=$(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=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-
-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=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) 
-	$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
-libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) 
-	$(LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	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=$(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=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config-h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	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) config-h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config-h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	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; \
-	  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; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-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 $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	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
-	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
-	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
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (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 \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(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 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-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."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool 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-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
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	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-html \
-	install-html-am install-includeHEADERS 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-includeHEADERS \
-	uninstall-libLTLIBRARIES
-
-
-ltdl.lo: ltdl.h config.h
-
-$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-# 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.
-.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/missing /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/missing
--- heartbeat-2.1.3/libltdl/missing	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/missing	1970-01-01 01:00:00.000000000 +0100
@@ -1,353 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2004-09-07.08
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 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, 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.
-
-# 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit 0
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit 0
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl/README /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl/README
--- heartbeat-2.1.3/libltdl/README	2007-04-05 15:20:16.000000000 +0100
+++ heartbeat-2.1.4/libltdl/README	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
-
-It supports the following dlopen interfaces:
-* dlopen (Solaris, Linux and various BSD flavors)
-* shl_load (HP-UX)
-* LoadLibrary (Win16 and Win32)
-* load_add_on (BeOS)
-* GNU DLD (emulates dynamic linking for static libraries)
-* dyld (darwin/Mac OS X)
-* libtool's dlpreopen
Binary files /tmp/RGiEJF5kLi/heartbeat-2.1.3/libltdl.tar and /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libltdl.tar differ
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/libtool /tmp/RRBT9Z8NmI/heartbeat-2.1.4/libtool
--- heartbeat-2.1.3/libtool	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/libtool	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,7629 @@
+#! /bin/bash
+
+# libtoolT - Provide generalized library-building support services.
+# Generated automatically by  (GNU heartbeat 2.1.4)
+# 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, 2008
+# 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="/bin/sed"
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="/bin/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=" CXX"
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host gorgon:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/bash"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=x86_64-unknown-linux-gnu
+host_os=linux-gnu
+
+# The build system.
+build_alias=
+build=x86_64-unknown-linux-gnu
+build_os=linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc -std=gnu99"
+
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
+# A language-specific compiler.
+CC="gcc -std=gnu99"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="/bin/grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld -m elf_x86_64"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC -DPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=98304
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=yes
+
+# Whether dlopen of programs is supported.
+dlopen_self=yes
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=no
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=" -fno-builtin"
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# 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="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+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 \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=""
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=""
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=""
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# 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=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# 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=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=no
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.2.4 /usr/lib /lib"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL CONFIG
+
+# 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, 2006,
+# 2007, 2008  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
+# 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.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION="1.5.26 Debian 1.5.26-4"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+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
+  # 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, and then maybe $echo will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# 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'
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit $EXIT_FAILURE
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+duplicate_deps=no
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+	# Failing that, at least try and use $RANDOM to avoid a race
+	my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+	save_mktempdir_umask=`umask`
+	umask 0077
+	$mkdir "$my_tmpdir"
+	umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+	exit $EXIT_FAILURE
+      }
+    fi
+
+    $echo "X$my_tmpdir" | $Xsed
+}
+
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    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
+			}
+		}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+
+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
+    fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
+
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
+    fi
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      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
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $exit_status
+      fi
+      case $host in
+      *-darwin*)
+	$show "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	if test -z "$run"; then
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+	  if test -n "$darwin_arches"; then 
+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      lipo -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    ${rm}r unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd "$darwin_orig_dir"
+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	fi # $run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+    func_extract_archives_result="$my_oldobjs"
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+disable_libs=no
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+  arg="$1"
+  shift
+
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit $EXIT_FAILURE
+	;;
+      esac
+
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  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 $?
+    ;;
+
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+    done
+    exit $?
+    ;;
+
+  --debug)
+    $echo "$progname: enabling shell trace mode"
+    set -x
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    $echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $echo "enable shared libraries"
+    else
+      $echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $echo "enable static libraries"
+    else
+      $echo "disable static libraries"
+    fi
+    exit $?
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
+  --quiet | --silent)
+    show=:
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+fi
+
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  if test -n "$libobj" ; then
+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+ 	  for arg in $args; do
+	    IFS="$save_ifs"
+
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
+	  done
+	  IFS="$save_ifs"
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	* )
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      case $lastarg in
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+      # in scan sets (worked around with variable expansion),
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+      # at all, so we specify them separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      base_compile="$base_compile $lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit $EXIT_FAILURE
+      ;;
+    target)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *)
+      # Get the name of the library object.
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSifmso]'
+    case $libobj in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
+    *.for) xform=for ;;
+    *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case $libobj in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+      $echo "$srcfile" > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
+
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      if test ! -d "${xdir}$objdir"; then
+	$show "$mkdir ${xdir}$objdir"
+	$run $mkdir ${xdir}$objdir
+	exit_status=$?
+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $exit_status
+	fi
+      fi
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      $run $rm "$lobj" "$output_obj"
+
+      $show "$command"
+      if $run eval $lt_env "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	$show "$mv $output_obj $lobj"
+	if $run $mv $output_obj $lobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+        suppress_output=' >/dev/null 2>&1'
+      fi
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $run $rm "$obj" "$output_obj"
+      $show "$command"
+      if $run eval $lt_env "$command"; then :
+      else
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+    fi
+
+    $run $mv "${libobj}T" "${libobj}"
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
+
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt $@"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    single_module="${wl}-single_module"
+
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static | -static-libtool-libs)
+	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
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-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
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat $save_arg`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		# If there is no directory component, then add one.
+		case $arg in
+		*/* | *\\*) . $arg ;;
+		*) . ./$arg ;;
+		esac
+
+		if test -z "$pic_object" || \
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none && \
+		   test "$non_pic_object" = none; then
+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+
+		# Extract subdirectory from the argument.
+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		if test "X$xdir" = "X$arg"; then
+		  xdir=
+		else
+		  xdir="$xdir/"
+		fi
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  libobjs="$libobjs $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if test -z "$run"; then
+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+		  exit $EXIT_FAILURE
+		else
+		  # Dry-run case.
+
+		  # Extract subdirectory from the argument.
+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		  if test "X$xdir" = "X$arg"; then
+		    xdir=
+		  else
+		    xdir="$xdir/"
+		  fi
+
+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+		  libobjs="$libobjs $pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      fi
+	    done
+	  else
+	    $echo "$modename: link input file \`$save_arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	darwin_framework|darwin_framework_skip)
+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  prev=
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit $EXIT_FAILURE
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework|-arch|-isysroot)
+	case " $CC " in
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+		prev=darwin_framework_skip ;;
+	  *) compiler_flags="$compiler_flags $arg"
+	     prev=darwin_framework ;;
+	esac
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    absdir="$dir"
+	    notinst_path="$notinst_path $dir"
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs -framework System"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      -model)
+	compile_command="$compile_command $arg"
+	compiler_flags="$compiler_flags $arg"
+	finalize_command="$finalize_command $arg"
+	prev=xcompiler
+	continue
+	;;
+
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m* pass through architecture-specific compiler args for GCC
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args 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*| \
+      -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.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # 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
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  # If there is no directory component, then add one.
+	  case $arg in
+	  */* | *\\*) . $arg ;;
+	  *) . ./$arg ;;
+	  esac
+
+	  if test -z "$pic_object" || \
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none && \
+	     test "$non_pic_object" = none; then
+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$arg"; then
+	    xdir=
+ 	  else
+	    xdir="$xdir/"
+	  fi
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    libobjs="$libobjs $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if test -z "$run"; then
+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+	    exit $EXIT_FAILURE
+	  else
+	    # Dry-run case.
+
+	    # Extract subdirectory from the argument.
+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$arg"; then
+	      xdir=
+	    else
+	      xdir="$xdir/"
+	    fi
+
+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    libobjs="$libobjs $pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $exit_status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplications in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-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"
+	  else
+	    compiler_flags="$compiler_flags $deplib"
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
+	    else
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
+
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit $EXIT_FAILURE
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
+              fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	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
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath " in
+	      *" $dir "*) ;;
+	      *" $absdir "*) ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    need_relink=yes
+	  fi
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	    $echo
+	    if test "$linkmode" = prog; then
+	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $echo "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$extract_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$old_archive_from_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null |
+                      $EGREP ": [^:]* bundle" >/dev/null ; then
+		      $echo "** Warning, lib $linklib is a module, not a shared library"
+		      if test -z "$old_library" ; then
+		        $echo
+		        $echo "** And there doesn't seem to be a static archive available"
+		        $echo "** The link will probably fail, sorry"
+		      else
+		        add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit $EXIT_FAILURE
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $echo
+	    $echo "*** Warning: This system can not link to static lib archive $lib."
+	    $echo "*** I have the capability to make that library automatically link in when"
+	    $echo "*** you link to this library.  But I can only do this if you have a"
+	    $echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $echo "*** But as you try to build a module library, libtool will still create "
+	      $echo "*** a static module, that should work as long as the dlopening application"
+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$echo
+		$echo "*** However, this would only work if libtool was able to extract symbol"
+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$echo "*** not find such a program.  So, this module is probably useless."
+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit $EXIT_FAILURE
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="$absdir"
+		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs,
+		  # but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
+		    fi
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path="$newlib_search_path $path";;
+		    esac
+		  fi
+		  path=""
+		  ;;
+		*)
+		  path="-L$path"
+		  ;;
+		esac
+		;;
+	      -l*)
+		case $host in
+		*-*-darwin*)
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
+		  ;;
+		*) continue ;;
+		esac
+		;;
+	      *) continue ;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit $EXIT_FAILURE
+	else
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test "$#" -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows|none)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    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
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  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)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	irix | nonstopux)
+	  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 ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  $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
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$echo "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	if test -n "$removelist"; then
+	  $show "${rm}r $removelist"
+	  $run ${rm}r $removelist
+	fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      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
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+ 	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		$rm conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "*** make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval $echo \"$potent_lib\" 2>/dev/null \
+		        | ${SED} 10q \
+		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      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
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+		case " $convenience " in
+		*" $test_deplib "*) ;;
+		*)
+			tmp_deplibs="$tmp_deplibs $test_deplib"
+			;;
+		esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	  fi
+	fi
+	
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval test_cmds=\"$archive_expsym_cmds\"
+	  cmds=$archive_expsym_cmds
+	else
+	  eval test_cmds=\"$archive_cmds\"
+	  cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise.
+	  $echo "creating reloadable object files..."
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  delfiles=
+	  last_robj=
+	  k=1
+	  output=$output_objdir/$output_la-${k}.$objext
+	  # Loop over the list of objects to be linked.
+	  for obj in $save_libobjs
+	  do
+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+	    if test "X$objlist" = X ||
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+		 test "$len" -le "$max_cmd_len"; }; then
+	      objlist="$objlist $obj"
+	    else
+	      # The command $test_cmds is almost too long, add a
+	      # command to the queue.
+	      if test "$k" -eq 1 ; then
+		# The first file doesn't have a previous command to add.
+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+	      else
+		# All subsequent reloadable object files will link in
+		# the last one created.
+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      fi
+	      last_robj=$output_objdir/$output_la-${k}.$objext
+	      k=`expr $k + 1`
+	      output=$output_objdir/$output_la-${k}.$objext
+	      objlist=$obj
+	      len=1
+	    fi
+	  done
+	  # Handle the remaining objects by creating one last
+	  # reloadable object file.  All subsequent reloadable object
+	  # files will link in the last one created.
+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+	  if ${skipped_export-false}; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    libobjs=$output
+	    # Append the command to create the export file.
+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+	  # Set up a command to remove the reloadable object files
+	  # after they are used.
+	  i=0
+	  while test "$i" -lt "$k"
+	  do
+	    i=`expr $i + 1`
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+	  done
+
+	  $echo "creating a temporary reloadable object file: $output"
+
+	  # Loop through the commands generated above and execute them.
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $concat_cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    cmds=$archive_expsym_cmds
+	  else
+	    cmds=$archive_cmds
+	    fi
+	  fi
+
+	  # Append the command to remove the reloadable object files
+	  # to the just-reset $cmds.
+	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      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'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $run eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	cmds=$reload_cmds
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      fi
+
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+	fi
+      fi
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	;;
+      esac
+
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+      fi
+
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$outputname.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+	    else
+	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+	    fi
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
+	    fi
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
+	    fi
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+	    else
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+"
+
+	    case $host in
+	    *cygwin* | *mingw* )
+	  $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs */
+struct {
+"
+	      ;;
+	    * )
+	  $echo >> "$output_objdir/$dlsyms" "\
+const struct {
+"
+	      ;;
+	    esac
+
+
+	  $echo >> "$output_objdir/$dlsyms" "\
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag";;
+	    esac
+	  esac
+
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            else
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            ;;
+          esac
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+      fi
+
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	exit_status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      fi
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
+  newargz = XMALLOC(char *, argc+2);
+EOF
+
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
+EOF
+
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe");
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
+
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
+
+EOF
+
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+              ;;
+            esac
+
+            cat >> $cwrappersource <<"EOF"
+  return 127;
+}
+
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable(const char * path)
+{
+  struct stat st;
+
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
+char *
+find_executable (const char* wrapper)
+{
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char* concat_name;
+
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
+#endif
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# 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='$sed_quote_subst'
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+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.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
+
+	  $echo >> $output "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit $EXIT_FAILURE
+      fi
+    fi
+
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  $echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$echo >> $output "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \$*\"
+      exit $EXIT_FAILURE
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
+
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+       cmds=$old_archive_from_new_cmds
+      else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
+
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    exit_status=$?
+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+	      exit $exit_status
+	    fi
+	  fi
+
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+
+	eval cmds=\"$old_archive_cmds\"
+
+	if len=`expr "X$cmds" : ".*"` &&
+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  $echo "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  for obj in $save_oldobjs
+	  do
+	    oldobjs="$objlist $obj"
+	    objlist="$objlist $obj"
+	    eval test_cmds=\"$old_archive_cmds\"
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	       test "$len" -le "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+	        RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        eval cmd=\"$cmd\"
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test "$#" -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+	  else
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+	  fi
+
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  cmds=$postinstall_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      file=`$echo $file|${SED} 's,.exe$,,'`
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin*|*mingw*)
+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir=`func_mktempdir`
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
+	      fi
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway 
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
+	  ;;
+	esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
+      fi
+
+      # Do each command in the postinstall commands.
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  cmds=$finish_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit $EXIT_SUCCESS
+
+    $echo "X----------------------------------------------------------------------" | $Xsed
+    $echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $echo "   $libdir"
+    done
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $echo
+    $echo "See any operating system documentation about shared libraries for"
+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    $echo "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit $EXIT_FAILURE
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE 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"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      cmds=$postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      cmds=$old_postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+	  # Read the .lo file
+	  . $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
+    exit $exit_status
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+  esac
+
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit $EXIT_FAILURE
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit $EXIT_SUCCESS
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+  ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $?
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+disable_libs=shared
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+disable_libs=static
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# Libtool was configured on host gorgon:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/bash"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=x86_64-unknown-linux-gnu
+host_os=linux-gnu
+
+# The build system.
+build_alias=
+build=x86_64-unknown-linux-gnu
+build_os=linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc -std=gnu99"
+
+# LTCC compiler flags.
+LTCFLAGS="-g -O2"
+
+# A language-specific compiler.
+CC="g++"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="/bin/grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld -m elf_x86_64"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC -DPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=98304
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=yes
+
+# Whether dlopen of programs is supported.
+dlopen_self=yes
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=no
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=" -fno-builtin"
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# 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="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../../../lib/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.2.4/crtbeginS.o"
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.2.4/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../../../lib/crtn.o"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.2.4 /usr/lib/gcc/x86_64-linux-gnu/4.2.4 /usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../../../lib /lib/../lib /usr/lib/../lib /usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../.."
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.2.4 -L/usr/lib/gcc/x86_64-linux-gnu/4.2.4 -L/usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.2.4/../../.."
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# 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=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# 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=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=no
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.2.4 /usr/lib /lib"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL TAG CONFIG: CXX
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/logd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/logd/Makefile
--- heartbeat-2.1.3/logd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/logd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,709 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# logd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/logd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/logd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# hbclient library: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+# Copyright (C) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+ha_sbindir = $(sbindir)
+gliblib = -lglib-2.0  
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+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)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ha_sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ha_sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ha_sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ha_sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-ha_sbinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-ha_sbinPROGRAMS:
+	@list='$(ha_sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+ha_logd$(EXEEXT): $(ha_logd_OBJECTS) $(ha_logd_DEPENDENCIES) 
+	@rm -f ha_logd$(EXEEXT)
+	$(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_OBJECTS) $(ha_logger_LDADD) $(LIBS)
+logtest$(EXEEXT): $(logtest_OBJECTS) $(logtest_DEPENDENCIES) 
+	@rm -f logtest$(EXEEXT)
+	$(LINK) $(logtest_OBJECTS) $(logtest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/ha_logd.Po
+include ./$(DEPDIR)/ha_logger.Po
+include ./$(DEPDIR)/logtest.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-ha_sbinPROGRAMS clean-halibPROGRAMS \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+
+install-exec-hook:
+	$(LN_S) -f $(sbindir)/ha_logger $(DESTDIR)$(halibdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/logd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/logd/Makefile.in
--- heartbeat-2.1.3/logd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/logd/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -41,7 +41,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -63,7 +63,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -112,6 +112,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -129,24 +130,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -208,12 +197,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -433,8 +423,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ha_sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ha_sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ha_sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ha_sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -461,8 +451,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -532,8 +522,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -545,8 +535,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -556,13 +546,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/admin/lrmadmin.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/admin/lrmadmin.c
--- heartbeat-2.1.3/lrm/admin/lrmadmin.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/admin/lrmadmin.c	2008-08-18 13:32:19.000000000 +0100
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <time.h>
 #ifndef __USE_GNU
 #define __USE_GNU
 /* For strnlen protype */ 
@@ -40,12 +41,13 @@
 #endif /* HAVE_GETOPT_H */
 #include <clplumbing/cl_log.h>
 #include <lrm/lrm_api.h>
+#include <lrm/lrm_msg.h>
 #include <lrm/raexec.h>
 #include <clplumbing/lsb_exitcodes.h>
 #include <clplumbing/GSource.h>
 #include <clplumbing/Gmain_timeout.h>
 
-const char * optstring = "AD:dEF:d:sg:M:O:P:c:S:LI:CT:n:h";
+const char * optstring = "AD:X:dEF:d:sg:M:O:P:c:S:LI:CT:n:h";
 
 #ifdef HAVE_GETOPT_H
 static struct option long_options[] = {
@@ -53,11 +55,12 @@
 	{"executera", 1, 0, 'E'},
 	{"flush",1,0,'F'},
 	{"monitor",0,0,'M'},
-	{"status",1,0,'S'},
+	{"state",1,0,'S'},
 	{"listall",0,0,'L'},
 	{"information",1,0,'I'},
 	{"add",1,0,'A'},
 	{"delete",1,0,'D'},
+	{"fail",1,0,'X'},
 	{"raclass_supported",1,0,'C'},
 	{"ratype_supported",1,0,'T'},
 	{"all_type_metadata",1,0,'O'},
@@ -85,6 +88,7 @@
 	INF_RSC,
 	ADD_RSC,
 	DEL_RSC,
+	FAIL_RSC,
 	RACLASS_SUPPORTED,
 	RATYPE_SUPPORTED,
 	RA_METADATA,
@@ -136,6 +140,7 @@
 "         {-A|--add} <rscid> <raclass> <ratype> <provider|NULL> [<rsc_params_list>]\n"
 "         {-D|--delete} <rscid>\n"
 "         {-F|--flush} <rscid>\n"
+"         {-X|--fail} <rscid> [<fail_rc> [<fail_reason>]]\n"
 "         {-E|--execute} <rscid> <operator> <timeout> <interval> <target_rc|EVERYTIME|CHANGED> [<operator_parameters_list>]\n"
 "         {-S|--state} <rscid> [-n <fake_name>]\n"
 "         {-L|--listall}\n"
@@ -157,6 +162,7 @@
 static int resource_operation(ll_lrm_t * lrmd, int argc, int optind, 
 			      char * argv[]);
 static int add_resource(ll_lrm_t * lrmd, int argc, int optind, char * argv[]);
+static int fail_resource(ll_lrm_t * lrmd, char *rsc_id, int optc, char *opts[]);
 static int transfer_cmd_params(int amount, int start, char * argv[], 
 			   const char * class, GHashTable ** params_ht);
 static void g_print_stringitem_and_free(gpointer data, gpointer user_data);
@@ -244,6 +250,12 @@
 				}
 				break;
 
+			case 'X':
+				OPTION_OBSCURE_CHECK 
+				lrmadmin_cmd = FAIL_RSC;
+				strncpy(rscid_arg_tmp, optarg, RID_LEN-1);
+				break;
+
 			case 'C':
 				OPTION_OBSCURE_CHECK 
 				lrmadmin_cmd = RACLASS_SUPPORTED;
@@ -427,6 +439,19 @@
 			ASYN_OPS = FALSE;
 			break;	
 
+		case FAIL_RSC:
+			/* Return value: HA_OK = 1 Or  HA_FAIL = 0 */
+			if (fail_resource(lrmd, rscid_arg_tmp,
+				argc-optind, argv+optind) == 1)
+			{
+				printf("Succeeded in failing the resource.\n");
+			} else {
+				printf("Failed to fail the resource.\n");
+				ret_value = -3;
+			}
+			ASYN_OPS = FALSE;
+			break;	
+
 		case FLUSH:
 			lrm_rsc = get_lrm_rsc(lrmd, rscid_arg_tmp);
 			if (!(lrm_rsc)) {
@@ -606,7 +631,7 @@
 	printf("return code: %d\n", op->rc);
 	printf("output data: \n%s\n", (op->output ? op->output : "[null]"));
 	printf("---------------------------------------\n\n");
-	ret_value = op->op_status;	
+	ret_value = op->rc;	
 }
 
 static int 
@@ -760,6 +785,25 @@
 	return (tmp_ret ? 0 : -1); /* tmp_ret is HA_OK=1 or HA_FAIL=0 */
 }
 
+static int 
+fail_resource(ll_lrm_t * lrmd, char *rsc_id, int optc, char *opts[])
+{
+	int fail_rc = 0;
+	const char * reason = NULL;
+
+	if (optc > 2) {
+		cl_log(LOG_ERR,"Bad usage.");
+		return -2;
+	}
+
+	if (optc >= 1)
+		fail_rc = atoi(opts[0]);
+	if (optc == 2)
+		reason = opts[1];
+
+	return lrmd->lrm_ops->fail_rsc(lrmd, rsc_id, fail_rc, reason);
+}
+
 static int
 transfer_cmd_params(int amount, int start, char * argv[], const char * class, 
 GHashTable ** params_ht)
@@ -784,11 +828,11 @@
 				goto error_return; /* Have to */
 			}
 
-			len_tmp = strnlen(delimit+1, 80) + 1;
+			len_tmp = strnlen(delimit+1, MAX_PARAM_LEN) + 1;
 			value = g_new(gchar, len_tmp);
 			strncpy(value, delimit+1, len_tmp);
 
-			len_tmp = strnlen(argv[i], 80) - strnlen(delimit, 80);
+			len_tmp = strnlen(argv[i], MAX_PARAM_LEN) - strnlen(delimit, MAX_PARAM_LEN);
 			key = g_new(gchar, len_tmp+1);
 			key[len_tmp] = '\0';
 			strncpy(key, argv[i], len_tmp);
@@ -889,6 +933,7 @@
 {
 	lrm_op_t* op = (lrm_op_t*)data;
 	GString * param_gstr;
+	time_t run_at=0, rcchange_at=0;
 
 	if (NULL == op) {
 		cl_log(LOG_ERR, "%s:%d: op==NULL"
@@ -899,17 +944,29 @@
 	param_gstr = g_string_new("");
 	g_hash_table_foreach(op->params, ocf_params_hash_to_str, &param_gstr);
 
+	if( op->t_run )
+		run_at=(time_t)op->t_run;
+	if( op->t_rcchange )
+		rcchange_at=(time_t)op->t_rcchange;
 	printf("   operation '%s' [call_id=%d]:\n"
 	       "      start_delay=%d, interval=%d, timeout=%d, app_name=%s\n"
 	       "      rc=%d (%s), op_status=%d (%s)\n"
-	       "      parameters: %s\n"
 		, nullcheck(op->op_type), op->call_id
 		, op->start_delay, op->interval, op->timeout
 		, nullcheck(op->app_name), op->rc
 		, rc_msg[(op->rc-EXECRA_EXEC_UNKNOWN_ERROR) % DIMOF(rc_msg)]
 		, op->op_status
 		, status_msg[(op->op_status-LRM_OP_PENDING) % DIMOF(status_msg)]
-		, param_gstr->str);
+	);
+	if( op->t_run || op->t_rcchange )
+		printf("      run at: %s"
+			   "      last rc change at: %s"
+			   "      queue time: %lums, exec time: %lums\n"
+			, op->t_run ? ctime(&run_at) : "N/A\n"
+			, op->t_rcchange ? ctime(&rcchange_at) : "N/A\n"
+			, op->queue_time, op->exec_time
+		);
+	printf("      parameters: %s\n", param_gstr->str);
 	g_string_free(param_gstr, TRUE);
 }
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/admin/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/admin/Makefile
--- heartbeat-2.1.3/lrm/admin/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lrm/admin/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,641 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lrm/admin/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/admin
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/admin
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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)/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
+LRM_DIR = lrm
+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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+lrmadmin$(EXEEXT): $(lrmadmin_OBJECTS) $(lrmadmin_DEPENDENCIES) 
+	@rm -f lrmadmin$(EXEEXT)
+	$(lrmadmin_LINK) $(lrmadmin_OBJECTS) $(lrmadmin_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/lrmadmin.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/admin/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/admin/Makefile.in
--- heartbeat-2.1.3/lrm/admin/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lrm/admin/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -52,7 +52,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -100,6 +100,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -117,24 +118,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -196,12 +185,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -408,8 +398,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -471,8 +461,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/lrmd/lrmd.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/lrmd/lrmd.c
--- heartbeat-2.1.3/lrm/lrmd/lrmd.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/lrmd/lrmd.c	2008-08-18 13:32:19.000000000 +0100
@@ -97,6 +97,7 @@
 	{GETLASTOP,	NO_MSG,	on_msg_get_last_op},
 	{GETALLRCSES,	NO_MSG,	on_msg_get_all},
 	{DELRSC,	REPLY_NOW,	on_msg_del_rsc},
+	{FAILRSC,	REPLY_NOW,	on_msg_fail_rsc},
 	{PERFORMOP,	REPLY_NOW,	on_msg_perform_op},
 	{FLUSHOPS,	REPLY_NOW,	on_msg_flush_all},
 	{CANCELOP,	REPLY_NOW,	on_msg_cancel_op},
@@ -170,7 +171,7 @@
 	}
 	rapop = cl_calloc(sizeof(ra_pipe_op_t), 1);
 	if ( rapop == NULL) {
-		lrmd_log(LOG_ERR, "%s:%d out of memory." 
+		lrmd_log(LOG_ERR, "%s:%d out of memory" 
 			, __FUNCTION__, __LINE__);
 		return NULL;
 	}
@@ -1218,7 +1219,10 @@
 	 * Calling this function accomplishes that.
 	 */
 	cl_set_all_coredump_signal_handlers();
-	drop_privs(0, 0); /* become "nobody" */
+	if( drop_privs(0, 0) ) { /* become "nobody" */
+		lrmd_log(LOG_WARNING,"%s: failed to drop privileges: %s"
+		, __FUNCTION__, strerror(errno));
+	}
 
 	/*
 	 * Add the signal handler for SIGUSR1, SIGUSR2. 
@@ -1261,7 +1265,9 @@
                 reg_to_apphbd = FALSE;
         }
 
-	return_to_orig_privs();
+	if( return_to_orig_privs() ) {
+		cl_perror("%s: failed to raise privileges", __FUNCTION__);
+	}
 	conn_cmd->ops->destroy(conn_cmd);
 	conn_cmd = NULL;
 
@@ -1777,10 +1783,11 @@
 	provider = ha_msg_value(msg, F_LRM_RPROVIDER);
 
 	lrmd_debug2(LOG_DEBUG
-	,	"%s: the client [pid:%d] want to get rsc metadata of %s::%s."
+	,	"%s: the client [pid:%d] wants to get rsc metadata of %s::%s::%s."
 	,	__FUNCTION__
 	,	client->pid
 	,	lrm_str(rclass)
+	,	lrm_str(provider)
 	,	lrm_str(rtype));
 
 	ret = create_lrm_ret(HA_OK, 5);
@@ -1795,13 +1802,19 @@
 	}
 	else {
 		char* meta = RAExec->get_resource_meta(rtype,provider);
-		if (NULL != meta) {
+		if (NULL != meta && strlen(meta) > 0) {
 			if (HA_OK != ha_msg_add(ret,F_LRM_METADATA, meta)) {
 				LOG_FAILED_TO_ADD_FIELD("metadata");
 			}
 			g_free(meta);
 		}
 		else {
+			lrmd_log(LOG_WARNING
+			, 	"%s: empty metadata for %s::%s::%s."
+			,	__FUNCTION__
+			,	lrm_str(rclass)
+			,	lrm_str(provider)
+			,	lrm_str(rtype));
 			ha_msg_mod_int(ret, F_LRM_RET, HA_FAIL);
 		}
 	}
@@ -2008,6 +2021,93 @@
 	return HA_OK;
 }
 
+static int
+prepare_failmsg(struct ha_msg* msg, int fail_rc, const char *fail_reason)
+{
+	call_id++; /* use the next id */
+	if (HA_OK != ha_msg_mod(msg,F_LRM_OP,ASYNC_OP_NAME)
+		|| HA_OK != ha_msg_add(msg,F_LRM_FAIL_REASON,fail_reason)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_ASYNCMON_RC,fail_rc)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_RC,fail_rc)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_OPSTATUS,(int)LRM_OP_DONE)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_CALLID,call_id)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_TIMEOUT,0)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_INTERVAL,0)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_TARGETRC,EVERYTIME)
+		|| HA_OK != ha_msg_mod_int(msg,F_LRM_DELAY,0)
+	) {
+		lrmd_log(LOG_ERR,"%s:%d: cannot add field to a message"
+		,	__FUNCTION__, __LINE__);
+		return 1;
+	}
+	return 0;
+}
+
+static void
+async_notify(gpointer key, gpointer val, gpointer data)
+{
+	struct ha_msg* msg = (struct ha_msg*)data;
+	lrmd_client_t* client;
+
+	client = lookup_client_by_name((char *)key);
+	if (!client) {
+		lrmd_log(LOG_INFO,
+			"%s: client %s not found, probably signed out", __FUNCTION__, (char *)key);
+		return;
+	}
+	if (HA_OK != ha_msg_mod(msg,F_LRM_APP,client->app_name)) {
+		lrmd_log(LOG_ERR,"%s:%d: cannot add field to a message"
+		,	__FUNCTION__, __LINE__);
+		return;
+	}
+	if (!client->ch_cbk) {
+		lrmd_log(LOG_WARNING,
+			"%s: callback channel is null", __FUNCTION__);
+	} else if (HA_OK != msg2ipcchan(msg, client->ch_cbk)) {
+		lrmd_log(LOG_WARNING,
+			"%s: can not send the ret msg", __FUNCTION__);
+	}
+}
+
+int
+on_msg_fail_rsc(lrmd_client_t* client, struct ha_msg* msg)
+{
+	lrmd_rsc_t* rsc;
+	const char* id;
+	int fail_rc = -1;
+	const char *fail_reason;
+
+	CHECK_ALLOCATED(client, "client", HA_FAIL);
+	CHECK_ALLOCATED(msg, "message", HA_FAIL);
+
+	id = ha_msg_value(msg, F_LRM_RID);
+	lrmd_debug2(LOG_DEBUG
+	,	"%s: client [%d] wants to fail rsc %s"
+	,	__FUNCTION__, client->pid, lrmd_nullcheck(id));
+
+	rsc = lookup_rsc_by_msg(msg);
+	if (!rsc) {
+		lrmd_log(LOG_ERR, "%s: no resource with id %s."
+		,	__FUNCTION__, lrmd_nullcheck(id));
+		return HA_FAIL;
+	}
+	fail_reason = ha_msg_value(msg,F_LRM_FAIL_REASON);
+	if (!fail_reason || *fail_reason == '\0') {
+		fail_reason = DEFAULT_FAIL_REASON;
+	}
+	if (HA_OK != ha_msg_value_int(msg,F_LRM_ASYNCMON_RC,&fail_rc) || fail_rc <= 0) {
+		fail_rc = DEFAULT_FAIL_RC;
+	}
+	if (prepare_failmsg(msg,fail_rc,fail_reason))
+		return HA_FAIL;
+	lrmd_log(LOG_WARNING
+	,	"received asynchronous failure for rsc %s (rc: %d, reason: %s)"
+	,	lrmd_nullcheck(id), fail_rc, fail_reason);
+	/* notify all clients from last_op table about the failure */
+	g_hash_table_foreach(rsc->last_op_table,async_notify,msg);
+	return HA_OK;
+}
+
 static gboolean
 free_str_hash_pair(gpointer key, gpointer value, gpointer user_data)
 {
@@ -2254,7 +2354,7 @@
 		LOG_FAILED_TO_ADD_FIELD("callid");
 		return -1;
 	}
-	if (HA_OK !=ha_msg_add(msg, F_LRM_APP, client->app_name)) {
+	if (HA_OK !=ha_msg_mod(msg, F_LRM_APP, client->app_name)) {
 		LOG_FAILED_TO_ADD_FIELD("app_name");
 		return -1;
 	}
@@ -2408,6 +2508,7 @@
 	if(last_ops != NULL) {
 		g_hash_table_foreach(last_ops, send_last_op, client->ch_cmd);
 	}
+
 	/* send the ops in op list */
 	for(node = g_list_first(rsc->op_list)
 	;	NULL != node; node = g_list_next(node)){
@@ -2446,11 +2547,6 @@
 	return HA_OK;
 }
 
-#define mk_op_id(op,id) do { \
-	const char *op_type = ha_msg_value(op->msg, F_LRM_OP); \
-	const char *op_interval = ha_msg_value(op->msg, F_LRM_INTERVAL); \
-	id = lrm_concat(op_type, op_interval, '_'); \
-} while(0)
 #define safe_len(s) (s ? strlen(s) : 0)
 
 static char *
@@ -2474,55 +2570,97 @@
 	return new_str;
 }
 
-/* /////////////////////op functions//////////////////////////////////////////// */
-static void 
-record_op_completion(lrmd_client_t* client, lrmd_rsc_t* rsc, lrmd_op_t* op)
+/* /////////////////////op functions////////////////////// */
+
+#define mk_op_id(op,id) do { \
+	const char *op_type = ha_msg_value(op->msg, F_LRM_OP); \
+	const char *op_interval = ha_msg_value(op->msg, F_LRM_INTERVAL); \
+	id = lrm_concat(op_type, op_interval, '_'); \
+} while(0)
+
+/* find the last operation for the client
+ * replace it with the new one (if requested)
+ */
+static void
+replace_last_op(lrmd_client_t* client, lrmd_rsc_t* rsc, lrmd_op_t* op)
 {
-	char *op_hash_key = NULL;
-	lrmd_op_t* old_op = NULL;
-	lrmd_op_t* new_op = NULL;
-	GHashTable* client_last_op = NULL;
+	char *op_hash_key;
+	GHashTable *client_last_op;
+	lrmd_op_t *old_op, *new_op;
+
+	if (!client || !rsc || !op)
+		return;
+	client_last_op = g_hash_table_lookup(rsc->last_op_table, client->app_name);
+	if (!client_last_op) {
+		client_last_op = g_hash_table_new_full(	g_str_hash
+		, 	g_str_equal, cl_free, NULL);
+		g_hash_table_insert(rsc->last_op_table
+		,	(gpointer)cl_strdup(client->app_name)
+		,	(gpointer)client_last_op);
+	}
+	mk_op_id(op,op_hash_key);
+	old_op = (lrmd_op_t*)g_hash_table_lookup(client_last_op, op_hash_key);
+
+	/* make a copy of op and insert it into client_last_op */
+	if (!(new_op = lrmd_op_copy(op))) {
+		lrmd_log(LOG_ERR, "%s:%d out of memory" 
+			, __FUNCTION__, __LINE__);
+	}
+	if (old_op) {
+		g_hash_table_replace(client_last_op,op_hash_key,(gpointer)new_op);
+		lrmd_op_destroy(old_op);
+	} else {
+		g_hash_table_insert(client_last_op,op_hash_key,(gpointer)new_op);
+	}
+}
+
+static void
+record_op_completion(lrmd_rsc_t* rsc, lrmd_op_t* op)
+{
+	lrmd_client_t* client;
 
 	LRMAUDIT();
 	/*save the op in the last op finished*/
 	if (rsc->last_op_done != NULL) {
 		lrmd_op_destroy(rsc->last_op_done);
 	}
-	rsc->last_op_done = lrmd_op_copy(op);
+	if (!(rsc->last_op_done = lrmd_op_copy(op))) {
+		lrmd_log(LOG_ERR, "%s:%d out of memory" 
+			, __FUNCTION__, __LINE__);
+	}
 	rsc->last_op_done->repeat_timeout_tag = (guint)0;
 
+	client = lookup_client(op->client_id);
 	if (!client) {
 		lrmd_debug(LOG_DEBUG, "%s: cannot record %s: client is gone."
 		,	__FUNCTION__, small_op_info(op)); 
 		LRMAUDIT();
 		return;
 	}
-	/*find the hash table for the client*/
-	client_last_op = g_hash_table_lookup(rsc->last_op_table
-	, 			client->app_name);
-	if (NULL == client_last_op) {
-		client_last_op = g_hash_table_new_full(	g_str_hash
-		, 	g_str_equal, cl_free, NULL);
-		g_hash_table_insert(rsc->last_op_table
-		,	(gpointer)cl_strdup(client->app_name)
-		,	(gpointer)client_last_op);
-	}
+	/* insert (or replace) the new op in last_op_table for the client */
+	replace_last_op(client,rsc,op);
+	LRMAUDIT();
+}
 
-	mk_op_id(op,op_hash_key);
-	old_op = g_hash_table_lookup(client_last_op, op_hash_key);
-	new_op = lrmd_op_copy(op);
-	if (NULL != old_op) {
-		g_hash_table_replace(client_last_op
-		, 	op_hash_key
-		,	(gpointer)new_op);
-		/* Don't let the timers go away */
-		lrmd_op_destroy(old_op);
-	}else{
-		g_hash_table_insert(client_last_op
-		, 	op_hash_key
-		,	(gpointer)new_op);
+static void
+to_repeatlist(lrmd_rsc_t* rsc, lrmd_op_t* op)
+{
+	lrmd_op_t *repeat_op;
+
+	if (!(repeat_op = lrmd_op_copy(op))) {
+		lrmd_log(LOG_ERR, "%s:%d out of memory" 
+			, __FUNCTION__, __LINE__);
 	}
-	LRMAUDIT();
+	reset_timestamps(repeat_op);
+	repeat_op->is_copy = FALSE;
+	repeat_op->repeat_timeout_tag = 
+		Gmain_timeout_add(op->interval,	
+				on_repeat_op_readytorun, repeat_op);
+	rsc->repeat_op_list = 
+		g_list_append (rsc->repeat_op_list, repeat_op);
+	lrmd_debug2(LOG_DEBUG
+	, "on_op_done:repeat %s is added to repeat op list to wait" 
+	, op_info(op));
 }
 
 static void 
@@ -2591,102 +2729,65 @@
 int
 on_op_done(lrmd_rsc_t* rsc, lrmd_op_t* op)
 {
-	int target_rc = -1;
-	int last_rc = -1;
-	int op_rc = -1;
+	int target_rc, last_rc, op_rc;
+	int rc_changed;
 	op_status_t op_status;
-	int op_status_int;
-	int need_notify = 0;
-	lrmd_client_t* client = NULL;
 
 	LRMAUDIT();
 	CHECK_ALLOCATED(op, "op", HA_FAIL );
 	if (op->exec_pid == 0) {
-		lrmd_log(LOG_ERR, "on_op_done: op->exec_pid == 0.");
+		lrmd_log(LOG_ERR, "%s: op->exec_pid == 0",__FUNCTION__);
 		return HA_FAIL;
 	}
 	op->t_done = time_longclock();
 
-	lrmd_debug2(LOG_DEBUG, "on_op_done: %s", op_info(op));
-	lrmd_debug2(LOG_DEBUG
-		 ,"Timestamps: Recv:%ld, Add to List:%ld, Perform:%ld"
-		 ", Done: %ld, Rc change: %ld"
-		 ,longclockto_ms(op->t_recv)
-		 ,longclockto_ms(op->t_addtolist)
-		 ,longclockto_ms(op->t_perform)
-		 ,longclockto_ms(op->t_done)
-		 ,longclockto_ms(op->t_rcchange));
-
-	if (HA_OK != ha_msg_value_int(op->msg,F_LRM_TARGETRC,&target_rc)){
-		lrmd_log(LOG_ERR
-		,	"%s: can not get target status field from a message"
-		,	__FUNCTION__);
-		return HA_FAIL;
-	}
-	if (HA_OK !=
-		ha_msg_value_int(op->msg, F_LRM_OPSTATUS, &op_status_int)) {
-		lrmd_log(LOG_ERR
-		,	"%s: can not get operation status field from a message"
-		,	__FUNCTION__);
-		return HA_FAIL;
-	}
-	op_status = (op_status_t)op_status_int;
-
 	if (debug_level >= 2) {
+		lrmd_debug(LOG_DEBUG, "%s: %s",__FUNCTION__, op_info(op));
 		lrmd_op_dump(op, __FUNCTION__);
 	}
 
+	return_on_no_int_value(op->msg,F_LRM_TARGETRC,&target_rc);
+	return_on_no_int_value(op->msg,F_LRM_OPSTATUS,(int *)&op_status);
+
+	last_rc = op_rc = -1; /* set all rc to -1 */
 	ha_msg_value_int(op->msg,F_LRM_RC,&op_rc);
-	ha_msg_value_int(op->msg,F_LRM_LASTRC, &last_rc);
-	if (op_status != LRM_OP_DONE
-		|| (op_rc == -1)
-		|| (op_rc == target_rc)
-		|| (target_rc == EVERYTIME)
-		|| ((target_rc == CHANGED)
-			&& ((last_rc == -1) || (last_rc != op_rc)))
-		) {
-		need_notify = 1;
-	}
-	if (op_status == LRM_OP_DONE
-		&& CHANGED == target_rc
+	ha_msg_value_int(op->msg,F_LRM_LASTRC,&last_rc);
+	rc_changed = (
+		op_status == LRM_OP_DONE
 		&& op_rc != -1
-		&& HA_OK != ha_msg_mod_int(op->msg, F_LRM_LASTRC, op_rc)) {
-		lrmd_log(LOG_ERR,"on_op_done: can not save status to "
-			"the message op->msg.");
-		return HA_FAIL;
-	}
-	if ((last_rc == -1) || (last_rc != op_rc)) {
+		&& ((last_rc == -1) || (last_rc != op_rc))
+	);
+	if (rc_changed) {
+		if (HA_OK != ha_msg_mod_int(op->msg, F_LRM_LASTRC, op_rc)) {
+			lrmd_log(LOG_ERR,"%s: cannot save status to msg",__FUNCTION__);
+			return HA_FAIL;
+		}
 		op->t_rcchange = op->t_perform;
 	}
+	if (store_timestamps(op))
+		return HA_FAIL;
 
-	/* remove the op from op_list and copy to last_op */
+	/* remove the op from op_list */
 	rsc->op_list = g_list_remove(rsc->op_list,op);
 	lrmd_debug2(LOG_DEBUG
-	, 	"on_op_done:%s is removed from op list" 
-	,	op_info(op));
+	, 	"%s:%s is removed from op list"
+	,	__FUNCTION__, op_info(op));
 
-	client = lookup_client(op->client_id);
-	if ( LRM_OP_CANCELLED != op_status ) {
-		/*record the outcome of the op */
-		record_op_completion(client, rsc, op);
-		/*copy the repeat op to repeat list to wait next perform */
-		if ( client && op->interval ) {
-			lrmd_op_t* repeat_op = lrmd_op_copy(op);
-			repeat_op->is_copy = FALSE;
-			repeat_op->repeat_timeout_tag = 
-				Gmain_timeout_add(op->interval,	
-						on_repeat_op_readytorun, repeat_op);
-			rsc->repeat_op_list = 
-				g_list_append (rsc->repeat_op_list, repeat_op);
-			lrmd_debug2(LOG_DEBUG
-			, "on_op_done:repeat %s is added to repeat op list to wait" 
-			, op_info(op));
+	if (op_status != LRM_OP_CANCELLED) {
+		record_op_completion(rsc,op); /*record the outcome of the op */
+		if (op->interval) { /* copy op to the repeat list */
+			to_repeatlist(rsc,op);
 		}
 	} else {
 		remove_op_history(op);
 	}
 
-	if ( need_notify ) {
+	if (op_status != LRM_OP_DONE
+		|| (op_rc == -1)
+		|| (op_rc == target_rc)
+		|| (target_rc == EVERYTIME)
+		|| ((target_rc == CHANGED) && rc_changed)
+	) {
 		notify_client(op);
 	}
 	lrmd_op_destroy(op);
@@ -2711,11 +2812,11 @@
 {
 	CHECK_ALLOCATED(op, "op", HA_FAIL );
 	if (op->exec_pid == 0) {
-		lrmd_debug(LOG_ERR, "%s: op->exec_pid == 0.",__FUNCTION__);
+		lrmd_debug(LOG_ERR, "%s: op->exec_pid == 0",__FUNCTION__);
 		return HA_FAIL;
 	}
 
-	if (HA_OK != ha_msg_add_int(op->msg, F_LRM_RC, HA_FAIL)) {
+	if (HA_OK != ha_msg_mod_int(op->msg, F_LRM_RC, HA_FAIL)) {
 		LOG_FAILED_TO_ADD_FIELD("F_LRM_RC");
 		return HA_FAIL;
 	}
@@ -2837,56 +2938,65 @@
 	return HA_OK;
 }
 
+static int
+store_timestamps(lrmd_op_t* op)
+{
+	struct ha_msg* msg = op->msg;
+	longclock_t	now = time_longclock(), /* tm2unix() needs this */
+		exec_time = zero_longclock,
+		queue_time = zero_longclock;
+
+	if (op->t_perform) {
+		queue_time =
+			longclockto_ms(sub_longclock(op->t_perform,op->t_addtolist));
+		if (op->t_done) {
+			exec_time =
+				longclockto_ms(sub_longclock(op->t_done,op->t_perform));
+		}
+	}
+	if ((HA_OK!=ha_msg_mod_ul(msg,F_LRM_T_RUN,tm2unix(op->t_perform)))
+		|| (HA_OK!=ha_msg_mod_ul(msg,F_LRM_T_RCCHANGE,tm2unix(op->t_rcchange)))
+		|| (HA_OK!=ha_msg_mod_ul(msg,F_LRM_EXEC_TIME,exec_time))
+		|| (HA_OK!=ha_msg_mod_ul(msg,F_LRM_QUEUE_TIME,queue_time))
+	) {
+		lrmd_log(LOG_ERR,"%s: can not save timestamps to msg",__FUNCTION__);
+		return 1;
+	}
+	return 0;
+}
+
+static void
+reset_timestamps(lrmd_op_t* op)
+{
+	op->t_perform = zero_longclock;
+	op->t_done = zero_longclock;
+	cl_msg_remove(op->msg, F_LRM_T_RUN);
+	cl_msg_remove(op->msg, F_LRM_T_RCCHANGE);
+	cl_msg_remove(op->msg, F_LRM_EXEC_TIME);
+	cl_msg_remove(op->msg, F_LRM_QUEUE_TIME);
+}
+
 struct ha_msg*
 op_to_msg(lrmd_op_t* op)
 {
 	struct ha_msg* msg = NULL;
-	longclock_t	now = time_longclock(),
-		exec_time = zero_longclock,
-		queue_time = zero_longclock;
 
 	CHECK_ALLOCATED(op, "op", NULL);
 	if (op->exec_pid == 0) {
-		lrmd_log(LOG_ERR, "op_to_msg: op->exec_pid is 0.");
+		lrmd_log(LOG_ERR, "%s: op->exec_pid is 0",__FUNCTION__);
 		return NULL;
 	}
 	msg = ha_msg_copy(op->msg);
 	if (NULL == msg) {
-		lrmd_log(LOG_ERR,"op_to_msg: can not copy the msg");
+		lrmd_log(LOG_ERR,"%s: can not copy the msg",__FUNCTION__);
 		return NULL;
 	}
-	if (HA_OK != ha_msg_add_int(msg, F_LRM_CALLID, op->call_id)) {
-		LOG_FAILED_TO_ADD_FIELD("call_id");
-		goto error;
-	}
-	if (HA_OK != ha_msg_add_ul(msg, F_LRM_T_RUN, tm2age(op->t_perform))) {
-		LOG_FAILED_TO_ADD_FIELD("t_run")
-		goto error;
-	}
-	if (HA_OK != ha_msg_add_ul(msg, F_LRM_T_RCCHANGE, tm2age(op->t_rcchange))) {
-		LOG_FAILED_TO_ADD_FIELD("t_rcchange")
-		goto error;
-	}
-	if (op->t_perform) {
-		queue_time =
-			longclockto_ms(sub_longclock(op->t_perform,op->t_addtolist));
-		if (op->t_done) {
-			exec_time =
-				longclockto_ms(sub_longclock(op->t_done,op->t_perform));
-		}
-	}
-	if (HA_OK != ha_msg_add_ul(msg, F_LRM_EXEC_TIME, exec_time)) {
-		LOG_FAILED_TO_ADD_FIELD("exec_time")
-		goto error;
-	}
-	if (HA_OK != ha_msg_add_ul(msg, F_LRM_QUEUE_TIME, queue_time)) {
-		LOG_FAILED_TO_ADD_FIELD("queue_time")
-		goto error;
+	if ((HA_OK!=ha_msg_mod_int(msg,F_LRM_CALLID,op->call_id))) {
+		lrmd_log(LOG_ERR,"%s: can not save F_LRM_CALLID to msg",__FUNCTION__);
+		ha_msg_del(msg);
+		msg = NULL;
 	}
 	return msg;
-
-error:	ha_msg_del(msg);
-	return NULL;
 }
 
 /* //////////////////////////////RA wrap funcs/////////////////////////////////// */
@@ -2918,7 +3028,7 @@
 	}
 
 	if (op->exec_pid == 0) {
-		lrmd_log(LOG_ERR, "perform_ra_op: op->exec_pid == 0.");
+		lrmd_log(LOG_ERR, "%s::%d: op->exec_pid == 0.", __FUNCTION__, __LINE__);
 		return HA_FAIL;
 	}
 
@@ -2938,25 +3048,31 @@
 
 	if(HA_OK != ha_msg_value_int(op->msg, F_LRM_TIMEOUT, &timeout)){
 		timeout = 0;
-		lrmd_log(LOG_ERR,"perform_ra_op: failed to get timeout from "
-			"the message op->msg.");
+		lrmd_log(LOG_ERR,"%s::%d: failed to get timeout for %s"
+		, __FUNCTION__, __LINE__, small_op_info(op));
 	}
 	
-	return_to_orig_privs();
+	if( return_to_orig_privs() ) {
+		cl_perror("%s::%d: failed to raise privileges"
+		, __FUNCTION__, __LINE__);
+	}
 	switch(pid=fork()) {
 		case -1:
-			cl_perror("perform_ra_op:fork failure");
+			cl_perror("%s::%d: fork", __FUNCTION__, __LINE__);
 			close(stdout_fd[0]);
 			close(stdout_fd[1]);
 			close(stderr_fd[0]);
 			close(stderr_fd[1]);
-			return_to_dropped_privs();
+			if( return_to_dropped_privs() ) {
+				cl_perror("%s::%d: failed to drop privileges"
+				, __FUNCTION__, __LINE__);
+			}
 			return HA_FAIL;
 
 		default:	/* Parent */
 			child_count++;
 			NewTrackedProc(pid, 1
-			,	debug_level ? PT_LOGVERBOSE : PT_LOGNONE
+			,	debug_level ? (op->interval ? PT_LOGNORMAL : PT_LOGVERBOSE) : PT_LOGNONE
 			,	op, &ManagedChildTrackOps);
 
 			close(stdout_fd[1]);
@@ -2980,7 +3096,10 @@
 
 				SetTrackedProcTimeouts(pid, op->killseq);
 			}
-			return_to_dropped_privs();
+			if( return_to_dropped_privs() ) {
+				lrmd_log(LOG_WARNING,"%s::%d: failed to drop privileges: %s"
+				, __FUNCTION__, __LINE__, strerror(errno));
+			}
 
 			if ( rapop == NULL) {
 				return HA_FAIL;
@@ -3005,8 +3124,7 @@
 			}
 			if (STDERR_FILENO != stderr_fd[1]) {
 				if (dup2(stderr_fd[1], STDERR_FILENO)!=STDERR_FILENO) {
-					cl_perror("%s::%d: dup2"
-						, __FUNCTION__, __LINE__);
+					cl_perror("%s::%d: dup2", __FUNCTION__, __LINE__);
 				}
 				close(stderr_fd[1]);
 			}
@@ -3014,9 +3132,11 @@
 			if (NULL == RAExec) {
 				close(stdout_fd[1]);
 				close(stderr_fd[1]);
-				lrmd_log(LOG_ERR,"perform_ra_op: can not find RAExec");
+				lrmd_log(LOG_ERR,"%s::%d: can't find RAExec for class %s"
+				, __FUNCTION__, __LINE__, rsc->class);
 				exit(EXECRA_EXEC_UNKNOWN_ERROR);
 			}
+			
 			/*should we use logging daemon or not in script*/
 			setenv(HALOGD, cl_log_get_uselogd()?"yes":"no",1);
 
@@ -3062,8 +3182,9 @@
 
 	LRMAUDIT();
 	if (--child_count < 0) {
-		lrmd_log(LOG_ERR, "%s:%d: child number is less than zero: %d"
+		lrmd_log(LOG_ERR, "%s:%d: child count is less than zero: %d"
 			, __FUNCTION__, __LINE__, child_count);
+		child_count = 0;
 	}
 
 	CHECK_ALLOCATED(p, "ProcTrack p", );
@@ -3266,6 +3387,19 @@
 	return (lrmd_client_t*) g_hash_table_lookup(clients, &pid);
 }
 
+static gboolean
+client_cmp_name(gpointer key, gpointer val, gpointer app_name)
+{
+	return strcmp(((lrmd_client_t*)val)->app_name,(char *)app_name) ?
+		FALSE : TRUE;
+}
+
+static lrmd_client_t*
+lookup_client_by_name(char *app_name)
+{
+	return (lrmd_client_t*)g_hash_table_find(clients,client_cmp_name,app_name);
+}
+
 lrmd_rsc_t*
 lookup_rsc (const char* rid)
 {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/lrmd/lrmd_fdecl.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/lrmd/lrmd_fdecl.h
--- heartbeat-2.1.3/lrm/lrmd/lrmd_fdecl.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/lrmd/lrmd_fdecl.h	2008-08-18 13:32:19.000000000 +0100
@@ -26,6 +26,7 @@
 static int on_msg_get_last_op(lrmd_client_t* client, struct ha_msg* msg);
 static int on_msg_get_all(lrmd_client_t* client, struct ha_msg* msg);
 static int on_msg_del_rsc(lrmd_client_t* client, struct ha_msg* msg);
+static int on_msg_fail_rsc(lrmd_client_t* client, struct ha_msg* msg);
 static int on_msg_cancel_op(lrmd_client_t* client, struct ha_msg* msg);
 static int on_msg_flush_all(lrmd_client_t* client, struct ha_msg* msg);
 static int on_msg_perform_op(lrmd_client_t* client, struct ha_msg* msg);
@@ -55,6 +56,8 @@
 static gboolean handle_pipe_ra_stdout(int fd, gpointer user_data);
 static gboolean handle_pipe_ra_stderr(int fd, gpointer user_data);
 static struct ha_msg* op_to_msg(lrmd_op_t* op);
+static int store_timestamps(lrmd_op_t* op);
+static void reset_timestamps(lrmd_op_t* op);
 static gboolean lrm_shutdown(void);
 static gboolean can_shutdown(void);
 static gboolean free_str_hash_pair(gpointer key
@@ -63,7 +66,9 @@
 ,	 gpointer value, gpointer user_data);
 static lrmd_op_t* lrmd_op_copy(const lrmd_op_t* op);
 static void send_last_op(gpointer key, gpointer value, gpointer user_data);
-static void record_op_completion(lrmd_client_t* client, lrmd_rsc_t* rsc, lrmd_op_t* op);
+static void replace_last_op(lrmd_client_t* client, lrmd_rsc_t* rsc, lrmd_op_t* op);
+static void record_op_completion(lrmd_rsc_t* rsc, lrmd_op_t* op);
+static void to_repeatlist(lrmd_rsc_t* rsc, lrmd_op_t* op);
 static void remove_op_history(lrmd_op_t* op);
 static void hash_to_str(GHashTable * , GString *);
 static void hash_to_str_foreach(gpointer key, gpointer value, gpointer userdata);
@@ -71,6 +76,11 @@
 static void check_queue_duration(lrmd_op_t* op);
 static gboolean flush_all(GList** listp);
 static gboolean cancel_op(GList** listp,int cancel_op_id);
+static int prepare_failmsg(struct ha_msg* msg,
+			int fail_rc, const char *fail_reason);
+static void async_notify(gpointer key, gpointer val, gpointer data);
+static gboolean client_cmp_name(gpointer key, gpointer val, gpointer app_name);
+static lrmd_client_t* lookup_client_by_name(char *app_name);
 
 /*
  * following functions are used to monitor the exit of ra proc
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/lrmd/lrmd.h /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/lrmd/lrmd.h
--- heartbeat-2.1.3/lrm/lrmd/lrmd.h	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/lrmd/lrmd.h	2008-08-18 13:32:19.000000000 +0100
@@ -90,6 +90,8 @@
 #define tm2age(tm) \
 	(cmp_longclock(tm, zero_longclock) <= 0) ? \
 		0 : longclockto_ms(sub_longclock(now, tm))
+#define tm2unix(tm) \
+	(time(NULL)-(tm2age(tm)+999)/1000)
 
 /*
  * The basic objects in our world:
@@ -193,12 +195,12 @@
 	struct ha_msg*		msg;
 	ra_pipe_op_t *		rapop;
 	char			first_line_ra_stdout[80]; /* only for heartbeat RAs*/
-	/*time stamp*/
-	longclock_t		t_recv;
-	longclock_t		t_addtolist;
-	longclock_t		t_perform;
-	longclock_t		t_done;
-	longclock_t		t_rcchange; /* when rc changed */
+	/*time stamps*/
+	longclock_t		t_recv; /* set in lrmd_op_new(), i.e. on op create */
+	longclock_t		t_addtolist; /* set in add_op_to_runlist() */
+	longclock_t		t_perform; /* set in perform_ra_op() */
+	longclock_t		t_done; /* set in on_op_done() */
+	longclock_t		t_rcchange; /* set in on_op_done(), could equal t_perform */
 	ProcTrackKillInfo	killseq[3];
 };
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/lrmd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/lrmd/Makefile
--- heartbeat-2.1.3/lrm/lrmd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lrm/lrmd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,654 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lrm/lrmd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/lrmd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/lrmd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+#  Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+#  Copyright (c) 2002 International Business Machines
+#
+# 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., 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)/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la   \
+		   $(top_builddir)/lib/apphb/libapphb.la 	\
+		   $(GLIBLIB)
+
+lrmd_SOURCES = lrmd.c audit.c lrmd_fdecl.h lrmd.h
+lrmd_LDFLAGS = $(top_builddir)/lib/lrm/liblrm.la 		\
+		   $(COMMONLIBS) 			\
+		   $(top_builddir)/lib/pils/libpils.la
+
+noinst_HEADERS = lrmd_fdecl.h lrmd.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+lrmd$(EXEEXT): $(lrmd_OBJECTS) $(lrmd_DEPENDENCIES) 
+	@rm -f lrmd$(EXEEXT)
+	$(lrmd_LINK) $(lrmd_OBJECTS) $(lrmd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/audit.Po
+include ./$(DEPDIR)/lrmd.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+
+# make lrmd's owner as hacluster:haclient?
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/lrmd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/lrmd/Makefile.in
--- heartbeat-2.1.3/lrm/lrmd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lrm/lrmd/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -55,7 +55,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -104,6 +104,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -121,24 +122,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -200,12 +189,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -418,8 +408,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -482,8 +472,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -495,8 +485,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -506,13 +496,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/Makefile
--- heartbeat-2.1.3/lrm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lrm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,652 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lrm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = lrmd admin test
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/Makefile.in
--- heartbeat-2.1.3/lrm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lrm/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,6 +88,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -105,24 +106,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -184,12 +173,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -458,8 +448,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/evaltest.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/evaltest.sh
--- heartbeat-2.1.3/lrm/test/evaltest.sh	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/evaltest.sh	2008-08-18 13:32:19.000000000 +0100
@@ -19,6 +19,7 @@
 
 : ${TESTDIR:=testcases}
 : ${LRMADMIN:=../admin/lrmadmin}
+: ${OCF_ROOT:=/usr/lib/ocf}
 
 . ./defaults
 . ./lrmadmin-interface
@@ -42,7 +43,7 @@
 	while [ "$rest" -gt 0 ]; do
 		sleep 1
 		echo -n "+" >&3
-		rest=$((rest-1))
+		rest=$(($rest-1))
 	done
 }
 specopt_extcheck() {
@@ -119,7 +120,7 @@
 
 dotest() {
 	echo -n "." >&3
-	test_cnt=$((test_cnt+1))
+	test_cnt=$(($test_cnt+1))
 	describe_$cmd  # show what we are about to do
 	lrm_$cmd |  # and execute the command
 		{ [ "$extcheck" ] && $extcheck || cat;}
@@ -130,7 +131,7 @@
 		echo .BG test line $line/job $job_cnt runs in background
 		dotest > $OUTDIR/bg$$-$line-$job_cnt 2>&1 &
 		bgprocs="$bgprocs $line:$job_cnt:$!"
-		job_cnt=$((job_cnt+1))
+		job_cnt=$(($job_cnt+1))
 	else
 		dotest
 	fi
@@ -139,7 +140,7 @@
 	while [ $repeat_cnt -le $repeat_limit ]; do
 		runonetest
 		resetvars  # unset all variables
-		repeat_cnt=$((repeat_cnt+1))
+		repeat_cnt=$(($repeat_cnt+1))
 	done
 	repeat_limit=1 repeat_cnt=1
 }
@@ -160,6 +161,6 @@
 		"%"*) specopt ;;
 		*) runtest ;;
 	esac
-	line=$((line+1))
+	line=$(($line+1))
 done
 waitforbgprocs
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/lrmregtest /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/lrmregtest
--- heartbeat-2.1.3/lrm/test/lrmregtest	2007-12-21 20:45:45.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/lrmregtest	2008-08-18 23:38:55.000000000 +0100
@@ -95,7 +95,7 @@
 <action name="migrate_to"   timeout="100" />
 <action name="migrate_from" timeout="90" />
 <action name="meta-data"    timeout="5" />
-<action name="verify-all"   timeout="30" />
+<action name="validate-all"   timeout="30" />
 </actions>
 </resource-agent>
 END
@@ -122,10 +122,10 @@
 sleepsleep() {
 	delay=$1
 	now=`perl -e 'print time()'`
-	by=$((now+delay))
+	by=$(($now+$delay))
 	while [ $now -lt $by ]; do
-		ocf_log debug "Gonna sleep for $((by-now)) seconds..."
-		sleep $((by-now))
+		ocf_log debug "Gonna sleep for $(($by-$now)) seconds..."
+		sleep $(($by-$now))
 		now=`perl -e 'print time()'`
 	done
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/lrmregtest.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/lrmregtest.in
--- heartbeat-2.1.3/lrm/test/lrmregtest.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/lrmregtest.in	2008-08-18 13:32:19.000000000 +0100
@@ -95,7 +95,7 @@
 <action name="migrate_to"   timeout="100" />
 <action name="migrate_from" timeout="90" />
 <action name="meta-data"    timeout="5" />
-<action name="verify-all"   timeout="30" />
+<action name="validate-all"   timeout="30" />
 </actions>
 </resource-agent>
 END
@@ -122,10 +122,10 @@
 sleepsleep() {
 	delay=$1
 	now=`perl -e 'print time()'`
-	by=$((now+delay))
+	by=$(($now+$delay))
 	while [ $now -lt $by ]; do
-		ocf_log debug "Gonna sleep for $((by-now)) seconds..."
-		sleep $((by-now))
+		ocf_log debug "Gonna sleep for $(($by-$now)) seconds..."
+		sleep $(($by-$now))
 		now=`perl -e 'print time()'`
 	done
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/Makefile
--- heartbeat-2.1.3/lrm/test/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lrm/test/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,837 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lrm/test/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/test
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/test
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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
+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 
+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)
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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 $(srcdir)/LRMBasicSanityCheck.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+lrmregtest: $(top_builddir)/config.status $(srcdir)/lrmregtest.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+lrmregtest-lsb: $(top_builddir)/config.status $(srcdir)/lrmregtest-lsb.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+lrmregtest-heartbeat: $(top_builddir)/config.status $(srcdir)/lrmregtest-heartbeat.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+apitest$(EXEEXT): $(apitest_OBJECTS) $(apitest_DEPENDENCIES) 
+	@rm -f apitest$(EXEEXT)
+	$(apitest_LINK) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
+callbacktest$(EXEEXT): $(callbacktest_OBJECTS) $(callbacktest_DEPENDENCIES) 
+	@rm -f callbacktest$(EXEEXT)
+	$(callbacktest_LINK) $(callbacktest_OBJECTS) $(callbacktest_LDADD) $(LIBS)
+plugintest$(EXEEXT): $(plugintest_OBJECTS) $(plugintest_DEPENDENCIES) 
+	@rm -f plugintest$(EXEEXT)
+	$(plugintest_LINK) $(plugintest_OBJECTS) $(plugintest_LDADD) $(LIBS)
+install-testSCRIPTS: $(test_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-testSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/apitest.Po
+include ./$(DEPDIR)/callbacktest.Po
+include ./$(DEPDIR)/plugintest.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-testDATA: $(test_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(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
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	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
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-testDATA uninstall-testSCRIPTS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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 \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-testDATA uninstall-testSCRIPTS
+
+
+#install-exec-local:
+#	$(mkinstalldirs) $(DESTDIR)/$(testdir)
+#	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(testdir)
+#	-chmod g+w $(DESTDIR)/$(testdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/Makefile.in
--- heartbeat-2.1.3/lrm/test/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -46,7 +46,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = regression.sh LRMBasicSanityCheck lrmregtest \
@@ -74,7 +74,7 @@
 am__installdirs = "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testdir)"
 testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(test_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -142,6 +142,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -159,24 +160,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -238,12 +227,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -628,8 +618,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -654,8 +644,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -665,13 +655,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/regression.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/regression.sh
--- heartbeat-2.1.3/lrm/test/regression.sh	2007-12-21 20:45:45.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/regression.sh	2008-12-29 22:12:09.000000000 +0000
@@ -17,6 +17,16 @@
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
+OCF_ROOT=/usr/lib/ocf
+export OCF_ROOT
+if [ -z "$OCF_ROOT" ]; then
+	[ -d /usr/lib/ocf ] && OCF_ROOT=/usr/lib/ocf
+fi
+if [ ! -d "$OCF_ROOT" ]; then
+	echo "OCF_ROOT environment variable not set"
+	exit 2
+fi
+
 TESTDIR=${TESTDIR:-testcases}
 DFLT_TESTSET=basicset
 OUTDIR=${OUTDIR:-output}
@@ -69,14 +79,6 @@
 	usage
 fi
 
-export OCF_ROOT
-if [ -z "$OCF_ROOT" ]; then
-	[ -d /usr/lib/ocf ] && OCF_ROOT=/usr/lib/ocf
-fi
-if [ ! -d "$OCF_ROOT" ]; then
-	echo "OCF_ROOT environment variable not set"
-	exit 2
-fi
 which xmllint >/dev/null 2>&1 || {
 	echo "WARNING: xmllint not available, some of the tests may fail"
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/regression.sh.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/regression.sh.in
--- heartbeat-2.1.3/lrm/test/regression.sh.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/regression.sh.in	2008-08-18 13:32:19.000000000 +0100
@@ -17,6 +17,16 @@
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
+OCF_ROOT=@OCF_ROOT_DIR@
+export OCF_ROOT
+if [ -z "$OCF_ROOT" ]; then
+	[ -d /usr/lib/ocf ] && OCF_ROOT=/usr/lib/ocf
+fi
+if [ ! -d "$OCF_ROOT" ]; then
+	echo "OCF_ROOT environment variable not set"
+	exit 2
+fi
+
 TESTDIR=${TESTDIR:-testcases}
 DFLT_TESTSET=basicset
 OUTDIR=${OUTDIR:-output}
@@ -69,14 +79,6 @@
 	usage
 fi
 
-export OCF_ROOT
-if [ -z "$OCF_ROOT" ]; then
-	[ -d /usr/lib/ocf ] && OCF_ROOT=/usr/lib/ocf
-fi
-if [ ! -d "$OCF_ROOT" ]; then
-	echo "OCF_ROOT environment variable not set"
-	exit 2
-fi
 which xmllint >/dev/null 2>&1 || {
 	echo "WARNING: xmllint not available, some of the tests may fail"
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/common.filter /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/common.filter
--- heartbeat-2.1.3/lrm/test/testcases/common.filter	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/testcases/common.filter	2008-08-18 13:32:19.000000000 +0100
@@ -1,7 +1,12 @@
+#!/bin/sh
+
 sed '
 /^lrmadmin/s/([0-9][0-9]*)/()/
 /^lrmadmin/s/^lrmadmin[^:]*: [^ ]* //
 s/call_id=[0-9][0-9]*/call_id=(removed)/
+/run at:/d
+/last rc change at:/d
+/queue time:/d
 ' |
 awk '
 /Waiting for lrmd to callback.../ { n=1; next; }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/Makefile
--- heartbeat-2.1.3/lrm/test/testcases/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/lrm/test/testcases/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,561 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# lrm/test/testcases/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/test/testcases
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/lrm/test/testcases
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../../..
+top_srcdir = ../../..
+
+#
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 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 \
+			rscexec.exp rscmgmt rscmgmt.exp
+
+#			shouldn't need this next line...
+EXTRA_DIST = $(testcases_SCRIPTS) $(testcases_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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
+.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)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-testcasesSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-testcasesDATA: $(testcases_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(testcasesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(testcasesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS) $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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
+
+
+#install-exec-local:
+#	$(mkinstalldirs) $(DESTDIR)/$(testdir)
+#	-chgrp $(HA_APIGROUP) $(DESTDIR)/$(testdir)
+#	-chmod g+w $(DESTDIR)/$(testdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/Makefile.in
--- heartbeat-2.1.3/lrm/test/testcases/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/testcases/Makefile.in	2008-08-18 23:38:07.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -90,6 +90,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -107,24 +108,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -186,12 +175,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/ra-list.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/ra-list.sh
--- heartbeat-2.1.3/lrm/test/testcases/ra-list.sh	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/testcases/ra-list.sh	2008-08-18 13:32:19.000000000 +0100
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 awk '
 NR==1 {num=$3;next}
 {in_num++}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/rscmgmt.log_filter /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/rscmgmt.log_filter
--- heartbeat-2.1.3/lrm/test/testcases/rscmgmt.log_filter	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/testcases/rscmgmt.log_filter	2008-08-18 13:32:19.000000000 +0100
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 awk '
 n<2 && /ERROR: on_msg_add_rsc: same id resource exists./ {n++; next}
 m<1 && /ERROR: on_msg_del_rsc: no rsc with id/ {m++; next}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/lrm/test/testcases/xmllint.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/lrm/test/testcases/xmllint.sh
--- heartbeat-2.1.3/lrm/test/testcases/xmllint.sh	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/lrm/test/testcases/xmllint.sh	2008-08-18 13:32:19.000000000 +0100
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 gawk -v many="$1" '
 BEGIN{XMLLINT="xmllint --noout -";}
 function chkoutput(ra) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ltmain.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ltmain.sh
--- heartbeat-2.1.3/ltmain.sh	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ltmain.sh	2008-04-29 22:33:55.000000000 +0100
@@ -2,7 +2,7 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  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.24 Debian 1.5.24-2"
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION="1.5.26 Debian 1.5.26-4"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
 	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
 	  $lt_var=C
 	  export $lt_var
 	fi"
 done
 
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
+
 # Make sure IFS has a sensible default
 lt_nl='
 '
@@ -485,7 +491,7 @@
     echo "\
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  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 $?
@@ -788,6 +794,7 @@
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1646,6 +1654,11 @@
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -2152,7 +2165,12 @@
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2948,12 +2966,18 @@
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3101,9 +3125,10 @@
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4245,9 +4270,10 @@
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6486,7 +6512,7 @@
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      for lt_var in LANG LANGUAGE 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
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/Makefile
--- heartbeat-2.1.3/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,914 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+# linux-ha: Linux-HA code
+#
+# Copyright (C) 2002 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+subdir = .
+DIST_COMMON = $(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 config.guess \
+	config.sub depcomp install-sh ltmain.sh missing 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 = $(install_sh) -d
+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 =  debian pkg port replace include lib \
+	heartbeat membership telecom resources lrm crm fencing \
+	logd snmp_subagent tools doc cts mgmt 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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = .
+top_srcdir = .
+EXTRA_DIST = bootstrap rc.config.heartbeat 	\
+			heartbeat.spec.in heartbeat.spec	\
+			ConfigureMe README.in libltdl.tar
+
+RPMFLAGS = -ta 
+AM_TAR = tar
+RPMDIR = $(HOME)/rpms
+WEBDIR = /home/alanr/ha-web/download
+HBWEBDIR = /home/alanr/ha-web/heartbeat
+RPMSRC = $(DESTDIR)$(RPMDIR)/SRPMS/$(PACKAGE)-$(VERSION)-$(RPMREL).src.rpm
+RPM386 = $(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-$(VERSION)-$(RPMREL).i586.rpm
+RPMstonith = $(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-stonith-$(VERSION)-$(RPMREL).i586.rpm
+RPMpils = $(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-pils-$(VERSION)-$(RPMREL).i586.rpm
+RPMldir = $(DESTDIR)$(RPMDIR)/RPMS/i586/$(PACKAGE)-ldirectord-$(VERSION)-$(RPMREL).i586.rpm
+SHAREDIR = /usr/share
+HBSHAREDIR = /usr/share/heartbeat
+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 = /var/lib/heartbeat/cores
+hauser = hacluster
+SNMP_SUBAGENT_DIR = snmp_subagent
+#CIM_PROVIDER_DIR = cim
+#TSA_PLUGIN_DIR = tsa_plugin
+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
+all: all-recursive
+
+.SUFFIXES:
+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
+.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: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(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 $(srcdir)/heartbeat.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+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 $@
+pkg/InfoFiles/preinstall: $(top_builddir)/config.status $(top_srcdir)/pkg/InfoFiles/preinstall.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+pkg/InfoFiles/postinstall: $(top_builddir)/config.status $(top_srcdir)/pkg/InfoFiles/postinstall.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+port/heartbeat/pkg-deinstall: $(top_builddir)/config.status $(top_srcdir)/port/heartbeat/pkg-deinstall.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+port/heartbeat/pkg-descr: $(top_builddir)/config.status $(top_srcdir)/port/heartbeat/pkg-descr.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+port/heartbeat/pkg-install: $(top_builddir)/config.status $(top_srcdir)/port/heartbeat/pkg-install.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+port/heartbeat/pkg-plist: $(top_builddir)/config.status $(top_srcdir)/port/heartbeat/pkg-plist.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-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 $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	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-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(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
+	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
+	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.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(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
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (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 \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(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 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	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-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
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-lzma 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 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
+		$(RPM) $(RPMFLAGS) $(TARFILE) </dev/null;
+
+deb:		dist
+		rm -rf $(distdir)
+		tar -zxf $(TARFILE)
+		cd $(distdir) ; dpkg-buildpackage -rfakeroot -us -uc 
+		rm -rf $(distdir)
+
+install-exec-local:
+	test -p $(DESTDIR)$(coredir) || mkdir -p $(DESTDIR)$(coredir)
+	-chown root $(DESTDIR)$(coredir)
+	chmod 755 $(DESTDIR)$(coredir)
+	mkdir -p $(DESTDIR)$(coredir)/root
+	-chown root $(DESTDIR)$(coredir)/root
+	chmod 700 $(DESTDIR)$(coredir)/root
+	mkdir -p $(DESTDIR)$(coredir)/nobody
+	-chown nobody $(DESTDIR)$(coredir)/nobody
+	chmod 700 $(DESTDIR)$(coredir)/nobody
+	mkdir -p $(DESTDIR)$(coredir)/$(hauser)
+	-chown $(hauser) $(DESTDIR)$(coredir)/$(hauser)
+	chmod 700 $(DESTDIR)$(coredir)/$(hauser)
+	cd $(DESTDIR)/usr/lib/heartbeat;				\
+	for file in `ls $(DESTDIR)$(HBSHAREDIR)`;			\
+	do if [  -d $$file ]; then continue; fi;	\
+		rm -f $$file && ln -s $(HBSHAREDIR)/$$file .;	\
+	done
+	cd $(DESTDIR)/usr/lib/heartbeat-gui && rm -f haclient.py && ln -s $(SHAREDIR)/heartbeat-gui/haclient.py .
+	rm -f $(DESTDIR)/usr/bin/hb_gui && ln -s $(SHAREDIR)/heartbeat-gui/haclient.py $(DESTDIR)/usr/bin/hb_gui 
+
+dist-clean-local:
+	rm -f autoconf automake autoheader $(PACKAGE)-*.tar.gz
+
+maintainer-clean-local:
+	rm -f libltdl.tar
+
+# "pkg" format for Solaris etc.
+pkg:
+		(cd pkg && $(MAKE) PWD=`pwd` pkg)
+
+# "port" format for BSD
+portfile:	dist
+		( cd port && $(MAKE) PWD=`pwd` portfile)
+
+drpm:		dist
+		$(RPM) --nodeps $(RPMFLAGS) $(TARFILE) </dev/null;
+handy: drpm handy-copy
+	$HOME/bin/linuxhasums $VERSION
+
+handy-copy:
+	cd doc; $(MAKE)
+	rm -f $(WEBDIR)/ChangeLog
+	cp $(HANDY_DOCS) $(TARFILE) $(ALL_RPMS) $(WEBDIR)
+	cp $(HBDOCS) $(HBWEBDIR)
+
+.PHONY: rpm pkg handy handy-copy
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/Makefile.am
--- heartbeat-2.1.3/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/Makefile.am	2008-12-29 22:12:09.000000000 +0000
@@ -59,10 +59,6 @@
 SNMP_SUBAGENT_DIR = snmp_subagent
 endif
 
-if MGMT_BUILD
-MGMT_DIR = mgmt
-endif
-
 if CIM_PROVIDER_BUILD
 CIM_PROVIDER_DIR = cim
 endif
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/Makefile.in
--- heartbeat-2.1.3/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/Makefile.in	2008-08-18 23:38:11.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -52,7 +52,7 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(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 \
@@ -61,9 +61,9 @@
 	$(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
+	$(top_srcdir)/port/heartbeat/pkg-plist.in config.guess \
+	config.sub depcomp install-sh ltmain.sh missing py-compile \
+	ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.in
@@ -71,7 +71,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = heartbeat.spec README pkg/InfoFiles/pkginfo \
@@ -93,8 +93,8 @@
 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
+	logd snmp_subagent tools doc cts mgmt @MGMT_DIR@ cim \
+	ldirectord config tsa_plugin contrib
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -137,6 +137,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -154,24 +155,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -233,12 +222,14 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+@MGMT_BUILD_TRUE@MGMT_DIR = mgmt
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -397,7 +388,6 @@
 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
@@ -550,8 +540,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -576,8 +566,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -587,13 +577,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -664,6 +653,10 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -690,6 +683,8 @@
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -843,8 +838,8 @@
 .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 \
+	dist-gzip dist-lzma 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 \
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/ccm/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/ccm/Makefile
--- heartbeat-2.1.3/membership/ccm/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/membership/ccm/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,841 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# membership/ccm/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership/ccm
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership/ccm
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 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 \
+			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl \
+                        -I$(top_builddir)/include/clplumbing \
+			-I$(top_srcdir)/include/clplumbing
+
+hadir = $(sysconfdir)/ha.d
+halibdir = $(libdir)/heartbeat
+ccmlibdir = $(halibdir)
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+havarrundir = $(localstatedir)/run/
+ccmdir = $(HA_VARRUNDIR)/$(HB_PKG)/ccm
+apigid = 65
+ccmuid = 17
+gliblib = -lglib-2.0  
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+noinst_HEADERS = ccm.h ccmlib.h
+lib_LTLIBRARIES = libccmclient.la libclm.la
+ccm_SOURCES = ccm.c \
+		  ccmmisc.c \
+		  ccmgraph.c \
+		  ccmversion.c \
+		  ccmupdate.c \
+		  ccmllm.c \
+		  ccmbitmap.c \
+		  ccm.h \
+		  ccmmain.c \
+		  ccmclient.c \
+		  ccmmsg.h   \
+		  ccmmsg.c   \
+		  ccm_statemachine.c \
+		  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)/heartbeat
+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
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libccmclient.la: $(libccmclient_la_OBJECTS) $(libccmclient_la_DEPENDENCIES) 
+	$(libccmclient_la_LINK) -rpath $(libdir) $(libccmclient_la_OBJECTS) $(libccmclient_la_LIBADD) $(LIBS)
+libclm.la: $(libclm_la_OBJECTS) $(libclm_la_DEPENDENCIES) 
+	$(libclm_la_LINK) -rpath $(libdir) $(libclm_la_OBJECTS) $(libclm_la_LIBADD) $(LIBS)
+install-ccmlibPROGRAMS: $(ccmlib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ccmlibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ccmlibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ccmlibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ccmlibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-ccmlibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-ccmlibPROGRAMS:
+	@list='$(ccmlib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+install-libclmPROGRAMS: $(libclm_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libclmPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libclmdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libclmPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libclmdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-libclmPROGRAMS:
+	@$(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"; \
+	done
+
+clean-libclmPROGRAMS:
+	@list='$(libclm_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+ccm$(EXEEXT): $(ccm_OBJECTS) $(ccm_DEPENDENCIES) 
+	@rm -f ccm$(EXEEXT)
+	$(ccm_LINK) $(ccm_OBJECTS) $(ccm_LDADD) $(LIBS)
+ccm_testclient$(EXEEXT): $(ccm_testclient_OBJECTS) $(ccm_testclient_DEPENDENCIES) 
+	@rm -f ccm_testclient$(EXEEXT)
+	$(LINK) $(ccm_testclient_OBJECTS) $(ccm_testclient_LDADD) $(LIBS)
+clmtest$(EXEEXT): $(clmtest_OBJECTS) $(clmtest_DEPENDENCIES) 
+	@rm -f clmtest$(EXEEXT)
+	$(LINK) $(clmtest_OBJECTS) $(clmtest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/ccm.Po
+include ./$(DEPDIR)/ccm_statemachine.Po
+include ./$(DEPDIR)/ccm_testclient.Po
+include ./$(DEPDIR)/ccmbitmap.Po
+include ./$(DEPDIR)/ccmclient.Po
+include ./$(DEPDIR)/ccmgraph.Po
+include ./$(DEPDIR)/ccmlib_eventapi.Plo
+include ./$(DEPDIR)/ccmlib_memapi.Plo
+include ./$(DEPDIR)/ccmllm.Po
+include ./$(DEPDIR)/ccmmain.Po
+include ./$(DEPDIR)/ccmmem.Po
+include ./$(DEPDIR)/ccmmisc.Po
+include ./$(DEPDIR)/ccmmsg.Po
+include ./$(DEPDIR)/ccmupdate.Po
+include ./$(DEPDIR)/ccmversion.Po
+include ./$(DEPDIR)/clmtest.Po
+include ./$(DEPDIR)/libclm_la-ccmlib_clm.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+libclm_la-ccmlib_clm.lo: ccmlib_clm.c
+	$(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
+	mv -f $(DEPDIR)/libclm_la-ccmlib_clm.Tpo $(DEPDIR)/libclm_la-ccmlib_clm.Plo
+#	source='ccmlib_clm.c' object='libclm_la-ccmlib_clm.lo' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-ccmlibPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libclmPROGRAMS clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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-libLTLIBRARIES \
+	uninstall-libclmPROGRAMS uninstall-local
+
+
+# additional installations not covered normally
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(ccmdir)
+	-chgrp $(apigid) $(DESTDIR)/$(ccmdir)
+	-chown $(ccmuid) $(DESTDIR)/$(ccmdir)
+	chmod 750 $(DESTDIR)/$(ccmdir)
+
+uninstall-local:
+	rm -fr $(DESTDIR)$(ccmdir)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/ccm/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/ccm/Makefile.in
--- heartbeat-2.1.3/membership/ccm/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/membership/ccm/Makefile.in	2008-08-18 23:38:08.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -44,7 +44,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -95,7 +95,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -146,6 +146,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -163,24 +164,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -242,12 +231,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -502,8 +492,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -511,8 +501,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -536,8 +526,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ccmlibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ccmlibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ccmlibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ccmlibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -564,8 +554,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libclmPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libclmdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libclmPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libclmdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -656,8 +646,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -669,8 +659,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -680,13 +670,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/Makefile
--- heartbeat-2.1.3/membership/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/membership/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,655 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# membership/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat library directory: Linux-HA code
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+QUORUMD_DIR = quorumd
+SUBDIRS = ccm $(QUORUMD_DIR)
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/Makefile.in
--- heartbeat-2.1.3/membership/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/membership/Makefile.in	2008-08-18 23:38:08.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,6 +88,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -105,24 +106,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -184,12 +173,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -461,8 +451,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -487,8 +477,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -498,13 +488,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/quorumd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/quorumd/Makefile
--- heartbeat-2.1.3/membership/quorumd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/membership/quorumd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,690 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# membership/quorumd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership/quorumd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/membership/quorumd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+#  Author: Huang Zhen <zhenhltc@cn.ibm.com>
+#  Copyright (c) 2006 International Business Machines
+#
+# 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., 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)/heartbeat
+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)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+quorumd$(EXEEXT): $(quorumd_OBJECTS) $(quorumd_DEPENDENCIES) 
+	@rm -f quorumd$(EXEEXT)
+	$(quorumd_LINK) $(quorumd_OBJECTS) $(quorumd_LDADD) $(LIBS)
+quorumdtest$(EXEEXT): $(quorumdtest_OBJECTS) $(quorumdtest_DEPENDENCIES) 
+	@rm -f quorumdtest$(EXEEXT)
+	$(quorumdtest_LINK) $(quorumdtest_OBJECTS) $(quorumdtest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/quorumd-quorumd.Po
+include ./$(DEPDIR)/quorumdtest-quorumdtest.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+quorumd-quorumd.o: quorumd.c
+	$(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
+	mv -f $(DEPDIR)/quorumd-quorumd.Tpo $(DEPDIR)/quorumd-quorumd.Po
+#	source='quorumd.c' object='quorumd-quorumd.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/quorumd-quorumd.Tpo $(DEPDIR)/quorumd-quorumd.Po
+#	source='quorumd.c' object='quorumd-quorumd.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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`
+
+quorumdtest-quorumdtest.o: quorumdtest.c
+	$(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
+	mv -f $(DEPDIR)/quorumdtest-quorumdtest.Tpo $(DEPDIR)/quorumdtest-quorumdtest.Po
+#	source='quorumdtest.c' object='quorumdtest-quorumdtest.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/quorumdtest-quorumdtest.Tpo $(DEPDIR)/quorumdtest-quorumdtest.Po
+#	source='quorumdtest.c' object='quorumdtest-quorumdtest.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/membership/quorumd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/membership/quorumd/Makefile.in
--- heartbeat-2.1.3/membership/quorumd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/membership/quorumd/Makefile.in	2008-08-18 23:38:08.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -62,7 +62,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -110,6 +110,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -127,24 +128,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -206,12 +195,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -425,8 +415,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -520,8 +510,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -533,8 +523,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -544,13 +534,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/client/haclient.glade /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/client/haclient.glade
--- heartbeat-2.1.3/mgmt/client/haclient.glade	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/mgmt/client/haclient.glade	2008-08-18 13:32:19.000000000 +0100
@@ -535,14 +535,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox_pengine">
+	    <widget class="GtkTable" id="pengine_table">
 	      <property name="visible">True</property>
+	      <property name="n_rows">1</property>
+	      <property name="n_columns">2</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
+	      <property name="row_spacing">0</property>
+	      <property name="column_spacing">0</property>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -574,14 +573,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox_crmd">
+	    <widget class="GtkTable" id="crmd_table">
 	      <property name="visible">True</property>
+	      <property name="n_rows">1</property>
+	      <property name="n_columns">2</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
+	      <property name="row_spacing">0</property>
+	      <property name="column_spacing">0</property>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -3365,7 +3363,7 @@
   </child>
 </widget>
 
-<widget class="GtkWindow" id="order">
+<widget class="GtkWindow" id="cmnobj">
   <property name="visible">True</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -3382,558 +3380,26 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="orderview">
+    <widget class="GtkVBox" id="cmnobj_view">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkTable" id="table6">
+	<widget class="GtkVBox" id="cmnobj_attrs">
 	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">10</property>
-	  <property name="column_spacing">10</property>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox25">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label137">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">ID:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox26">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label138">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Type:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox27">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label139">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">To:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="id">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="type">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes">before
-after</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="to">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes"></property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">10</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label152">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">From:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">10</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">10</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="from">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes">
-
-</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">10</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox14">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="apply">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Apply</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="reset">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Reset</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="colocation">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes"></property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="colocationview">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkTable" id="table7">
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">10</property>
-	  <property name="column_spacing">10</property>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox28">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label153">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">ID:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox29">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label154">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">To:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEventBox" id="eventbox30">
-	      <property name="visible">True</property>
-	      <property name="visible_window">True</property>
-	      <property name="above_child">False</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label155">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Score:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">1</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">10</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="id">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="from">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes"></property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="to">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes"></property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">10</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="score">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes">INFINITY</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">10</property>
-	      <property name="y_options">expand</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label157">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">From:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">10</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">10</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">10</property>
-	  <property name="expand">False</property>
+	  <property name="expand">True</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
 
       <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox15">
+	<widget class="GtkHButtonBox" id="hbuttonbox14">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 	  <property name="spacing">0</property>
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/client/haclient.py.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/client/haclient.py.in
--- heartbeat-2.1.3/mgmt/client/haclient.py.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/mgmt/client/haclient.py.in	2008-08-18 13:32:19.000000000 +0100
@@ -24,8 +24,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-import sys, os, string, socket, syslog, webbrowser, pickle, xml, gc
+import sys, os, string, socket, syslog, webbrowser, pickle, xml, gc, time, binascii, thread, tarfile
+from stat import *
 from xml.dom.minidom import parseString
+from xml.parsers.xmlproc.xmldtd import load_dtd_string
 
 import locale, gettext
 app_name = "haclient"
@@ -97,10 +99,10 @@
 	return False
 	
 def add_column(widget, label, value, icon_cell_func = None, editable = False
-		, options=None, call_back=None, visible = True) :
+		, options=None, call_back=None, visible = True, is_enum = False) :
 	tvcolumn = gtk.TreeViewColumn(label)
 	widget.append_column(tvcolumn)
-	if options == None or not pygtk_2_6_newer():
+	if options == None or options == [] or not pygtk_2_6_newer():
 		cell = gtk.CellRendererText()
 	else :
 		cell = gtk.CellRendererCombo()
@@ -109,10 +111,13 @@
 		for option in options :
 			store.append([option])
 		cell.set_property("text-column",0)
+		if is_enum :
+			cell.set_property('has-entry', False)
 	
 	if editable :
 		cell.set_property('editable', True)
 		cell.connect('edited', edited_cb, (widget.get_model(), value, call_back))
+
 	if icon_cell_func != None :
 		icon_cell = gtk.CellRendererPixbuf()
 		tvcolumn.pack_start(icon_cell, False)
@@ -125,16 +130,21 @@
 def msgbox(msg) :
 	global top_window
 	dialog = gtk.Dialog(_("Message"), top_window, gtk.DIALOG_MODAL, (gtk.STOCK_OK, True))
+	im=gtk.Image()
+	im.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_DIALOG)
+	hb=gtk.HBox()
+	hb.pack_start(im)
 	label = gtk.Label(msg)
-	dialog.vbox.add(label)
-	label.show()
+	label.set_selectable(True)
+	hb.pack_start(label)
+	dialog.vbox.pack_start(hb)
+	dialog.show_all()
 	save_top_window = top_window
 	top_window = dialog
 	dialog.run()
 	top_window = save_top_window
 	dialog.destroy()
 
-
 def confirmbox(msg, button=(gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO), title ="") :
 	global top_window
 	dialog = gtk.Dialog(_("Confirm"),  top_window, gtk.DIALOG_MODAL,button)
@@ -146,6 +156,7 @@
 	frame.set_label_widget(confirm_title)
 	confirm_msg =  gtk.Label()
 	confirm_msg.set_text(msg)
+	confirm_msg.set_selectable(True)
 	dialog.vbox.pack_start(frame)
 	hb=gtk.HBox()
 	hb.pack_start(im)
@@ -191,6 +202,8 @@
 				combo.child.set_text(fields[row].default)
 			else :
 				combo.child.set_text(fields[row].options[0])
+			if fields[row].entry_editable == False :
+				combo.child.set_editable(False)
 			widgets.append(combo)
 			table.attach(combo, 1,2, row, row+1)
 			combos[fields[row].key] = combo
@@ -217,7 +230,7 @@
 
 	while True :
 		ret = dialog.run()
-		if ret in [gtk.RESPONSE_CANCEL,gtk.RESPONSE_DELETE_EVENT] :
+		if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
 			top_window = save_top_window
 			dialog.destroy()
 			return None
@@ -250,8 +263,9 @@
 	can_be_empty = True
 	editable = True
 	auto_gen = False
+	entry_editable = True
 	def __init__(self, key, label=None, default=None, options=None,
-			can_be_empty=True, editable=True, auto_gen=False) :
+			can_be_empty=True, editable=True, auto_gen=False, entry_editable = True) :
 		self.key = key
 		self.label = cond(label==None, key, label)
 		self.default = default
@@ -259,6 +273,7 @@
 		self.can_be_empty = can_be_empty
 		self.editable = editable
 		self.auto_gen = auto_gen
+		self.entry_editable = entry_editable
 
 class RAMeta :
 	name = ""
@@ -302,7 +317,7 @@
 
 	while True :
 		ret = dialog.run()
-		if ret in [gtk.RESPONSE_CANCEL,gtk.RESPONSE_DELETE_EVENT] :
+		if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
 			top_window = save_top_window
 			dialog.destroy()
 			return (None,None)
@@ -414,34 +429,71 @@
 	
 		
 	def on_add(self, widget) :
-		new = kvbox(self.title, filter(lambda f:f.editable, self.fields), self.auto_fill)
-		if new != None :
-			self.insert(new)
+		objdlg = AddObjectDlg()
+		object = objdlg.run(self.title, self.obj_type, self.meta, self.static_desc)
+		if object != None :
+			self.insert(object)
 			
 	def create_store(self, n) :
 		if n == 3 :
 			return gtk.ListStore(str, str, str)
-		if n == 4 :
-			return gtk.ListStore(str, str, str, str)
+		if n == 5 :
+			return gtk.ListStore(str, str, str, str, str)
 		if n == 10 :
 			return gtk.ListStore(str, str, str, str, str,str, str, str, str, str)
 		return None
 		
-	def __init__(self, widget, add_btn, del_btn, title, fields, call_back=None, auto_fill=None) :
+	def __init__(self, widget, add_btn, del_btn, title, obj_type = "nvpair", meta = None,
+			call_back=None, static_desc = None) :
 		self.add_btn = add_btn
 		self.del_btn = del_btn
 		self.widget = widget
 		self.call_back = call_back
 		self.title = title
- 		self.fields = fields
 		self.add_btn_handler = add_btn.connect("clicked", self.on_add)
 		self.del_btn_handler = del_btn.connect("clicked", self.on_del)
-		self.auto_fill = auto_fill
-		self.store = self.create_store(len(fields))
+		self.obj_type = obj_type
+		self.meta = meta
+		self.static_desc = static_desc
+		dtd_elem = manager.get_dtd_elem(obj_type)
+		attr_list = dtd_elem.get_attr_list()
+		self.attr_list = attr_list
+		self.store = self.create_store(len(attr_list))
 		widget.set_model(self.store)
-		for i in range(len(fields)) :
-			add_column(widget, fields[i].label, i, None, fields[i].editable,
-				fields[i].options, call_back, not fields[i].auto_gen)
+		name_cap = lambda name: name.replace("-"," ").replace("_"," ").title().replace("Id","ID")
+		for i in range(len(attr_list)) :
+			attr_name = attr_list[i]
+			attr = dtd_elem.get_attr(attr_name)
+			attr_type = attr.get_type()
+			attr_default = attr.get_default()
+			attr_decl = attr.get_decl()
+
+			if attr_name == "id" :
+				visible = False
+			else :
+				visible = True
+
+			if attr_decl == "#REQUIRED" and i == 1 :
+				editable = False
+			else :
+				editable = True
+
+			option_list = []
+			if type(attr_type) == list :
+				is_enum = True
+				if attr_type.count("true") > 0 and attr_type.count("false") > 0 :
+					option_list.extend(["true", "false"])
+				else :
+					option_list.extend(attr_type)
+			else :
+				is_enum = False
+				if attr_default != None :
+					option_list.extend([attr_default])
+			if option_list != [] and attr_decl != "#REQUIRED" :
+				option_list.insert(0, "")
+
+			add_column(widget, _(name_cap(attr_list[i])), i, None, editable,
+				option_list, call_back, visible, is_enum)
 			
 		
 	def clear(self) :
@@ -456,9 +508,9 @@
 			
 	def insert(self, item) :
 		values = []
-		for f in self.fields :
-			if item.has_key(f.key) :
-				values.append(item[f.key])
+		for attr in self.attr_list :
+			if item.has_key(attr) :
+				values.append(item[attr])
 			else :
 				values.append("")
 		self.store.append(values)
@@ -470,8 +522,8 @@
 		items = []
 		while iter != None :
 			item = {}
-			for i in range(len(self.fields)) :
-				item[self.fields[i].key] = self.store.get_value(iter,i)
+			for i in range(len(self.attr_list)) :
+				item[self.attr_list[i]] = self.store.get_value(iter,i)
 			items.append(item)
 			iter = self.store.iter_next(iter)
 		return items
@@ -645,7 +697,7 @@
 			self.add_node(nodes_root, node, node in active_nodes, node in crm_nodes)
 
 		rscs_root = self.store.append(root, [_("Resources"),"", "resources"])
-		rscs = manager.get_all_rsc_id()
+		rscs = manager.get_top_rsc()
 		for rsc in rscs :
 			self.add_rsc(rscs_root, rsc)
 
@@ -691,7 +743,7 @@
 			label = type
 			status = type
 			iter = self.store.append(parent,[rsc, _(status), _(label)])
-			for subrsc in manager.get_rsc_sub_rsc(rsc) :
+			for subrsc in manager.get_sub_rsc(rsc) :
 				self.add_rsc(iter, subrsc)
 					
 	def add_node(self, nodes_root, node, active, started):
@@ -800,28 +852,19 @@
 	name = "clusterview"
 	pengine_metadata = None
 	crmd_metadata = None
-	pengine_widgets = None
-	crmd_widgets = None
+ 	pengine_widgetgroup = None
+ 	crmd_widgetgroup = None
 	
 	def on_apply(self, widget):
 		glade = self.glade
 		
 		current_page = glade.get_widget("notebook").get_current_page()
 		if current_page == 1:
-			(widgets, metadata) = (self.pengine_widgets, self.pengine_metadata)
+			(widgetgroup, metadata) = (self.pengine_widgetgroup, self.pengine_metadata)
 		elif current_page == 2:
-			(widgets, metadata) = (self.crmd_widgets, self.crmd_metadata)
+			(widgetgroup, metadata) = (self.crmd_widgetgroup, self.crmd_metadata)
 
-		new_crm_config = {}
-		for key in widgets["combos"].keys():
-			new_crm_config[key] = widgets["combos"][key].child.get_text()
-		for key in widgets["checkbuttons"].keys():
-			if widgets["checkbuttons"][key].get_active():
-				new_crm_config[key] = "true"
-			else:
-				new_crm_config[key] = "false"
-		for key in widgets["entries"].keys():
-			new_crm_config[key] = widgets["entries"][key].get_text()
+		new_crm_config = widgetgroup.get_values()
 		manager.update_crm_config(metadata, new_crm_config)
 
 		View.on_apply(self, widget)
@@ -829,22 +872,16 @@
 	def on_default(self, widget):
 		current_page = self.glade.get_widget("notebook").get_current_page()
 		if current_page == 1:
-			(widgets, metadata) = (self.pengine_widgets, self.pengine_metadata)
+			(widgetgroup, metadata) = (self.pengine_widgetgroup, self.pengine_metadata)
 		elif current_page == 2:
-			(widgets, metadata) = (self.crmd_widgets, self.crmd_metadata)
+			(widgetgroup, metadata) = (self.crmd_widgetgroup, self.crmd_metadata)
 
 		default_crm_config = {}
 		for parameter in metadata.parameters:
 			default_crm_config[parameter["name"]] = str(parameter["content"]["default"])
 
 		if default_crm_config != {}:
-			for key in widgets["combos"].keys():
-				widgets["combos"][key].child.set_text(default_crm_config[key])
-				widgets["combos"][key].child.set_editable(False)
-			for key in widgets["checkbuttons"].keys():
-				widgets["checkbuttons"][key].set_active("true" == default_crm_config[key])
-			for key in widgets["entries"].keys():
-				widgets["entries"][key].set_text(default_crm_config[key])
+			widgetgroup.show_values(default_crm_config)
 
 		View.on_default(self, widget)
 	
@@ -861,18 +898,12 @@
 			glade.get_widget("deadtime").set_text(config["deadtime"])
 			glade.get_widget("initdead").set_text(config["initdead"])
 
-		for (widgets, metadata) in ((self.pengine_widgets, self.pengine_metadata),
-						(self.crmd_widgets, self.crmd_metadata)):
-			if metadata != None and widgets != None:
+		for (widgetgroup, metadata) in ((self.pengine_widgetgroup, self.pengine_metadata),
+						(self.crmd_widgetgroup, self.crmd_metadata)):
+			if metadata != None and widgetgroup != None:
 				crm_config = manager.get_crm_config(metadata)
 				if crm_config != {}:
-					for key in widgets["combos"].keys():
-						widgets["combos"][key].child.set_text(crm_config[key])
-						widgets["combos"][key].child.set_editable(False)
-					for key in widgets["checkbuttons"].keys():
-						widgets["checkbuttons"][key].set_active("true" == crm_config[key])
-					for key in widgets["entries"].keys():
-						widgets["entries"][key].set_text(crm_config[key])
+					widgetgroup.show_values(crm_config)
 
 		View.update(self)
 	
@@ -888,10 +919,10 @@
 		name_cap = lambda name: name.replace("-"," ").replace("_"," ").title().replace("Crmd ","CRMD ").\
 						replace("Pe ", "PE ").replace("Dc ","DC ")
 
-		for widgets in (self.pengine_widgets, self.crmd_widgets):
+		for widgets in (self.pengine_widgetgroup.widgets, self.crmd_widgetgroup.widgets):
 			if widgets != None:
-				for key in widgets["labels"].keys():
-					make_label_active(widgets["labels"][key], 
+				for key in widgets["name_labels"].keys():
+					make_label_active(widgets["name_labels"][key], 
 								_(name_cap(key)+":"),
 								"www.linux-ha.org")
 							
@@ -904,7 +935,7 @@
 					gtk.STOCK_NO, gtk.RESPONSE_NO))
 			if ret == gtk.RESPONSE_YES :
 				self.on_apply(widget)
-			if ret == gtk.RESPONSE_NO :
+			else :
 				self.update()
 
 		if page_num == 0:
@@ -922,9 +953,11 @@
 		self.crmd_metadata = manager.get_crm_metadata("crmd")
 
 		if self.pengine_metadata != None:
-			self.pengine_widgets = self.render_cluster_conf(self.pengine_metadata)
+			pengine_widgets = self.render_crmconf_widgets(self.pengine_metadata)
+			self.pengine_widgetgroup = WidgetGroup(pengine_widgets)
 		if self.crmd_metadata != None:
-			self.crmd_widgets = self.render_cluster_conf(self.crmd_metadata)
+			crmd_widgets = self.render_crmconf_widgets(self.crmd_metadata)
+			self.crmd_widgetgroup = WidgetGroup(crmd_widgets)
 
 		notebook = glade.get_widget("notebook")
 		notebook.connect("switch-page", self.on_notebook_event)
@@ -935,20 +968,18 @@
 
 		self.update()
 
-
-
-	def render_cluster_conf(self, metadata):
+	def render_crmconf_widgets(self, metadata):
 		if metadata.name == "Policy Engine":
-			vbox = self.glade.get_widget("vbox_pengine")
+			table = self.glade.get_widget("pengine_table")
 		elif metadata.name == "CRM Daemon":
-			vbox = self.glade.get_widget("vbox_crmd")
+			table = self.glade.get_widget("crmd_table")
 
 		widgets = {}
-		labels = {}
+		name_labels = {}
 		combos = {}
+		combo_entries = {}
 		checkbuttons = {}
 		entries = {}
-		table = gtk.Table(2, 1, False)
 		parameters = metadata.parameters
 
 		for row in range(len(parameters)):
@@ -957,15 +988,37 @@
 			eventbox = gtk.EventBox()
 			eventbox.add(label)
 			table.attach(eventbox, 0, 1, row, row+1, xpadding = 5)
-			labels[parameters[row]["name"]] = label
+			name_labels[parameters[row]["name"]] = label
 
-			if parameters[row]["content"].has_key("values"):
-				combo = gtk.combo_box_entry_new_text()
+			longdesc = parameters[row].get("longdesc")
+			shortdesc = parameters[row].get("shortdesc")
+			if len(longdesc) == 0 :
+				tip = shortdesc
+			elif longdesc.find(shortdesc) > -1 :
+				tip = longdesc
+			else :
+				if shortdesc.endswith(_(".")) :
+					tip = shortdesc + "\n" + longdesc
+				else :
+					tip = shortdesc + _(".") + "\n" + longdesc
+			tooltips = gtk.Tooltips()
+			tooltips.set_tip(label, tip)
+
+			if parameters[row]["content"]["type"] == "enum" \
+					and parameters[row]["content"].has_key("values"):
+				combo = gtk.combo_box_new_text()
 				for option in parameters[row]["content"]["values"]:
 					combo.append_text(option)
 				combo.connect("changed", self.on_changed)
-				table.attach(combo, 1, 2, row, row+1, xpadding = 5)
+				table.attach(combo, 1, 2, row, row+1, yoptions = not gtk.EXPAND, xpadding = 5)
 				combos[parameters[row]["name"]] = combo
+			elif parameters[row]["content"].has_key("values"):
+				combo_entry = gtk.combo_box_entry_new_text()
+				for option in parameters[row]["content"]["values"]:
+					combo_entry.append_text(option)
+				combo_entry.connect("changed", self.on_changed)
+				table.attach(combo_entry, 1, 2, row, row+1, yoptions = not gtk.EXPAND, xpadding = 5)
+				combo_entries[parameters[row]["name"]] = combo_entry
 			elif parameters[row]["content"]["type"] == "boolean":
 				checkbutton = gtk.CheckButton()
 				checkbutton.connect("toggled", self.on_changed)
@@ -977,98 +1030,76 @@
 				table.attach(entry, 1,2, row, row+1, xpadding = 5)
 				entries[parameters[row]["name"]] = entry 
 	
-		vbox.pack_start(table)
-		vbox.show_all()
+		table.show_all()
 
-		widgets["labels"] = labels
+		widgets["name_labels"] = name_labels
 		widgets["combos"] = combos
+		widgets["combo_entries"] = combo_entries
 		widgets["checkbuttons"] = checkbuttons
 		widgets["entries"] = entries
 	
 		return widgets
 
 class OrderView(View) :
-	name = "orderview"
+	name = "cmnobj_view"
 	save_order = None
+	obj_attrs = None
 	def on_apply(self, widget):
-		glade = self.glade
-		order = self.save_order
-		order["from"] = glade.get_widget("from").child.get_text()
-		order["type"] = glade.get_widget("type").child.get_text()
-		order["to"] = glade.get_widget("to").child.get_text()
-		manager.update_constraint("rsc_order", order)
-		
-		View.on_apply(self, widget)
-		
+		passed = self.obj_attrs.verify_values()
+		if passed :
+			order = self.obj_attrs.get_values()
+			manager.update_constraint("rsc_order", order)
+			View.on_apply(self, widget)
 	
 	def update(self) :
-		glade = self.glade
 		order = manager.get_constraint("rsc_order", self.param)
-		if order != None :
- 			glade.get_widget("id").set_text(order["id"])
- 			glade.get_widget("from").child.set_text(order["from"])
- 			glade.get_widget("from").child.set_editable(False)
- 			glade.get_widget("to").child.set_text(order["to"])
- 			glade.get_widget("to").child.set_editable(False)
- 			glade.get_widget("type").child.set_text(order["type"])
- 			glade.get_widget("type").child.set_editable(False)
-			store = gtk.ListStore(str)
-			for rsc in manager.get_all_rsc_id():
-				store.append([rsc])
-			glade.get_widget("to").set_model(store)
-			glade.get_widget("from").set_model(store)
+		
+		if self.obj_attrs != None and order != None :
+			self.obj_attrs.show_values(order)
 			self.save_order = order
 		View.update(self)
 
 	def __init__(self, order_id) :
 		View.__init__(self,order_id)
-		glade = self.glade
- 		glade.get_widget("from").connect("changed", self.on_changed)
- 		glade.get_widget("type").connect("changed", self.on_changed)
- 		glade.get_widget("to").connect("changed", self.on_changed)
+
+		self.obj_attrs = RscOrder(False)
+		widgets = self.obj_attrs.widgets
+		self.glade.get_widget("cmnobj_attrs").pack_start(self.obj_attrs.attrs_vbox)
+		for widget_type in ("combos", "bool_combos", "combo_entries") :
+			for widget in widgets[widget_type].values() :
+				widget.connect("changed", self.on_changed)
 		self.update()
-		
+
 class ColocationView(View) :
-	name = "colocationview"
+	name = "cmnobj_view"
 	save_colocation = None
+	obj_attrs = None
 	def on_apply(self, widget):
-		glade = self.glade
-		colocation = self.save_colocation
-		colocation["from"] = glade.get_widget("from").child.get_text()
-		colocation["score"] = glade.get_widget("score").child.get_text()
-		colocation["to"] = glade.get_widget("to").child.get_text()
-		manager.update_constraint("rsc_colocation", colocation)
-		
-		View.on_apply(self, widget)
+		passed = self.obj_attrs.verify_values()
+		if passed :
+			colocation = self.obj_attrs.get_values()
+			manager.update_constraint("rsc_colocation", colocation)
+			View.on_apply(self, widget)
 		
-	
 	def update(self) :
-		glade = self.glade
 		colocation = manager.get_constraint("rsc_colocation", self.param)
-		if colocation != None :
-			glade.get_widget("id").set_text(colocation["id"])
-			glade.get_widget("from").child.set_text(colocation["from"])
-			glade.get_widget("from").child.set_editable(False)
-			glade.get_widget("to").child.set_text(colocation["to"])
-			glade.get_widget("to").child.set_editable(False)
-			glade.get_widget("score").child.set_text(colocation["score"])
-			glade.get_widget("score").child.set_editable(False)
-			store = gtk.ListStore(str)
-			for rsc in manager.get_all_rsc_id():
-				store.append([rsc])
-			glade.get_widget("from").set_model(store)
-			glade.get_widget("to").set_model(store)
+
+		if self.obj_attrs != None and colocation != None :
+			self.obj_attrs.show_values(colocation)
 			self.save_colocation = colocation
 		View.update(self)
 
 	def __init__(self, colo_id) :
 		View.__init__(self, colo_id)
-		glade = self.glade
-		glade.get_widget("from").connect("changed", self.on_changed)
-		glade.get_widget("to").connect("changed", self.on_changed)
-		glade.get_widget("score").connect("changed", self.on_changed)
+
+		self.obj_attrs = RscColocation(False)
+		widgets = self.obj_attrs.widgets
+		self.glade.get_widget("cmnobj_attrs").pack_start(self.obj_attrs.attrs_vbox)
+		for widget_type in ("combos", "bool_combos", "combo_entries") :
+			for widget in widgets[widget_type].values() :
+				widget.connect("changed", self.on_changed)
 		self.update()		
-				
+			
 class LocationView(View) :
 	name = "locationview"
 	expr_list = None
@@ -1098,7 +1129,7 @@
 			for expr in location["exprs"] :
 				self.expr_list.insert(expr)
 			store = gtk.ListStore(str)
-			for rsc in manager.get_all_rsc_id():
+			for rsc in manager.get_all_rsc():
 				store.append([rsc])
 			glade.get_widget("resource").set_model(store)
 			self.save_location = location
@@ -1114,11 +1145,8 @@
 			glade.get_widget("add_expr"),
 			glade.get_widget("del_expr"),
 			_("Add Expression"),
-			[Field("id", _("ID"), "id_", None, False, auto_gen=True),
-			Field("attribute", _("Attribute"), "#uname", ["#uname","#id", "#is_dc"], False),
-			Field("operation", _("Operation"), "eq",
-				['lt','gt','lte','gte','eq','ne','defined','not_defined'], False),
-			Field("value", _("Value"), "", manager.get_all_nodes(), False)],
+			"expression",
+			None,
 			self.on_changed)
 		self.update()
 		
@@ -1193,37 +1221,6 @@
 	def on_notebook_event(self, widget, page, page_num) :
 		global last_rsc_view_page_num
 		last_rsc_view_page_num = page_num
-			
-	def autofill_param(self, combo, widgets) :
-		for param in self.meta.parameters :
-			if combo.child.get_text() == param["name"] :
-				widgets[2].set_text(param["content"]["default"])
-
-	def autofill_op(self, combo, widgets, combo_name) :			
-		if combo_name == "name" :
-			for op in self.meta.actions :
-				if combo.child.get_text() == op["name"] :
-					widgets[2].set_text(op.get("description", ""))
-					widgets[3].set_text(op.get("interval", ""))
-					widgets[4].set_text(op.get("timeout", ""))
-					widgets[5].set_text(op.get("start-delay", ""))
-					widgets[6].child.set_text(op.get("disabled", ""))
-					widgets[7].child.set_text(op.get("role", ""))
-					widgets[8].child.set_text(op.get("prereq", ""))
-					widgets[9].child.set_text(op.get("on-fail", ""))
-					break
-		elif combo_name == "role" :
-			for op in self.meta.actions :
-				if widgets[1].child.get_text() == op["name"] and combo.child.get_text() == op.get("role", "") :
-					widgets[2].set_text(op.get("description", ""))
-					widgets[3].set_text(op.get("interval", ""))
-					widgets[4].set_text(op.get("timeout", ""))
-					widgets[5].set_text(op.get("start-delay", ""))
-					widgets[6].child.set_text(op.get("disabled", ""))
-					widgets[8].child.set_text(op.get("prereq", ""))
-					widgets[9].child.set_text(op.get("on-fail", ""))
-					break
-
 
 	def __init__(self, rsc) :
 		View.__init__(self, rsc)
@@ -1241,31 +1238,20 @@
 				if not f["name"] in op_options : op_options.append(f["name"])
 			
 		self.param_list = ListWithAddDel(glade.get_widget("parameters"),
-					    glade.get_widget("addparam"),
-					    glade.get_widget("delparam"),
-					    _("Add Parameter"),
-					    [Field("id", _("ID"), "", None, False, auto_gen=True),
-			  		     Field("name", _("Name"), "", param_options, False),
-					     Field("value", _("Value"), "", None, True)],
-					    self.on_changed,
-						self.autofill_param)
+					glade.get_widget("addparam"),
+					glade.get_widget("delparam"),
+					_("Add Parameter"),
+					"nvpair",
+					meta,
+					self.on_changed)
 				      
 		self.op_list = ListWithAddDel(glade.get_widget("operations"),
-					 glade.get_widget("addop"),
-					 glade.get_widget("delop"),
-					 _("Add Operation"),
-					    [Field("id", _("ID"), "", None, False, auto_gen=True),
-			  		     Field("name", _("Name"), "", op_options, False),
-					     Field("description", _("Description"), "", None, True),
-					     Field("interval", _("Interval"), "", None, True),
-					     Field("timeout", _("Timeout"), "", None, True),
-					     Field("start_delay", _("Start Delay"), "0", None, True),
-					     Field("disabled", _("Disabled"), "false", ["true","false"], True),
-					     Field("role", _("Role"),"Started",["Master","Slave","Started","Stopped"],True),
-					     Field("prereq", _("Prereq"), "", ["nothing","quorum","fencing"], True),
-					     Field("on_fail", _("On Fail"), "",["ignore","block","stop","restart","fence"], True)],
-					 self.on_changed,
-					 self.autofill_op)
+					glade.get_widget("addop"),
+					glade.get_widget("delop"),
+					_("Add Operation"),
+					"op",
+					meta,
+					self.on_changed)
 		
 		options_dict = {"is_managed":["default","true","false"],
 			"restart_type":["ignore","restart"],
@@ -1341,13 +1327,12 @@
 		glade = self.glade
 			
 		self.param_list = ListWithAddDel(glade.get_widget("parameters"),
-					    glade.get_widget("addparam"),
-					    glade.get_widget("delparam"),
-					    _("Add Parameter"),
-					    [Field("id", _("ID"), "", None, False, auto_gen=True),
-			  		     Field("name", _("Name"), "", None, False),
-					     Field("value", _("Value"), "", None, True)],
-					    self.on_changed)
+					glade.get_widget("addparam"),
+					glade.get_widget("delparam"),
+					_("Add Parameter"),
+					"nvpair",
+					None,
+					self.on_changed)
 					    
 		options_dict = {"is_managed":["default","true","false"],
 			"restart_type":["ignore","restart"],
@@ -1392,10 +1377,6 @@
 			param_names = [f["name"] for f in meta.parameters]
 			param_descs = [f["shortdesc"] for f in meta.parameters]
 		
-		fields = [Field("id", _("ID"), "id_", None, False, auto_gen = True),
-			  Field("name", _("Name"), "", param_names, False),
-			  Field("value", _("Value"), "", None, True),
-			  Field("shortdesc", _("Description"), "", param_descs, False,False)]
 		glade = self.glade	  
 		glade.get_widget("is_master").set_active(False)
 		glade.get_widget("is_clone").set_active(False)
@@ -1403,7 +1384,7 @@
 		param_list = ListWithAddDel(glade.get_widget("parameters"),
 				       glade.get_widget("addparam"),
 				       glade.get_widget("delparam"),
-				       _("Add Parameter"), fields)
+				       _("Add Parameter"), "nvpair", meta)
 		self.param_list = param_list
 		if meta != None :
 			for param in meta.parameters :
@@ -1507,6 +1488,9 @@
 					meta = manager.get_rsc_meta(c,t,p)
 					if meta != None :
 						desc = meta.shortdesc
+					else :
+						if c == "ocf" or c == "stonith":
+							continue
 					if c=="heartbeat" :
 						p = "heartbeat"
 					elif c=="stonith" :
@@ -1552,7 +1536,7 @@
 		
 		store = gtk.ListStore(str)
 		store.append([""])
-		for rsc in manager.get_all_rsc_id() :
+		for rsc in manager.get_all_rsc() :
 			if manager.get_rsc_type(rsc) == "group" :
 				store.append([rsc])
 		glade.get_widget("group").set_model(store)
@@ -1583,12 +1567,12 @@
 					if not check_entry_value(glade, "master_max"): passed = False
 					if not check_entry_value(glade, "master_node_max"): passed = False
 				if manager.rsc_exists(glade.get_widget("id").get_text()) :
-					msgbox(_("the ID already exists"))
+					msgbox(_("The ID already exists"))
 					passed = False
 
 				group_ = glade.get_widget("group").child.get_text()
 				if group_ != "" and manager.rsc_exists(group_) and manager.get_rsc_type(group_) != "group":
-					msgbox(_("the Group Name is exists"))
+					msgbox(_("The specified group name exists, while it's not group type"))
 					passed = False
 
 				if group_ != "" and glade.get_widget("is_clone").get_active():
@@ -1638,7 +1622,7 @@
 							gtk.STOCK_YES, gtk.RESPONSE_YES,
 							gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL),
 							_("Are you sure you want to set \"target_role\"?"))
-						if retval == gtk.RESPONSE_CANCEL:
+						if retval in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
 							continue
 						if retval == gtk.RESPONSE_NO:
 							rsc["params"].remove(target_role_set)
@@ -1654,7 +1638,417 @@
 					dialog.destroy()
 					return None
 		
-	
+class AddObjectDlg :
+	obj_type = None	
+	widgets = None
+	glade = None
+
+	def run(self, title, obj_type, meta = None, static_desc = None) :
+		global top_window
+
+		dialog = gtk.Dialog(title, top_window, gtk.DIALOG_MODAL,
+			(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+		if obj_type == "rsc_order" :
+			obj_attrs = RscOrder(True, meta, static_desc)
+		elif obj_type == "rsc_colocation" :
+			obj_attrs = RscColocation(True, meta, static_desc)
+		elif obj_type == "nvpair" :
+			obj_attrs = InstAttrsNV(True, meta, static_desc)
+		elif obj_type == "expression" :
+			obj_attrs = Expression(True, meta, static_desc)
+		elif obj_type == "op" :
+			obj_attrs = OP(True, meta, static_desc)
+		else :
+			obj_attrs = ObjectAttrs(obj_type, True, meta, static_desc)
+
+		dialog.vbox.pack_start(obj_attrs.attrs_vbox)
+		dialog.vbox.show()
+		save_top_window = top_window
+		top_window = dialog
+
+		while True :
+			ret = dialog.run()
+			if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
+				top_window = save_top_window
+				dialog.destroy()
+				return None
+			else :
+				passed = obj_attrs.verify_values()
+				if passed :
+					object = obj_attrs.get_values()
+					top_window = save_top_window
+					dialog.destroy()
+					return object
+
+
+class ClusterReportDlg :
+	def set_params(self) :
+		global top_window
+		dialog = gtk.Dialog(_("Cluster Report"), top_window, gtk.DIALOG_MODAL,
+			(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+		self.dialog = dialog
+
+		current_time = time.time()
+		from_time = time.localtime(current_time - 1800)
+		to_time = time.localtime(current_time)
+
+		fdatetime = self.render_time_widgets("<b>"+_("From")+"</b>", from_time, False)
+		tdatetime = self.render_time_widgets("<b>"+_("To")+"</b>", to_time, True)
+
+		save_top_window = top_window
+		top_window = dialog
+		dialog.show_all()
+
+		while True :
+			ret = dialog.run()
+			if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
+				top_window = save_top_window
+				dialog.destroy()
+				return None
+			else :
+				ftime = fdatetime.get_time() 
+				if tdatetime.time_hbox.get_property("sensitive") :
+					ttime = tdatetime.get_time()
+				else :
+					ttime = None
+
+				passed = True
+				if ttime != None and time.mktime(ftime) > time.mktime(ttime) :
+					msgbox(_("The \"From\" time should before the \"To\" one"))
+					passed = False
+
+				if passed :
+					report_params = {}
+					report_params["ftime"] = time.strftime("%F %T", ftime)
+					if ttime != None :
+						report_params["ttime"] = time.strftime("%F %T", ttime)
+
+					top_window = save_top_window
+					dialog.destroy()
+					return report_params
+
+	def render_time_widgets(self, label, default_time, sensibility) :
+		time_label = gtk.Label()
+		time_label.set_markup(_(label))
+		time_label.set_alignment(0, 0.5)
+		
+		datetime = DateTime(default_time)
+
+		if sensibility :
+			time_checkbutton = gtk.CheckButton()
+			time_checkbutton.add(time_label)
+			time_checkbutton.connect("toggled", self.on_checkbutton_toggled, datetime.time_hbox)
+			self.dialog.vbox.pack_start(time_checkbutton, False)
+			datetime.time_hbox.set_sensitive(False)
+		else :
+			self.dialog.vbox.pack_start(time_label, False)
+
+		self.dialog.vbox.pack_start(datetime.time_hbox, False)
+
+		return datetime
+
+	def on_checkbutton_toggled(self, widget, hbox) :
+		hbox.set_sensitive(widget.get_active())
+
+class SelectFileDlg :
+	def select_file(self, orig_filename = None) :
+		global top_window
+		file_dialog = gtk.FileChooserDialog(_("Save as ..."), None, 
+				gtk.FILE_CHOOSER_ACTION_SAVE,
+				(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+				gtk.STOCK_SAVE, gtk.RESPONSE_OK))
+		if orig_filename != None :
+			file_dialog.set_current_name(orig_filename)
+
+		save_top_window = top_window
+		top_window = file_dialog
+
+		while True :
+			ret = file_dialog.run()
+			if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
+				top_window = save_top_window
+				file_dialog.destroy()
+				return None
+			else :
+				save_folder = file_dialog.get_current_folder()
+				save_file = file_dialog.get_filename()
+				passed = True
+				try :
+					if not os.access(save_folder, os.R_OK | os.W_OK | os.X_OK) :
+						msgbox(_("Permission denied: ") + save_folder)
+						passed = False
+						continue
+					if os.access(save_file, os.F_OK) :
+						retval = confirmbox(_("A file with the same name already exists: ")
+								+ os.path.basename(save_file) + "\n"
+								+_("Do you want to overwrite it?"),
+								(gtk.STOCK_YES, gtk.RESPONSE_YES,
+								gtk.STOCK_NO, gtk.RESPONSE_NO),
+								_("Replace it?"))
+						if retval in [gtk.RESPONSE_NO, gtk.RESPONSE_DELETE_EVENT] :
+							passed = False
+							continue
+							
+				except OSError, msg :
+					msgbox(_("System error: ") + str(msg))
+					passed = False
+
+				if passed :
+					top_window = save_top_window
+					file_dialog.destroy()
+					return save_file
+
+
+
+class DateTime:
+	def __init__(self, default_time) :
+		time_hbox = gtk.HBox()
+
+		time_date = gtk.Entry()
+		time_date.set_width_chars(10)
+		time_date.set_editable(False)
+		time_hbox.pack_start(time_date, False)
+
+		time_cal_window = gtk.Window(gtk.WINDOW_POPUP)
+		time_cal = gtk.Calendar()
+		time_cal_window.add(time_cal)
+		
+		time_cal_button = gtk.ToggleButton()
+		arrow = gtk.Arrow(gtk.ARROW_DOWN, gtk.SHADOW_OUT)
+		time_cal_button.add(arrow)
+		time_cal_button.connect("toggled", self.on_toggled, time_cal_window)
+		time_hbox.pack_start(time_cal_button, False)
+
+		time_cal_window.connect("button-press-event", self.on_button_press, time_cal_button)
+		time_cal_window.connect("key-press-event", self.on_key_press, time_cal_button)
+
+		time_cal.connect("day-selected", self.on_day_selected, time_date)
+
+		time_cal.select_month(default_time[1]-1, default_time[0])
+		time_cal.select_day(default_time[2])
+
+		space = gtk.Label(" ")
+		time_hbox.pack_start(space, False)
+
+		time_hr_adj = gtk.Adjustment(default_time[3], 00, 23, 1, 4)
+		time_hr = gtk.SpinButton(time_hr_adj, 0, 0)
+		time_hr.set_width_chars(2)
+		time_hr.set_wrap(True)
+		time_hbox.pack_start(time_hr, False)
+
+		time_colon = gtk.Label(":")
+		time_hbox.pack_start(time_colon, False)
+
+		time_min_adj = gtk.Adjustment(default_time[4], 00, 59, 1, 5)
+		time_min = gtk.SpinButton(time_min_adj, 0, 0)
+		time_min.set_width_chars(2)
+		time_min.set_wrap(True)
+		time_hbox.pack_start(time_min, False)
+		
+		time_colon = gtk.Label(":")
+		time_hbox.pack_start(time_colon, False)
+
+		time_sec_adj = gtk.Adjustment(default_time[5], 00, 59, 1, 5)
+		time_sec = gtk.SpinButton(time_sec_adj, 0, 0)
+		time_sec.set_width_chars(2)
+		time_sec.set_wrap(True)
+		time_hbox.pack_start(time_sec, False)
+
+		time_widgets = {}
+		self.time_date = time_date
+		self.time_hr = time_hr
+		self.time_min = time_min
+		self.time_sec = time_sec
+		self.time_hbox = time_hbox
+
+	def on_toggled(self, widget, cal_window) :
+		if widget.get_active() :
+			self.cal_popup(widget, cal_window)
+		else :
+			self.cal_hide(widget, cal_window)
+
+	def cal_popup(self, widget, cal_window) :
+		(x, y) = widget.get_parent_window().get_position()
+		x += widget.allocation.x
+		y += widget.allocation.y + widget.allocation.height
+		cal_window.grab_add()
+		cal_window.move(x, y)
+		cal_window.grab_focus()
+		cal_window.show_all()
+
+		if gtk.gdk.pointer_grab(cal_window.window, True,
+			gtk.gdk.BUTTON_PRESS_MASK | gtk.gdk.BUTTON_RELEASE_MASK | gtk.gdk.POINTER_MOTION_MASK,
+			None, None, 0L) == gtk.gdk.GRAB_SUCCESS :
+			if (gtk.gdk.keyboard_grab (cal_window.window, True, 0L) != 0):
+				gtk.gdk.pointer_ungrab(0L)
+
+	def cal_hide(self, widget, cal_window) :
+		cal_window.hide()
+		cal_window.grab_remove()
+		gtk.gdk.pointer_ungrab(0L)
+		gtk.gdk.keyboard_ungrab(0L)
+
+	def on_button_press(self, cal_window, event, button) :
+		button.set_active(False)
+				
+	def on_key_press(self, cal_window, event, button) :
+		if event.keyval == gtk.keysyms.Escape :
+			button.set_active(False)
+		else :
+			gtk.gdk.keyboard_grab (cal_window.window, True, 0L)
+
+	def on_day_selected(self, cal_window, date_entry) :
+		(year, month, day) = cal_window.get_date()
+		mytime = time.mktime((year, month+1, day, 0, 0, 0, 0, 0, -1))
+		localtime = time.strftime("%Y-%m-%d", time.localtime(mytime))
+		date_entry.set_text(localtime)
+		#date_entry.set_text("%d-%02d-%02d"%(year, month+1, day))
+
+	def get_time(self) :
+		datetime = time.strptime("%s %02d:%02d:%02d"%(self.time_date.get_text(),
+							self.time_hr.get_value(),
+							self.time_min.get_value(),
+							self.time_sec.get_value()), "%Y-%m-%d %H:%M:%S")
+		return datetime
+
+class ProgressPulse :
+	def __init__(self, title, msg, pulse_msg, button=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL), destroy_condition = None) :
+		global top_window
+		self.destroy_condition = destroy_condition
+
+		dialog = gtk.Dialog(title, top_window, gtk.DIALOG_MODAL, button)
+		if msg != None :
+			label = gtk.Label(msg)
+			dialog.vbox.pack_start(label, False)
+		self.pbar = gtk.ProgressBar()
+		if pulse_msg != None :
+			self.pbar.set_text(pulse_msg)
+		self.timer = gobject.timeout_add(100, self.pulse)
+		dialog.vbox.pack_start(self.pbar, False)
+		dialog.show_all()
+
+		self.save_top_window = top_window
+		self.dialog = dialog
+
+	def pulse(self) :
+		if self.destroy_condition != None and self.destroy_condition() :
+			self.destroy()
+			return False
+		else :
+			self.pbar.pulse()
+			return True
+
+	def destroy(self) :
+		global top_window
+		top_window = self.save_top_window
+		self.dialog.destroy()
+		gobject.source_remove(self.timer)
+
+	def run(self) :	
+		ret = self.dialog.run()
+		self.destroy()
+		return ret
+
+class DesReportDlg:
+	def __init__(self, des_file_lines) :
+		global top_window
+		self.des_file_lines = des_file_lines
+
+		dialog = gtk.Dialog(_("Description of Cluster Report"), top_window, gtk.DIALOG_MODAL,
+				(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+
+		entries = {}
+		combo_entries = {}
+
+		for line in des_file_lines :
+			if line.startswith("Severity: [choose one] ") :
+				options =  line.replace("Severity: [choose one] ", "").split()
+				hbox = gtk.HBox()
+				label = gtk.Label(_("Severity:"))
+				label.set_alignment(0, 0.5)
+				hbox.pack_start(label, False)
+				
+				combo_entry = gtk.combo_box_entry_new_text()
+				combo_entry.append_text("")
+				for option in options :
+					combo_entry.append_text(option)
+				hbox.pack_start(combo_entry)
+				dialog.vbox.pack_start(hbox, False)
+				combo_entries["severity"] = combo_entry 
+			elif line.startswith("Component: [choose one] ") :
+				options = line.replace("Component: [choose one] ", "").split()
+				hbox = gtk.HBox()
+				label = gtk.Label(_("Component:"))
+				label.set_alignment(0, 0.5)
+				hbox.pack_start(label, False)
+				
+				combo_entry = gtk.combo_box_entry_new_text()
+				combo_entry.append_text("")
+				for option in options :
+					combo_entry.append_text(option)
+				hbox.pack_start(combo_entry)
+				dialog.vbox.pack_start(hbox, False)
+				combo_entries["component"] = combo_entry
+			elif line.startswith("Subject:") :
+				hbox = gtk.HBox()
+				label = gtk.Label(_("Subject:"))
+				label.set_alignment(0, 0.5)
+				hbox.pack_start(label, False)
+				entry = gtk.Entry()
+				hbox.pack_start(entry)
+				dialog.vbox.pack_start(hbox, False)
+				entries["subject"] = entry
+			elif line.startswith("Detailed description:") :
+				label = gtk.Label(_("Detailed description:"))
+				label.set_alignment(0, 0.5)
+				dialog.vbox.pack_start(label, False)
+
+				sw = gtk.ScrolledWindow()
+				sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+				des_text = gtk.TextView()
+				des_text.set_wrap_mode(gtk.WRAP_WORD)
+				self.des_textbuffer = des_text.get_buffer()
+				sw.add(des_text)
+				dialog.vbox.pack_start(sw)
+			elif not line.startswith("[...]") and not line.startswith("---") :
+				label = gtk.Label(line.replace("\n", ""))
+				label.set_alignment(0, 0.5)
+				label.set_selectable(True)
+				dialog.vbox.pack_start(label, False)
+
+		widgets = {}
+		widgets["entries"] = entries
+		widgets["combo_entries"] = combo_entries
+		self.widget_group = WidgetGroup(widgets)
+
+		dialog.show_all()
+		self.dialog = dialog
+		self.save_top_window = top_window
+
+	def run(self) :
+		global top_window
+		des_file_lines  = self.des_file_lines
+		ret = self.dialog.run()
+		if ret in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
+			top_window = self.save_top_window
+			self.dialog.destroy()
+			return None
+		else :
+			fields = self.widget_group.get_values()
+			detailed_des = self.des_textbuffer.get_text(*self.des_textbuffer.get_bounds())
+			new_file_lines = []
+			for i in range(len(des_file_lines)) :
+				if des_file_lines[i].startswith("Severity: [choose one] ") :
+					des_file_lines[i] = "Severity: %s\n"%fields.get("severity", "")
+				elif des_file_lines[i].startswith("Component: [choose one] ") :
+					des_file_lines[i] = "Component: %s\n"%fields.get("component", "")
+				elif des_file_lines[i].startswith("Subject:") :
+					des_file_lines[i] = "Subject: %s\n"%fields.get("subject", "")
+				elif des_file_lines[i-2].startswith("Detailed description:") :
+					des_file_lines[i] = detailed_des + "\n"
+			top_window = self.save_top_window
+			self.dialog.destroy()
+			return des_file_lines 
 
 class MainWindow :
 	'''
@@ -1727,6 +2121,13 @@
 			manager.connected
 			and self.cur_type in [_("native")])
 
+		self.set_action_sensitive('migratersc',
+			manager.connected
+			and self.cur_type in [_("native"), _("group"), _("clone"), _("master")])
+
+		self.set_action_sensitive('unmigratersc', manager.connected)
+		self.set_action_sensitive('report', manager.connected)
+
 	# functions
 	def update(self) :
 		self.tree.update()
@@ -1854,28 +2255,22 @@
 		elif new_type["type"] == _("location") :
 			location = kvbox(_("Add Location Constraint"),
 				[Field("id",_("ID"),"location_",None, False),
-				 Field("rsc",_("Resource"),None, manager.get_all_rsc_id(),False)])
+				 Field("rsc",_("Resource"),None, manager.get_all_rsc(),False)])
 			if location != None :
 				location["score"] = '0'
 				location["boolean_op"] = ''
 				location["exprs"] = []
 				manager.update_constraint("rsc_location", location)
 		elif new_type["type"] == _("order") :
-			order = kvbox(_("Add Order Constraint"),
-				[Field("id",_("ID"),"order_",None,False),
-				 Field("from",_("From"),None, manager.get_all_rsc_id(),False),
-				 Field("type",_("Type"),None, ["before","after"], False),
-				 Field("to",_("To"),None, manager.get_all_rsc_id(), False)])
-			if order != None :
-				manager.update_constraint("rsc_order", order)
+			objdlg = AddObjectDlg()
+			object = objdlg.run("Add Order Constraint", "rsc_order")
+			if object != None :
+				manager.update_constraint("rsc_order", object)
 		elif new_type["type"] == _("colocation") :
-			colocation = kvbox(_("Add Colocation Constraint"),
-				[Field("id",_("ID"),"colocation_",None,False),
-				 Field("from",_("From"),None, manager.get_all_rsc_id(),False),
-				 Field("to",_("To"),None, manager.get_all_rsc_id(), False),
-				 Field("score",_("Score"),None, ["INFINITY","0","-INFINITY"], False)])
-			if colocation != None :
-				manager.update_constraint("rsc_colocation", colocation)
+			objdlg = AddObjectDlg()
+			object = objdlg.run("Add Colocation Constraint", "rsc_colocation")
+			if object != None :
+				manager.update_constraint("rsc_colocation", object)
 			
 	def on_del_item(self, action) :
 		if confirmbox(_("Delete") + " "+self.cur_type + " " + self.cur_name + "?") == gtk.RESPONSE_YES:
@@ -1888,7 +2283,7 @@
 					parent = manager.parent[self.cur_name] 
 				except KeyError : # the self.cur_name does not exist in manager.parent
 					parent = self.cur_name
-				if len(manager.get_rsc_sub_rsc(parent)) == 1 :
+				if len(manager.get_sub_rsc(parent)) == 1 :
 					manager.do_cmd("del_rsc\n"+parent)
 				else :
 					manager.do_cmd("del_rsc\n"+self.cur_name)
@@ -1915,7 +2310,7 @@
 			if param["name"] == "target_role" and param["value"] == target_role :
 				return
 
-		for subrsc in manager.get_rsc_sub_rsc(self.cur_name) :
+		for subrsc in manager.get_sub_rsc(self.cur_name) :
 			(attrs, running_on, metaattrs, params, ops) = \
 				manager.get_rsc_info(subrsc)
 			for metaattr in metaattrs :
@@ -1931,7 +2326,7 @@
 								gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL),
 								_("Do you want to retain the \"target_role\" set for sub-resource \"")
 								+subrsc+_("\"?"))
-					if retval == gtk.RESPONSE_CANCEL:
+					if retval in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
 						return	
 					if retval == gtk.RESPONSE_NO:
 						new_metaattrs = metaattrs[:]
@@ -1947,11 +2342,347 @@
 			manager.do_cmd("move_rsc\n%s\ndown"%self.cur_name)
 	
 	def on_item_cleanup(self, action) :
-		if self.cur_type == _("native") :
-			manager.do_cmd("cleanup_rsc\n"+self.cur_name)
-		elif self.cur_type in [_("group"),_("clone"),_("master")] :
-			for rsc in manager.get_rsc_sub_rsc(self.cur_name) :
-				manager.do_cmd("cleanup_rsc\n"+rsc)
+		rsc_list = manager.get_all_rsc()
+		if rsc_list == None :
+			return
+		rsc_options = rsc_list[:]
+		rsc_options.insert(0, _("all resources"))
+
+		node_list = manager.get_normal_nodes()
+		if node_list == None :
+			return
+		node_options = node_list[:]
+		node_options.insert(0, _("all nodes"))
+
+		cleanup = kvbox(_("Cleanup Resource"),
+				[Field("rsc", _("Resource"), self.cur_name, rsc_options, False, entry_editable = False),
+				Field("node", _("Node"), _("all nodes"), node_options, False, entry_editable = False)])
+
+		if cleanup != None :
+			cleanup_rscs = []
+			if cleanup["rsc"] == _("all resources") :
+				for rsc in rsc_list :
+					if manager.get_rsc_type(rsc) == "native" :
+						cleanup_rscs.append(rsc)
+			elif manager.get_rsc_type(cleanup["rsc"]) != "native" :
+				all_subrscs = manager.get_all_subrsc(cleanup["rsc"])
+				if all_subrscs == None :
+					return
+				for rsc in all_subrscs :
+					if manager.get_rsc_type(rsc) == "native" :
+						cleanup_rscs.append(rsc)
+			else :
+				cleanup_rscs.append(cleanup["rsc"])
+			
+			if cleanup["node"] == _("all nodes") :
+				cleanup_nodes = node_list
+			else :
+				cleanup_nodes = [cleanup["node"]]
+					
+			for rsc in cleanup_rscs :
+				for node in cleanup_nodes :
+					manager.do_cmd("cleanup_rsc\n"+ node + "\n" + rsc)
+
+	def on_migrate_rsc(self, action) :
+		node_list = manager.get_normal_nodes()
+		node_list.insert(0, "")
+		
+		migrate = kvbox(_("Migrate Resource"),
+				[Field("rsc", _("Resource"), self.cur_name, manager.get_all_rsc(), False, entry_editable = False),
+				Field("to_node", _("To Node"), "", node_list, True, entry_editable = False),
+				Field("force", _("Force"), "", ["", "True", "False"], True, entry_editable = False)])
+
+		if migrate != None :
+			running_on = manager.query("rsc_running_on\n%s"%migrate["rsc"])
+			if running_on == None or running_on == [] :
+				if migrate["to_node"] == "" :
+					msgbox(migrate["rsc"]+_(" not migrated: not-active and no prefered node specified."))
+					return
+
+			if migrate["to_node"] in running_on :
+				msgbox(migrate["rsc"]+_(" is already running on ")+migrate["to_node"])
+				return
+
+			if migrate["to_node"] != None and len(migrate["to_node"]) > 0 :
+				location = {}
+				location["id"] = "cli-prefer-" + migrate["rsc"]
+				location["rsc"] = migrate["rsc"]
+				location["score"] = "INFINITY"
+				location["boolean_op"] = ""
+				location["exprs"] = []
+				expr = {}
+				expr["id"] = uuid() 
+				expr["attribute"] = "#uname"
+				expr["operation"] = "eq"
+				expr["value"] = migrate["to_node"]
+				location["exprs"].append(expr)
+
+				manager.update_constraint("rsc_location", location)
+
+			if running_on != None and len(running_on) > 0 :
+				if migrate["force"] == "True" or migrate["to_node"] == "" :
+					location = {}
+					location["id"] = "cli-standby-" + migrate["rsc"]
+					location["rsc"] = migrate["rsc"]
+					location["score"] = "-INFINITY"
+					location["boolean_op"] = ""
+					location["exprs"] = []
+					expr = {}
+					expr["id"] = uuid() 
+					expr["attribute"] = "#uname"
+					expr["operation"] = "eq"
+					expr["value"] = running_on[0]
+					location["exprs"].append(expr)
+					manager.update_constraint("rsc_location", location)
+
+	def on_unmigrate_rsc(self, action) :
+		location_ids = manager.query("get_cos\nrsc_location")
+		migrate_ids = {}
+		rsc_ids = []
+		for id in location_ids :
+			for prefix in ["cli-prefer-", "cli-standby-"] :
+				if id.startswith(prefix) :
+					split_id = id.split(prefix)
+					if len(split_id) > 1 :
+						rsc_id = split_id[1]
+						if not migrate_ids.has_key(rsc_id) :
+							migrate_ids[rsc_id] = []
+						migrate_ids[rsc_id].append(id)
+
+		all_str = _("all migrated resources")
+		rsc_list = migrate_ids.keys()[:]
+		rsc_list.insert(0, all_str)
+		unmigrate = kvbox(_("Clear Migrate Constraints"),
+				[Field("rsc", _("Resource"), all_str, rsc_list, False, entry_editable = False)])
+
+		if unmigrate != None :
+			if unmigrate["rsc"] == all_str :
+				for rsc_id in migrate_ids.keys() :
+					for id in migrate_ids[rsc_id] :
+						manager.do_cmd("del_co\nrsc_location\n"+id)
+			else :
+				for id in migrate_ids[unmigrate["rsc"]] :
+					manager.do_cmd("del_co\nrsc_location\n"+id)
+
+	def on_cluster_report(self, action) :
+		rpdlg = ClusterReportDlg()
+		report_params = rpdlg.set_params()
+		if report_params == None :
+			return
+
+		report_cmd = "gen_cluster_report\n%s\n%s"%(report_params["ftime"], report_params.get("ttime", ""))
+		manager.async_do_cmd(report_cmd)
+
+		pbar = ProgressPulse(_("Cluster Report"), 
+					_("Generating the cluster report may take a while,")+"\n"
+					+_("depending on the size of logs..."), 
+					None, None,
+					lambda : manager.async_ret_list.get(report_cmd) != None)
+		ret = pbar.run()
+		if ret not in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT] :
+			self.save_cluster_report(manager.async_ret_list.pop(report_cmd))
+
+	def save_cluster_report(self, str_list) :
+		if manager.failed_reason != "" :
+			msgbox(manager.failed_reason)
+			return
+		elif str_list == None or len(str_list) < 2 :
+			msgbox(_("Failed to generate the cluster report"))
+			return
+
+		sfdlg = SelectFileDlg()
+		save_file = sfdlg.select_file(str_list[0].split("/")[-1])
+		if save_file == None :
+			return
+
+		base64_str = "\n".join(str_list[1:])
+		try :
+			bin_str = binascii.a2b_base64(base64_str)
+		except binascii.Incomplete, msg :
+			msgbox(_("Incomplete data: ") + str(msg))
+			return
+
+		try :
+			fd = os.open(save_file, os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644)
+		except OSError, msg :
+			msgbox(_("System error: ") + str(msg))
+			return
+
+		try :
+			os.write(fd, bin_str)
+		except OSError, msg :
+			msgbox(_("System error: ") + str(msg))
+			os.close(fd)
+			return
+		os.close(fd)
+
+		self.des_cluster_report(save_file)
+
+	def des_cluster_report(self, save_file) :
+		save_dir = os.path.dirname(save_file)
+
+		try :
+			current_tarfile = tarfile.open(save_file, "r:gz")
+		except IOError, msg :
+			msgbox(_("I/O error: ") + str(msg))
+			return
+		except tarfile.TarError, msg :
+			msgbox(_("Tar error: ") + "%s: '%s'"%(str(msg), save_file))
+			return
+			
+		try :
+			file_list = current_tarfile.getnames()
+			for filename in file_list :
+				current_tarfile.extract(filename, save_dir)
+		except tarfile.TarError, msg :
+			msgbox(_("Tar error: ") + "%s: '%s'"%(str(msg), save_file))
+			current_tarfile.close()
+			return
+		current_tarfile.close()
+
+		des_filename = None
+		for filename in file_list :
+			if filename.endswith("description.txt") :
+				des_filename = filename
+				break
+
+		if des_filename != None :
+			des_filepath = os.path.join(save_dir, des_filename)
+
+			try :
+				des_f = open(des_filepath, "r+")
+			except IOError, msg :
+				msgbox(_("I/O error: ") + str(msg))
+				self.delete_files(save_dir, file_list)
+				return
+
+			try :
+				file_lines = des_f.readlines()
+			except IOError, msg :
+				msgbox(_("I/O error: ") + str(msg))
+				des_f.close()
+				self.delete_files(save_dir, file_list)
+				return
+
+			des_report = DesReportDlg(file_lines)
+			new_file_lines = des_report.run()
+
+			if new_file_lines == None :
+				new_file_lines = file_lines
+
+			try :
+				des_f.seek(0)
+				des_f.truncate()
+				des_f.writelines(new_file_lines)
+			except IOError, msg :
+				msgbox(_("I/O error: ") + str(msg))
+				des_f.close()
+				self.delete_files(save_dir, file_list)
+				return
+
+			des_f.close()
+
+		try :
+			new_tarfile = tarfile.open(save_file, "w:gz")
+		except IOError, msg :
+			msgbox(_("I/O error: ") + str(msg))
+			self.delete_files(save_dir, file_list)
+			return
+		except tarfile.TarError, msg :
+			msgbox(_("Tar error: ") + "%s: '%s'"%(str(msg), save_file))
+			self.delete_files(save_dir, file_list)
+			return
+
+		current_arcname = os.path.commonprefix(file_list).split(os.sep)[0]
+		if current_arcname != '' :
+			file_basename = os.path.basename(save_file)
+			if save_file.endswith(".tar.gz") :
+				new_arcname = file_basename[:file_basename.rfind(".tar.gz")]
+			elif save_file.endswith(".tgz") :
+				new_arcname = file_basename[:file_basename.rfind(".tgz")]
+			elif save_file.endswith(".gz") :
+				new_arcname = file_basename[:file_basename.rfind(".gz")]
+			else :
+				new_arcname = file_basename
+
+			folder = os.path.join(save_dir, current_arcname)
+			try :
+				new_tarfile.add(folder, new_arcname)
+			except IOError, msg :
+				msgbox(_("I/O error: ") + str(msg))
+				return
+			except tarfile.TarError, msg :
+				msgbox(_("Tar error: ") + "%s: '%s'"%(str(msg), save_file))
+				new_tarfile.close()
+				self.delete_files(save_dir, file_list)
+				return
+			new_tarfile.close()
+			self.delete_files(save_dir, file_list)
+
+		else :
+			for filename in file_list :
+				file_path = os.path.join(save_dir, filename)
+				try :
+					new_tarfile.add(file_path, recursive=False)
+				except IOError, msg :
+					msgbox(_("I/O error: ") + str(msg))
+					new_tarfile.close()
+					self.delete_files(save_dir, file_list)
+					return
+				except tarfile.TarError, msg :
+					msgbox(_("Tar error: ") + "%s: '%s'"%(str(msg), save_file))
+					new_tarfile.close()
+					self.delete_files(save_dir, file_list)
+					return
+			new_tarfile.close()
+			self.delete_files(save_dir, file_list)
+
+	def delete_files(self, save_dir, file_list) :
+		dir_list = []
+		for filename in file_list :
+			file_path = os.path.join(save_dir, filename)
+			try :
+				mode = os.lstat(file_path)[ST_MODE]
+			except OSError, msg :
+				msgbox(_("System error: ") + str(msg))
+				continue
+
+			if S_ISDIR(mode) :
+				dir_list.append(file_path)
+			else :
+				try :
+					os.unlink(file_path)
+				except OSError, msg :
+					msgbox(_("System error: ") + str(msg))
+					continue
+
+		for dir_path in dir_list :
+			if os.access(dir_path, os.F_OK) :
+				self.delete_dir(dir_path)
+		
+	def delete_dir(self, dir_path) :
+		real_path = os.path.realpath(dir_path)
+		if real_path.count(os.sep) == len(real_path) :
+			msgbox(_("Do not delete the root directory"))
+			return
+
+		for root, dirs, files in os.walk(dir_path, False) :
+    			for name in files :
+				try :
+					os.unlink(os.path.join(root, name))
+				except OSError, msg :
+					msgbox(_("System error: ") + str(msg))
+					continue
+			for name in dirs :
+				try :
+					os.rmdir(os.path.join(root, name))
+				except OSError, msg :
+					msgbox(_("System error: ") + str(msg))
+					continue
+		try :
+			os.rmdir(dir_path)
+		except OSError, msg :
+			msgbox(_("System error: ") + str(msg))
 
 	def load_icon(self, name, file) :
 		icons = gtk.IconFactory()
@@ -2002,11 +2733,16 @@
 					<menuitem action="defaultrsc"/>
 					<menuitem action="uprsc"/>
 					<menuitem action="downrsc"/>
+					<menuitem action="migratersc"/>
+					<menuitem action="unmigratersc"/>
 				</menu>
 				<menu action="node">
 					<menuitem action="standby"/>
 					<menuitem action="active"/>
 				</menu>
+				<menu action="tools">
+					<menuitem action="report"/>
+				</menu>
 			</menubar>
 			<popup name="resource_popup">
 				<menuitem action="addrsc"/>
@@ -2017,6 +2753,8 @@
 				<menuitem action="defaultrsc"/>
 				<menuitem action="uprsc"/>
 				<menuitem action="downrsc"/>
+				<menuitem action="migratersc"/>
+				<menuitem action="unmigratersc"/>
 			</popup>
 			<popup name="connection_popup">
 				<menuitem action="login"/>
@@ -2027,6 +2765,9 @@
 				<menuitem action="standby"/>
 				<menuitem action="active"/>
 			</popup>
+			<popup action="tools_popup">
+				<menuitem action="report"/>
+			</popup>
 			<toolbar name="toolbar">
 				<toolitem action="login"/>
 				<toolitem action="logout"/>
@@ -2039,33 +2780,56 @@
 				<toolitem action="defaultrsc"/>
 				<toolitem action="uprsc"/>
 				<toolitem action="downrsc"/>
+				<toolitem action="migratersc"/>
+				<toolitem action="unmigratersc"/>
 				<separator/>
 				<toolitem action="standby"/>
 				<toolitem action="active"/>
 				<separator/>
+				<toolitem action="report"/>
+				<separator/>
 				<toolitem action="quit"/>
 			</toolbar>
 		</ui>'''
 		uimanager = gtk.UIManager()
 		actiongroup = gtk.ActionGroup('haclient')
+		
+		if pygtk_2_6_newer() :
+			login_icon = gtk.STOCK_CONNECT
+			logout_icon = gtk.STOCK_DISCONNECT
+			startrsc_icon = gtk.STOCK_MEDIA_PLAY
+			stoprsc_icon = gtk.STOCK_MEDIA_STOP
+		else :
+			login_icon = "ha-login"
+			logout_icon = "ha-logout"
+			startrsc_icon = "ha-start-resource"
+			stoprsc_icon = "ha-stop-resource"
+			
 		actiongroup.add_actions([
 			('connection', None, _('Connection')),
-			('login', "ha-login", _('Login...'), None,_('login to cluster'), self.on_login),
-			('logout', "ha-logout", _('Logout'), None,_('logout from cluster'), self.on_logout),
-			('quit', "ha-exit", _('Quit'), None,_('Quit the Program'), self.on_quit),
+			('login', login_icon, _('Login...'), None,_('login to cluster'), self.on_login),
+			('logout', logout_icon, _('Logout'), None,_('logout from cluster'), self.on_logout),
+			('quit', gtk.STOCK_QUIT, _('Quit'), None,_('Quit the Program'), self.on_quit),
 			('resource', None, _('Resources')),
-			('addrsc', "ha-add-resource", _('Add New Item'), None,_('add new item'), self.on_add_item),
-			('delrsc', "ha-remove-resource", _('Delete'), None,_('delete current item'), self.on_del_item),
-			('cleanuprsc', "ha-cleanup-resource", _('Cleanup resource'), None,_('cleanup resource'), self.on_item_cleanup),
-			('startrsc', "ha-start-resource", _('Start'), None,_('start resource'), self.on_item_action),
-			('stoprsc', "ha-stop-resource", _('Stop'), None,_('stop resource'), self.on_item_action),
-			('defaultrsc', "ha-default-resource", _('Default'), None,_('work as default'), self.on_item_action),
-			('uprsc', "ha-up-resource", _('Move Up'), None,_('move the resource up in the group'), self.on_item_move),
-			('downrsc', "ha-down-resource", _('Move Down'), None,_('move the resource down in the group'),
-				 self.on_item_move),
+			('addrsc', gtk.STOCK_ADD, _('Add New Item'), None,_('add new item'), self.on_add_item),
+			('delrsc', gtk.STOCK_REMOVE, _('Delete'), None,_('delete current item'), self.on_del_item),
+			('cleanuprsc', gtk.STOCK_CLEAR, _('Cleanup Resource'), None,_('cleanup resource'), self.on_item_cleanup),
+			('startrsc', startrsc_icon, _('Start'), None,_('start resource'), self.on_item_action),
+			('stoprsc', stoprsc_icon, _('Stop'), None,_('stop resource'), self.on_item_action),
+			('defaultrsc', gtk.STOCK_EXECUTE, _('Default'), None,_('work as default'), self.on_item_action),
+			('uprsc', gtk.STOCK_GO_UP, _('Move Up'), None,_('move the resource up in the group'), self.on_item_move),
+			('downrsc', gtk.STOCK_GO_DOWN, _('Move Down'), None,_('move the resource down in the group'),
+				self.on_item_move),
+			('migratersc', gtk.STOCK_REDO,  _('Migrate Resource'), None, _('migrate a resource to specified node'), 
+				self.on_migrate_rsc),
+			('unmigratersc', gtk.STOCK_UNDO,  _('Clear Migrate Constraints'),
+				None, _('clear constraints created by migrate'),
+				self.on_unmigrate_rsc),
 			('node', None, _('Nodes')),
 			('standby', "ha-standby-node", _('Standby'), None,_('make the node standby'), self.on_standby),
-			('active', "ha-active-node", _('Active'), None,_('make the node active'), self.on_active)
+			('active', "ha-active-node", _('Active'), None,_('make the node active'), self.on_active),
+			('tools', None, _('Tools')),
+			('report', gtk.STOCK_DND, _('Cluster Report'), None, _('generate a cluster report'), self.on_cluster_report)
 			])
 		uimanager.insert_action_group(actiongroup, 0)
 		uimanager.add_ui_from_string(ui_xml)
@@ -2117,6 +2881,10 @@
 	active_nodes = []
 	all_nodes = []
 	failed_reason = ""
+	dtd_elems = {}
+	session_lock = thread.allocate_lock()
+	async_ret_str = {}
+	async_ret_list = {} 
 		
 	# cache functions
 
@@ -2152,6 +2920,7 @@
 		return attr_list
 		
 	def run(self) :
+		gtk.gdk.threads_init()
 		gtk.main()
 		if self.connected :
 			mgmt_disconnect()
@@ -2180,17 +2949,31 @@
 		port = ""
 		if string.find(server, ":") != -1 :
 			server,port = string.split(server,":")
-		ip = socket.gethostbyname(server)
-		ret = mgmt_connect(ip, username, password, port)
+		try :
+			ip = socket.gethostbyname(server)
+		except socket.error :
+			self.failed_reason = _("Can't resolve address of server ")+server
+			return False
+
+		try :
+			ret = mgmt_connect(ip, username, password, port)
+		except :
+			self.failed_reason = _("Can't connect to server ")+server
+			mgmt_disconnect()
+			return False
+
 		if ret != 0 :
 			if ret == -1 :
-				self.failed_reason = _("Can't connect to server")
+				self.failed_reason = _("Can't connect to server ")+server
 			elif ret == -2 :
 				self.failed_reason =\
-				 _("Failed in the authentication.\n User Name or Password may be wrong." \
+			 	_("Failed in the authentication.\n User Name or Password may be wrong." \
 				"\n or the user doesn't belong to haclient group")
+			else :
+				self.failed_reason = _("Can't login to server.\n The protocols may be mismatched.")
 			mgmt_disconnect()
 			return False
+
 		window.statusbar.pop(1)	
 		window.statusbar.push(1,_("Connected to ")+server)
 		self.connected = True
@@ -2217,19 +3000,27 @@
 		
 	def do_cmd(self, command) :
 		self.failed_reason = ""
+		self.session_lock.acquire()
 		ret_str = mgmt_sendmsg(command)
+		self.session_lock.release()
 		if ret_str == None :
 			debug(str(string.split(command, "\n"))+":None")
 			self.failed_reason = "return None"
 			return None
  		while len(ret_str)>=4 and ret_str[:4] == "evt:" :
 			gobject.idle_add(self.on_event, None, None, ret_str)
+			self.session_lock.acquire()
  			ret_str = mgmt_recvmsg()
+			self.session_lock.release()
 			if ret_str == None :
 				debug(str(string.split(command, "\n"))+":None")
 				self.failed_reason = "return None"
 				return None
 
+		return self.ret_str2list(ret_str, command)
+
+	def ret_str2list(self, ret_str, command) :
+		self.failed_reason = ""
 		ret_list = string.split(ret_str, "\n")
 		if ret_list[0] != "ok" :
 			debug(str(string.split(command, "\n"))+":"+ str(ret_list))
@@ -2238,7 +3029,27 @@
 			return None
 		debug(str(string.split(command, "\n"))+":"+ str(ret_list))
 		return ret_list[1:]
-		
+
+	def async_sendmsg(self, command) :
+		self.session_lock.acquire()
+		self.async_ret_str[command] = mgmt_thread_sendmsg(command)
+		self.session_lock.release()
+		
+	def async_do_cmd(self, command) :
+		self.session_lock.acquire()
+		self.async_ret_str = {}
+		self.async_ret_list = {}
+		self.session_lock.release()
+		thread.start_new(self.async_sendmsg, (command, ))
+
+	def process_async_ret(self, command) :
+		self.failed_reason = ""
+		if self.async_ret_str.get(command) == None :
+			debug(str(string.split(command, "\n"))+":None")
+			self.failed_reason == "return None"
+			return None
+
+		self.async_ret_list[command] = self.ret_str2list(self.async_ret_str.pop(command), command)
 		
 	def logout(self) :
 		mgmt_disconnect()
@@ -2275,8 +3086,18 @@
 				gobject.timeout_add(1000, self.on_reconnect)
 	
 	def on_event(self, source, condition, event_str) :
+		self.session_lock.acquire()
+		if len(self.async_ret_str) > 0 :
+			for command in self.async_ret_str.keys() :
+				self.process_async_ret(command)
+			self.session_lock.release()
+			return True
+		self.session_lock.release()
+
 		if event_str == None : 	# called by gtk
+			self.session_lock.acquire()
 			event = mgmt_recvmsg()
+			self.session_lock.release()
 			log("on_event:"+str(event))
 			self.process_event(event)
 			return True
@@ -2293,6 +3114,22 @@
 		gc.collect()
 		self.update_timer = -1
 
+	def get_crm_dtd(self):
+		lines = self.query("crm_dtd", True)
+		if lines == None:
+			return None
+		dtd = "\n".join(lines)
+
+		return dtd
+		
+	def get_dtd_elem(self, elem_name) :
+		if not self.dtd_elems.has_key(elem_name) :
+			dtd = self.get_crm_dtd()
+			complete_dtd = load_dtd_string(dtd)
+			self.dtd_elems[elem_name] = complete_dtd.get_elem(elem_name)
+		
+		return self.dtd_elems[elem_name]
+
 	# cluster functions		
 	def get_crm_metadata(self, crm_cmd) :
 		if crm_cmd == None :
@@ -2301,15 +3138,12 @@
 
 		if lines == None :
 			return None
-		meta_data = ""
-		for line in lines :
-			if len(line)!= 0 :
-				meta_data = meta_data + line + "\n"
+		meta_data = "\n".join(lines)
 
 		try :
 			doc_xml = parseString(meta_data).documentElement
 		except xml.parsers.expat.ExpatError:
-			debug("fail to parse the metadata of "+rsc_type)
+			log("Failed to parse the metadata of CRM: "+ crm_cmd)
 			return None
 			
 		meta = RAMeta()
@@ -2334,7 +3168,7 @@
 			content = {}
 			content["type"] = content_xml.getAttribute("type")
 			content["default"] = content_xml.getAttribute("default")
-			if content["type"] == "enum":
+			if content["type"] == "enum" :
 				values_tag = "Allowed values:"
 				index = param["longdesc"].rfind(values_tag)
 				if index != -1:
@@ -2406,6 +3240,14 @@
 	def get_nodetype(self, node):
 		return self.query("node_type\n%s"%node)
 	
+	def get_normal_nodes(self) :
+		nodes = self.query("all_nodes")
+		normal_nodes = []
+		for node in nodes :
+			if self.get_nodetype(node)[0] == "normal" :
+				normal_nodes.append(node)
+		return normal_nodes
+
 	def get_active_nodes(self):
 		self.active_nodes = self.query("active_nodes")
 		return self.active_nodes
@@ -2430,10 +3272,10 @@
 	# resource functions
 	def add_group(self, group) :
 		if len(group["id"]) == 0 :
-			msgbox (_("the ID can't be empty"))
+			msgbox (_("The ID can't be empty"))
 			return
 		if self.rsc_exists(group["id"]):
-			msgbox (_("the ID already exists"))
+			msgbox (_("The ID already exists"))
 			return
 		cmd = "add_grp\n"+group["id"]
 		for param in group["params"] :
@@ -2447,7 +3289,7 @@
 		
 	def add_native(self, rsc) :
 		if self.rsc_exists(rsc["id"]) :
-			msgbox (_("the ID already exists"))
+			msgbox (_("The ID already exists"))
 			return
 			
 		cmd = "add_rsc"
@@ -2487,7 +3329,7 @@
 						[], new_metaattrs, ["id","name","value"]);
 				self.cache_delkey(group_id+"\ncollocated")
 				
-	def get_all_rsc_id(self) :
+	def get_top_rsc(self) :
 		return self.query("all_rsc")
 
 	def get_rsc_type(self, rsc_id) :
@@ -2499,13 +3341,35 @@
 	def get_rsc_running_on(self, rsc_id) :
 		return self.query("rsc_running_on\n"+rsc_id)
 
-	def get_rsc_sub_rsc(self, rsc_id) :
+	def get_sub_rsc(self, rsc_id) :
 		sub_rscs = self.query("sub_rsc\n"+rsc_id)
 		if sub_rscs != None :
 			for sub_rsc in sub_rscs :
 				self.parent[sub_rsc] = rsc_id
 		return sub_rscs
 
+	def get_all_subrsc(self, rsc_id) :
+		all_subrscs = []
+		sub_rscs = self.get_sub_rsc(rsc_id)
+		if sub_rscs != None :
+			for sub_rsc in sub_rscs :
+				all_subrscs.append(sub_rsc)
+				all_sub_subrscs = self.get_all_subrsc(sub_rsc)
+				if all_sub_subrscs != None :
+					all_subrscs.extend(all_sub_subrscs)
+		return all_subrscs
+
+	def get_all_rsc(self) :
+		all_rscs = []
+		top_rscs = self.query("all_rsc")
+		if top_rscs != None :
+			for top_rsc in top_rscs :
+				all_rscs.append(top_rsc)
+				all_subrscs = self.get_all_subrsc(top_rsc)
+				if all_subrscs != None :
+					all_rscs.extend(all_subrscs)
+		return all_rscs
+
 	def get_rsc_info(self, rsc) :
 		rsc_attr_names = ["id", "description", "class", "provider", 
 				"type", "is_managed","restart_type",
@@ -2532,7 +3396,8 @@
 		params = self.split_attr_list(raw_params, param_attr_names)
 		
 		raw_ops = self.query("rsc_full_ops\n%s"%rsc)
-		raw_ops = raw_ops[1:]
+		if raw_ops != None :
+			raw_ops = raw_ops[1:]
 		ops = self.split_attr_list(raw_ops, op_attr_names)
 
 		return (attrs, running_on, metaattrs, params, ops)
@@ -2626,7 +3491,9 @@
 		try :
 			doc_xml = parseString(meta_data).documentElement
 		except xml.parsers.expat.ExpatError:
-			debug("fail to parse the metadata of "+rsc_type)
+			err_msg = "Failed to parse the metadata of resource agent: "
+			log(err_msg + rsc_type)
+			msgbox(_(err_msg) + rsc_type)
 			return None
 			
 		meta = RAMeta()
@@ -2675,7 +3542,7 @@
 		return provider
 
 	def rsc_exists(self, rsc_id) :
-		return rsc_id in self.get_all_rsc_id()
+		return rsc_id in self.get_all_rsc()
 
 	def update_attrs(self, up_cmd, del_cmd, old_attrs, new_attrs, keys):
 		oldkeys = []
@@ -2761,25 +3628,25 @@
 				expr = dict(zip(expr_attr_names,attrs[4+i*4:8+i*4]))
 				location["exprs"].append(expr)
 			return location
-		elif type == "rsc_order" :
-			order_attr_names = ["id","from","type","to"]
-			attrs = manager.query("get_co\nrsc_order\n" + id)
+		elif type == "rsc_order" or type == "rsc_colocation" :
+			constraint_attr_names = self.get_dtd_elem(type).get_attr_list()
+			cmd = "get_co\n" + type + "\n" + id
+			for attr in constraint_attr_names:
+				cmd = cmd + "\n" + str(attr)
+			attrs = manager.query(cmd)
 			if attrs == None :
 				return None
-			order = dict(zip(order_attr_names,attrs))
-			return order
-		elif type == "rsc_colocation" :
-			colocation_attr_names = ["id","from","to","score"]
-			attrs = manager.query("get_co\nrsc_colocation\n" + id)
-			if attrs == None :
-				return None
-			colocation = dict(zip(colocation_attr_names,attrs))
-			return colocation
+			constraint = {}
+			for i in range(len(constraint_attr_names)) :
+				if attrs[i] != "" :
+					constraint[constraint_attr_names[i]] = attrs[i]
+			return constraint
 			
-				
 	def update_constraint(self, type, constraint) :
-		if constraint["id"] in manager.get_constraints(type) :
-			self.do_cmd("del_co\n"+type+"\n" + constraint["id"])
+		for current_cos in manager.get_constraints(type):
+			if constraint["id"] == current_cos["id"] :
+				self.do_cmd("del_co\n"+type+"\n" + constraint["id"])
+				break
 		if type == "rsc_location" :
 			manager.do_cmd("del_co\nrsc_location\n"+constraint["id"])
 			if self.failed_reason != "" :
@@ -2789,15 +3656,700 @@
 			for expr in constraint["exprs"] :
 				cmd = cmd + "\n" + expr["id"] + "\n" + expr["attribute"] + \
 					"\n" + expr["operation"] + "\n" + expr["value"]
-		elif type == "rsc_order" :
-			cmd = "up_co\nrsc_order\n%s\n%s\n%s\n%s"% \
-			 (constraint["id"],constraint["from"],constraint["type"],constraint["to"])
-		elif type == "rsc_colocation" :
-			cmd = "up_co\nrsc_colocation\n%s\n%s\n%s\n%s"% 	(constraint["id"],constraint["from"],constraint["to"],constraint["score"])
+		elif type == "rsc_order" or type == "rsc_colocation":
+			cmd = "up_co\n%s\nid\n%s"%(type, constraint["id"])
+			attrlist = constraint.keys()[:]
+			attrlist.remove("id")
+			for attr in attrlist:
+				cmd = cmd + "\n%s\n%s"%(str(attr),constraint[attr])
 		self.do_cmd(cmd)
 		if self.failed_reason != "" :
 			msgbox(self.failed_reason)
 
+class WidgetGroup :
+	def __init__(self, widgets) :
+		self.widgets = widgets
+
+	def get_values(self) :
+		object = {}
+		widgets = self.widgets
+		if widgets.has_key("value_labels") :
+			for key in widgets["value_labels"].keys() :
+				object[key] = widgets["value_labels"][key].get_text()
+				if object[key] == "" or object[key] == None :
+					object.pop(key)
+		if widgets.has_key("combos") :
+			for key in widgets["combos"].keys() :
+				if pygtk_2_6_newer() :
+					object[key] = widgets["combos"][key].get_active_text()
+				else :
+					iter = widgets["combos"][key].get_active_iter()
+					if iter != None :
+						object[key] = widgets["combos"][key].get_model().get_value(iter, 0)
+					else :
+						object[key] = None
+				if object[key] == "" or object[key] == None :
+					object.pop(key)
+		if widgets.has_key("bool_combos") :
+			for key in widgets["bool_combos"].keys() :
+				if pygtk_2_6_newer() :
+					object[key] = widgets["bool_combos"][key].get_active_text()
+				else :
+					iter = widgets["bool_combos"][key].get_active_iter()
+					if iter != None :	
+						object[key] = widgets["bool_combos"][key].get_model().get_value(iter, 0)
+					else :
+						object[key] = None
+				if object[key] == "" or object[key] == None :
+					object.pop(key)
+		if widgets.has_key("combo_entries") :
+			for key in widgets["combo_entries"].keys() :
+				object[key] = widgets["combo_entries"][key].child.get_text()
+				if object[key] == "" or object[key] == None :
+					object.pop(key)
+		if widgets.has_key("checkbuttons") :
+			for key in widgets["checkbuttons"].keys() :
+				if widgets["checkbuttons"][key].get_active() :
+					object[key] = "true"
+				else:
+					object[key] = "false"
+		if widgets.has_key("entries") :
+			for key in widgets["entries"].keys() :
+				object[key] = widgets["entries"][key].get_text()
+				if object[key] == "" or object[key] == None :
+					object.pop(key)
+		return object
+
+	def show_values(self, object) :
+		widgets = self.widgets
+		if widgets.has_key("value_labels") :
+			for key in widgets["value_labels"].keys() :
+				if object.has_key(key) :
+					widgets["value_labels"][key].set_text(object[key])
+		if widgets.has_key("combos") :
+ 			for key in widgets["combos"].keys() :
+				if object.has_key(key) :
+					iter = widgets["combos"][key].get_model().get_iter_first()
+					while iter != None :
+						if widgets["combos"][key].get_model().get_value(iter,0) == object[key] :
+							widgets["combos"][key].set_active_iter(iter)
+						iter = widgets["combos"][key].get_model().iter_next(iter)
+				else :
+					widgets["combos"][key].set_active(0)
+
+		if widgets.has_key("bool_combos") :
+ 			for key in widgets["bool_combos"].keys() :
+				if object.has_key(key) :
+					if object[key] == "true" or object[key] == "yes" or object[key] == "1" :
+						bool_value = "true"
+					elif object[key] == "false" or object[key] == "no" or object[key] == "0" :
+						bool_value = "false"
+					else :
+						bool_value = object[key]
+					iter = widgets["bool_combos"][key].get_model().get_iter_first()
+					while iter != None :
+						if widgets["bool_combos"][key].get_model().get_value(iter,0) == bool_value :
+							widgets["bool_combos"][key].set_active_iter(iter)
+						iter = widgets["bool_combos"][key].get_model().iter_next(iter)
+				else :
+					widgets["bool_combos"][key].set_active(0)
+			
+		if widgets.has_key("combo_entries") :
+ 			for key in widgets["combo_entries"].keys():
+				if object.has_key(key) :
+					widgets["combo_entries"][key].child.set_text(object[key])
+				else :
+					widgets["combo_entries"][key].child.set_text("")
+
+		if widgets.has_key("entries") :
+			for key in widgets["entries"].keys() :
+				if object.has_key(key) :
+					widgets["entries"][key].set_text(object[key])
+				else :
+					widgets["entries"][key].set_text("")
+
+		if widgets.has_key("checkbuttons") :
+			for key in widgets["checkbuttons"].keys() :
+				if object.has_key(key) :
+					lower_value = object[key].lower()
+					widgets["checkbuttons"][key].set_active("true" == lower_value
+										or "yes" == lower_value
+										or "1" == lower_value)
+
+class ObjectAttrs(WidgetGroup) :
+	dynamic_fill = None
+	dynamic_desc = None
+
+	def __init__(self, obj_type, is_newobj = False, meta = None, static_desc = None) :
+		validate_type = "dtd"
+		self.obj_type = obj_type
+		self.is_newobj = is_newobj
+		self.meta = meta
+
+		self.dtd_elem = manager.get_dtd_elem(obj_type)
+		self.render_attrs_vbox()
+		if validate_type == "dtd" :
+			self.render_widgets_dtd()
+			self.verify_values = self.verify_values_dtd
+			if self.dtd_elem.get_content_model()[1] == [] :
+				auto_id = True
+			else :
+				auto_id = False
+
+		if auto_id == True :
+			if self.widgets.has_key("name_labels") and self.widgets["name_labels"].has_key("id") :
+				self.widgets["name_labels"]["id"].hide_all()
+			if self.widgets.has_key("combo_entries") and self.widgets["combo_entries"].has_key("id") :
+				self.widgets["combo_entries"]["id"].child.set_text(uuid())
+				self.widgets["combo_entries"]["id"].hide_all()
+		else :
+			if self.widgets.has_key("combo_entries") and self.widgets["combo_entries"].has_key("id") :
+				self.widgets["combo_entries"]["id"].child.set_text(obj_type.split("_")[-1]+"_")
+
+		self.auto_fill()
+
+		if self.dynamic_desc == None and static_desc == None :
+			self.desc_vbox.hide()
+
+		if static_desc != None :
+			self.show_desc(static_desc)
+
+		if self.dynamic_fill != None or self.dynamic_desc != None :
+			for widget_type in ("combos", "bool_combos", "combo_entries") :
+				if self.widgets.has_key(widget_type) :
+					for widget in self.widgets[widget_type].values() :
+						widget.connect("changed", self.on_changed)
+
+
+	def render_attrs_vbox(self) :
+		required_vbox = gtk.VBox()
+		optional_vbox = gtk.VBox()
+		desc_vbox = gtk.VBox()
+		vbox_list = [(required_vbox, "Required"), 
+				(optional_vbox, "Optional"),
+				(desc_vbox, "Description")]
+		for (vbox, label_text) in vbox_list : 
+			vbox_label = gtk.Label()
+			vbox_label.set_markup('<b>' + _(label_text) + '</b>')
+			vbox_label.set_alignment(0, 1)
+			vbox_label.set_padding(5, 0)
+			vbox.pack_start(vbox_label, False, padding=2)
+
+		attrs_vbox = gtk.VBox()
+		for (vbox, label_text) in vbox_list :
+			attrs_vbox.pack_start(vbox, False)
+
+		self.attrs_vbox = attrs_vbox
+		self.required_vbox = required_vbox
+		self.optional_vbox = optional_vbox
+		self.desc_vbox = desc_vbox
+
+	def render_widgets_dtd(self):
+		obj_type = self.obj_type
+		is_newobj = self.is_newobj
+		required_vbox = self.required_vbox
+		optional_vbox = self.optional_vbox
+		attrs_vbox = self.attrs_vbox
+
+		dtd_elem = self.dtd_elem
+
+		widgets = {}
+		name_labels = {}
+		value_labels = {}
+		combos = {}
+		bool_combos = {}
+		combo_entries = {}
+		required_row = 0
+		optional_row = 0
+		name_label_max_len = 0
+
+		name_cap = lambda name: name.replace("-"," ").replace("_"," ").title().replace("Id","ID")
+		for attr_name in dtd_elem.get_attr_list() :
+			if len(attr_name) >  name_label_max_len :
+				name_label_max_len = len(attr_name)
+			attr = dtd_elem.get_attr(attr_name)
+			label = gtk.Label(_(name_cap(attr_name)+":"))
+			label.set_alignment(0, 0.5)
+			label.set_padding(10, 0)
+			eventbox = gtk.EventBox()
+			eventbox.add(label)
+			name_labels[attr_name] = label
+
+			attr_type = attr.get_type()
+			attr_default = attr.get_default()
+			attr_decl = attr.get_decl()
+			
+			if attr_name == "id" and is_newobj == False :
+				widget = gtk.Label()
+				widget.set_alignment(0, 0.5)
+				value_labels[attr_name] = widget
+			elif type(attr_type) == list:
+				is_boolean = False
+				store = gtk.ListStore(str, str)
+				if attr_decl != "#REQUIRED" :
+					store.append(["", ""])
+				if attr_type.count("true") > 0 and attr_type.count("false") > 0 :
+					options = ("true", "false")
+					is_boolean = True
+				else: 
+					options = attr_type
+					
+				for option in options:
+					if attr_default != None and option == attr_default :
+						store.append([option, "["+_("default")+"]"])
+					else :
+						store.append([option, ""])
+				widget = gtk.ComboBox(store)
+				cell0 = gtk.CellRendererText()
+				cell1 = gtk.CellRendererText()
+				widget.pack_start(cell0, True)
+				widget.pack_start(cell1, True)
+				widget.add_attribute(cell0, 'text', 0)
+				widget.add_attribute(cell1, 'text', 1)
+				if is_boolean == False :
+					combos[attr_name] = widget
+				else :
+					bool_combos[attr_name] = widget
+			else :
+				store = gtk.ListStore(str, str)
+				if attr_decl != "#REQUIRED" :
+					store.append(["", ""])
+				if attr_default != None :
+					store.append([attr_default, "["+_("default")+"]"])
+				widget = gtk.ComboBoxEntry(store)
+				cell = gtk.CellRendererText()
+				widget.pack_start(cell, True)
+				widget.add_attribute(cell, 'text', 1)
+				combo_entries[attr_name] = widget
+
+			
+			hbox = gtk.HBox()
+			hbox.pack_start(eventbox, False)
+			hbox.pack_start(widget, padding=10)
+
+			if attr_decl == "#REQUIRED":
+				required_vbox.pack_start(hbox, False, padding=2)
+			else:
+				optional_vbox.pack_start(hbox, False, padding=2)
+
+		attrs_vbox.show_all()
+
+		for name_label in name_labels.values() :
+			name_label.set_width_chars(name_label_max_len)
+		
+		widgets["name_labels"] = name_labels
+		widgets["value_labels"] = value_labels
+		widgets["combos"] = combos
+		widgets["bool_combos"] = bool_combos
+		widgets["combo_entries"] = combo_entries
+
+		self.widgets = widgets
+
+	def verify_values_dtd(self) :
+		widgets = self.widgets
+		obj_type = self.obj_type
+		passed = True
+		dtd_elem = self.dtd_elem
+		object = self.get_values()
+
+		name_cap = lambda name: name.replace("-"," ").replace("_"," ").title().replace("Id","ID")
+		for attr_name in dtd_elem.get_attr_list() :
+			attr = dtd_elem.get_attr(attr_name)
+			attr_decl = attr.get_decl()
+			
+			if attr_decl == "#REQUIRED" and not object.has_key(attr_name) :
+				msgbox(_(name_cap(attr_name)+":")+_(" can't be empty"))
+				passed =False
+		return passed
+
+	def combobox_store_append(self, combo, append_options) :
+		current_store = combo.get_model()
+		retained_store = []
+		for i in range(len(current_store)) :
+			if current_store[i][0] == "" :
+				retained_store.insert(0, current_store[i])
+			elif current_store[i][1] == "["+_("default")+"]" :
+				retained_store.append(current_store[i])
+			
+		new_store = gtk.ListStore(str, str)
+		for retained in retained_store :
+			new_store.append(retained)
+		retained_list = [k[0] for k in retained_store]
+		for append_option in append_options :
+			if retained_list.count(append_option[0]) == 0 :
+				new_store.append(append_option)
+		combo.set_model(new_store)
+
+	def auto_fill(self) :
+		widgets = self.widgets
+		rsc_store = gtk.ListStore(str, str)
+		for rsc in manager.get_all_rsc() :
+			rsc_store.append([rsc, ""])
+		if widgets.has_key("combo_entries") :
+			for key in ["rsc", "from", "to"] :
+				if widgets["combo_entries"].has_key(key) :
+					self.combobox_store_append(widgets["combo_entries"][key], rsc_store)
+
+		try :
+			op_dtd_elem = manager.get_dtd_elem("op")
+			role_attr = op_dtd_elem.get_attr("role")
+			role_attr_type = role_attr.get_type()
+		except KeyError :
+			role_attr_type = None
+
+		if role_attr_type != None and type(role_attr_type) == list :
+			roles = role_attr_type
+		else :
+			roles = ["Master", "Slave", "Started", "Stopped"]
+
+		role_store = [[role, ""] for role in roles]
+		if widgets.has_key("combo_entries") :
+			for key in ["role", "from_role", "to_role"] :
+				if widgets["combo_entries"].has_key(key) :
+					self.combobox_store_append(widgets["combo_entries"][key], role_store)
+
+		scores = ["INFINITY", "-INFINITY"]
+		score_store = [[score, ""] for score in scores]
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("score") :
+			self.combobox_store_append(widgets["combo_entries"]["score"], score_store)
+
+
+	def on_changed(self, widget) :
+		if self.dynamic_fill != None :
+			self.dynamic_fill(widget)
+		if self.dynamic_desc != None :
+			desc = self.dynamic_desc(widget)
+			if desc != None :
+				self.show_desc(desc)
+
+	def show_desc(self, desc) :
+		widgets = self.widgets
+		desc_vbox = self.desc_vbox
+
+		if not widgets.has_key("desc_labels") :
+			desc_labels = []
+			for row in range(len(desc)) :
+				desc_label = gtk.Label(desc[row])
+				desc_label.set_alignment(0, 0.5)
+				desc_label.set_padding(10, 0)
+				desc_vbox.pack_start(desc_label, padding=2)
+				desc_labels.append(desc_label)
+			if desc_labels != [] :
+				widgets["desc_labels"] = desc_labels
+		else :
+			for row in range(len(desc)) :
+				widgets["desc_labels"][row].set_text(desc[row])
+		desc_vbox.show_all()
+
+
+class InstAttrsNV(ObjectAttrs) :
+	def __init__(self, is_newobj = False, meta = None, static_desc = None) :
+		ObjectAttrs.__init__(self, "nvpair", is_newobj, meta, static_desc)
+
+	def auto_fill(self) :
+		widgets = self.widgets
+		meta = self.meta
+		if meta != None :
+			instattr_store = []
+			for param in meta.parameters :
+				param_attr = ""
+				if param["required"] == "1" :
+					param_attr =  param_attr + _("required")
+				if param["unique"] == "1" :
+					if param_attr != "" :
+						param_attr = param_attr + _(", ")
+					param_attr = param_attr + _("unique")
+				if param_attr != "" :
+					param_attr = "[ "+ param_attr + " ]"
+				instattr_store.append([param["name"], param_attr])
+					
+			if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("name") :
+				self.combobox_store_append(widgets["combo_entries"]["name"], instattr_store)
+
+	def dynamic_fill(self, widget) :
+		widgets = self.widgets
+		meta = self.meta
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("name") \
+				and widget == widgets["combo_entries"]["name"] \
+				and meta != None :
+			instattr = self.get_values()
+			value_store = []
+			if instattr.has_key("name") :
+				for param in meta.parameters :
+					if instattr["name"] == param["name"] :
+						default_value = param["content"]["default"]
+						if default_value != None and default_value != "" :
+							value_store.insert(0, [default_value, "[ "+ _("default") + " ]"])
+						break
+			if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("value") :
+				self.combobox_store_append(widgets["combo_entries"]["value"], value_store)
+
+	def dynamic_desc(self, widget) :
+		widgets = self.widgets
+		meta = self.meta
+		if meta == None or not widgets.has_key("combo_entries") \
+				or widget != widgets["combo_entries"].get("name") :
+			return None
+
+		desc = []
+		instattr = self.get_values()
+		if instattr.has_key("name") :
+			for param in meta.parameters :
+				if instattr["name"] == param["name"] :		
+					longdesc = param["longdesc"]
+					shortdesc = param["shortdesc"]
+					if longdesc != None and longdesc != "" :
+						desc = [longdesc]
+					elif shortdesc != None and shortdesc != "" :
+						desc = [shortdesc]
+					break
+		else :
+			desc = [""]
+		return desc
+
+class Expression(ObjectAttrs) :
+	def __init__(self, is_newobj = False, meta = None, static_desc = None) :
+		ObjectAttrs.__init__(self, "expression", is_newobj, meta, static_desc)
+
+	def auto_fill(self) :
+		widgets = self.widgets
+		attr_names = ["#uname","#id", "#is_dc"]
+		attr_store = [[attr_name, ""] for attr_name in attr_names]
+		
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("attribute") :
+			self.combobox_store_append(widgets["combo_entries"]["attribute"], attr_store)
+
+	def dynamic_fill(self, widget) :
+		widgets = self.widgets
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("attribute") \
+				and widget == widgets["combo_entries"]["attribute"] :
+			expr = self.get_values()
+			value_store = []
+			if expr.has_key("attribute") :
+				if expr["attribute"] == "#uname" :
+					value_store = [[node, ""] for node in manager.get_normal_nodes()]
+				elif expr["attribute"] == "#is_dc" :
+					value_store = [[boolean_val, ""] for boolean_val in ["true", "false"]]
+
+			if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("value") :
+				self.combobox_store_append(widgets["combo_entries"]["value"], value_store)
+
+class OP(ObjectAttrs) :
+	def __init__(self, is_newobj = False, meta = None, static_desc = None) :
+		ObjectAttrs.__init__(self, "op", is_newobj, meta, static_desc)
+
+	def auto_fill(self) :
+		widgets = self.widgets
+		meta = self.meta
+		actions = ["start", "stop", "reload", "monitor", "status", "migrate_from", "migrate_to", "promote", "demote"]
+		op_names = []
+		if meta != None :
+			for action in meta.actions :
+				if action["name"] not in op_names :
+					op_names.append(action["name"])
+		else :
+			op_names = actions
+		op_name_store = [[op_name, ""] for op_name in op_names]
+
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("name") :
+			self.combobox_store_append(widgets["combo_entries"]["name"], op_name_store)
+
+	def dynamic_fill(self, widget) :
+		widgets = self.widgets
+		meta = self.meta
+		if meta == None or not widgets.has_key("combo_entries") :
+			return
+		elif widget != widgets["combo_entries"].get("name") :
+			if not widgets.has_key("combos") :
+				return
+			elif widget != widgets["combos"].get("role") :
+				return
+
+		op = self.get_values()
+		if op.has_key("name") :
+			default_role = manager.get_dtd_elem("op").get_attr("role").get_default()
+
+			for action in meta.actions :
+				if action["name"] == op["name"] :
+					if action.get("role") == op.get("role") \
+							or ( action.get("role") == None and op.get("role") == default_role ) \
+							or ( action.get("role") == default_role and op.get("role") == None) :
+						for attr_name in widgets["combo_entries"].keys() :
+							if attr_name != "id" and attr_name != "name" and attr_name != "role":
+								attr_store = []
+								if attr_name == "start_delay" and action.has_key("start-delay") :
+									action["start_delay"] = action["start-delay"]
+								if action.has_key(attr_name) :
+									attr_store.append([action[attr_name], ""])
+								self.combobox_store_append(widgets["combo_entries"][attr_name], attr_store)
+								widgets["combo_entries"][attr_name].child.set_text(action.get(attr_name, ""))
+						break
+		else :
+			for attr_name in widgets["combo_entries"].keys() :
+				if attr_name != "name" :
+					self.combobox_store_append(widgets["combo_entries"][attr_name], [])
+					widgets["combo_entries"][attr_name].child.set_text("")
+
+class RscOrder(ObjectAttrs) :
+	def __init__(self, is_newobj = False, meta = None, static_desc = None) :
+		ObjectAttrs.__init__(self, "rsc_order", is_newobj, meta, static_desc)
+
+	def dynamic_fill(self, widget) :
+		widgets = self.widgets
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("from") \
+				and widget == widgets["combo_entries"]["from"] :
+			key_pair = ["from", "action"]
+		elif widgets.has_key("combo_entries") and widgets["combo_entries"].has_key("to") \
+				and widget == widgets["combo_entries"]["to"] :
+			key_pair = ["to", "to_action"]
+		else :
+			return
+
+		object = self.get_values()
+		actions_list = ["start", "stop", "reload", "monitor", "status", "migrate_from", "migrate_to", "promote", "demote"]
+
+		if object.has_key(key_pair[0]) :
+			(attrs, running_on, metaattrs, params, ops) = manager.get_rsc_info(object[key_pair[0]])
+			meta = manager.get_rsc_meta(attrs.get("class"), attrs.get("type"), attrs.get("provider"))
+			if meta != None :
+				actions = []
+				for f in meta.actions :
+					if not f["name"] in actions : 
+						actions.append(f["name"])
+			else :
+				actions = actions_list
+		else :
+			actions = actions_list
+
+		action_store = [[action, ""] for action in actions]
+
+		if widgets.has_key("combo_entries") and widgets["combo_entries"].has_key(key_pair[1]) :
+			self.combobox_store_append(widgets["combo_entries"][key_pair[1]], action_store)
+
+	def dynamic_desc(self, widget) :
+		dtd_elem = self.dtd_elem
+		order = self.get_values()
+		for attr_name in dtd_elem.get_attr_list() :
+			attr = dtd_elem.get_attr(attr_name)
+			if not order.has_key(attr_name) :
+				if attr_name != "id" and attr.get_decl() == "#REQUIRED" :
+					return [_("* Specify dependencies between the actions on two resources"), 
+						_("* Please set the required attributes"), "", ""]
+				order[attr_name] = attr.get_default()
+			if order[attr_name] == None :
+				order[attr_name] = ""
+		desc = []
+		desc.append("* %s %s %s %s %s"
+				%(order["action"].capitalize(), order["from"], order["type"], order["to_action"], order["to"]))
+
+		if order["score"] == "INFINITY" or order["score"] == "infinity":
+			if order["type"] == "before" :
+				desc.append("* If cannot %s %s, do not %s %s"
+						%(order["action"], order["from"], order["to_action"], order["to"]))
+			else :
+				desc.append("* If cannot %s %s, do not %s %s"
+						%(order["to_action"], order["to"], order["action"], order["from"]))
+		else :
+			desc.append("")
+
+		action = self.invert_action(order["action"])
+		to_action = self.invert_action(order["to_action"])
+		if order["symmetrical"] == "true" and action != None and to_action != None :
+			desc.append("* %s %s %s %s %s"
+					%(to_action.capitalize(), order["to"], order["type"], action, order["from"]))
+			if order["score"] == "INFINITY" or order["score"] == "infinity":
+				if order["type"] == "before" :
+					desc.append("* If cannot %s %s, do not %s %s"
+							%(to_action, order["to"], action, order["from"]))
+				else :
+					desc.append("* If cannot %s %s, do not %s %s"
+							%(action, order["from"], to_action, order["to"]))
+			else:
+				desc.append("")
+		else :
+			desc.append("")
+			desc.append("")
+
+		return desc
+
+	def invert_action(self, action) :
+		if action == "start" :
+			return "stop"
+		elif action == "stop" :
+			return "start"
+		elif action == "promote" :
+			return "demote"
+		elif action == "demote" :
+			return "promote"
+		elif action == "promoted" :
+			return "demoted"
+		elif action == "demoted" :
+			return "promoted"
+		if action == "started" :
+			return "stopped"
+		elif action == "stopped" :
+			return "started"
+		else :
+			return None
+
+class RscColocation(ObjectAttrs) :
+	def __init__(self, is_newobj = False, meta = None, static_desc = None) :
+		ObjectAttrs.__init__(self, "rsc_colocation", is_newobj, meta, static_desc)
+
+	def dynamic_desc(self, widget) :
+		dtd_elem = self.dtd_elem
+		colocation = self.get_values()
+		for attr_name in dtd_elem.get_attr_list() :
+			attr = dtd_elem.get_attr(attr_name)
+			if not colocation.has_key(attr_name) :
+				if attr_name != "id" and attr.get_decl() == "#REQUIRED" :
+					return [_("* Specify where a resource should run relative to another resource"),
+						_("* Please set the required attributes"), "", ""]
+				colocation[attr_name] = attr.get_default()
+			if colocation[attr_name] == None :
+				colocation[attr_name] = ""
+		desc = []
+
+		if colocation["score"] == "INFINITY" or colocation["score"] == "infinity" :
+			desc.append("* Make %s %s on the same node as %s %s  ( %s according to %s )"
+					%(colocation["from"], colocation["from_role"], colocation["to"], colocation["to_role"],
+					colocation["from"], colocation["to"]))
+			desc.append("* If %s cannot be %s on any node, then %s won't be %s anywhere"
+					%(colocation["to"], colocation["to_role"], colocation["from"], colocation["from_role"]))
+			if colocation["symmetrical"] == "false" :
+				desc.append("* If %s cannot be %s on any node, %s won't be affected"
+						%(colocation["from"], colocation["from_role"], colocation["to"]))
+				desc.append("")
+			else : 
+				desc.append("* Make %s %s on the same node as %s %s  ( %s according to %s )"
+						%(colocation["to"], colocation["to_role"], colocation["from"], colocation["from_role"],
+						colocation["to"], colocation["from"]))
+				desc.append("* If %s cannot be %s on any node, then %s won't be %s anywhere"
+						%(colocation["from"], colocation["from_role"], colocation["to"], colocation["to_role"]))
+		elif colocation["score"] == "-INFINITY" or colocation["score"] == "-infinity" :
+			desc.append("* Prevent %s from being %s on the same node as %s %s  ( %s according to %s )" 
+					%(colocation["from"], colocation["from_role"], colocation["to"], colocation["to_role"],
+					colocation["from"], colocation["to"]))
+			desc.append("* If %s is %s on every node, then %s won't be %s anywhere"
+					%(colocation["to"], colocation["to_role"], colocation["from"], colocation["from_role"]))
+			if colocation["symmetrical"] == "false" :
+				desc.append("* If %s is %s on every node, %s won't be affected"
+						%(colocation["from"], colocation["from_role"], colocation["to"]))
+				desc.append("")
+			else :
+				desc.append("* Prevent %s from being %s on the same node as %s %s ( %s according to %s)" 
+						%(colocation["to"], colocation["to_role"], colocation["from"], colocation["from_role"],
+						colocation["to"], colocation["from"]))
+				desc.append("* If %s is %s on every node, then %s won't be %s anywhere"
+						%(colocation["from"], colocation["from_role"], colocation["to"], colocation["to_role"]))
+		else :
+			desc.append("* Combine this colocation score and the appropriate location scores to decide where to put the resources")
+			desc.append("")
+			desc.append("")
+			desc.append("")
+
+		return desc
+
 if __name__ == '__main__' :
 	if not pygtk_2_4_newer () :
 		print "the pygtk 2.4 or newer is needed."
Binary files /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/client/haclient.zh_CN.mo and /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/client/haclient.zh_CN.mo differ
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/client/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/client/Makefile.in
--- heartbeat-2.1.3/mgmt/client/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/mgmt/client/Makefile.in	2008-08-18 23:38:08.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -43,7 +43,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = haclient.py mgmtcmd.py
@@ -62,7 +62,7 @@
 	$(mgmtdtest_LDFLAGS) $(LDFLAGS) -o $@
 guilibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(guilib_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -119,6 +119,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -136,24 +137,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -215,12 +204,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = mgmt
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -388,7 +378,6 @@
 			  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			  -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-MGMT_DIR = mgmt
 mgmtdtest_SOURCES = mgmtdtest.c
 mgmtdtest_LDADD = $(top_builddir)/lib/$(MGMT_DIR)/libhbmgmtclient.la \
 			  $(top_builddir)/lib/$(MGMT_DIR)/libhbmgmttls.la \
@@ -444,8 +433,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -560,8 +549,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -573,8 +562,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -584,13 +573,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/daemon/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/daemon/Makefile.am
--- heartbeat-2.1.3/mgmt/daemon/Makefile.am	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/mgmt/daemon/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -28,18 +28,19 @@
 COMMONLIBS	=  $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(GLIBLIB)
 noinst_HEADERS	=  mgmt_internal.h
-EXTRA_DIST	=  mgmtd.pam
+EXTRA_DIST	=  mgmtd.pam mgmtd.pam.common
 		   
 LRM_DIR		= lrm
 
-pamdir 		= /etc/pam.d
+pamdir 		= $(sysconfdir)/pam.d
+if USE_PAM_COMMON
+pam_DATA	= mgmtd.pam.common
+else
 pam_DATA	= mgmtd.pam
+endif
 
 install-data-hook:
-		mv $(DESTDIR)$(pamdir)/mgmtd.pam $(DESTDIR)$(pamdir)/hbmgmtd; \
-		if [ -f /etc/SuSE-release ]; then \
-		sed -i 's/pam_unix/&2/' $(DESTDIR)$(pamdir)/hbmgmtd; \
-		fi
+		mv $(DESTDIR)$(pamdir)/$(pam_DATA) $(DESTDIR)$(pamdir)/hbmgmtd
 
 
 halib_PROGRAMS 	=  mgmtd
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/daemon/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/daemon/Makefile.in
--- heartbeat-2.1.3/mgmt/daemon/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/mgmt/daemon/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -44,7 +44,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,7 +88,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,6 +139,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -156,24 +157,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -235,12 +224,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -405,10 +395,11 @@
 		   $(GLIBLIB)
 
 noinst_HEADERS = mgmt_internal.h
-EXTRA_DIST = mgmtd.pam
+EXTRA_DIST = mgmtd.pam mgmtd.pam.common
 LRM_DIR = lrm
-pamdir = /etc/pam.d
-pam_DATA = mgmtd.pam
+pamdir = $(sysconfdir)/pam.d
+@USE_PAM_COMMON_FALSE@pam_DATA = mgmtd.pam
+@USE_PAM_COMMON_TRUE@pam_DATA = mgmtd.pam.common
 mgmtd_SOURCES = mgmtd.c
 mgmtd_LDFLAGS = -lpam
 mgmtd_LDADD = $(top_builddir)/lib/mgmt/libhbmgmtclient.la \
@@ -470,8 +461,8 @@
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -479,8 +470,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -502,8 +493,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -614,8 +605,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -627,8 +618,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -638,13 +629,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -797,10 +787,7 @@
 
 
 install-data-hook:
-		mv $(DESTDIR)$(pamdir)/mgmtd.pam $(DESTDIR)$(pamdir)/hbmgmtd; \
-		if [ -f /etc/SuSE-release ]; then \
-		sed -i 's/pam_unix/&2/' $(DESTDIR)$(pamdir)/hbmgmtd; \
-		fi
+		mv $(DESTDIR)$(pamdir)/$(pam_DATA) $(DESTDIR)$(pamdir)/hbmgmtd
 # 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.
 .NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/daemon/mgmt_crm.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/daemon/mgmt_crm.c
--- heartbeat-2.1.3/mgmt/daemon/mgmt_crm.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/mgmt/daemon/mgmt_crm.c	2008-08-18 13:32:19.000000000 +0100
@@ -23,6 +23,7 @@
 
 #include <unistd.h>
 #include <glib.h>
+#include <regex.h>
 
 #include <heartbeat.h>
 #include <clplumbing/cl_malloc.h>
@@ -45,9 +46,10 @@
 int init_crm(int cache_cib);
 void final_crm(void);
 
-static void on_cib_diff(const char *event, HA_Message *msg);
+static void on_cib_diff(const char *event, crm_data_t *msg);
 
 static char* on_get_cib_version(char* argv[], int argc);
+static char* on_get_crm_dtd(char* argv[], int argc);
 
 static char* on_get_crm_metadata(char* argv[], int argc);
 static char* on_get_crm_config(char* argv[], int argc);
@@ -100,6 +102,8 @@
 static char* on_update_constraint(char* argv[], int argc);
 static char* on_delete_constraint(char* argv[], int argc);
 
+static char* on_gen_cluster_report(char* argv[], int argc);
+
 static void get_meta_attributes_id(const char* rsc_id, char* id);
 static void get_instance_attributes_id(const char* rsc_id, char* id);
 static void get_attr_id(const char* rsc_id, const char* attr_type, const char* attr, char* id);
@@ -115,7 +119,8 @@
 static resource_t* get_parent(resource_t* child);
 static int get_fix(const char* rsc_id, char* prefix, char* suffix, char* real_id);
 static const char* get_rsc_tag(resource_t* rsc);
-static int cl_msg_swap_offset(struct ha_msg* msg, int offset1, int offset2);
+static int cl_msg_swap_offset(crm_data_t* msg, int offset1, int offset2);
+int regex_match(const char *regex, const char *str);
 
 pe_working_set_t* cib_cached = NULL;
 int cib_cache_enable = FALSE;
@@ -129,16 +134,9 @@
 /* internal functions */
 GList* find_xml_node_list(crm_data_t *root, const char *child_name)
 {
-	int i;
 	GList* list = NULL;
-	if (root == NULL) {
-		return NULL;
-	}
-	for (i = 0; i < root->nfields; i++ ) {
-		if (strncmp(root->names[i], child_name, MAX_STRLEN) == 0) {
-			list = g_list_append(list, root->values[i]);
-		}
-	}
+	xml_child_iter_filter(root, child, child_name,
+			      list = g_list_append(list, child));
 	return list;
 }
 
@@ -161,10 +159,7 @@
 	rc = cib_conn->cmds->delete(
 			cib_conn, type, cib_object, output, cib_sync_call);
 	free_xml(cib_object);
-	if (rc < 0) {
-		return -1;
-	}
-	return 0;
+	return rc;
 }
 
 pe_working_set_t*
@@ -229,9 +224,9 @@
 		return ret;
 	}
 	
-	failed_tag = cl_get_struct(output, XML_FAIL_TAG_CIB);
+	failed_tag = find_entity(output, XML_FAIL_TAG_CIB, NULL);
 	if (failed_tag != NULL) {
-		reason = ha_msg_value(failed_tag, XML_FAILCIB_ATTR_REASON);
+		reason = crm_element_value(failed_tag, XML_FAILCIB_ATTR_REASON);
 		if (reason != NULL) {
 			ret = mgmt_msg_append(ret, reason);
 		}
@@ -344,7 +339,7 @@
 	resource_t* rsc;
 	const char* cur_id;
 	pe_working_set_t* data_set;
-	struct ha_msg* attrs;
+	crm_data_t* attrs;
 	
 	data_set = get_data_set();
 	rsc = pe_find_resource(data_set->resources, rsc_id);	
@@ -353,13 +348,13 @@
 		free_data_set(data_set);
 		return;
 	}
-	attrs = cl_get_struct((struct ha_msg*)rsc->xml, "meta_attributes");
+	attrs = find_entity(rsc->xml, "meta_attributes", NULL);
 	if (attrs == NULL) {
 		snprintf(id, MAX_STRLEN, "%s_meta_attrs", rsc_id);
 		free_data_set(data_set);
 		return;
 	}
-	cur_id = ha_msg_value(attrs, "id");
+	cur_id = crm_element_value(attrs, "id");
 	if (cur_id == NULL) {
 		snprintf(id, MAX_STRLEN, "%s_meta_attrs", rsc_id);
 		free_data_set(data_set);
@@ -376,7 +371,7 @@
 	resource_t* rsc;
 	const char* cur_id;
 	pe_working_set_t* data_set;
-	struct ha_msg* attrs;
+	crm_data_t * attrs;
 	
 	data_set = get_data_set();
 	rsc = pe_find_resource(data_set->resources, rsc_id);	
@@ -385,13 +380,13 @@
 		free_data_set(data_set);
 		return;
 	}
-	attrs = cl_get_struct((struct ha_msg*)rsc->xml, "instance_attributes");
+	attrs = find_entity(rsc->xml, "instance_attributes", NULL);
 	if (attrs == NULL) {
 		snprintf(id, MAX_STRLEN, "%s_instance_attrs", rsc_id);
 		free_data_set(data_set);
 		return;
 	}
-	cur_id = ha_msg_value(attrs, "id");
+	cur_id = crm_element_value(attrs, "id");
 	if (cur_id == NULL) {
 		snprintf(id, MAX_STRLEN, "%s_instance_attrs", rsc_id);
 		free_data_set(data_set);
@@ -405,12 +400,10 @@
 static void
 get_attr_id(const char* rsc_id, const char* attr_type, const char* attr, char* id)
 {
-	int i;
 	resource_t* rsc;
 	const char * name_nvpair;
 	const char * id_nvpair;
-	struct ha_msg* attrs;
-	struct ha_msg* nvpair;
+	crm_data_t * attrs;
 	pe_working_set_t* data_set;
 	const char * mid = "";
 
@@ -427,32 +420,31 @@
 		return;
 	}
 
-	attrs = cl_get_struct((struct ha_msg*)rsc->xml, attr_type);
+	attrs = find_entity(rsc->xml, attr_type, NULL);
 	if(attrs == NULL) {
 		snprintf(id, MAX_STRLEN,  "%s_%s%s", rsc_id, mid, attr);
 		free_data_set(data_set);
 		return;
 	}
-	attrs = cl_get_struct(attrs, "attributes");
+	attrs = find_entity(attrs, "attributes", NULL);
 	if(attrs == NULL) {
 		snprintf(id, MAX_STRLEN,  "%s_%s%s", rsc_id, mid, attr);
 		free_data_set(data_set);
 		return;
 	}
-	for (i = 0; i < attrs->nfields; i++) {
-		if (STRNCMP_CONST(attrs->names[i], "nvpair") == 0) {
-			nvpair = (struct ha_msg*)attrs->values[i];
-			name_nvpair = ha_msg_value(nvpair, "name");
+
+	xml_child_iter_filter(attrs, nvpair, "nvpair",
+			name_nvpair = crm_element_value(nvpair, "name");
 			if ( strncmp(name_nvpair,attr,MAX_STRLEN) == 0 ) {
-				id_nvpair = ha_msg_value(nvpair,"id");
+				id_nvpair = crm_element_value(nvpair,"id");
 				if (id_nvpair != NULL) {
 					STRNCPY(id,id_nvpair,MAX_STRLEN);
 					free_data_set(data_set);
 					return;					
 				}
 			}
-		}
-	}
+	    );
+	
 	snprintf(id, MAX_STRLEN,  "%s_%s%s", rsc_id, mid, attr);
 	free_data_set(data_set);
 	return;
@@ -493,6 +485,7 @@
 			, on_cib_connection_destroy);
 
 	reg_msg(MSG_CIB_VERSION, on_get_cib_version);
+	reg_msg(MSG_CRM_DTD, on_get_crm_dtd);
 	reg_msg(MSG_CRM_METADATA, on_get_crm_metadata);
 	reg_msg(MSG_CRM_CONFIG, on_get_crm_config);
 	reg_msg(MSG_UP_CRM_CONFIG, on_update_crm_config);
@@ -542,6 +535,8 @@
 	reg_msg(MSG_GET_CONSTRAINT, on_get_constraint);
 	reg_msg(MSG_DEL_CONSTRAINT, on_delete_constraint);
 	reg_msg(MSG_UP_CONSTRAINT, on_update_constraint);
+
+	reg_msg(MSG_GEN_CLUSTER_REPORT, on_gen_cluster_report);
 	
 	return 0;
 }	
@@ -557,7 +552,7 @@
 
 /* event handler */
 void
-on_cib_diff(const char *event, HA_Message *msg)
+on_cib_diff(const char *event, crm_data_t *msg)
 {
 	if (debug_level) {
 		mgmt_debug(LOG_DEBUG,"update cib finished");
@@ -591,7 +586,7 @@
 	char* ret;
 	
 	data_set = get_data_set();
-	version = ha_msg_value(data_set->input, "num_updates");
+	version = crm_element_value(data_set->input, "num_updates");
 	if (version != NULL) {
 		ret = cl_strdup(MSG_OK);
 		ret = mgmt_msg_append(ret, version);
@@ -604,6 +599,39 @@
 }
 
 static char*
+on_get_crm_dtd(char* argv[], int argc)
+{
+	const char *dtd_file = HA_NOARCHDATAHBDIR"/crm.dtd";
+	char buf[MAX_STRLEN];	
+	char* ret = cl_strdup(MSG_OK);
+	FILE *fstream = NULL;
+
+	ARGC_CHECK(1);
+
+	if ((fstream = fopen(dtd_file, "r")) == NULL){
+		mgmt_log(LOG_ERR, "error on fopen %s: %s",
+			 dtd_file, strerror(errno));
+		return cl_strdup(MSG_FAIL);
+	}
+
+	while (!feof(fstream)){
+		memset(buf, 0, sizeof(buf));
+		if (fgets(buf, sizeof(buf), fstream) != NULL){
+			ret = mgmt_msg_append(ret, buf);
+			ret[strlen(ret)-1] = '\0';
+		}
+		else{
+			sleep(1);
+		}
+	}
+
+	if (fclose(fstream) == -1)
+		mgmt_log(LOG_WARNING, "failed to fclose stream");
+
+	return ret;
+}
+
+static char*
 on_get_crm_metadata(char* argv[], int argc)
 {
 	char cmd[MAX_STRLEN];
@@ -613,6 +641,11 @@
 
 	ARGC_CHECK(2);
 
+	if (STRNCMP_CONST(argv[1], "pengine") != 0 &&
+			STRNCMP_CONST(argv[1], "crmd") != 0) {
+		return cl_strdup(MSG_FAIL);
+	}
+
 	snprintf(cmd, sizeof(cmd), BIN_DIR"/%s metadata", argv[1]);
 	if ((fstream = popen(cmd, "r")) == NULL){
 		mgmt_log(LOG_ERR, "error on popen %s: %s",
@@ -624,6 +657,7 @@
 		memset(buf, 0, sizeof(buf));
 		if (fgets(buf, sizeof(buf), fstream) != NULL){
 			ret = mgmt_msg_append(ret, buf);
+			ret[strlen(ret)-1] = '\0';
 		}
 		else{
 			sleep(1);
@@ -691,8 +725,8 @@
 		cur = find_xml_node_list(attrs, "nvpair");
 		while (cur != NULL) {
 			attr = (crm_data_t*)cur->data;
-			if(strncmp(ha_msg_value(attr,"name"),argv[1], MAX_STRLEN)==0) {
-				id = ha_msg_value(attr,"id");
+			if(strncmp(crm_element_value(attr,"name"),argv[1], MAX_STRLEN)==0) {
+				id = crm_element_value(attr,"id");
 				break;
 			}
 			cur = g_list_next(cur);
@@ -946,7 +980,7 @@
 static int
 delete_lrm_rsc(IPC_Channel *crmd_channel, const char *host_uname, const char *rsc_id)
 {
-	HA_Message *cmd = NULL;
+	crm_data_t *cmd = NULL;
 	crm_data_t *msg_data = NULL;
 	crm_data_t *rsc = NULL;
 	crm_data_t *params = NULL;
@@ -973,17 +1007,17 @@
 	crm_free(key);
 
 	if(send_ipc_message(crmd_channel, cmd)) {
-		crm_msg_del(cmd);
+		free_xml(cmd);
 		return 0;
 	}
-	crm_msg_del(cmd);
+	free_xml(cmd);
 	return -1;
 }
 
 static int
 refresh_lrm(IPC_Channel *crmd_channel, const char *host_uname)
 {
-	HA_Message *cmd = NULL;
+	crm_data_t *cmd = NULL;
 	char our_pid[11];
 	
 	snprintf(our_pid, 10, "%d", getpid());
@@ -993,10 +1027,10 @@
 			     CRM_SYSTEM_CRMD, client_name, our_pid);
 	
 	if(send_ipc_message(crmd_channel, cmd)) {
-		crm_msg_del(cmd);
+		free_xml(cmd);
 		return 0;
 	}
-	crm_msg_del(cmd);
+	free_xml(cmd);
 	return -1;
 }
 
@@ -1007,8 +1041,10 @@
 	char our_pid[11];
 	char *now_s = NULL;
 	time_t now = time(NULL);
+	char *dest_node = NULL;
+	int rc;
 	
-	ARGC_CHECK(2);
+	ARGC_CHECK(3);
 	snprintf(our_pid, 10, "%d", getpid());
 	our_pid[10] = '\0';
 	
@@ -1016,11 +1052,20 @@
 				    NULL, &crmd_channel);
 
 	send_hello_message(crmd_channel, our_pid, client_name, "0", "1");
-	delete_lrm_rsc(crmd_channel, NULL, argv[1]);
+	delete_lrm_rsc(crmd_channel, argv[1], argv[2]);
 	refresh_lrm(crmd_channel, NULL); 
-
+	
+	rc = query_node_uuid(cib_conn, argv[1], &dest_node);
+	if (rc != cib_ok) {
+		mgmt_log(LOG_WARNING, "Could not map uname=%s to a UUID: %s\n",
+				argv[1], cib_error2string(rc));
+	} else {
+		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
+				NULL, crm_concat("fail-count", argv[2], '-'), NULL, FALSE);
+		mgmt_log(LOG_INFO, "Delete fail-count for %s from %s", argv[2], argv[1]);
+	}
 	/* force the TE to start a transition */
-	sleep(5); /* wait for the refresh */
+	sleep(2); /* wait for the refresh */
 	now_s = crm_itoa(now);
 	update_attr(cib_conn, cib_sync_call,
 		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
@@ -1194,7 +1239,7 @@
 }
 
 int
-cl_msg_swap_offset(struct ha_msg* msg, int offset1, int offset2)
+cl_msg_swap_offset(crm_data_t* msg, int offset1, int offset2)
 {
 	char* name;
 	int nlen;
@@ -1226,11 +1271,10 @@
 char*
 on_move_rsc(char* argv[], int argc)
 {
-	int i, rc, pos = -1;
+	int i = 0, rc, pos = -1;
 	int first_child = -1;
 	int last_child = -1;
 	const char* child_id;
-	struct ha_msg* child;
 	resource_t* rsc;
 	resource_t* parent;
 	pe_working_set_t* data_set;
@@ -1243,21 +1287,23 @@
 		free_data_set(data_set);
 		return cl_strdup(MSG_FAIL);
 	}
-	for (i=0; i < parent->xml->nfields ; i++){
-		if (STRNCMP_CONST(parent->xml->names[i], "primitive")!=0) {
-			continue;
-		}
-		child = (struct ha_msg*)parent->xml->values[i];
-		if (first_child == -1) {
+	xml_child_iter(
+		parent->xml, child,
+		const char *name = crm_element_name(child);
+		if (STRNCMP_CONST(name, "primitive") == 0) {
+		    if (first_child == -1) {
 			first_child = i;
-		}
-		last_child = i;
-		child_id = ha_msg_value(child,"id");
-		if (strcmp(child_id, argv[1]) == 0) {
-			mgmt_log(LOG_INFO,"find %s !",child_id);
+		    }
+		    last_child = i;
+		    child_id = crm_element_value(child, "id");
+		    if (strcmp(child_id, argv[1]) == 0) {
+			mgmt_log(LOG_INFO,"find %s !", child_id);
 			pos = i;
+		    }
 		}
-	}	
+		i++;
+	    );
+	
 	if (STRNCMP_CONST(argv[2],"up")==0) {
 		if (pos-1<first_child) {
 			free_data_set(data_set);
@@ -1276,12 +1322,13 @@
 		free_data_set(data_set);
 		return cl_strdup(MSG_FAIL);
 	}
-	mgmt_log(LOG_INFO, "on_move_rsc:%s",dump_xml_formatted(parent->xml));
-	free_data_set(data_set);
+	mgmt_log(LOG_INFO, "on_move_rsc:%s", dump_xml_formatted(parent->xml)); /* Memory leak! */
 	
 	rc = cib_conn->cmds->variant_op(
 			cib_conn, CIB_OP_REPLACE, NULL,"resources",
 			parent->xml, &output, cib_sync_call);
+
+	free_data_set(data_set);
 	
 	if (rc < 0) {
 		return crm_failed_msg(output, rc);
@@ -1357,48 +1404,48 @@
 	resource_t* rsc;
 	char* ret;
 	const char* value;
-	struct ha_msg* attrs;
+	crm_data_t * attrs;
 	pe_working_set_t* data_set;
 	
 	data_set = get_data_set();
 	GET_RESOURCE()
 
 	ret = cl_strdup(MSG_OK);
-	attrs = (struct ha_msg*)rsc->xml;
-	ret = mgmt_msg_append(ret, ha_msg_value(attrs, "id"));
-	ret = mgmt_msg_append(ret, ha_msg_value(attrs, "description"));
+	attrs = rsc->xml;
+	ret = mgmt_msg_append(ret, crm_element_value(attrs, "id"));
+	ret = mgmt_msg_append(ret, crm_element_value(attrs, "description"));
 	if (rsc->variant == pe_native) {
-		ret = mgmt_msg_append(ret, ha_msg_value(attrs, "class"));
-		ret = mgmt_msg_append(ret, ha_msg_value(attrs, "provider"));
-		ret = mgmt_msg_append(ret, ha_msg_value(attrs, "type"));
+		ret = mgmt_msg_append(ret, crm_element_value(attrs, "class"));
+		ret = mgmt_msg_append(ret, crm_element_value(attrs, "provider"));
+		ret = mgmt_msg_append(ret, crm_element_value(attrs, "type"));
 	}
-	value = ha_msg_value(attrs, "is_managed");
+	value = crm_element_value(attrs, "is_managed");
 	ret = mgmt_msg_append(ret, value?value:"#default");
-	value = ha_msg_value(attrs, "restart_type");
+	value = crm_element_value(attrs, "restart_type");
 	ret = mgmt_msg_append(ret, value?value:"#default");
-	value = ha_msg_value(attrs, "multiple_active");
+	value = crm_element_value(attrs, "multiple_active");
 	ret = mgmt_msg_append(ret, value?value:"#default");
-	value = ha_msg_value(attrs, "resource_stickiness");
+	value = crm_element_value(attrs, "resource_stickiness");
 	ret = mgmt_msg_append(ret, value?value:"#default");
-	value = ha_msg_value(attrs, "resource_failure_stickiness");
+	value = crm_element_value(attrs, "resource_failure_stickiness");
 	ret = mgmt_msg_append(ret, value?value:"#default");
 	
 	switch (rsc->variant) {
 		case pe_group:
-			value = ha_msg_value(attrs, "ordered");
+			value = crm_element_value(attrs, "ordered");
 			ret = mgmt_msg_append(ret, value?value:"#default");
-			value = ha_msg_value(attrs, "collocated");
+			value = crm_element_value(attrs, "collocated");
 			ret = mgmt_msg_append(ret, value?value:"#default");
 			break;
 		case pe_clone:
 		case pe_master:
-			value = ha_msg_value(attrs, "notify");
+			value = crm_element_value(attrs, "notify");
 			ret = mgmt_msg_append(ret, value?value:"#default");
-			value = ha_msg_value(attrs, "globally_unique");
+			value = crm_element_value(attrs, "globally_unique");
 			ret = mgmt_msg_append(ret, value?value:"#default");
-			value = ha_msg_value(attrs, "ordered");
+			value = crm_element_value(attrs, "ordered");
 			ret = mgmt_msg_append(ret, value?value:"#default");
-			value = ha_msg_value(attrs, "interleave");
+			value = crm_element_value(attrs, "interleave");
 			ret = mgmt_msg_append(ret, value?value:"#default");
 			break;
 		default:
@@ -1543,35 +1590,31 @@
 char*
 on_get_rsc_metaattrs(char* argv[], int argc)
 {
-	int i;
 	resource_t* rsc;
 	char* ret;
-	struct ha_msg* attrs;
-	struct ha_msg* nvpair;
+	crm_data_t * attrs;
 	pe_working_set_t* data_set;
 	
 	data_set = get_data_set();
 	GET_RESOURCE()
 
 	ret = cl_strdup(MSG_OK);
-	attrs = cl_get_struct((struct ha_msg*)rsc->xml, "meta_attributes");
+	attrs = find_entity(rsc->xml, "meta_attributes", NULL);
 	if(attrs == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	attrs = cl_get_struct(attrs, "attributes");
+	attrs = find_entity(attrs, "attributes", NULL);
 	if(attrs == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	for (i = 0; i < attrs->nfields; i++) {
-		if (STRNCMP_CONST(attrs->names[i], "nvpair") == 0) {
-			nvpair = (struct ha_msg*)attrs->values[i];
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "id"));
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "name"));
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "value"));
-		}
-	}
+	xml_child_iter_filter(attrs, nvpair, "nvpair",
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "id"));
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "name"));
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "value"));
+	    );
+	
 	free_data_set(data_set);
 	return ret;
 }
@@ -1580,35 +1623,30 @@
 char*
 on_get_rsc_params(char* argv[], int argc)
 {
-	int i;
 	resource_t* rsc;
 	char* ret;
-	struct ha_msg* attrs;
-	struct ha_msg* nvpair;
+	crm_data_t * attrs;
 	pe_working_set_t* data_set;
 	
 	data_set = get_data_set();
 	GET_RESOURCE()
 
 	ret = cl_strdup(MSG_OK);
-	attrs = cl_get_struct((struct ha_msg*)rsc->xml, "instance_attributes");
+	attrs = find_entity(rsc->xml, "instance_attributes", NULL);
 	if(attrs == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	attrs = cl_get_struct(attrs, "attributes");
+	attrs = find_entity(attrs, "attributes", NULL);
 	if(attrs == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	for (i = 0; i < attrs->nfields; i++) {
-		if (STRNCMP_CONST(attrs->names[i], "nvpair") == 0) {
-			nvpair = (struct ha_msg*)attrs->values[i];
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "id"));
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "name"));
-			ret = mgmt_msg_append(ret, ha_msg_value(nvpair, "value"));
-		}
-	}
+	xml_child_iter_filter(attrs, nvpair, "nvpair",
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "id"));
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "name"));
+			ret = mgmt_msg_append(ret, crm_element_value(nvpair, "value"));
+	    );
 	free_data_set(data_set);
 	return ret;
 }
@@ -1875,34 +1913,27 @@
 char*
 on_get_rsc_ops(char* argv[], int argc)
 {
-	int i;
 	resource_t* rsc;
 	char* ret;
-	struct ha_msg* ops;
-	struct ha_msg* op;
+	crm_data_t * ops;
 	pe_working_set_t* data_set;
 	
 	data_set = get_data_set();
 	GET_RESOURCE()
 
 	ret = cl_strdup(MSG_OK);
-	ops = cl_get_struct((struct ha_msg*)rsc->xml, "operations");
+	ops = find_entity(rsc->xml, "operations", NULL);
 	if (ops == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	for (i = 0; i < ops->nfields; i++) {
-		if (STRNCMP_CONST(ops->names[i], "op") == 0) {
-			if (ops->types[i] != FT_STRUCT) {
-				continue;
-			}
-			op = (struct ha_msg*)ops->values[i];
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "id"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "name"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "interval"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "timeout"));
-		}
-	}
+	xml_child_iter_filter(ops, op, "op",
+			ret = mgmt_msg_append(ret, crm_element_value(op, "id"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "name"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "interval"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "timeout"));
+	    );
+	
 	free_data_set(data_set);
 	return ret;
 }
@@ -1922,11 +1953,10 @@
 char*
 on_get_rsc_full_ops(char* argv[], int argc)
 {
-	int i;
+	const char *value;
 	resource_t* rsc;
 	char* ret;
-	struct ha_msg* ops;
-	struct ha_msg* op;
+	crm_data_t * ops;
 	pe_working_set_t* data_set;
 	
 	data_set = get_data_set();
@@ -1934,33 +1964,28 @@
 
 	ret = cl_strdup(MSG_OK);
 	ret = mgmt_msg_append(ret, "10");
-	ops = cl_get_struct((struct ha_msg*)rsc->xml, "operations");
+	ops = find_entity(rsc->xml, "operations", NULL);
 	if (ops == NULL) {
 		free_data_set(data_set);
 		return ret;
 	}
-	for (i = 0; i < ops->nfields; i++) {
-		if (STRNCMP_CONST(ops->names[i], "op") == 0) {
-			const char* value = NULL;
-			if (ops->types[i] != FT_STRUCT) {
-				continue;
-			}
-			op = (struct ha_msg*)ops->values[i];
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "id"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "name"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "description"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "interval"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "timeout"));
-			value = ha_msg_value(op, "start_delay");
+
+	xml_child_iter_filter(ops, op, "op",
+			ret = mgmt_msg_append(ret, crm_element_value(op, "id"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "name"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "description"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "interval"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "timeout"));
+			value = crm_element_value(op, "start_delay");
 			ret = mgmt_msg_append(ret, value==NULL?"0":value);
-			value = ha_msg_value(op, "disabled");
+			value = crm_element_value(op, "disabled");
 			ret = mgmt_msg_append(ret, value==NULL?"false":value);
-			value = ha_msg_value(op, "role");
+			value = crm_element_value(op, "role");
 			ret = mgmt_msg_append(ret, value==NULL?"Started":value);
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "prereq"));
-			ret = mgmt_msg_append(ret, ha_msg_value(op, "on_fail"));
-		}
-	}
+			ret = mgmt_msg_append(ret, crm_element_value(op, "prereq"));
+			ret = mgmt_msg_append(ret, crm_element_value(op, "on_fail"));
+	    );
+
 	free_data_set(data_set);
 	return ret;
 }
@@ -2258,7 +2283,7 @@
 	cur = list;
 	while (cur != NULL) {
 		crm_data_t* location = (crm_data_t*)cur->data;
-		ret = mgmt_msg_append(ret, ha_msg_value(location, "id"));
+		ret = mgmt_msg_append(ret, crm_element_value(location, "id"));
 		
 		cur = g_list_next(cur);
 	}
@@ -2279,7 +2304,7 @@
 	crm_data_t* cos = NULL;
 	pe_working_set_t* data_set;
 	const char* path[] = {"configuration","constraints"};
-	ARGC_CHECK(3); 
+	int i;
 	
 	data_set = get_data_set();
 	cos = find_xml_node_nested(data_set->input, path, 2);
@@ -2292,36 +2317,30 @@
 	cur = list;
 	while (cur != NULL) {
 		crm_data_t* constraint = (crm_data_t*)cur->data;
-		if (strncmp(argv[2],ha_msg_value(constraint, "id"), MAX_STRLEN)==0) {
+		if (strncmp(argv[2],crm_element_value(constraint, "id"), MAX_STRLEN)==0) {
 			if (STRNCMP_CONST(argv[1],"rsc_location")==0) {
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "id"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "rsc"));
+				ret = mgmt_msg_append(ret, crm_element_value(constraint, "id"));
+				ret = mgmt_msg_append(ret, crm_element_value(constraint, "rsc"));
 				rule = find_xml_node(constraint,"rule",TRUE);
-				ret = mgmt_msg_append(ret, ha_msg_value(rule, "score"));
-				ret = mgmt_msg_append(ret, ha_msg_value(rule, "boolean_op"));
+				ret = mgmt_msg_append(ret, crm_element_value(rule, "score"));
+				ret = mgmt_msg_append(ret, crm_element_value(rule, "boolean_op"));
 				expr_list = find_xml_node_list(rule, "expression");
 				expr_cur = expr_list;
 				while(expr_cur) {
 					crm_data_t* expr = (crm_data_t*)expr_cur->data;
-					ret = mgmt_msg_append(ret, ha_msg_value(expr, "id"));
-					ret = mgmt_msg_append(ret, ha_msg_value(expr, "attribute"));
-					ret = mgmt_msg_append(ret, ha_msg_value(expr, "operation"));
-					ret = mgmt_msg_append(ret, ha_msg_value(expr, "value"));
+					ret = mgmt_msg_append(ret, crm_element_value(expr, "id"));
+					ret = mgmt_msg_append(ret, crm_element_value(expr, "attribute"));
+					ret = mgmt_msg_append(ret, crm_element_value(expr, "operation"));
+					ret = mgmt_msg_append(ret, crm_element_value(expr, "value"));
 					expr_cur = g_list_next(expr_cur);
 				}
 				g_list_free(expr_list);
 			}
-			else if (STRNCMP_CONST(argv[1],"rsc_order")==0) {
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "id"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "from"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "type"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "to"));
-			}
-			else if (STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "id"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "from"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "to"));
-				ret = mgmt_msg_append(ret, ha_msg_value(constraint, "score"));
+			else if (STRNCMP_CONST(argv[1],"rsc_order")==0 ||
+					STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
+				for(i = 3; i < argc; i++){
+					ret = mgmt_msg_append(ret, crm_element_value(constraint, argv[i]));
+				}
 			}
 			break;
 		}
@@ -2353,6 +2372,7 @@
 	crm_data_t* output;
 	int i;
 	char xml[MAX_STRLEN];
+	char buf[MAX_STRLEN];
 
 	if (STRNCMP_CONST(argv[1],"rsc_location")==0) {
 		snprintf(xml, MAX_STRLEN,
@@ -2369,15 +2389,14 @@
 		strncat(xml, "</rule></rsc_location>",
 				sizeof(xml)-strlen(xml)-1);
 	}
-	else if (STRNCMP_CONST(argv[1],"rsc_order")==0) {
-		snprintf(xml, MAX_STRLEN,
-			 "<rsc_order id=\"%s\" from=\"%s\" type=\"%s\" to=\"%s\"/>",
-			 argv[2], argv[3], argv[4], argv[5]);
-	}
-	else if (STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
-		snprintf(xml, MAX_STRLEN,
-			 "<rsc_colocation id=\"%s\" from=\"%s\" to=\"%s\" score=\"%s\"/>",
-			 argv[2], argv[3], argv[4], argv[5]);
+	else if (STRNCMP_CONST(argv[1],"rsc_order")==0 ||
+			STRNCMP_CONST(argv[1],"rsc_colocation")==0) {
+		snprintf(xml, MAX_STRLEN, "<%s", argv[1]);
+		for (i = 2; i < argc-1; i += 2){
+			snprintf(buf, MAX_STRLEN, " %s=\"%s\"", argv[i], argv[i+1]);
+			strncat(xml, buf, sizeof(xml)-strlen(xml)-1);
+		}
+		strncat(xml, " />", sizeof(xml)-strlen(xml)-1);
 	}
 	cib_object = string2xml(xml);
 	if(cib_object == NULL) {
@@ -2398,3 +2417,96 @@
 	return cl_strdup(MSG_OK);
 }
 
+static char*
+on_gen_cluster_report(char* argv[], int argc)
+{
+	char cmd[MAX_STRLEN];
+	char buf[MAX_STRLEN];
+	char filename[MAX_STRLEN];
+	char *dest = tempnam("/tmp", "clrp.");
+	char* ret = cl_strdup(MSG_OK);
+	FILE *fstream = NULL;
+	const char* date_regex = \
+		"[0-9]{4}-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-5][0-9]";
+
+	ARGC_CHECK(3);
+
+	if (regex_match(date_regex, argv[1])) {
+		snprintf(buf, sizeof(buf), "-f \"%s\"", argv[1]);
+	}
+	else {
+		mgmt_log(LOG_ERR, "invalid \"from\" date expression: \"%s\"", argv[1]);
+		free(dest);
+		return cl_strdup(MSG_FAIL);
+	}
+
+	if (strnlen(argv[2], MAX_STRLEN) != 0) {
+		if (regex_match(date_regex, argv[2])) {
+			strncat(buf, " -t \"", sizeof(buf)-strlen(buf)-1);
+			strncat(buf, argv[2], sizeof(buf)-strlen(buf)-1);
+			strncat(buf, "\"", sizeof(buf)-strlen(buf)-1);
+		}
+		else {
+			mgmt_log(LOG_ERR, "invalid \"to\" date expression: \"%s\"", argv[2]);
+			free(dest);
+			return cl_strdup(MSG_FAIL);
+		}
+	}
+
+	snprintf(cmd, sizeof(cmd), "hb_report -DC %s %s", buf, dest);
+	mgmt_log(LOG_INFO, "cluster_report: %s", cmd);
+	if (system(cmd) < 0) {
+		mgmt_log(LOG_ERR, "error on system %s: %s",
+			 cmd, strerror(errno));
+		free(dest);
+		return cl_strdup(MSG_FAIL);
+	}
+
+	snprintf(filename, sizeof(filename), "%s.tar.gz", dest);
+	snprintf(cmd, sizeof(cmd), "base64 %s", filename);
+	if ((fstream = popen(cmd, "r")) == NULL) {
+		mgmt_log(LOG_ERR, "error on popen %s: %s",
+			 cmd, strerror(errno));
+		unlink(filename);
+		free(dest);
+		return cl_strdup(MSG_FAIL);
+	 }
+
+	ret = mgmt_msg_append(ret, filename);
+	while (!feof(fstream)) {
+		memset(buf, 0, sizeof(buf));
+		if (fgets(buf, sizeof(buf), fstream) != NULL) {
+			ret = mgmt_msg_append(ret, buf);
+			ret[strlen(ret)-1] = '\0';
+		}
+		else {
+			sleep(1);
+		}
+	}
+	if (pclose(fstream) == -1)
+		mgmt_log(LOG_WARNING, "failed to close pipe");
+
+	unlink(filename);
+	free(dest);
+	return ret;
+}
+
+int
+regex_match(const char *regex, const char *str)
+{
+	regex_t preg;
+	int ret;
+
+	if (regcomp(&preg, regex, REG_EXTENDED|REG_NOSUB) != 0){
+		mgmt_log(LOG_ERR, "error regcomp regular expression: \"%s\"", regex);
+		return 0;
+	}
+
+	ret = regexec(&preg, str, 0, NULL, 0);
+	if (ret != 0) {
+		mgmt_log(LOG_WARNING, "no match or error regexec: \"%s\" \"%s\"", regex, str);
+	}
+
+	regfree(&preg);
+	return (ret == 0);
+}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/daemon/mgmtd.pam.common /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/daemon/mgmtd.pam.common
--- heartbeat-2.1.3/mgmt/daemon/mgmtd.pam.common	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/mgmt/daemon/mgmtd.pam.common	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth include common-auth
+account include common-account
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/daemon/mgmt_lrm.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/daemon/mgmt_lrm.c
--- heartbeat-2.1.3/mgmt/daemon/mgmt_lrm.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/mgmt/daemon/mgmt_lrm.c	2008-08-18 13:32:19.000000000 +0100
@@ -27,6 +27,7 @@
 #include <heartbeat.h>
 #include <clplumbing/cl_log.h>
 #include <clplumbing/cl_syslog.h>
+#include <clplumbing/cl_malloc.h>
 
 #include "mgmt_internal.h"
 #include <lrm/lrm_api.h>
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mgmt/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mgmt/Makefile.in
--- heartbeat-2.1.3/mgmt/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/mgmt/Makefile.in	2008-08-18 23:38:08.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,6 +88,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -105,24 +106,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -184,12 +173,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -458,8 +448,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/missing /tmp/RRBT9Z8NmI/heartbeat-2.1.4/missing
--- heartbeat-2.1.3/missing	2007-12-21 20:44:16.000000000 +0000
+++ heartbeat-2.1.4/missing	2008-08-18 23:37:49.000000000 +0100
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
 
 # 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.
+# 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
@@ -29,6 +33,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -38,18 +44,24 @@
   configure_ac=configure.in
 fi
 
-case "$1" in
+msg="missing on your system"
+
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -67,6 +79,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
     ;;
 
   -*)
@@ -87,14 +104,44 @@
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+  aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -102,13 +149,8 @@
     ;;
 
   autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -116,13 +158,8 @@
     ;;
 
   autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -130,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
     ;;
 
   autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -185,74 +212,67 @@
 
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
   help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
          it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/mkinstalldirs /tmp/RRBT9Z8NmI/heartbeat-2.1.4/mkinstalldirs
--- heartbeat-2.1.3/mkinstalldirs	2007-12-21 20:44:16.000000000 +0000
+++ heartbeat-2.1.4/mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/pkg/InfoFiles/pkginfo /tmp/RRBT9Z8NmI/heartbeat-2.1.4/pkg/InfoFiles/pkginfo
--- heartbeat-2.1.3/pkg/InfoFiles/pkginfo	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/pkg/InfoFiles/pkginfo	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,8 @@
+PKG=LXHAhb
+ARCH=x86_64
+VERSION=2.1.4
+NAME=Open-HA software for multi-machine resilience
+CATEGORY=system
+CLASSES=none build
+BASEDIR=/
+EMAIL=linux-ha@lists.linux-ha.org
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/pkg/InfoFiles/postinstall /tmp/RRBT9Z8NmI/heartbeat-2.1.4/pkg/InfoFiles/postinstall
--- heartbeat-2.1.3/pkg/InfoFiles/postinstall	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/pkg/InfoFiles/postinstall	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Solaris pkg post-install script.
+#	Nothing yet.  Might start heartbeat.
+#
+# (c) 2004 David Lee <t.d.lee@durham.ac.uk>
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/pkg/InfoFiles/preinstall /tmp/RRBT9Z8NmI/heartbeat-2.1.4/pkg/InfoFiles/preinstall
--- heartbeat-2.1.3/pkg/InfoFiles/preinstall	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/pkg/InfoFiles/preinstall	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Solaris pkg pre-install script.
+#	Keep in step with "%pre" section of "heartbeat.spec".
+#
+# (c) 2004 David Lee <t.d.lee@durham.ac.uk>
+#
+# License:      GNU General Public License (GPL)
+#
+
+if
+  getent group haclient >/dev/null
+then
+  : OK group haclient already present
+else
+  GROUPOPT="-g 65"
+  if
+    /usr/sbin/groupadd $GROUPOPT haclient 2>/dev/null
+  then
+    : OK we were able to add group haclient
+  else
+    /usr/sbin/groupadd haclient
+  fi
+fi
+
+if
+  getent passwd hacluster >/dev/null
+then
+  : OK user hacluster already present
+else
+  USEROPT="-g haclient -u 17 -d /var/lib/heartbeat/cores/hacluster"
+  if
+    /usr/sbin/useradd $USEROPT hacluster 2>/dev/null
+  then
+    : OK we were able to add user hacluster
+  else
+    /usr/sbin/useradd hacluster
+  fi
+fi
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/pkg/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/pkg/Makefile
--- heartbeat-2.1.3/pkg/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/pkg/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# pkg/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# $Id: Makefile.am,v 1.14 2005/11/15 13:11:17 davidlee Exp $
+#
+# "pkg" Makefile for Solaris etc.
+#
+# Copyright (C) 2001, 2004 David Lee
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# 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)
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/pkg
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/pkg
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+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
+all: all-am
+
+.SUFFIXES:
+$(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
+.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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-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
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+pkg:	$(PKGDIR)/$(PKGNAME)/pkgmap
+
+# Build the "pkg" from the pseudo-install
+$(PKGDIR)/$(PKGNAME)/pkgmap:	$(PKGINFO)
+	-rm -rf  $(PKGDIR)
+	-mkdir  $(PKGDIR)
+	cd $(INFOFILES) && pkgmk -d ../$(PKGDIR) -r ../$(TMPINSTDIR)
+
+# pseudo-install into $(TMPINSTDIR)
+stamp-tmpinst:
+	cd $(top_builddir) \
+	  && (umask 022 && $(MAKE) install DESTDIR=$(PWD)/$(TMPINSTDIR))
+	echo timestamp > stamp-tmpinst
+
+$(INFOFILES)/prototype:	stamp-tmpinst
+	-mkdir $(INFOFILES)
+	(cd $(TMPINSTDIR) && pkgproto .) \
+	  | $(AWK) ' \
+	    $$1 !~ /^[ils]$$/ \
+	      { $$(NF-1) = "root" ; $$(NF) = "sys" } \
+	    "/" $$3 ~ /^(\/etc|\/etc\/init.d|\/opt|\/var|\/var\/run)$$/ \
+	      { $$4 = $$5 = $$6 = "?" } \
+	    "/" $$3 ~ /^(\/usr|\/usr\/lib|\/usr\/lib\/ocf)$$/ \
+	      { $$4 = $$5 = $$6 = "?" } \
+	    "/" $$3 == "/var/run/heartbeat/ccm" \
+	      { $$5 = "hacluster" ; $$6 = "haclient" } \
+	    "/" $$3 == "/var/run/heartbeat/crm" \
+	      { $$5 = "hacluster" ; $$6 = "haclient" } \
+	    "/" $$3 == "/var/lib/heartbeat/crm" \
+	      { $$5 = "hacluster" ; $$6 = "haclient" } \
+	    "/" $$3 == "/var/lib/heartbeat/cores/hacluster" \
+	      { $$5 = "hacluster" } \
+	    "/" $$3 == "/var/lib/heartbeat/cores/nobody" \
+	      { $$5 = "nobody" } \
+	    "/" $$3 == "/usr/bin/cl_status" \
+	      { $$5 = "hacluster" ; $$6 = "haclient" } \
+	    { print ; } \
+	  ' > $@
+	echo "d none etc/rc2.d ? ? ?" >> $@
+	echo "d none etc/rc0.d ? ? ?" >> $@
+	echo "d none etc/rc1.d ? ? ?" >> $@
+	echo "d none etc/rcS.d ? ? ?" >> $@
+	echo "s none etc/rc2.d/S75heartbeat=/etc/init.d/heartbeat" >> $@
+	echo "s none etc/rc0.d/K05heartbeat=/etc/init.d/heartbeat" >> $@
+	echo "s none etc/rc1.d/K05heartbeat=/etc/init.d/heartbeat" >> $@
+	echo "s none etc/rcS.d/K05heartbeat=/etc/init.d/heartbeat" >> $@
+	echo "i pkginfo" >> $@
+	echo "i preinstall" >> $@
+	echo "i postinstall" >> $@
+
+clean-local:
+	rm -rf $(TMPINSTDIR) $(PKGDIR)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/pkg/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/pkg/Makefile.in
--- heartbeat-2.1.3/pkg/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/pkg/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -62,7 +62,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -100,6 +100,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -117,24 +118,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -196,12 +185,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/heartbeat/pkg-deinstall /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/heartbeat/pkg-deinstall
--- heartbeat-2.1.3/port/heartbeat/pkg-deinstall	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/heartbeat/pkg-deinstall	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,84 @@
+#! /bin/sh
+#
+# License:      GNU General Public License (GPL)
+#
+
+ask() {
+    local question default answer
+
+    question=$1
+    default=$2
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+	read -p "${question} [${default}]? " answer
+    fi
+    if [ x${answer} = x ]; then
+	answer=${default}
+    fi
+    echo ${answer}
+}
+
+yesno() {
+    local dflt question answer
+
+    question=$1
+    dflt=$2
+    while :; do
+	answer=$(ask "${question}" "${dflt}")
+	case "${answer}" in
+	[Yy]*)		return 0;;
+	[Nn]*)		return 1;;
+	esac
+	echo "Please answer yes or no."
+    done
+}
+
+delete_account() {
+    local u g home
+
+    u=$1
+    g=$2
+    if yesno "Do you want me to remove group \"${g}\"" y; then
+	pw groupdel -n ${g}
+	echo "Done."
+    fi
+    if yesno "Do you want me to remove user \"${u}\"" y; then
+	eval home=~${u}
+	pw userdel -n ${u}
+	echo "Done."
+	if [ -d "${home}" ]; then
+	    echo "Please remember to remove the home directory \"${home}\" as"
+	    echo "well as the mirrored files."
+	fi
+    fi
+}
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+
+export PATH=/bin:/usr/bin:/usr/sbin
+
+base=${PKG_PREFIX}
+
+if ps -axc | grep -q heartbeat; then
+    if yesno "There are some heartbeat processes running.  Shall I kill them" y
+    then
+	killall heartbeat
+	sleep 2
+    else
+	echo "OK ... I hope you know what you are doing."
+    fi
+fi
+
+delete_account hacluster haclient
+
+echo "Removing runtime files"
+if [ -d ${base}/var/lib/heartbeat ]; then
+    rm -r ${base}/var/lib/heartbeat
+fi
+if [ -f ${base}/var/lock/subsys/heartbeat ]; then
+    rm ${base}/var/lock/subsys/heartbeat
+fi
+if [ -f ${base}/var/run/heartbeat.pid ]; then
+    rm ${base}/var/run/heartbeat.pid
+fi
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/heartbeat/pkg-descr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/heartbeat/pkg-descr
--- heartbeat-2.1.3/port/heartbeat/pkg-descr	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/heartbeat/pkg-descr	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,22 @@
+heartbeat is a basic high-availability subsystem.  It will run
+scripts at initialization, and when machines go up or down.  This
+version will also perform IP address takeover using gratuitous ARPs.
+
+It implements the following kinds of heartbeats:
+        - Bidirectional Serial Rings ("raw" serial ports)
+        - UDP/IP broadcast (ethernet, etc)
+        - Unicast heartbeats
+        - "ping" heartbeats (for routers, switches, etc.)
+           (to be used for breaking ties in 2-node systems)
+
+ldirectord is a stand-alone daemon to monitor services.
+
+The STONITH module (a.k.a. STOMITH) provides an extensible interface
+for remotely powering down a node in the cluster.
+
+PILS is an generalized and portable open source Plugin and Interface
+Loading System.  PILS manages both plugins (loadable objects), and
+the interfaces these plugins implement.  PILS is designed to support
+any number of plugins implementing any number of interfaces.
+
+WWW: http://linux-ha.org/
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/heartbeat/pkg-install /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/heartbeat/pkg-install
--- heartbeat-2.1.3/port/heartbeat/pkg-install	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/heartbeat/pkg-install	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,131 @@
+#! /bin/sh
+#
+# License:      GNU General Public License (GPL)
+#
+
+base=${PKG_PREFIX}
+
+ask() {
+    local question default answer
+
+    question=$1
+    default=$2
+    if [ -z "${PACKAGE_BUILDING}" ]; then
+	read -p "${question} [${default}]? " answer
+    fi
+    if [ x${answer} = x ]; then
+	answer=${default}
+    fi
+    echo ${answer}
+}
+
+yesno() {
+    local dflt question answer
+
+    question=$1
+    dflt=$2
+    while :; do
+	answer=$(ask "${question}" "${dflt}")
+	case "${answer}" in
+	[Yy]*)		return 0;;
+	[Nn]*)		return 1;;
+	esac
+	echo "Please answer yes or no."
+    done
+}
+
+make_account() {
+    local u g gcos homeopt home
+
+    u=$1
+    g=$2
+    gcos=$3
+    homeopt=${4:+"-d $4"}
+
+    if pw group show "${g}" >/dev/null 2>&1; then
+	echo "You already have a group \"${g}\", so I will use it."
+    else
+	echo "You need a group \"${g}\"."
+	if which -s pw && yesno "Would you like me to create it" y; then
+	    pw groupadd ${g} -g 65 || exit
+	    echo "Done."
+	else
+	    echo "Please create it, and try again."
+	    if ! grep -q "^${u}:" /etc/passwd; then
+		echo "While you're at it, please create a user \"${u}\" too,"
+		echo "with a default group of \"${g}\"."
+	    fi
+	    exit 1
+	fi
+    fi
+    
+    if pw user show "${u}" >/dev/null 2>&1; then
+	echo "You already have a user \"${u}\", so I will use it."
+    else
+	echo "You need a user \"${u}\"."
+	if which -s pw && yesno "Would you like me to create it" y; then
+	    pw useradd ${u} -g ${g} -u 17 -h - ${homeopt} \
+		-s /nonexistent -c "${gcos}" || exit
+	    echo "Done."
+	else
+	    echo "Please create it, and try again."
+	    exit 1
+	fi
+    fi
+
+    if [ x"$homeopt" = x ]; then
+	eval home=~${u}
+	if [ ! -d "${home}" ]; then
+	    if yesno \
+		"Would you like me to create ${u}'s home directory (${home})" y
+	    then
+		mkdir -p ${home}/.cvsup || exit
+		touch ${home}/.cvsup/auth || exit
+		chown -R ${u}:${g} ${home} || exit
+		chmod -R go= ${home} || exit
+	    else
+		echo "Please create it, and try again."
+		exit 1
+	    fi
+	fi
+    fi
+}
+
+case $2 in
+
+POST-INSTALL)
+    if which -s pw && which -s lockf; then
+	:
+    else
+	cat <<EOF
+
+This system looks like a pre-2.2 version of FreeBSD.  I see that it
+is missing the "lockf" and/or "pw" utilities.  I need these utilities.
+Please get them and install them, and try again.  You can get the
+sources from:
+
+  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.bin/lockf.tar.gz
+  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
+
+EOF
+	exit 1
+    fi
+
+    echo ""
+    user=hacluster
+    group=haclient
+    make_account ${user} ${group} "${user} ${group}" "/nonexistent"
+
+    echo "Adding empty dirs and pid file in \"${base}\"."
+    test -d ${base}/var/lib/heartbeat/ckpt || \
+            install -d -m 755 ${base}/var/lib/heartbeat/ckpt
+    test -d ${base}/var/lib/heartbeat/ccm || \
+            install -d -m 755 ${base}/var/lib/heartbeat/ccm
+    test -d ${base}/etc/ha.d/conf || \
+            install -d -m 755 ${base}/etc/ha.d/conf
+    test -d ${base}/var/run || install -d -m 755 ${base}/var/run
+    test -f ${base}/var/run/heartbeat.pid || \
+            install -m 644 -o ${user} -g ${group} /dev/null \
+                ${base}/var/run/heartbeat.pid
+    ;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/heartbeat/pkg-plist /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/heartbeat/pkg-plist
--- heartbeat-2.1.3/port/heartbeat/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/heartbeat/pkg-plist	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,275 @@
+bin/cl_status
+etc/ha.d/README.config
+etc/ha.d/harc
+etc/ha.d/rc.d/ask_resources
+etc/ha.d/rc.d/hb_takeover
+etc/ha.d/rc.d/ip-request
+etc/ha.d/rc.d/ip-request-resp
+etc/ha.d/rc.d/status
+etc/ha.d/resource.d/AudibleAlarm
+etc/ha.d/resource.d/Delay
+etc/ha.d/resource.d/Filesystem
+etc/ha.d/resource.d/ICP
+etc/ha.d/resource.d/IPaddr
+etc/ha.d/resource.d/IPaddr2
+etc/ha.d/resource.d/IPsrcaddr
+etc/ha.d/resource.d/LVM
+etc/ha.d/resource.d/LinuxSCSI
+etc/ha.d/resource.d/MailTo
+etc/ha.d/resource.d/OCF
+etc/ha.d/resource.d/Raid1
+etc/ha.d/resource.d/SendArp
+etc/ha.d/resource.d/ServeRAID
+etc/ha.d/resource.d/WAS
+etc/ha.d/resource.d/WinPopup
+etc/ha.d/resource.d/Xinetd
+etc/ha.d/resource.d/apache
+etc/ha.d/resource.d/db2
+etc/ha.d/resource.d/portblock
+etc/ha.d/shellfuncs
+etc/logrotate.d/heartbeat
+etc/logrotate.d/ldirectord
+include/clplumbing/GSource.h
+include/clplumbing/Gmain_timeout.h
+include/clplumbing/apphb_cs.h
+include/clplumbing/base64.h
+include/clplumbing/cl_log.h
+include/clplumbing/cl_malloc.h
+include/clplumbing/cl_poll.h
+include/clplumbing/cl_signal.h
+include/clplumbing/cpulimits.h
+include/clplumbing/ipc.h
+include/clplumbing/loggingdaemon.h
+include/clplumbing/longclock.h
+include/clplumbing/lsb_exitcodes.h
+include/clplumbing/mkstemp_mode.h
+include/clplumbing/netstring.h
+include/clplumbing/proctrack.h
+include/clplumbing/realtime.h
+include/clplumbing/recoverymgr_cs.h
+include/clplumbing/timers.h
+include/clplumbing/ttylock.h
+include/clplumbing/uids.h
+include/heartbeat/HBauth.h
+include/heartbeat/HBcomm.h
+include/heartbeat/apphb.h
+include/heartbeat/apphb_notify.h
+include/heartbeat/ha_config.h
+include/heartbeat/ha_msg.h
+include/heartbeat/hb_api.h
+include/heartbeat/heartbeat.h
+include/heartbeat/recoverymgr.h
+include/ocf/oc_event.h
+include/ocf/oc_membership.h
+include/pils/generic.h
+include/pils/interface.h
+include/pils/plugin.h
+include/saf/ais.h
+include/saf/ais_amf.h
+include/saf/ais_base.h
+include/saf/ais_checkpoint.h
+include/saf/ais_event.h
+include/saf/ais_lock.h
+include/saf/ais_membership.h
+include/saf/ais_message.h
+include/stonith/expect.h
+include/stonith/stonith.h
+lib/heartbeat/BasicSanityCheck
+lib/heartbeat/ResourceManager
+lib/heartbeat/TestHeartbeatComm
+lib/heartbeat/api_test
+lib/heartbeat/apphbd
+lib/heartbeat/apphbtest
+lib/heartbeat/ccm
+lib/heartbeat/ccm_testclient
+lib/heartbeat/checkpointd
+lib/heartbeat/ckpttest
+lib/heartbeat/clmtest
+lib/heartbeat/cts/CM_fs.py
+lib/heartbeat/cts/CM_hb.py
+lib/heartbeat/cts/CTS.py
+lib/heartbeat/cts/CTSaudits.py
+lib/heartbeat/cts/CTSlab.py
+lib/heartbeat/cts/CTStests.py
+lib/heartbeat/cts/README
+lib/heartbeat/findif
+lib/heartbeat/ha_config
+lib/heartbeat/hb_standby
+lib/heartbeat/hb_takeover
+lib/heartbeat/heartbeat
+lib/heartbeat/ipctest
+lib/heartbeat/ipctransientclient
+lib/heartbeat/ipctransientserver
+lib/heartbeat/ipfail
+lib/heartbeat/mach_down
+lib/heartbeat/plugins/AppHBNotification/recmgr.a
+lib/heartbeat/plugins/AppHBNotification/recmgr.la
+lib/heartbeat/plugins/AppHBNotification/recmgr.so
+lib/heartbeat/plugins/HBauth/crc.a
+lib/heartbeat/plugins/HBauth/crc.la
+lib/heartbeat/plugins/HBauth/crc.so
+lib/heartbeat/plugins/HBauth/md5.a
+lib/heartbeat/plugins/HBauth/md5.la
+lib/heartbeat/plugins/HBauth/md5.so
+lib/heartbeat/plugins/HBauth/sha1.a
+lib/heartbeat/plugins/HBauth/sha1.la
+lib/heartbeat/plugins/HBauth/sha1.so
+lib/heartbeat/plugins/HBcomm/bcast.a
+lib/heartbeat/plugins/HBcomm/bcast.la
+lib/heartbeat/plugins/HBcomm/bcast.so
+lib/heartbeat/plugins/HBcomm/mcast.a
+lib/heartbeat/plugins/HBcomm/mcast.la
+lib/heartbeat/plugins/HBcomm/mcast.so
+lib/heartbeat/plugins/HBcomm/ping.a
+lib/heartbeat/plugins/HBcomm/ping.la
+lib/heartbeat/plugins/HBcomm/ping.so
+lib/heartbeat/plugins/HBcomm/ping_group.a
+lib/heartbeat/plugins/HBcomm/ping_group.la
+lib/heartbeat/plugins/HBcomm/ping_group.so
+lib/heartbeat/plugins/HBcomm/serial.a
+lib/heartbeat/plugins/HBcomm/serial.la
+lib/heartbeat/plugins/HBcomm/serial.so
+lib/heartbeat/plugins/HBcomm/ucast.a
+lib/heartbeat/plugins/HBcomm/ucast.la
+lib/heartbeat/plugins/HBcomm/ucast.so
+lib/heartbeat/plugins/test/test.a
+lib/heartbeat/plugins/test/test.la
+lib/heartbeat/plugins/test/test.so
+lib/heartbeat/recoverymgrd
+lib/heartbeat/req_resource
+lib/heartbeat/send_arp
+lib/libapphb.a
+lib/libapphb.la
+lib/libapphb.so
+lib/libapphb.so.0
+lib/libccmclient.a
+lib/libccmclient.la
+lib/libccmclient.so
+lib/libccmclient.so.0
+lib/libckpt.a
+lib/libckpt.la
+lib/libckpt.so
+lib/libckpt.so.0
+lib/libclm.a
+lib/libclm.la
+lib/libclm.so
+lib/libclm.so.0
+lib/libhbclient.a
+lib/libhbclient.la
+lib/libhbclient.so
+lib/libhbclient.so.0
+lib/libpils.a
+lib/libpils.la
+lib/libpils.so
+lib/libpils.so.0
+lib/libplumb.a
+lib/libplumb.la
+lib/libplumb.so
+lib/libplumb.so.0
+lib/librecoverymgr.a
+lib/librecoverymgr.la
+lib/librecoverymgr.so
+lib/librecoverymgr.so.0
+lib/libstonith.a
+lib/libstonith.la
+lib/libstonith.so
+lib/libstonith.so.0
+lib/pils/plugins/InterfaceMgr/generic.a
+lib/pils/plugins/InterfaceMgr/generic.la
+lib/pils/plugins/InterfaceMgr/generic.so
+lib/stonith/plugins/stonith/apcmaster.a
+lib/stonith/plugins/stonith/apcmaster.la
+lib/stonith/plugins/stonith/apcmaster.so
+lib/stonith/plugins/stonith/apcsmart.a
+lib/stonith/plugins/stonith/apcsmart.la
+lib/stonith/plugins/stonith/apcsmart.so
+lib/stonith/plugins/stonith/baytech.a
+lib/stonith/plugins/stonith/baytech.la
+lib/stonith/plugins/stonith/baytech.so
+lib/stonith/plugins/stonith/external.a
+lib/stonith/plugins/stonith/external.la
+lib/stonith/plugins/stonith/external.so
+lib/stonith/plugins/stonith/ibmhmc.a
+lib/stonith/plugins/stonith/ibmhmc.la
+lib/stonith/plugins/stonith/ibmhmc.so
+lib/stonith/plugins/stonith/meatware.a
+lib/stonith/plugins/stonith/meatware.la
+lib/stonith/plugins/stonith/meatware.so
+lib/stonith/plugins/stonith/null.a
+lib/stonith/plugins/stonith/null.la
+lib/stonith/plugins/stonith/null.so
+lib/stonith/plugins/stonith/nw_rpc100s.a
+lib/stonith/plugins/stonith/nw_rpc100s.la
+lib/stonith/plugins/stonith/nw_rpc100s.so
+lib/stonith/plugins/stonith/rcd_serial.a
+lib/stonith/plugins/stonith/rcd_serial.la
+lib/stonith/plugins/stonith/rcd_serial.so
+lib/stonith/plugins/stonith/rps10.a
+lib/stonith/plugins/stonith/rps10.la
+lib/stonith/plugins/stonith/rps10.so
+lib/stonith/plugins/stonith/ssh.a
+lib/stonith/plugins/stonith/ssh.la
+lib/stonith/plugins/stonith/ssh.so
+lib/stonith/plugins/stonith/wti_nps.a
+lib/stonith/plugins/stonith/wti_nps.la
+lib/stonith/plugins/stonith/wti_nps.so
+sbin/ldirectord
+sbin/meatclient
+sbin/stonith
+sbin/supervise-ldirectord-config
+share/doc/heartbeat-1.2.3/AUTHORS
+share/doc/heartbeat-1.2.3/COPYING
+share/doc/heartbeat-1.2.3/ChangeLog
+share/doc/heartbeat-1.2.3/DirectoryMap.txt
+share/doc/heartbeat-1.2.3/GettingStarted.html
+share/doc/heartbeat-1.2.3/GettingStarted.txt
+share/doc/heartbeat-1.2.3/HardwareGuide.html
+share/doc/heartbeat-1.2.3/HardwareGuide.txt
+share/doc/heartbeat-1.2.3/README
+share/doc/heartbeat-1.2.3/Requirements.html
+share/doc/heartbeat-1.2.3/Requirements.txt
+share/doc/heartbeat-1.2.3/apphbd.cf
+share/doc/heartbeat-1.2.3/authkeys
+share/doc/heartbeat-1.2.3/faqntips.html
+share/doc/heartbeat-1.2.3/faqntips.txt
+share/doc/heartbeat-1.2.3/ha.cf
+share/doc/heartbeat-1.2.3/haresources
+share/doc/heartbeat-1.2.3/heartbeat_api.html
+share/doc/heartbeat-1.2.3/heartbeat_api.txt
+share/doc/heartbeat-1.2.3/rsync.html
+share/doc/heartbeat-1.2.3/rsync.txt
+share/doc/heartbeat-1.2.3/startstop
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@unexec rmdir %D/var/run 2>/dev/null || true
+@unexec rmdir %D/var/lock/subsys 2>/dev/null || true
+@unexec rmdir %D/var/lock 2>/dev/null || true
+@unexec rmdir %D/var/lib/heartbeat/ckpt 2>/dev/null || true
+@unexec rmdir %D/var/lib/heartbeat/ccm 2>/dev/null || true
+@unexec rmdir %D/var/lib/heartbeat 2>/dev/null || true
+@unexec rmdir %D/var/lib 2>/dev/null || true
+@unexec rmdir %D/var 2>/dev/null || true
+@dirrm share/doc/heartbeat-1.2.3
+@dirrm lib/stonith/plugins/stonith
+@dirrm lib/stonith/plugins
+@dirrm lib/stonith
+@dirrm lib/pils/plugins/InterfaceMgr
+@dirrm lib/pils/plugins
+@dirrm lib/pils
+@dirrm lib/heartbeat/plugins/test
+@dirrm lib/heartbeat/plugins/HBcomm
+@dirrm lib/heartbeat/plugins/HBauth
+@dirrm lib/heartbeat/plugins/AppHBNotification
+@dirrm lib/heartbeat/plugins
+@dirrm lib/heartbeat/cts
+@dirrm lib/heartbeat
+@dirrm include/stonith
+@dirrm include/saf
+@dirrm include/pils
+@dirrm include/ocf
+@dirrm include/heartbeat
+@dirrm include/clplumbing
+@dirrm etc/ha.d/resource.d
+@dirrm etc/ha.d/rc.d
+@unexec rmdir %D/etc/ha.d/conf 2>/dev/null || true
+@unexec rmdir %D/etc/ha.d 2>/dev/null || true
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/Makefile
--- heartbeat-2.1.3/port/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,533 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# port/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# $Id: Makefile.am,v 1.9 2006/04/13 09:54:19 andrew Exp $
+#
+# Open-HA "port" Makefile for FreeBSD
+#
+# Copyright (C) 2005 Matthew Soffen
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+# 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)
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = OPENHA
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/port
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/port
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = \
+		portMakefile.in			\
+		heartbeat/pkg-deinstall.in		\
+		heartbeat/pkg-descr.in		\
+		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
+all: all-am
+
+.SUFFIXES:
+$(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
+.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:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-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-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+portfile:
+	rm -f $(TARFILE) heartbeat.tar heartbeat.tar.gz
+	ln -s ../$(TARFILE) $(TARFILE)
+	$(MD5) $(TARFILE) > heartbeat/distinfo
+#	 Create the DistInfo file for the port file.
+	ls -l ../$(TARFILE) | $(AWK) '{print "SIZE \($(TARFILE)\) = "$$5}' >> heartbeat/distinfo
+	cp portMakefile heartbeat/Makefile
+	$(TAR) -cvf heartbeat.tar heartbeat/Makefile heartbeat/distinfo heartbeat/pkg-deinstall heartbeat/pkg-descr heartbeat/pkg-install heartbeat/pkg-plist
+	$(GZIP_PROG) heartbeat.tar
+
+clean:
+	rm -f $(TARFILE) heartbeat.tar port/distinfo port/Makefile
+
+clean-local:
+	rm -rf $(TMPINSTDIR) $(PKGDIR)
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/Makefile.in
--- heartbeat-2.1.3/port/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/port/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -63,7 +63,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = portMakefile
@@ -101,6 +101,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -118,24 +119,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -197,12 +186,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/port/portMakefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/port/portMakefile
--- heartbeat-2.1.3/port/portMakefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/port/portMakefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	hearbeat
+# Date created:		18 March 2005
+# Added to HA Project from initial work by
+# 	Scott Kleihege <scott-ports@tummy.com>
+#
+# License:      GNU General Public License (GPL)
+#
+# $FreeBSD$
+#
+
+PORTNAME=	heartbeat
+PORTVERSION=	2.1.4
+CATEGORIES=	sysutils
+MASTER_SITES=	http://linux-ha.org/download/
+
+MAINTAINER=	sirgeek-ha@mrsucko.org
+COMMENT=	Subsystem for High-Availability Clustering
+
+BUILD_DEPENDS=	${LOCALBASE}/include/libnet.h:${PORTSDIR}/net/libnet-devel \
+		${LOCALBASE}/include/glib12/glib.h:${PORTSDIR}/devel/glib12
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_PERL5=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	yes
+CONFIGURE_ARGS=	 --prefix=/usr/local --sysconfdir=/usr/local/etc --localstatedir=/var --enable-all --with-group-id=90 --with-ccmuser-id=90
+
+MAN1=		cl_status.1
+MAN8=		apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \
+		stonith.8 supervise-ldirectord-config.8
+
+pre-install:
+	PATH=${PATH}:${LOCALBASE}/bin
+
+post-install:
+	PKG_PREFIX=${LOCALBASE} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/py-compile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/py-compile
--- heartbeat-2.1.3/py-compile	2007-12-21 20:44:18.000000000 +0000
+++ heartbeat-2.1.4/py-compile	2008-08-18 23:37:52.000000000 +0100
@@ -1,7 +1,9 @@
 #!/bin/sh
-
 # py-compile - Compile a Python program
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 2000, 2001, 2003, 2004, 2005  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
@@ -15,78 +17,130 @@
 
 # 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.
+# 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.
 
-# called as "py-compile [--basedir DIR] PY_FILES ...
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
 if [ -z "$PYTHON" ]; then
   PYTHON=python
 fi
 
 basedir=
-
-case "$1" in
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
     --basedir)
-	basedir=$2
-	shift 2
-	;;
-    --help)
-	echo "Usage: py-compile [--basedir DIR] PY_FILES ..."
-	echo "Byte compile some python scripts.  This should be performed"
-	echo "after they have been moved to the final installation location"
-	exit 0
-	;;
-    --version)
-	echo "py-compile version 0.0"
-	exit 0
-	;;
-esac
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
+
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+      exit $?
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit $?
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
-    echo "No files given to $0" 1>&2
+if test -z "$files"; then
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
 
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
+# 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:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/README /tmp/RRBT9Z8NmI/heartbeat-2.1.4/README
--- heartbeat-2.1.3/README	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/README	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,37 @@
+Hi,
+
+Welcome to the linux-ha project source tree.
+
+There is a little documentation on setting things up for a HA failover
+system in the doc directory.  The following things are among the more
+interesting docs:
+	GettingStarted.html		HardwareGuide.html
+	Requirements.html		faqntips.html
+	nice_failback.txt		rsync.html
+
+For building the system:
+
+If you have no idea what to do, then you should probably use the ConfigureMe
+to configure (and make, install, package, etc.) the software.  ConfigureMe
+makes some educated guesses on how linux-ha ought to be installed by
+default on the current system type.
+
+If you have played with autoconf/automake packages before, then you can use
+the bootstrap script, or configure, etc. like normal.
+
+Due to the way that init directories are handled by heartbeat,
+make distcheck can be problematic. The following should allow
+this to run successfully, noting that gmake is often available
+as make:
+
+gmake DESTDIR="$PWD/heartbeat-2.1.4/=inst" distcheck
+
+For more information on the project, see the web site at linux-ha.org.
+Information on joining mailing lists can be found at
+	http://linux-ha.org/contact/
+
+
+	Enjoy!
+
+
+	-- The Linux-Ha development team
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/replace/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/replace/Makefile
--- heartbeat-2.1.3/replace/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/replace/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,621 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# replace/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+#
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h \
+	$(top_builddir)/include/hb_config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libreplace_la_DEPENDENCIES =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+am_libreplace_la_OBJECTS =
+libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS) 
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/replace
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/replace
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+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 =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES) 
+	$(LINK)  $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include $(DEPDIR)/NoSuchFunctionName.Plo
+include $(DEPDIR)/alphasort.Plo
+include $(DEPDIR)/daemon.Plo
+include $(DEPDIR)/inet_pton.Plo
+include $(DEPDIR)/scandir.Plo
+include $(DEPDIR)/setenv.Plo
+include $(DEPDIR)/strerror.Plo
+include $(DEPDIR)/strlcat.Plo
+include $(DEPDIR)/strlcpy.Plo
+include $(DEPDIR)/strndup.Plo
+include $(DEPDIR)/strnlen.Plo
+include $(DEPDIR)/unsetenv.Plo
+include $(DEPDIR)/uuid_parse.Plo
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf $(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf $(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/replace/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/replace/Makefile.in
--- heartbeat-2.1.3/replace/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/replace/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -59,7 +59,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -67,7 +67,7 @@
 libreplace_la_DEPENDENCIES = @LTLIBOBJS@
 am_libreplace_la_OBJECTS =
 libreplace_la_OBJECTS = $(am_libreplace_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -115,6 +115,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -132,24 +133,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -211,12 +200,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -455,8 +445,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -468,8 +458,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -479,13 +469,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/apache /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/apache
--- heartbeat-2.1.3/resources/heartbeat/apache	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/apache	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA apache, based on original heartbeat RA. See
+#		OCF RA apache for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:	linux-ha@lists.linux-ha.org
+# License:	GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 apache::/opt/IBMHTTPServer/conf/httpd.conf
+#       node1  10.0.0.170 IBMhttpd
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 [config-file-pathname] $LEGAL_ACTIONS"
+    exit 1
+}
+
+case $# in
+  1)	op=$1
+	;;
+  2)	OCF_RESKEY_configfile=$1; export OCF_RESKEY_configfile
+	op=$2
+	;;
+  *)	usage
+	;;
+esac
+
+OCF_TYPE=apache
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$OCF_RESKEY_configfile
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf $op
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/AudibleAlarm /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/AudibleAlarm
--- heartbeat-2.1.3/resources/heartbeat/AudibleAlarm	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/AudibleAlarm	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA AudibleAlarm, based on original heartbeat RA.
+#		See OCF RA AudibleAlarm for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+	echo "Usage: $0 [node1 node2 ... ] $LEGAL_ACTIONS"
+}
+
+if [ $# = 0 ]; then
+   usage
+fi
+
+# Get operation name, which is the last argument we are passed.
+for arg in "$@"; do
+    op=$arg
+done
+
+nodelist=`echo $* | sed 's%'$op'$%%'`
+
+OCF_TYPE=AudibleAlarm
+OCF_RESOURCE_INSTANCE=AudibleAlarm
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_nodelist=$nodelist; export OCF_RESKEY_nodelist 
+ra_execocf $op
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/db2 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/db2
--- heartbeat-2.1.3/resources/heartbeat/db2	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/db2	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA db2, based on original heartbeat RA.
+#		See OCF RA db2 for more information. 
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:	linux-ha@lists.linux-ha.org
+# License:	GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines, Inc.
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 db2::db2inst1
+#
+# See usage() function below for more details...
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 db2-database-owner-id $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+OCF_TYPE=db2
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_instance=$1; export OCF_RESKEY_instance
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Delay /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Delay
--- heartbeat-2.1.3/resources/heartbeat/Delay	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/Delay	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+#
+# License:      GNU General Public License (GPL)
+# Support:      linux-ha@lists.linux-ha.org
+#
+#	This script is a test resource for introducing delay.
+#
+#	usage: $0  {start|stop|status|monitor}
+#	usage: $0  delay {start|stop|status|monitor}
+#	usage: $0  startdelay stopdelay {start|stop|status|monitor}
+#
+#	This is really a test resource script.
+#
+
+usage() {
+  echo "usage: $0 [delay [stopdelay]] $LEGAL_ACTIONS"
+  exit 1
+}
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+case $# in
+  1)	op=$1;;
+  2)	OCF_RESKEY_startdelay=$1; export OCF_RESKEY_startdelay; op=$2;;
+  3)	OCF_RESKEY_startdelay=$1; 
+	OCF_RESKEY_stopdelay=$2; 
+	export OCF_RESKEY_startdelay OCF_RESKEY_stopdelay; 
+	op=$3;;
+  *)	usage;;
+esac
+
+if [ -z $OCF_RESKEY_startdelay ]; then
+    OCF_RESKEY_startdelay=10
+fi
+
+OCF_TYPE=Delay
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_${OCF_RESKEY_startdelay}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf $op
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Filesystem /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Filesystem
--- heartbeat-2.1.3/resources/heartbeat/Filesystem	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/Filesystem	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA Filesystem, based on original heartbeat RA.
+#		See OCF RA Filesystem for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# usage: ./Filesystem <device> <directory> [<fstype> [<options>]] {start|stop|status}
+#
+#<device>    : name of block device for the filesystem. e.g. /dev/sda1, /dev/md0
+#		Or a -U or -L option for mount, or an NFS mount specification,
+#		or a samba share
+#<directory> : the mount point for the filesystem
+#<fstype>    : optional name of the filesystem type. e.g. ext2
+#<options>   : options to be given to the mount command via -o
+#
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 Filesystem::/dev/sda1::/data1::ext2
+#  or
+#       node1  10.0.0.170 Filesystem::-Ldata1::/data1::ext2
+#  or
+#       node1  10.0.0.170 Filesystem::server:/data1::/data1::nfs::ro
+#
+# This assumes you want to manage a filesystem on a shared (scsi) bus.
+# Do not put this filesystem in /etc/fstab.  This script manages all of
+# that for you.
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <device> <directory> [<fstype> [<options>]] $LEGAL_ACTIONS"
+    exit 1
+}
+
+# Check the arguments passed to this script
+if [ $# -lt 3 ]; then
+    usage
+fi
+
+if [ "x$2" != "x" ]; then
+    OCF_RESKEY_device="$1"; shift 
+    export OCF_RESKEY_device
+fi
+
+if [ "x$2" != "x" ]; then
+    OCF_RESKEY_directory="$1"; shift
+    export OCF_RESKEY_directory
+fi
+
+if [ "x$2" != "x" ]; then
+    OCF_RESKEY_fstype=$1; shift
+    export OCF_RESKEY_fstype
+fi
+
+if [ "x$2" != "x" ]; then
+    OCF_RESKEY_options="$1";  shift
+    export OCF_RESKEY_options
+fi
+
+OCF_TYPE=Filesystem
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$OCF_RESKEY_device
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf  $1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/hto-mapfuncs /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/hto-mapfuncs
--- heartbeat-2.1.3/resources/heartbeat/hto-mapfuncs	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/hto-mapfuncs	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# Author: Zhao Kai <zhaokai@cn.ibm.com>
+#
+# License:      GNU General Public License (GPL)
+# Support:      linux-ha@lists.linux-ha.org
+#
+#set -x
+. /etc/ha.d/shellfuncs
+
+OCF_ROOT_DIR=/usr/lib/ocf
+OCF_RA_DIR=/usr/lib/ocf/resource.d/
+
+OCF_RA_VERSION_MAJOR=1 ; export OCF_RA_VERSION_MAJOR
+OCF_RA_VERSION_MINOR=0 ; export OCF_RA_VERSION_MINOR
+OCF_ROOT=$OCF_ROOT_DIR ; export OCF_ROOT
+
+LEGAL_ACTIONS="(start|stop|status|usage|meta-data)"
+
+log_and_print(){
+	ha_log "$*"
+	echo "$*"
+}
+
+#
+# rsc_id=rsc1 rsc_type=IPaddr2 provide=heartbeat start ip=192.168.0.1 .....
+#
+ra_execocf(){
+    if [ "x${1}" = "x" ]; then
+	log_and_print "ERROR: No action specfied."
+	usage
+	exit 1
+    fi
+
+    . ${OCF_RA_DIR}/heartbeat/.ocf-shellfuncs
+    
+    __ACTION=$1
+    __SCRIPT_NAME="${OCF_RA_DIR}/heartbeat/${OCF_TYPE}"
+    
+    if [ "x${OCF_TYPE}" = "x" ]; then
+	log_and_print "ERROR: Internal error. No value for OCF_TYPE specified"
+	exit 1
+    fi
+    
+    if [ ! -x $__SCRIPT_NAME ] 
+    then
+	log_and_print "ERROR: $__SCRIPT_NAME is not an executable file "
+	exit 1
+    fi
+
+    # execute ocf ra and get return value
+    case $__ACTION in
+	start)		$__SCRIPT_NAME start;;
+	stop)		$__SCRIPT_NAME stop ;;
+	monitor)	$__SCRIPT_NAME monitor;;
+	status)		$__SCRIPT_NAME monitor;;	# Mapping this to monitor is a bug
+	
+	usage|help)	usage;;
+	*)		log_and_print "ERROR: Unknown operation: $__ACTION"
+			usage
+			exit 1;;
+    esac
+    
+    ocf_return_status=$?
+    case $ocf_return_status in
+	$OCF_SUCCESS)
+              case $__ACTION in
+		  monitor|status)	log_and_print "INFO: $rsc_type Running OK";;
+		  *)			log_and_print "INFO: $rsc_type Success";;
+	      esac;;
+
+	$OCF_ERR_GENERIC)
+		log_and_print "ERROR: $rsc_type Generic error";;
+
+	$OCF_ERR_ARGS)
+		log_and_print "ERROR: $rsc_type Illegal argument";;
+
+	$OCF_ERR_UNIMPLEMENTED)
+		log_and_print "ERROR: $rsc_type Function unimplemented";;
+
+	$OCF_ERR_PERM)
+		log_and_print "ERROR: $rsc_type User had insufficient privilege";;
+
+	$OCF_ERR_INSTALLED)
+		log_and_print "ERROR: $rsc_type Program is not installed";;
+
+	$OCF_ERR_CONFIGURED)
+		log_and_print "ERROR: $rsc_type Program is not configured";;
+
+	$OCF_NOT_RUNNING)
+		log_and_print "INFO: $rsc_type Resource is stopped";;
+	*)
+		log_and_print "ERROR: $rsc_type Unknown error: $ocf_return_status"
+		exit 1
+		;;
+	esac
+
+	return $ocf_return_status
+}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/ICP /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/ICP
--- heartbeat-2.1.3/resources/heartbeat/ICP	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/ICP	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA ICP, based on original heartbeat RA.
+#		See OCF RA ICP for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:      linux-ha@lists.linux-ha.org
+# License:	GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 LinuxSCSI::0:0 ICP::c0h1::/dev/sdb1 LVM::myvolname
+#
+# Notice that you will need to get the utility "icpclucon" from the ICP
+# support to use this.
+#
+# See usage() function below for more details...
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <ICP cluster drive ID> <device> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 3 ]; then
+    usage
+    exit 1
+fi
+
+OCF_TYPE=ICP
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_driveid=$1 
+OCF_RESKEY_device=$2
+export OCF_RESKEY_device OCF_RESKEY_driveid
+
+ra_execocf $3
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/ids /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/ids
--- heartbeat-2.1.3/resources/heartbeat/ids	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/ids	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,118 @@
+#!/bin/sh
+#
+#
+# ids
+#
+# Description:  
+#
+# Wrapper script for the ids OCF resource agent that
+# manages an IBM Informix Dynamic Server (IDS) instance 
+# as an High-Availability resource.
+####
+#
+# Author:			Lars D. Forseth, <lars.forseth@de.ibm.com> or <lars@forseth.de>
+# Created:			May 25th 2007
+# Last Modified:	July 30th 2007
+# Support:			linux-ha@lists.linux-ha.org
+# License:			GNU General Public License (GPL), Version 2 or later
+# Copyright:		(c) 2002 - 2007 International Business Machines, Inc.
+#
+# This code is inspired by the db2 and Filesystem wrapper 
+# resource scripts both written by Xun Sun, <xunsun@cn.ibm.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 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Further, this software is distributed without any warranty that it is
+# free of the rightful claim of any third person regarding infringement
+# or the like.  Any license provided herein, whether implied or
+# otherwise, applies only to this software file.  Patent licenses, if
+# any, provided herein do not apply to combinations of this program with
+# other software, or any other product whatsoever.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+####
+#
+# Example usage as it would appear in /etc/ha.d/haresources:
+#		node1 192.168.0.1 ids::/informix::ids1::onconfig.ids1
+#
+#
+# --> Note that passing dbname and sqltestquery in heartbeat version 1 style is not supported!
+#
+# See usage() function below for more details...
+####
+
+
+#
+# Include variables and functions needed to wrap 
+# from heartbeat V1 resource agent style (haresources, no crm) 
+# to heartbeat V2 resource agent style (crm, OCF)
+#
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+
+#
+# Function that displays the usage of this script.
+#
+usage() {
+	echo "usage: $0 [<INFORMIXDIR> <INFORMIXSERVER> <ONCONFIG>] $LEGAL_ACTIONS"
+	exit 1
+}
+
+
+#
+# Check if number of parameters is valid.
+# Valid hereby are: 
+# 	- 1 parameter (only the action to perform)
+# 	- or 4 parameters (variables needed plus the action to perform)
+#
+if [ $# -ne 1 -a $# -ne 4 ]; then
+	usage
+fi
+
+
+#
+# Set OCF parameter variables, if supplied
+#
+
+# Set informixdir only if there follows at least one more unempty parameter
+if [ -n "$2" ]; then
+    OCF_RESKEY_informixdir="$1"; shift
+    export OCF_RESKEY_informixdir
+fi
+
+# Set informixserver only if there follows at least one more unempty parameter
+if [ -n "$2" ]; then
+    OCF_RESKEY_informixserver="$1"; shift
+    export OCF_RESKEY_informixserver
+fi
+
+# Set onconfig only if there follows at least one more unempty parameter
+if [ -n "$2" ]; then
+    OCF_RESKEY_onconfig="$1"; shift
+    export OCF_RESKEY_onconfig
+fi
+
+
+#
+# Set general OCF variables
+#
+OCF_TYPE=ids
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$OCF_RESKEY_informixserver
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+
+#
+# Finally call OCF resource agent we are wrapping here...
+#
+ra_execocf $1
+###############################################################################
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/IPaddr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/IPaddr
--- heartbeat-2.1.3/resources/heartbeat/IPaddr	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/IPaddr	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA IPaddr, based on original heartbeat RA.
+#		See OCF RA IPaddr for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# License:      GNU General Public License (GPL)
+# Support:      linux-ha@lists.linux-ha.org
+# Copyright:	(C) 2005 International Business Machines
+#
+#	This script manages IP alias IP addresses
+#
+#	It can add an IP alias, or remove one.
+#
+#	usage: $0 <ip-address> {start|stop|status|monitor}
+#
+#	The "start" arg adds an IP alias.
+#
+#	Surprisingly, the "stop" arg removes one.	:-)
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+
+usage() {
+    echo "usage: $0 <ip-address> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+# We need to split the argument into pieces that IPaddr OCF RA can
+# recognize, sed is prefered over Bash specific builtin functions 
+# for portability.
+
+BASEIP=`echo $1 | sed 's%/.*%%'`
+OCF_RESKEY_ip=$BASEIP; export OCF_RESKEY_ip
+
+str=`echo $1 | sed 's%^'$BASEIP'/*%%'`
+if [ ! -z "$str" ]; then
+    NETMASK=`echo $str | sed 's%/.*%%'`
+    OCF_RESKEY_cidr_netmask=$NETMASK; export OCF_RESKEY_cidr_netmask
+
+    str=`echo $str | sed 's%^'$NETMASK'/*%%'`
+    NIC=`echo $str | sed 's%/.*%%'`
+    case $NIC in
+	[0-9]*)	BROADCAST=$NIC
+	    OCF_RESKEY_broadcast=$BROADCAST; export OCF_RESKEY_broadcast
+	    NIC=
+	    ;;
+	"")	;;
+	*)	BROADCAST=`echo $str | sed -e 's%^'$NIC'/*%%' -e 's%/.*%%'`
+	    OCF_RESKEY_nic=$NIC; export OCF_RESKEY_nic
+	    OCF_RESKEY_broadcast=$BROADCAST; export OCF_RESKEY_broadcast
+	    ;;
+    esac
+fi
+
+#
+# Determine if this IP address is really being served, or not.
+# Note that we don't distinguish if *we're* serving it locally...
+#
+ip_monitor() {
+	PINGARGS="`pingargs $BASEIP`"
+	for j in 1 2 3
+	do
+	  # for R1 style clusters, CTS runs this on the test monitor node
+	  # so we cannot check to see if the IP address is served locally
+	  # This means that the ARP spoofing is also tested
+	  # But we can't tell for sure which node is serving the IP
+	  if
+	    /bin/ping $PINGARGS >/dev/null 2>&1
+	  then
+	    exit 0
+	  fi
+	done
+	
+	exit 1
+}
+
+case $2 in
+  monitor)	
+	ip_monitor
+	;;
+  *)	
+	;;
+esac
+
+OCF_TYPE=IPaddr
+OCF_RESKEY_lvs_support=0
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$BASEIP
+export OCF_TYPE OCF_RESOURCE_INSTANCE OCF_RESKEY_lvs_support
+
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/IPaddr2 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/IPaddr2
--- heartbeat-2.1.3/resources/heartbeat/IPaddr2	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/IPaddr2	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA IPaddr2, based on original heartbeat RA.
+#		See OCF RA IPaddr2 for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+#	This script manages IP alias IP addresses
+#
+#	It can add an IP alias, or remove one.
+#
+#	usage: $0 ip-address[/netmaskbits[/interface[:label][/broadcast]]] \
+#	    {start|stop|status|monitor}
+#
+#	The "start" arg adds an IP alias.
+#
+#	Surprisingly, the "stop" arg removes one.	:-)
+#
+unset LANG; export LANG
+LC_ALL=C
+export LC_ALL
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+# We need to split the argument into pieces that IPaddr OCF RA can
+# recognize, sed is prefered over Bash specific builtin functions 
+# for portability.
+
+usage() {
+  echo "usage: $0 ip-address[/netmaskbits[/interface[:label][/broadcast]]] $LEGAL_ACTIONS"
+}
+
+if [ $# != 2 ]; then
+    usage
+    exit 1
+fi
+
+BASEIP=`echo $1 | sed 's%/.*%%'`
+OCF_RESKEY_ip=$BASEIP; export OCF_RESKEY_ip
+
+str=`echo $1 | sed 's%^'$BASEIP'/*%%'`
+if [ ! -z "$str" ]; then
+    NETMASK=`echo $str | sed 's%/.*%%'`
+    OCF_RESKEY_cidr_netmask=$NETMASK; export OCF_RESKEY_cidr_netmask
+    
+    str=`echo $str | sed 's%^'$NETMASK'/*%%'`
+    NIC=`echo $str | sed 's%/.*%%'`
+    case $NIC in
+	[0-9]*)	BROADCAST=$NIC
+	    OCF_RESKEY_broadcast=$BROADCAST; export OCF_RESKEY_broadcast
+	    NIC=
+	    ;;
+	"")	;;
+	*)	BROADCAST=`echo $str | sed -e 's%^'$NIC'/*%%' -e 's%/.*%%'`
+	    OCF_RESKEY_nic=$NIC; export OCF_RESKEY_nic
+	    OCF_RESKEY_broadcast=$BROADCAST; export OCF_RESKEY_broadcast
+	    ;;
+    esac
+fi
+
+OCF_TYPE=IPaddr2
+OCF_RESKEY_lvs_support=1
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$BASEIP
+export OCF_TYPE OCF_RESOURCE_INSTANCE OCF_RESKEY_lvs_support
+
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/IPsrcaddr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/IPsrcaddr
--- heartbeat-2.1.3/resources/heartbeat/IPsrcaddr	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/IPsrcaddr	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA IPsrcaddr, based on original heartbeat RA.
+#		See OCF RA IPsrcaddr for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:	linux-ha@lists.linux-ha.org
+# License:	GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+#	It can add a preferred source address, or remove one.
+#
+#	usage: IPsrcaddr ip-address {start|stop|status|monitor}
+#
+#	The "start" arg adds a preferred source address.
+#
+#	Surprisingly, the "stop" arg removes it.	:-)
+#
+#	NOTES:
+#
+#	1) There must be exactly one default route!
+#	2) The script depends on Alexey Kuznetsov's ip utility from the
+#	iproute aka iproute2 package.
+#	3) No checking is done to see if the passed in IP address can
+#	reasonably be associated with the interface on which the default
+#	route exists.  So unless you want to deliberately spoof your source IP,
+#	check it!  Normally, I would expect that your haresources looks
+#	something like:
+#
+#		nodename ip1 ip2 ... ipN IPsrcaddr::ipX
+#
+#	where ipX is one of the ip1 to ipN.
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+USAGE="usage: $0 <ip-address> $LEGAL_ACTIONS";
+
+usage() {
+    echo $USAGE >&2
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+OCF_TYPE=IPsrcaddr
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_ipaddress=$1; export OCF_RESKEY_ipaddress
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/IPv6addr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/IPv6addr
--- heartbeat-2.1.3/resources/heartbeat/IPv6addr	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/IPv6addr	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA IPv6addr. See OCF RA IPv6addr for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <ip-address> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+OCF_TYPE=IPv6addr
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_ipv6addr=$1; export OCF_RESKEY_ipv6addr
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/LinuxSCSI /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/LinuxSCSI
--- heartbeat-2.1.3/resources/heartbeat/LinuxSCSI	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/LinuxSCSI	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA LinuxSCSI, based on original heartbeat RA.
+#		See OCF RA LinuxSCSI for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# CAVEATS:	See the usage message for some important warnings
+#
+# usage: ./LinuxSCSI <host>:<channel>:<target>[:<lun>] {start|stop|status}
+#
+#<host>:	Host adapter number of the SCSI device to query
+#<channel>:	SCSI channel
+#<target>:	Target ID of the SCSI device under consideration
+#<lun>:		LUN of the SCSI device under consideration
+#			(optional)
+#
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 LinuxSCSI:0:0:11 
+#
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0  <host>:<channel>:<target>[:<lun>] $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+OCF_TYPE=LinuxSCSI
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_scsi=$1; export OCF_RESKEY_scsi
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/LVM /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/LVM
--- heartbeat-2.1.3/resources/heartbeat/LVM	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/LVM	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA LVM, based on original heartbeat RA.
+#		See OCF RA LVM for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com>
+# Support:	linux-ha@lists.linux-ha.org
+# License:	GNU Lesser General Public License (LGPL)
+# Copyright:	(C) 2005 International Business Machines, Inc.
+#
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 ServeRAID::1::1 LVM::myvolname
+#
+# See usage() function below for more details...
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <LVM-configuration file> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 2 ]; then
+    usage
+fi
+
+OCF_TYPE=LVM
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_volgrpname=$1; export OCF_RESKEY_volgrpname
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/LVSSyncDaemonSwap /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/LVSSyncDaemonSwap
--- heartbeat-2.1.3/resources/heartbeat/LVSSyncDaemonSwap	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/LVSSyncDaemonSwap	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,201 @@
+#!/bin/sh
+#
+#
+#        Copyright (C) 2005 Horms <horms@verge.net.au>
+#
+# 	 License:      GNU General Public License (GPL)
+# 	 Support:      linux-ha@lists.linux-ha.org
+#
+#        This script manages the LVS synchronisation daemon
+#
+#       Please note that as of 2.4.29, this is no longer needed
+#       as both the master and backup daemon can run simultaneously
+#
+#        usage: $0 {master|backup} {interface} {start|stop|status|monitor|cleanup}
+#
+#        The first argument, master or backup, is the YING.
+#        The YANG is internally calculated to be which ever or master and
+#        backup YING is not.
+#
+#       e.g $0 LVSSyncDaemonSwap master start   # YING=master YANG=backup
+#           $0 LVSSyncDaemonSwap backup start   # YING=backup YANG=master
+#               
+#
+#       "start" will stop the YANG if it is running and starts the YING
+#       "stop"  will stop the YING if it is running and starts the YANG
+#       "cleanup" is a non-standard target stop the YING if it is running
+#                 an stop the YANG if it is running 
+#
+#
+#
+unset LANG
+LC_ALL=C
+export LC_ALL
+
+prefix=/usr
+exec_prefix=/usr
+. /etc/ha.d/shellfuncs
+
+USAGE="usage: $0 {master|backup} {interface} {start|stop|status|monitor|cleanup}\n\nNote: $0 only works on Linux";
+
+# This is consistent with ldirectord's behaviour
+# Except that this script does not have a debug mode
+if [ -x "/sbin/ipvsadm" ]; then
+	IPVSADM="/sbin/ipvsadm";
+elif [ -x "/usr/sbin/ipvsadm" ]; then
+	IPVSADM="/usr/sbin/ipvsadm";
+else
+	ha_log "ERROR: Can not find ipvsadm";
+	exit 1
+fi
+
+IPVSADM_VERSION=$($IPVSADM --version | cut -d " " -f 2)
+
+get_status() {
+    if echo $PS | grep " \[ipvs[ _]sync$1\]$" > /dev/null; then
+        echo "running"
+        return 3
+    fi
+
+    echo "stopped"
+    return 0
+}
+
+status() {
+    echo -n "$1 "
+    get_status $1
+    RC=$?
+
+    pid=$(echo "$PS" | sed -e '/ \[ipvs[ _]syncmaster\]$/!d' -e 's/^ *//' -e 's/ .*$//')
+    if [ ! -z "$pid" ]; then
+        echo "(ipvs_syncmaster pid: $pid)"
+    fi
+
+    pid=$(echo "$PS" | sed -e '/ \[ipvs[ _]syncbackup\]$/!d' -e 's/^ *//' -e 's/ .*$//')
+    if [ ! -z "$pid" ]; then
+        echo "(ipvs_syncbackup pid: $pid)"
+    fi
+
+    return $RC
+}
+
+run_ipvsadm () {
+    $IPVSADM $@
+    rc=$?
+    if [ $rc -ne 0 ]; then
+        echo "ERROR: ipvsadm $@ failed."
+        return $rc
+    fi
+
+    return 0
+}
+
+ying_yan() {
+    if [ "$1" = "master" ]; then
+        echo "backup"
+    else 
+        echo "master"
+    fi
+}
+
+start_stop() {
+    YING=$1
+    YANG=$2
+
+    if [ $(get_status $YING) = "running" ]; then
+        return 0
+    fi
+
+    if [ $(get_status $YANG) = "running" ]; then
+        if [ "$IPVSADM_VERSION" = "v1.21" ]; then
+            run_ipvsadm --stop-daemon || return $?
+	else
+            run_ipvsadm --stop-daemon $YANG || return $?
+	fi
+        ha_log "info: ipvs_sync$YANG down"
+    fi
+
+    run_ipvsadm --start-daemon $YING --mcast-interface=$IFACE || return $?
+
+    ha_log "info: ipvs_sync$YING up"
+    return 0
+}
+
+start() {
+    start_stop $1 $(ying_yan $1) || return $?
+    ha_log "info: ipvs_sync$YING obtained"
+    return 0
+}
+
+stop() {
+    start_stop $(ying_yan $1) $1 || return $?
+    ha_log "info: ipvs_sync$YANG released"
+    return 0
+}
+
+cleanup() {
+    if [ $(get_status master) = "running" ]; then
+            YING=master
+    elif [ $(get_status backup) = "running" ]; then
+            YING=backup
+    else
+        return 0
+    fi
+
+    
+    run_ipvsadm --stop-daemon || return $?
+    if [ "$IPVSADM_VERSION" = "v1.21" ]; then
+        run_ipvsadm --stop-daemon || return $?
+    else
+        run_ipvsadm --stop-daemon $YANG || return $?
+    fi
+    ha_log "info: ipvs_sync$YING down"
+    return 0
+}
+
+usage() {
+  echo -e $USAGE >&2
+}
+
+if
+    [ $# -lt 2 -o $# -gt 3 ]
+then
+    usage
+    exit 1
+fi
+
+PS=$(ps ax | grep " \[ipvs[ _]sync")
+
+if [ $# -eq 3 ]
+then
+    CMD=$3
+    IFACE=$2
+else
+    CMD=$2
+    IFACE=eth0
+fi
+
+case $CMD in
+    start)
+        start $1
+        ;;
+    stop)
+        stop $1
+        ;;
+    status)
+        status $1
+        ;;
+    monitor)
+        status $1
+        ;;
+    cleanup)
+        cleanup $1
+        ;;
+    *)
+        usage
+        exit 1
+        ;;
+esac
+
+exit $?
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/MailTo /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/MailTo
--- heartbeat-2.1.3/resources/heartbeat/MailTo	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/MailTo	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Description:	wrapper of OCF RA MailTo, based on original heartbeat RA.
+#		See OCF RA MailTo for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+#	This can be given in the haresources file as:
+#		MailTo::alanr@unix.sh::BigImportantWebServer
+#		MailTo::alanr@unix.sh,spoppi@gmx.de::BigImportantWebServer
+#
+#	This will then be put into the message subject and body.
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+  echo "Usage: $0 <email> [<subject>] $LEGAL_ACTIONS"
+  exit 1
+}
+
+case "$#" in
+  0|1)	echo "At least 1 Email address has to be given!"
+    	usage
+	;;
+  2)	
+	cmd=$2
+	OCF_RESKEY_email=$1
+	export OCF_RESKEY_email
+	;;
+  3)	
+	cmd=$3
+	OCF_RESKEY_email=$1
+	OCF_RESKEY_subject=$2
+	export OCF_RESKEY_email OCF_RESKEY_subject
+    	;;
+  *)	echo "Additional parameters found: $# but max. 3 are allowed!"
+	usage;;
+esac
+
+OCF_TYPE=MailTo
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf $cmd
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Makefile
--- heartbeat-2.1.3/resources/heartbeat/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,610 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# resources/heartbeat/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources/heartbeat
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources/heartbeat
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+MAINTAINERCLEANFILES = Makefile.in
+harddir = $(sysconfdir)/ha.d/resource.d
+hard_SCRIPTS = IPv6addr	\
+			apache		\
+			AudibleAlarm	\
+			db2		\
+			Delay		\
+			Filesystem	\
+			hto-mapfuncs	\
+			ICP		\
+			ids		\
+			IPaddr		\
+			IPaddr2		\
+			IPsrcaddr	\
+			LinuxSCSI	\
+			LVM		\
+			LVSSyncDaemonSwap \
+			MailTo		\
+			OCF		\
+			portblock	\
+			ServeRAID	\
+			SendArp		\
+			Raid1		\
+			WAS		\
+			WinPopup	\
+			Xinetd
+
+all: all-am
+
+.SUFFIXES:
+$(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
+.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 $(srcdir)/AudibleAlarm.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Delay: $(top_builddir)/config.status $(srcdir)/Delay.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+db2: $(top_builddir)/config.status $(srcdir)/db2.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Filesystem: $(top_builddir)/config.status $(srcdir)/Filesystem.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hto-mapfuncs: $(top_builddir)/config.status $(srcdir)/hto-mapfuncs.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ICP: $(top_builddir)/config.status $(srcdir)/ICP.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ids: $(top_builddir)/config.status $(srcdir)/ids.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+IPaddr: $(top_builddir)/config.status $(srcdir)/IPaddr.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+IPaddr2: $(top_builddir)/config.status $(srcdir)/IPaddr2.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+IPsrcaddr: $(top_builddir)/config.status $(srcdir)/IPsrcaddr.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+IPv6addr: $(top_builddir)/config.status $(srcdir)/IPv6addr.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+LinuxSCSI: $(top_builddir)/config.status $(srcdir)/LinuxSCSI.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+LVM: $(top_builddir)/config.status $(srcdir)/LVM.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+LVSSyncDaemonSwap: $(top_builddir)/config.status $(srcdir)/LVSSyncDaemonSwap.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+MailTo: $(top_builddir)/config.status $(srcdir)/MailTo.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+OCF: $(top_builddir)/config.status $(srcdir)/OCF.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+portblock: $(top_builddir)/config.status $(srcdir)/portblock.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Raid1: $(top_builddir)/config.status $(srcdir)/Raid1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ServeRAID: $(top_builddir)/config.status $(srcdir)/ServeRAID.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+SendArp: $(top_builddir)/config.status $(srcdir)/SendArp.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+WAS: $(top_builddir)/config.status $(srcdir)/WAS.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+WinPopup: $(top_builddir)/config.status $(srcdir)/WinPopup.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+Xinetd: $(top_builddir)/config.status $(srcdir)/Xinetd.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-hardSCRIPTS: $(hard_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-hardSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Makefile.in
--- heartbeat-2.1.3/resources/heartbeat/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/resources/heartbeat/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -49,7 +49,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = apache AudibleAlarm Delay db2 Filesystem \
@@ -93,6 +93,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -110,24 +111,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -189,12 +178,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/OCF /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/OCF
--- heartbeat-2.1.3/resources/heartbeat/OCF	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/OCF	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,153 @@
+#!/bin/sh
+#
+# Copyright: (C) 2003 International Business Machines Corporation
+# Author:	Alan Robertson <alanr@unix.sh>
+# License:      GNU General Public License (GPL)
+# Support:      linux-ha@lists.linux-ha.org
+#
+
+#
+#	OCF resource agent wrapper script for "original" heartbeat
+#	resource system
+#
+#	This allows heartbeat to use OCF resource agents.
+#
+#	They are configured in /etc/ha.d/haresources like this:
+#
+#	OCF::resource-type::resource-instance-name
+#
+#	Note that resource-type must be a script in the ${OCF_AGENTS} directory
+#	and that resource-instance-name must be a configuration file in
+#	${HA_DIR}/conf/OCF/OCF-resource-name/
+#
+
+HA_HBCONF_DIR=/etc/ha.d
+
+# Source function library.
+. $HA_HBCONF_DIR/shellfuncs
+
+# ${HA_DIR} is where things show up
+# ${HA_DIR}/conf/OCF is where we find our resource settings.
+#	One directory per resource type
+#
+# ${OCF_AGENTS} is a directory above where OCF resource agent scripts
+#	are found
+#
+#
+usage() {
+	cat <<-! >&2
+	usage: $0 OCF-resource-name OCF-instance-name operation-name
+
+	OCF-resource-name is the name of an OCF-compliant resource agent
+	script found under an immediate subdirectory of ${OCF_AGENTS}
+
+	OCF-instance-name is the name of an instance of OCF-resource-name.
+	It corresponds to an instance conf file named
+	${HA_DIR}/conf/OCF/OCF-resource-name/OCF-instance-name
+
+	operation-name is one of:
+		start
+		stop
+		status
+		monitor
+
+	!
+	exit 1
+}
+
+#
+#	Official OCF environment variable names
+#
+OCF_RES_VERSION_MAJOR=1
+OCF_RES_VERSION_MAJOR=0
+OCF_RES_NAME=$2
+export OCF_RES_VERSION_MAJOR OCF_RES_VERSION_MAJOR OCF_RES_NAME
+
+ocf_catvars()
+{
+  cat $Resource_Inst_File | sed -e 's%#.*%%' -e 's%^[ 	]*%%' | grep '.'
+}
+
+ocf_varnames()
+{
+  ocf_catvars | grep '=' | sed 's%=.*%%'
+}
+
+ocf_setvars()
+{
+  . $Resource_Inst_File
+  for j in `ocf_varnames`
+  do
+    eval export $j
+  done
+}
+
+ocf_op() {
+  (
+    ocf_setvars
+    $Resource_Script $1
+  )
+}
+
+rname()
+{
+  echo "OCF Resource $Resource_Name::$Resource_Instance"
+}
+
+ocf_status() {
+  statoutput=`OCF_STATUS_QOS=0 ocf_op status`
+  rc=$?
+  case $statoutput in
+    "")	;;
+    *)  ha_log "info: $statoutput"
+  esac
+  if
+    [ $rc -eq 0 ]
+  then
+    case $statoutput in
+      *OK*|*running*)	echo $statoutput;;
+      *)		echo "`rname` is running"
+			;;
+    esac
+    return 0
+  else
+    case $statoutput in
+      *OK*|*running*)	echo "`rname` is stopped"
+			;;
+      *)		echo "$statoutput";;
+    esac
+    return $rc
+  fi
+}
+
+ocf_monitor()
+{
+  OCF_STATUS_QOS=10 ocf_op status
+}
+
+if
+  [ $# -ne 3 ]
+then
+  usage
+fi
+
+Resource_Name=$1
+Resource_Instance=$2
+Operation=$3
+Resource_Inst_File="${HA_DIR}/conf/OCF/${Resource_Name}/${Resource_Instance}"
+Resource_Script=`ls ${OCF_AGENTS}/*/${Resource_Name} 2>/dev/null | head -n 1`
+
+
+if
+  [ ! -f "$Resource_Script" -o ! -x "$Resource_Script" \
+    ! -f "$Resource_Inst_File" ]
+then
+  usage
+fi
+
+
+case $Operation in
+  status)	ocf_status;;
+  monitor)	ocf_monitor;;
+  *)		ocf_op $Operation;;
+esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/portblock /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/portblock
--- heartbeat-2.1.3/resources/heartbeat/portblock	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/portblock	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA portblock, based on original heartbeat RA.
+#		See OCF RA portblock for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+usage()
+{
+    echo "usage: $0 {udp|tcp} portno,portno {block|unblock} $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 3 ]; then
+    usage
+fi
+
+OCF_RESKEY_protocol=$1
+OCF_RESKEY_portno=$2
+OCF_RESKEY_action=$3
+export OCF_RESKEY_action OCF_RESKEY_portno OCF_RESKEY_action
+
+OCF_TYPE=portblock
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1_$2
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf $4 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Raid1 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Raid1
--- heartbeat-2.1.3/resources/heartbeat/Raid1	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/Raid1	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA Raid1, based on original heartbeat RA.
+#		See OCF RA Raid1 for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# usage: $0 <raidtab_config_file> <md_dev_name> {start|stop|status}
+#
+# in /etc/ha.d/haresources, use a line such as:
+# nodea  10.0.0.170 Raid1::/etc/raidtab.md0::/dev/md0 Filesystem::/dev/md0::/data1::ext2
+#
+# The "start" arg starts up the raid device
+# The "stop" arg stops it.  NOTE: all filesystems must be unmounted
+#  and no processes should be accessing the device.
+# The "status" arg just prints out whether the device is running or not
+# 
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <raidtab_config_file> <md_dev_name> $LEGAL_ACTIONS"
+}
+
+if [ $# != 3 ]; then
+    usage
+    exit 1
+fi
+
+OCF_TYPE=Raid1
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_raidconf=$1
+OCF_RESKEY_raiddev=$2
+export OCF_RESKEY_raiddev OCF_RESKEY_raidconf
+ra_execocf $3
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/SendArp /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/SendArp
--- heartbeat-2.1.3/resources/heartbeat/SendArp	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/SendArp	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+#
+#	2006, Huang Zhen <zhen.huang@gmail.com>
+#	convert it to calling OCF counterpart.
+#
+#	Copyright (C) 2004 Horms <horms@verge.net.au>
+#
+#       Based on IPaddr2: Copyright (C) 2003 Tuomo Soini <tis@foobar.fi>
+#
+# 	License:      GNU General Public License (GPL)
+# 	Support:      linux-ha@lists.linux-ha.org
+#
+#	This script send out gratuitous Arp for an IP address
+#
+#       It can be used _instead_ of the IPaddr2 or IPaddr resource
+#       to send gratuitous arp for an IP address on a given interface, 
+#       without adding the address to that interface. I.e. if for
+#       some reason you want to send gratuitous arp for addresses
+#       managed by IPaddr2 or IPaddr on an additional interface.
+#
+#	usage: $0 ip-address[/netmaskbits[/interface[:label][/broadcast]]] \
+#	    {start|stop|status|monitor}
+#
+#	The "start" arg adds an IP alias.
+#
+#	Surprisingly, the "stop" arg removes one.	:-)
+#
+#
+
+set -e
+
+unset LANG; export LANG
+LC_ALL=C
+export LC_ALL
+
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+# We need to split the argument into pieces that IPaddr OCF RA can
+# recognize, sed is prefered over Bash specific builtin functions 
+# for portability.
+
+usage() {
+  echo "usage: $0 ip-address/interface $LEGAL_ACTIONS"
+}
+
+if [ $# != 2 ]; then
+    usage
+    exit 1
+fi
+BASEIP=`echo $1 | sed "s%/.*%%"`
+INTERFACE=`echo $1 | sed "s%${BASEIP}/%%"`
+
+OCF_TYPE=SendArp
+OCF_RESKEY_ip=$BASEIP
+OCF_RESKEY_nic=$INTERFACE
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$BASEIP
+export OCF_TYPE OCF_RESOURCE_INSTANCE OCF_RESKEY_ip OCF_RESKEY_nic
+
+ra_execocf $2
+
+# EOF - end of file
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/ServeRAID /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/ServeRAID
--- heartbeat-2.1.3/resources/heartbeat/ServeRAID	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/ServeRAID	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA ServeRAID, based on original heartbeat RA.
+#		See OCF RA ServeRAID for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# usage: ./ServeRAID <adapter> <MergeGroup#>  {start|stop|status}
+#
+#<adapter>:	Adapter number of the ServeRAID adapter 
+#<MergeGroup#>:	MergeGroup # of the logical drive under consideration.
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 ServeRAID::1::1
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+    echo "usage: $0 <serveraid#> <sharedmergegroup#> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# != 3 ]; then
+    usage
+fi
+
+OCF_TYPE=ServeRAID
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$1
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_serveraid=$1
+OCF_RESKEY_mergegroup=$2
+export OCF_RESKEY_mergegroup OCF_RESKEY_serveraid
+
+ra_execocf $3
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/WAS /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/WAS
--- heartbeat-2.1.3/resources/heartbeat/WAS	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/WAS	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# 
+# Description:	wrapper of OCF RA WAS, based on original heartbeat RA.
+#		See OCF RA WAS for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+# An example usage in /etc/ha.d/haresources: 
+#       node1  10.0.0.170 WAS::/opt/WebSphere/ApplicationServer/config/server-cfg.xml
+#
+# See usage() function below for more details...
+#
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+unset LC_ALL; export LC_ALL
+unset LANGUAGE; export LANGUAGE
+
+usage() {
+  cat <<-! >&1
+	For the single server edition of WAS:
+	usage: $0 [<WAS-configuration file>] $LEGAL_ACTIONS
+
+	For the advanced edition of WAS:
+	usage: $0 [<WAS-(snoop)-port-number>] $LEGAL_ACTIONS
+	!
+  exit 1
+}
+
+case $# in
+  1)
+    op=$1;;
+  2)
+    op=$2
+    if [ -f $1 ]; then
+	OCF_RESKEY_config=$1; export OCF_RESKEY_config
+    else
+	case $1 in
+	    *[!0-9]*)
+		echo "ERROR: $1 is neither a WAS configuration file nor a valid port number!"
+  		usage;;
+	    *)
+		OCF_RESKEY_port=$1; export OCF_RESKEY_port
+		port=$1;;
+	esac
+    fi;;
+  *)
+    usage;;
+esac
+
+OCF_TYPE=WAS
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf $op
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/WAS.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/WAS.in
--- heartbeat-2.1.3/resources/heartbeat/WAS.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/heartbeat/WAS.in	2008-08-18 13:32:19.000000000 +0100
@@ -41,7 +41,7 @@
 	OCF_RESKEY_config=$1; export OCF_RESKEY_config
     else
 	case $1 in
-	    *[^0-9]*)	
+	    *[!0-9]*)
 		echo "ERROR: $1 is neither a WAS configuration file nor a valid port number!"
   		usage;;
 	    *)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/WinPopup /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/WinPopup
--- heartbeat-2.1.3/resources/heartbeat/WinPopup	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/WinPopup	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Resource script for sending WinPopups using smbclient
+# derived from Alan Robertson's MailTo script
+#
+# Author: Sandro Poppi <spoppi@gmx.de>
+#
+# License:      GNU General Public License (GPL)
+# Support:      linux-ha@lists.linux-ha.org
+#
+# Description: sends WinPopups to a sysadmin's workstation
+#	       whenever a takeover occurs.
+#
+#	Note: This command requires an argument, unlike normal init scripts.
+#
+#	This can be given in the haresources file as:
+#
+#		WinPopup::hosts
+#
+#	where "hosts" is a file containing the IPs/Workstation names
+#	one by line to be sent WinPopups
+#
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+usage() {
+  echo "Usage: $0 [workstationfile] $LEGAL_ACTIONS"
+  exit 1
+}
+
+# max. 2 parameters allowed
+if [ $# -gt 2 ] ; then
+  echo "Additional parameters found: $# but only 2 are allowed!"
+  usage
+fi
+
+# See how we were called.
+if [ $# -eq 2 ] ; then
+  # optional parameter found
+  cmd=$2
+  hostfile=$1
+else
+  cmd=$1
+  hostfile="hosts"
+fi
+
+OCF_RESKEY_hostfile=$hostfile
+export OCF_RESKEY_hostfile
+
+OCF_TYPE=WinPopup
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+ra_execocf  $cmd
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/heartbeat/Xinetd /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/heartbeat/Xinetd
--- heartbeat-2.1.3/resources/heartbeat/Xinetd	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/heartbeat/Xinetd	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+#
+# Description:	wrapper of OCF RA Xinetd, based on original heartbeat RA.
+#		See OCF RA Xinetd for more information.
+#
+# Author:	Xun Sun <xunsun@cn.ibm.com> 
+# Support:      linux-ha@lists.linux-ha.org
+# License:      GNU General Public License (GPL)
+# Copyright:	(C) 2005 International Business Machines
+#
+
+# Source function library.
+. /etc/ha.d/resource.d//hto-mapfuncs
+
+xup_usage () {
+    echo "Usage: $0 <xinetd-service-name> $LEGAL_ACTIONS"
+    exit 1
+}
+
+if [ $# -ne 2 ]; then
+    xup_usage
+fi 
+
+OCF_TYPE=Xinetd
+OCF_RESOURCE_INSTANCE=${OCF_TYPE}
+export OCF_TYPE OCF_RESOURCE_INSTANCE
+
+OCF_RESKEY_service=$1; export OCF_RESKEY_service
+ra_execocf $2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/Makefile
--- heartbeat-2.1.3/resources/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,652 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# resources/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+# Author: Sun Jiang Dong <sunjd@cn.ibm.com>
+# Copyright (c) 2004 International Business Machines
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = OCF heartbeat
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/Makefile.in
--- heartbeat-2.1.3/resources/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/resources/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -88,6 +88,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -105,24 +106,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -184,12 +173,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -458,8 +448,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -484,8 +474,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/apache /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/apache
--- heartbeat-2.1.3/resources/OCF/apache	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/apache	2008-08-18 13:32:19.000000000 +0100
@@ -97,7 +97,7 @@
 
 	validate-all	validate the instance parameters
 	!
-  exit $OCF_ERR_ARGS
+  exit $1
 }
 
 apachecat() {
@@ -538,7 +538,7 @@
   OPTIONS="$OCF_RESKEY_options"
   TESTREGEX=${OCF_RESKEY_testregex:-'</ *body *>[[:space:]]*</ *html *>'}
 else
-  usage
+  usage $OCF_ERR_ARGS
 fi
 
 LSB_STATUS_STOPPED=3
@@ -570,7 +570,7 @@
   	    meta-data)	metadata_apache;;
 	  esac
 	  ocf_log err "No valid httpd found! Please revise your <HTTPDLIST> item"
-          exit $OCF_ERR_CONFIGURED
+          exit $OCF_ERR_INSTALLED
 	fi
 # Let the user know that the $HTTPD used is not the one (s)he specified via $OCF_RESKEY_httpd
         if
@@ -618,5 +618,5 @@
   monitor)	monitor_apache;;
   meta-data)	metadata_apache;;
   validate-all)	validate_all_apache;;
-  *)		usage;;
+  *)		usage $OCF_ERR_UNIMPLEMENTED;;
 esac
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/AudibleAlarm /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/AudibleAlarm
--- heartbeat-2.1.3/resources/OCF/AudibleAlarm	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/AudibleAlarm	2008-08-18 13:32:19.000000000 +0100
@@ -150,7 +150,7 @@
 	exit $OCF_SUCCESS
 	;;
    start)
-	for arg in "$OCF_RESKEY_nodelist"
+	for arg in $OCF_RESKEY_nodelist
  	  do
 	    if [ "$us" = "$arg" ]; then
 	      # We should not start because we are on a host
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/drbd /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/drbd
--- heartbeat-2.1.3/resources/OCF/drbd	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/drbd	2008-08-18 13:32:19.000000000 +0100
@@ -187,7 +187,7 @@
 
 drbd_init() {
 	check_binary $DRBDADM
-	CRM_MASTER=${HA_SBIN_DIR}/crm_master
+	CRM_MASTER="${HA_SBIN_DIR}/crm_master -l reboot "
 	
 	RESOURCE="$OCF_RESKEY_drbd_resource"
 	CLONE_NO="$OCF_RESKEY_CRM_meta_clone"
@@ -301,20 +301,20 @@
 	# TODO: This is probably way too complex. 
 	case $DRBD_CSTATE in
 	Connected) 
-		do_cmd $CRM_MASTER -v 75 -l reboot
+		do_cmd $CRM_MASTER -v 75
 		;;
 	SyncSource|PausedSyncS|WFBitMapS|SkippedSyncS)
-		do_cmd $CRM_MASTER -v 100 -l reboot
+		do_cmd $CRM_MASTER -v 100
 		;;
         # TODO:
         # (Inconsistent || Diskless && WFConnection) should be -infinity
 	# This one implies we'll try to promote even on disconnected
 	# nodes, but that might not work.
 	WFConnection) 
-		do_cmd $CRM_MASTER -v 10 -l reboot
+		do_cmd $CRM_MASTER -v 10
 		;;
 	*)
-		do_cmd $CRM_MASTER -v 5 -l reboot
+		do_cmd $CRM_MASTER -v 5
 		;;
 	esac
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Dummy /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Dummy
--- heartbeat-2.1.3/resources/OCF/Dummy	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Dummy	2008-08-18 13:32:19.000000000 +0100
@@ -67,7 +67,7 @@
 <action name="migrate_to"   timeout="100" />
 <action name="migrate_from" timeout="90" />
 <action name="meta-data"    timeout="5" />
-<action name="verify-all"   timeout="30" />
+<action name="validate-all"   timeout="30" />
 </actions>
 </resource-agent>
 END
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/EvmsSCC /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/EvmsSCC
--- heartbeat-2.1.3/resources/OCF/EvmsSCC	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/EvmsSCC	2008-08-18 13:32:19.000000000 +0100
@@ -70,8 +70,8 @@
 <action name="start" timeout="60" />
 <action name="stop" timeout="60" />
 <action name="notify" timeout="60" />
-<action name="status" depth="0" timeout="10" interval="10" start-delay="10" />
-<action name="monitor" depth="0" timeout="10" interval="10" start-delay="10" />
+<action name="status" depth="0" timeout="10" interval="10" />
+<action name="monitor" depth="0" timeout="10" interval="10" />
 <action name="meta-data" timeout="5" />
 </actions>
 </resource-agent>
@@ -151,7 +151,7 @@
                 while [ -n "$EVMS_OUTPUT" ] ; do
                         EVMS_OUTPUT=`evms_activate 2>&1`
                         if [ -n "$EVMS_OUTPUT" ] ; then
-                                SLEEP_TIME=$(($RANDOM % 40))
+                                SLEEP_TIME=$(($(ocf_maybe_random) % 40))
                                 ocf_log info "EvmsSCC: Evms call failed - sleeping for $SLEEP_TIME seconds and then trying again."
                                 sleep $SLEEP_TIME
                         else
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Filesystem /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Filesystem
--- heartbeat-2.1.3/resources/OCF/Filesystem	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Filesystem	2008-08-18 13:32:19.000000000 +0100
@@ -188,7 +188,7 @@
 }
 
 determine_blockdevice() {
-	if [ $blockdevice == "yes" ]; then
+	if [ $blockdevice = "yes" ]; then
 		return
 	fi
 
@@ -301,7 +301,7 @@
 	else
 		OCFS2_CLUSTER=$(find "$OCFS2_CONFIGFS" -maxdepth 1 -mindepth 1 -type d -printf %f 2>/dev/null)
 		set -- $OCFS2_CLUSTER
-		local n="$#"
+		local n; n="$#"
 		if [ $n -gt 1 ]; then
 			ocf_log err "$OCFS2_CLUSTER: several clusters found."
 			exit $OCF_ERR_GENERIC
@@ -453,11 +453,11 @@
 		return $OCF_ERR_UNIMPLEMENTED
 	fi
 
-	local n_type="$OCF_RESKEY_CRM_meta_notify_type"
-	local n_op="$OCF_RESKEY_CRM_meta_notify_operation"
-	local n_active="$OCF_RESKEY_CRM_meta_notify_active_uname"
-	local n_stop="$OCF_RESKEY_CRM_meta_notify_stop_uname"
-	local n_start="$OCF_RESKEY_CRM_meta_notify_start_uname"
+	local n_type; n_type="$OCF_RESKEY_CRM_meta_notify_type"
+	local n_op; n_op="$OCF_RESKEY_CRM_meta_notify_operation"
+	local n_active; n_active="$OCF_RESKEY_CRM_meta_notify_active_uname"
+	local n_stop; n_stop="$OCF_RESKEY_CRM_meta_notify_stop_uname"
+	local n_start; n_start="$OCF_RESKEY_CRM_meta_notify_start_uname"
 
 	ocf_log info "$OCFS2_UUID: notify: $n_type for $n_op"
 	ocf_log info "$OCFS2_UUID: notify active: $n_active"
@@ -477,7 +477,7 @@
 			# Duplicate removal - start can contain nodes
 			# already on the active list, confusing the
 			# script later on:
-			for UNAME in "$n_active"; do
+			for UNAME in $n_active; do
 				n_start=`echo ${n_start} | sed s/$UNAME//`
 			done
 			# Merge pruned lists again:
@@ -490,7 +490,7 @@
 		stop)
 			# remove unames from notify_stop_uname; these have been
 			# stopped and can no longer be considered active.
-			for UNAME in "$n_stop"; do
+			for UNAME in $n_stop; do
 				n_active=`echo ${n_active} | sed s/$UNAME//`
 			done
 			;;
@@ -506,7 +506,7 @@
 
 	ocf_log info "$OCFS2_UUID: post-processed active: $n_active"
 
-	local n_myself=${HA_CURHOST:-$(uname -n | tr '[A-Z]' '[a-z]')}
+	local n_myself; n_myself=${HA_CURHOST:-$(uname -n | tr '[A-Z]' '[a-z]')}
 	ocf_log info "$OCFS2_UUID: I am node $n_myself."
 
 	case " $n_active " in
@@ -605,7 +605,7 @@
 					if [ "X${HOSTOS}" = "XOpenBSD" ];then
 						PIDS=`fstat | grep ${SUB} | awk '{print $3}'`
 						for PID in ${PIDS};do
-							kill -9 ${PID}
+							kill -s 9 ${PID}
 							ocf_log info "Sent kill -9 to ${PID}"
 						done
 					else
@@ -627,9 +627,11 @@
 
 	flushbufs $DEVICE
 
-	if [ "$FSTYPE" = "ocfs2" ]; then
-		ocfs2_init
-		ocfs2_cleanup
+	if [ $rc -eq $OCF_SUCCESS ]; then
+		if [ "$FSTYPE" = "ocfs2" ]; then
+			ocfs2_init
+			ocfs2_cleanup
+		fi
 	fi
 
 	return $rc
@@ -727,9 +729,9 @@
 	;;
 -*) # Oh... An option to mount instead...  Typically -U or -L
 	;;
-[^/]*:/*)	# An NFS filesystem specification...
+[!/]*:/*)	# An NFS filesystem specification...
 	;;
-//[^/]*/*)	# An SMB filesystem specification...
+//[!/]*/*)	# An SMB filesystem specification...
 	;;
 /dev/null)	# Special case for BSC
 	blockdevice=yes
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/ids /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/ids
--- heartbeat-2.1.3/resources/OCF/ids	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/ids	2008-08-18 13:32:19.000000000 +0100
@@ -674,6 +674,15 @@
 #
 ###
 
+case "$1" in
+	usage)
+		ids_usage
+		exit $?;;
+	meta-data)
+		ids_meta_data
+		exit $?;;
+esac
+
 # Validate configuration (parameters and such) 
 # passed to this script and only process the method parameter
 # if the configuration is valid! Otherwise exit with OCF_ERR_ARGS error code.
@@ -720,14 +729,6 @@
 		ids_methods
 		exit $?;;
 
-	usage)
-		ids_usage
-		exit $?;;
-
-	meta-data)
-		ids_meta_data
-		exit $?;;
-
 	*)
 		ids_log error "mainsection: no or invalid command supplied: $1"
 		exit $OCF_ERR_UNIMPLEMENTED;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/IPaddr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/IPaddr
--- heartbeat-2.1.3/resources/OCF/IPaddr	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/IPaddr	2008-08-18 13:32:19.000000000 +0100
@@ -247,9 +247,10 @@
     CMD="OCF_RESKEY_cidr_netmask=32 OCF_RESKEY_ip=$1 OCF_RESKEY_nic=$ifname $FINDIF"
     if
       NICINFO=`eval $CMD`
+      NICINFO=`echo $NICINFO | tr -s " "`
     then
-	netmask_text=`echo "$NICINFO" | cut -f2 -d " "`
-	broadcast=`echo "$NICINFO" | cut -f3 -d " "`
+	netmask_text=`echo "$NICINFO" | cut -f3 -d " "`
+	broadcast=`echo "$NICINFO" | cut -f5 -d " "`
     else
 	echo "ERROR: $CMD failed (rc=$rc)"
 	exit $OCF_ERR_GENERIC
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/IPaddr2 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/IPaddr2
--- heartbeat-2.1.3/resources/OCF/IPaddr2	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/IPaddr2	2008-08-18 13:32:19.000000000 +0100
@@ -173,7 +173,16 @@
 
 </longdesc>
 <shortdesc lang="en">Cluster IP hashing function</shortdesc>
-<content type="string" default="sourceip-sourceport-destport"/>
+<content type="string" default="sourceip-sourceport"/>
+</parameter>
+
+<parameter name="unique_clone_address">
+<longdesc lang="en">
+If true, add the clone ID to the supplied value of ip to create
+a unique address to manage 
+</longdesc>
+<shortdesc lang="en">Create a unique address for cloned instances</shortdesc>
+<content type="boolean" default="false"/>
 </parameter>
 
 <parameter name="arp_interval">
@@ -268,8 +277,8 @@
 	fi
 
 	IP_INC_GLOBAL=${OCF_RESKEY_CRM_meta_clone_max:-1}
-	IP_INC_NO=`expr $OCF_RESKEY_CRM_meta_clone + 1`
-	IP_CIP_HASH="${OCF_RESKEY_clusterip_hash}"
+	IP_INC_NO=`expr ${OCF_RESKEY_CRM_meta_clone:-0} + 1`
+	IP_CIP_HASH="${OCF_RESKEY_clusterip_hash:-'sourceip-sourceport'}"
 
 	if [ $LVS_SUPPORT -gt 0 ] && [ $IP_INC_GLOBAL -gt 1 ]; then
 		ocf_log err "LVS and load sharing do not go together well"
@@ -542,7 +551,7 @@
 	fi
 
 	# Special handling for the CIP:
-	if grep -q "^${IP_INC_NO},\|,${IP_INC_NO},\|,${IP_INC_NO}$\|^${IP_INC_NO}$" $IP_CIP_FILE ; then
+	if egrep -q "(^|,)${IP_INC_NO}(,|$)" $IP_CIP_FILE ; then
 		echo "ok"
 		return 0
 	else
@@ -758,7 +767,7 @@
 	fi
 
 	case $IF_MAC in
-	[0-9a-zA-Z][1379bBdDfF][^0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][^0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][^0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][^0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][^0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z])
+	[0-9a-zA-Z][1379bBdDfF][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z][!0-9a-zA-Z][0-9a-zA-Z][0-9a-zA-Z])
 		;;
 	*)
 		valid=0
@@ -775,6 +784,16 @@
 	exit $OCF_SUCCESS
 }
 
+case "$OCF_RESKEY_unique_clone_address" in
+  true|TRUE|True|yes|YES|Yes|1)
+    prefix=`echo $OCF_RESKEY_ip | awk -F. '{print $1"."$2"."$3}'`
+    suffix=`echo $OCF_RESKEY_ip | awk -F. '{print $4}'`
+    suffix=`expr ${OCF_RESKEY_CRM_meta_clone:-0} + $suffix`
+    OCF_RESKEY_ip="$prefix.$suffix"
+    ;;
+  *) ;;
+esac
+
 case $__OCF_ACTION in
 meta-data)	meta_data
 		;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/IPsrcaddr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/IPsrcaddr
--- heartbeat-2.1.3/resources/OCF/IPsrcaddr	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/IPsrcaddr	2008-08-18 13:32:19.000000000 +0100
@@ -212,7 +212,7 @@
 CheckIP() {
   ip="$1"
   case $ip in
-    *[^0-9.]*) #got invalid char
+    *[!0-9.]*) #got invalid char
 	false;;
     .*|*.) #begin or end by ".", which is invalid
 	false;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/MailTo /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/MailTo
--- heartbeat-2.1.3/resources/OCF/MailTo	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/MailTo	2008-08-18 13:32:19.000000000 +0100
@@ -83,7 +83,7 @@
 }
 
 MailProgram() {
-	mail -s "$1" "$email"  <<EOF
+	$MAILCMD -s "$1" "$email"  <<EOF
         $Subject
  
         Command line was:
@@ -135,7 +135,7 @@
 	local local_email=`echo $email | tr ",\t" " " | tr -s " "`
 
 #	ocf_log info "[$local_email]"
-	for item in "$local_email"
+	for item in $local_email
 	do
 	    case $item in
 		*?@?*)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Makefile
--- heartbeat-2.1.3/resources/OCF/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/OCF/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,777 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# resources/OCF/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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)$(dtddir)" "$(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)
+dtdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(common_SCRIPTS) $(dtd_SCRIPTS) $(ocf_SCRIPTS)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources/OCF
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/resources/OCF
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+# Makefile.am for OCF RAs
+#
+# Author: Sun Jing Dong
+# Copyright (C) 2004 IBM
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = $(ocf_SCRIPTS) ra-api-1.dtd
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
+dtddir = $(HA_NOARCHDATAHBDIR)
+ocfdir = /usr/lib/ocf/resource.d//heartbeat
+dtd_SCRIPTS = ra-api-1.dtd
+gliblib = -lglib-2.0  
+IPv6addr_SOURCES = IPv6addr.c
+IPv6addr_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la    \
+                        $(gliblib) -lnet
+
+ocf_SCRIPTS = ClusterMon 	\
+			Dummy		\
+		        IPaddr		\
+		        IPaddr2		\
+		        drbd		\
+			apache		\
+			AudibleAlarm	\
+			db2		\
+			Delay		\
+			drbd		\
+			eDir88		\
+			EvmsSCC		\
+			Evmsd		\
+			Filesystem	\
+			ids		\
+			iscsi		\
+			ICP		\
+			IPsrcaddr	\
+			LinuxSCSI	\
+			LVM		\
+			MailTo		\
+			ManageRAID	\
+			ManageVE	\
+			mysql		\
+			o2cb		\
+			oracle		\
+			oralsnr		\
+			pingd		\
+			portblock	\
+			pgsql		\
+			Pure-FTPd	\
+			Raid1		\
+			rsyncd		\
+			SAPDatabase	\
+			SAPInstance	\
+			SendArp		\
+			ServeRAID	\
+			SphinxSearchDaemon	\
+			Stateful	\
+			SysInfo		\
+			tomcat		\
+			VIPArip		\
+			WAS		\
+			WAS6		\
+			WinPopup	\
+			Xen		\
+			Xinetd		\
+			.ocf-shellfuncs	 \
+			.ocf-binaries	 \
+			.ocf-directories \
+			.ocf-returncodes
+
+commondir = /usr/lib/heartbeat
+# Legacy locations
+common_SCRIPTS = ocf-shellfuncs ocf-returncodes
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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 $(srcdir)/.ocf-directories.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+.ocf-shellfuncs: $(top_builddir)/config.status $(srcdir)/.ocf-shellfuncs.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ocf-returncodes: $(top_builddir)/config.status $(srcdir)/ocf-returncodes.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ocf-shellfuncs: $(top_builddir)/config.status $(srcdir)/ocf-shellfuncs.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-ocfPROGRAMS: $(ocf_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ocfPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ocfdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ocfPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ocfdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-ocfPROGRAMS:
+	@$(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"; \
+	done
+
+clean-ocfPROGRAMS:
+	@list='$(ocf_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+IPv6addr$(EXEEXT): $(IPv6addr_OBJECTS) $(IPv6addr_DEPENDENCIES) 
+	@rm -f IPv6addr$(EXEEXT)
+	$(LINK) $(IPv6addr_OBJECTS) $(IPv6addr_LDADD) $(LIBS)
+install-commonSCRIPTS: $(common_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-commonSCRIPTS:
+	@$(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"; \
+	done
+install-dtdSCRIPTS: $(dtd_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-dtdSCRIPTS:
+	@$(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"; \
+	done
+install-ocfSCRIPTS: $(ocf_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-ocfSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/IPv6addr.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(ocfdir)" "$(DESTDIR)$(commondir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(ocfdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-ocfPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-commonSCRIPTS install-dtdSCRIPTS \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-commonSCRIPTS uninstall-dtdSCRIPTS \
+	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 html html-am info info-am \
+	install install-am install-commonSCRIPTS install-data \
+	install-data-am install-dtdSCRIPTS 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-dtdSCRIPTS \
+	uninstall-ocfPROGRAMS 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Makefile.am /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Makefile.am
--- heartbeat-2.1.3/resources/OCF/Makefile.am	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Makefile.am	2008-08-18 13:32:19.000000000 +0100
@@ -18,11 +18,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST		= $(ocf_SCRIPTS)
+EXTRA_DIST		= $(ocf_SCRIPTS) ra-api-1.dtd
 
 INCLUDES		= -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
 
-ocfdir		     = @OCF_RA_DIR@/heartbeat
+dtddir			= $(HA_NOARCHDATAHBDIR)
+ocfdir		    = @OCF_RA_DIR@/heartbeat
+
+dtd_SCRIPTS		= ra-api-1.dtd
 
 gliblib                 = @GLIBLIB@
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Makefile.in
--- heartbeat-2.1.3/resources/OCF/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Makefile.in	2008-08-18 23:38:09.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -44,13 +44,13 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 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)"
+	"$(DESTDIR)$(dtddir)" "$(DESTDIR)$(ocfdir)"
 ocfPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(ocf_PROGRAMS)
 am_IPv6addr_OBJECTS = IPv6addr.$(OBJEXT)
@@ -59,9 +59,10 @@
 IPv6addr_DEPENDENCIES = $(top_builddir)/lib/clplumbing/libplumb.la \
 	$(am__DEPENDENCIES_1)
 commonSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+dtdSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 ocfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(common_SCRIPTS) $(ocf_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+SCRIPTS = $(common_SCRIPTS) $(dtd_SCRIPTS) $(ocf_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -109,6 +110,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -126,24 +128,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -205,12 +195,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -366,9 +357,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(ocf_SCRIPTS)
+EXTRA_DIST = $(ocf_SCRIPTS) ra-api-1.dtd
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
+dtddir = $(HA_NOARCHDATAHBDIR)
 ocfdir = @OCF_RA_DIR@/heartbeat
+dtd_SCRIPTS = ra-api-1.dtd
 gliblib = @GLIBLIB@
 IPv6addr_SOURCES = IPv6addr.c
 IPv6addr_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la    \
@@ -481,8 +474,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ocfPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ocfdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(ocfPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ocfdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -522,6 +515,25 @@
 	  echo " rm -f '$(DESTDIR)$(commondir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(commondir)/$$f"; \
 	done
+install-dtdSCRIPTS: $(dtd_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-dtdSCRIPTS:
+	@$(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"; \
+	done
 install-ocfSCRIPTS: $(ocf_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(ocfdir)" || $(MKDIR_P) "$(DESTDIR)$(ocfdir)"
@@ -582,8 +594,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -595,8 +607,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -606,13 +618,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -655,7 +666,7 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS)
 installdirs:
-	for dir in "$(DESTDIR)$(ocfdir)" "$(DESTDIR)$(commondir)" "$(DESTDIR)$(ocfdir)"; do \
+	for dir in "$(DESTDIR)$(ocfdir)" "$(DESTDIR)$(commondir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(ocfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -703,8 +714,8 @@
 
 info-am:
 
-install-data-am: install-commonSCRIPTS install-ocfPROGRAMS \
-	install-ocfSCRIPTS
+install-data-am: install-commonSCRIPTS install-dtdSCRIPTS \
+	install-ocfPROGRAMS install-ocfSCRIPTS
 
 install-dvi: install-dvi-am
 
@@ -740,8 +751,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-commonSCRIPTS uninstall-ocfPROGRAMS \
-	uninstall-ocfSCRIPTS
+uninstall-am: uninstall-commonSCRIPTS uninstall-dtdSCRIPTS \
+	uninstall-ocfPROGRAMS uninstall-ocfSCRIPTS
 
 .MAKE: install-am install-strip
 
@@ -750,16 +761,16 @@
 	distclean-compile distclean-generic distclean-libtool \
 	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-data-am install-dtdSCRIPTS 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
+	uninstall-am uninstall-commonSCRIPTS uninstall-dtdSCRIPTS \
+	uninstall-ocfPROGRAMS 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.
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/mysql /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/mysql
--- heartbeat-2.1.3/resources/OCF/mysql	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/mysql	2008-08-18 13:32:19.000000000 +0100
@@ -9,7 +9,8 @@
 # Author:	Alan Robertson 		: DB2 Script
 # Author:	Jakub Janczak  		: Rewrite as MySQL
 # Author:	Andrew Beekhof 		: Cleanup and import
-# Author:	Sebastian Reitenbach 	: add OpenBSD defaults, more cleanup
+# Author:	Sebastian Reitenbach    : add OpenBSD defaults, more cleanup
+# Author:  Narayan Newton      : Add Gentoo/Debian defaults
 #
 # Support:	linux-ha@lists.linux-ha.org
 # License:	GNU General Public License (GPL)
@@ -44,7 +45,7 @@
 
 # Fill in some defaults if no values are specified
 HOSTOS=`uname`
-if [ "X${HOSTOS}" == "XOpenBSD" ];then
+if [ "X${HOSTOS}" = "XOpenBSD" ];then
 OCF_RESKEY_binary_default="/usr/local/bin/mysqld_safe"
 OCF_RESKEY_config_default="/etc/my.cnf"
 OCF_RESKEY_datadir_default="/var/mysql"
@@ -185,7 +186,7 @@
 The socket to be used for mysqld.
 </longdesc>
 <shortdesc lang="en">MySQL socket</shortdesc>
-<content type="string" default="${OCF_RESKEY_pid_default}"/>
+<content type="string" default="${OCF_RESKEY_socket_default}"/>
 </parameter>
 
 <parameter name="test_table" unique="0" required="0">
@@ -193,7 +194,7 @@
 Table to be tested in monitor statement (in database.table notation)
 </longdesc>
 <shortdesc lang="en">MySQL test table</shortdesc>
-<content type="string" default="OCF_RESKEY_test_table_default" />
+<content type="string" default="${OCF_RESKEY_test_table_default}" />
 </parameter>
 
 <parameter name="test_user" unique="0" required="0">
@@ -201,7 +202,7 @@
 MySQL test user
 </longdesc>
 <shortdesc lang="en">MySQL test user</shortdesc>
-<content type="string" default="OCF_RESKEY_test_user_default" />
+<content type="string" default="${OCF_RESKEY_test_user_default}" />
 </parameter>
 
 <parameter name="test_passwd" unique="0" required="0">
@@ -247,24 +248,24 @@
 # checking the parameters
     if [ ! -f $OCF_RESKEY_config ]; then
 	ocf_log err "Config $OCF_RESKEY_mysql_config doesn't exist";
-	exit $OCF_ERR_ARGS;
+	exit $OCF_ERR_INSTALLED;
     fi
     
     if [ ! -d $OCF_RESKEY_datadir ]; then
 	ocf_log err "Datadir $OCF_RESKEY_datadir dosen't exist";
-	exit $OCF_ERR_ARGS;
+	exit $OCF_ERR_INSTALLED;
     fi
     
     getent passwd $OCF_RESKEY_user >/dev/null 2>&1
     if [ ! $? -eq 0 ]; then
 	ocf_log err "User $OCF_RESKEY_user doesn't exit";
-	exit $OCF_ERR_ARGS;
+	exit $OCF_ERR_INSTALLED;
     fi
     
     getent group $OCF_RESKEY_group >/dev/null 2>&1
     if [ ! $? -eq 0 ]; then
 	ocf_log err "Group $OCF_RESKEY_group doesn't exist";
-	exit $OCF_ERR_ARGS;
+	exit $OCF_ERR_INSTALLED;
     fi
 }
 
@@ -313,7 +314,7 @@
 
 mysql_start() {
     mysql_status
-    if [ $? == $OCF_SUCCESS ]; then
+    if [ $? = $OCF_SUCCESS ]; then
 	ocf_log info "MySQL already running"
 	return $OCF_SUCCESS
     fi
@@ -323,7 +324,7 @@
     chmod 0640 $OCF_RESKEY_log
     [ -x /sbin/restorecon ] && /sbin/restorecon $OCF_RESKEY_log
     
-    if [ $OCF_RESKEY_enable_creation -a ! -d $OCF_RESKEY_datadir/mysql ] ; then	
+    if [ "$OCF_RESKEY_enable_creation" = 1 -a ! -d $OCF_RESKEY_datadir/mysql] ; then	
         ocf_log info "Initializing MySQL database: " 
 	$MYSQL_BINDIR/mysql_install_db --datadir=$OCF_RESKEY_datadir
         rc=$?
@@ -334,6 +335,20 @@
         chown -R $OCF_RESKEY_user:$OCF_RESKEY_group $OCF_RESKEY_datadir
     fi
 
+    pid_dir=`dirname $OCF_RESKEY_pid`
+    if [ ! -d $pid_dir ] ; then
+	ocf_log info "Creating PID dir: $pid_dir"
+	mkdir -p $pid_dir
+	chown $OCF_RESKEY_user:$OCF_RESKEY_group $pid_dir
+    fi
+
+    socket_dir=`dirname $OCF_RESKEY_socket`
+    if [ ! -d $socket_dir ] ; then
+	ocf_log info "Creating socket dir: $socket_dir"
+	mkdir -p $socket_dir
+	chown $OCF_RESKEY_user:$OCF_RESKEY_group $socket_dir
+    fi
+
     # Uncomment to perform permission clensing
     # - not convinced this should be enabled by default
     #
@@ -386,7 +401,7 @@
     while [ $stop_wait = 1 ]; do
 	mysql_status
 	rc=$?
-	if [ $rc == $OCF_NOT_RUNNING ]; then
+	if [ $rc = $OCF_NOT_RUNNING ]; then
 	    stop_wait=0
 	fi
         sleep 1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/o2cb /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/o2cb
--- heartbeat-2.1.3/resources/OCF/o2cb	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/o2cb	2008-08-18 13:32:19.000000000 +0100
@@ -51,11 +51,13 @@
 
 <longdesc lang="en">
 
-This script manages the Oracle Cluster membership layer. It obsoletes
-manual configuration of the nodes in /etc/ocfs2/cluster.conf, and
-automates the discovery of the IP addresses uses by o2cb. It should be
-used below one or more ocfs2 mounts managed by Filesystem.
+This script manages the Oracle Cluster membership layer. It might
+eventually obsolete manual configuration of the nodes in
+/etc/ocfs2/cluster.conf, and automates the discovery of the IP addresses
+uses by o2cb. It should be used below one or more ocfs2 mounts managed
+by Filesystem.
 
+THIS IS EXPERIMENTAL AND SHOULD ONLY BE USED FOR TESTING!
 </longdesc>
 <shortdesc lang="en">OCFS2 membership layer manager.</shortdesc>
 
@@ -176,7 +178,7 @@
 	# Duplicate removal - start can contain nodes
 	# already on the active list, confusing the
 	# script later on:
-	for UNAME in "$n_active"; do
+	for UNAME in $n_active; do
 		n_start="${n_start//$UNAME/}"
 	done
 
@@ -311,7 +313,7 @@
 		;;
 esac
 
-RCO2CB=INITDIR/o2cb
+RCO2CB=$INITDIR/o2cb
 # RCO2CB=/etc/init.d/o2cb
 
 if [ ! -x $RCO2CB ]; then
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/.ocf-binaries /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/.ocf-binaries
--- heartbeat-2.1.3/resources/OCF/.ocf-binaries	2007-12-21 20:45:52.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/.ocf-binaries	2008-12-29 22:12:09.000000000 +0000
@@ -7,14 +7,13 @@
 export PATH
 
 # Binaries and binary options for use in Resource Agents
-: ${AWK:=/usr/bin/gawk}
+: ${AWK:=/usr/bin/mawk}
 : ${EGREP:="/bin/grep -E"}
 : ${IFCONFIG_A_OPT:="-a"}
-: ${MAILCMD:=/bin/mail}
-: ${MKTEMP:=/bin/mktemp}
+: ${MAILCMD:=mailx}
 : ${PING:=/bin/ping}
-: ${RPM:=/usr/bin/rpmbuild}
-: ${SH:=/bin/sh}
+: ${RPM:=}
+: ${SH:=/bin/bash}
 : ${TEST:=/usr/bin/test}
 : ${TESTPROG:=/usr/bin/test}
 
@@ -48,7 +47,6 @@
 : ${SCP:=scp}
 : ${SSH:=ssh}
 : ${SWIG:=swig}
-: ${MKTEMP:=mktemp}
 : ${GZIP_PROG:=gzip}
 : ${TAR:=tar}
 : ${MD5:=md5}
@@ -73,7 +71,7 @@
 
 have_binary () {
     bin=`echo $1 | sed -e 's/ -.*//'`
-    if [ -x "`which $bin`" ] ; then
+    if [ -x "`which $bin`" ] >/dev/null 2>&1 ; then
 	return 0
     fi
     return 1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/.ocf-binaries.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/.ocf-binaries.in
--- heartbeat-2.1.3/resources/OCF/.ocf-binaries.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/.ocf-binaries.in	2008-08-18 13:32:19.000000000 +0100
@@ -11,7 +11,6 @@
 : ${EGREP:="@EGREP@"}
 : ${IFCONFIG_A_OPT:="@IFCONFIG_A_OPT@"}
 : ${MAILCMD:=@MAILCMD@}
-: ${MKTEMP:=@MKTEMP@}
 : ${PING:=@PING@}
 : ${RPM:=@RPM@}
 : ${SH:=@SHELL@}
@@ -48,7 +47,6 @@
 : ${SCP:=scp}
 : ${SSH:=ssh}
 : ${SWIG:=swig}
-: ${MKTEMP:=mktemp}
 : ${GZIP_PROG:=gzip}
 : ${TAR:=tar}
 : ${MD5:=md5}
@@ -73,7 +71,7 @@
 
 have_binary () {
     bin=`echo $1 | sed -e 's/ -.*//'`
-    if [ -x "`which $bin`" ] ; then
+    if [ -x "`which $bin`" ] >/dev/null 2>&1 ; then
 	return 0
     fi
     return 1
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/ocf-returncodes /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/ocf-returncodes
--- heartbeat-2.1.3/resources/OCF/ocf-returncodes	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/OCF/ocf-returncodes	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,12 @@
+#
+# Warn about, but continue with, deprecated locations.
+#
+# Copyright (c) 2007 David Lee <t.d.lee@durham.ac.uk>
+#
+# GPL version 2 or later.
+#
+
+. /usr/lib/ocf/resource.d//heartbeat/.ocf-returncodes
+
+ha_log "WARN: Use of /usr/lib/heartbeat/ocf-returncodes is deprecated."
+ha_log "WARN: Please use /usr/lib/ocf/resource.d//heartbeat/.ocf-returncodes instead."
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/.ocf-shellfuncs /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/.ocf-shellfuncs
--- heartbeat-2.1.3/resources/OCF/.ocf-shellfuncs	2007-12-21 20:45:52.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/.ocf-shellfuncs	2008-12-29 22:12:09.000000000 +0000
@@ -58,6 +58,13 @@
 	esac
 }
 
+ocf_maybe_random() {
+	local rnd="$RANDOM"
+	# Something sane-ish in case a shell doesn't support $RANDOM
+	[ -n "$rnd" ] || rnd=$$
+	echo $rnd
+}
+
 # Portability comments:
 # o The following rely on Bourne "sh" pattern-matching, which is usually
 #   that for filename generation (note: not regexp).
@@ -208,19 +215,15 @@
 }
 
 ocf_take_lock() {
-    lockfile=$1
-
-    if [ ! -n $RANDOM ]; then
-	# Something sane-ish in case a shell doesn't support $RANDOM
-	RANDOM=$$
-    fi
+    local lockfile=$1
+    local rnd=$(ocf_maybe_random)
 
-    sleep 0.$RANDOM
+    sleep 0.$rnd
     while 
 	ocf_pidfile_status $lockfile
     do
 	ocf_log info "Sleeping until $lockfile is released..."
-	sleep 0.$RANDOM
+	sleep 0.$rnd
     done
     echo $$ > $lockfile
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/ocf-shellfuncs /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/ocf-shellfuncs
--- heartbeat-2.1.3/resources/OCF/ocf-shellfuncs	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/OCF/ocf-shellfuncs	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,16 @@
+#
+# Warn about, but continue with, deprecated locations.
+#
+# Copyright (c) 2007 David Lee <t.d.lee@durham.ac.uk>
+#
+# GPL version 2 or later.
+#
+
+. /usr/lib/ocf/resource.d//heartbeat/.ocf-shellfuncs
+
+
+ha_log "WARN: Use of /usr/lib/heartbeat/ocf-shellfuncs is deprecated."
+ha_log "WARN: Please use /usr/lib/ocf/resource.d//heartbeat/.ocf-shellfuncs instead."
+ha_log 'WARN: Note that the $OCF_ROOT environment variable points to '"$OCF_ROOT"
+ha_log 'WARN: We recommend using the $OCF_ROOT environment variable'
+ha_log "WARN: Please fix $0 at your earliest convenience"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/.ocf-shellfuncs.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/.ocf-shellfuncs.in
--- heartbeat-2.1.3/resources/OCF/.ocf-shellfuncs.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/.ocf-shellfuncs.in	2008-08-18 13:32:19.000000000 +0100
@@ -58,6 +58,13 @@
 	esac
 }
 
+ocf_maybe_random() {
+	local rnd="$RANDOM"
+	# Something sane-ish in case a shell doesn't support $RANDOM
+	[ -n "$rnd" ] || rnd=$$
+	echo $rnd
+}
+
 # Portability comments:
 # o The following rely on Bourne "sh" pattern-matching, which is usually
 #   that for filename generation (note: not regexp).
@@ -208,19 +215,15 @@
 }
 
 ocf_take_lock() {
-    lockfile=$1
-
-    if [ ! -n $RANDOM ]; then
-	# Something sane-ish in case a shell doesn't support $RANDOM
-	RANDOM=$$
-    fi
+    local lockfile=$1
+    local rnd=$(ocf_maybe_random)
 
-    sleep 0.$RANDOM
+    sleep 0.$rnd
     while 
 	ocf_pidfile_status $lockfile
     do
 	ocf_log info "Sleeping until $lockfile is released..."
-	sleep 0.$RANDOM
+	sleep 0.$rnd
     done
     echo $$ > $lockfile
 }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/oracle /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/oracle
--- heartbeat-2.1.3/resources/OCF/oracle	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/oracle	2008-08-18 13:32:19.000000000 +0100
@@ -25,11 +25,12 @@
 #	OCF_RESKEY_home (optional; else read it from /etc/oratab)
 #	OCF_RESKEY_user (optional; figure it out by checking file ownership)
 #	OCF_RESKEY_ipcrm (optional; defaults to "instance")
+#	OCF_RESKEY_clear_backupmode (optional; default to "false")
+#	OCF_RESKEY_shutdown_method (optional; default to "checkpoint/abort")
 #
 # Initialization:
 
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-PATH="$PATH:$ORACLE_HOME/bin"
 
 #######################################################################
 
@@ -142,6 +143,35 @@
 <content type="string" default="instance" />
 </parameter>
 
+<parameter name="clear_backupmode" unique="0" required="0">
+<longdesc lang="en">
+The clear of the backup mode of ORACLE.
+</longdesc>
+<shortdesc lang="en">clear_backupmode</shortdesc>
+<content type="boolean" default="false" />
+</parameter>
+
+<parameter name="shutdown_method" unique="0" required="0">
+<longdesc lang="en">
+How to stop Oracle is a matter of taste it seems. The default
+method ("checkpoint/abort") is:
+
+	alter system checkpoint;
+	shutdown abort;
+
+This should be the fastest safe way bring the instance down. If
+you find "shutdown abort" distasteful, set this attribute to
+"immediate" in which case we will
+
+	shutdown immediate;
+
+If you still think that there's even better way to shutdown an
+Oracle instance we are willing to listen.
+</longdesc>
+<shortdesc lang="en">shutdown_method</shortdesc>
+<content type="string" default="checkpoint/abort" />
+</parameter>
+
 </parameters>
 
 <actions>
@@ -149,8 +179,6 @@
 <action name="stop" timeout="120" />
 <action name="status" timeout="5" />
 <action name="monitor" depth="0" timeout="30" interval="120" start-delay="10" />
-<action name="dumpinstipc" timeout="10" />
-<action name="cleanup" timeout="5" />
 <action name="validate-all" timeout="5" />
 <action name="methods" timeout="5" />
 <action name="meta-data" timeout="5" />
@@ -193,6 +221,10 @@
 	# there a better way to find out ORACLE_OWNER?
 	[ x = "x$ORACLE_OWNER" ] &&
 		ORACLE_OWNER=`ls -ld $ORACLE_HOME/. 2>/dev/null | awk 'NR==1{print $3}'`
+
+	sqlplus=$ORACLE_HOME/bin/sqlplus
+	lsnrctl=$ORACLE_HOME/bin/lsnrctl
+	tnsping=$ORACLE_HOME/bin/tnsping
 }
 
 testoraenv() {
@@ -200,12 +232,8 @@
 	[ x != "x$ORACLE_HOME" -a x != "x$ORACLE_OWNER" ] ||
 		return 1
 	#	and some important things are there
-	check_binary sqlplus
-
-	# These don't seem to be used anywhere...
-	check_binary lsnrctl
-	check_binary tnsping
-
+	[ -x "$sqlplus" -a -x "$lsnrctl" -a -x "$tnsping" ] ||
+		return 1
 	return 0
 }
 
@@ -221,11 +249,11 @@
 #
 #	Run commands as the Oracle owner...
 #
-runasdba() {
+execsql() {
 	if [ "$US" = "$ORACLE_OWNER" ]; then
-		$SH
+		$sqlplus -S /nolog
 	else
-		su $ORACLE_OWNER
+		su - $ORACLE_OWNER -c "$sqlplus -S /nolog"
 	fi
 }
 
@@ -241,11 +269,7 @@
 	echo "set pagesize 0"
 	for func; do $func; done
 	) |
-	if [ "$US" = "$ORACLE_OWNER" ]; then
-		sqlplus -S /nolog
-	else
-		su $ORACLE_OWNER -c "`which sqlplus` -S /nolog"
-	fi | grep -v '^Connected'
+	execsql | grep -v '^Connected'
 }
 
 #
@@ -260,13 +284,48 @@
 dbopen() {
 	echo 'alter database open;'
 }
-dbstop() {
+dbstop_immediate() {
+	echo 'shutdown immediate'
+}
+dbstop_checkpoint_abort() {
 	echo 'alter system checkpoint;'
 	echo 'shutdown abort'
 }
+dbstop() {
+	case "${shutdown_method}" in
+	"immediate")
+		dbstop_immediate
+	;;
+	"checkpoint/abort")
+		dbstop_checkpoint_abort
+	;;
+	esac
+}
 dbstart() {
 	echo 'startup'
 }
+dbstart_mount() {
+	echo 'startup mount'
+}
+dbendbackup() {
+	echo 'alter database end backup;'
+}
+db_backup_mode() {
+	echo "select 'COUNT'||count(*) from v\$backup where status='ACTIVE';"
+}
+is_clear_backupmode_set(){
+	[ x"${clear_backupmode}" = x"true" ]
+}
+is_instance_in_backup_mode() {
+	typeset count
+	count="`dbasql db_backup_mode | sed 's/COUNT//'`"
+	[ x"$count" != x"0" ]
+}
+clear_backup_mode() {
+	typeset output
+	output="`dbasql dbendbackup`"
+	ocf_log info "Oracle instance $ORACLE_SID alter database end backup: $output"
+}
 getdumpdest() {
 	#echo 'select value from v$parameter where name = \'user_dump_dest\';'
 	echo "select value from v\$parameter where name = 'user_dump_dest';"
@@ -396,28 +455,49 @@
 		case "$status" in
 		"OPEN")
 			: nothing to be done, we can leave right now
-    		ocf_log info "Oracle instance $ORACLE_SID already running"
+			ocf_log info "Oracle instance $ORACLE_SID already running"
 			return $OCF_SUCCESS
 		;;
 		"STARTED")
-			output=`dbasql dbmount dbopen`
+			output=`dbasql dbmount`
 		;;
 		"MOUNTED")
-			output=`dbasql dbopen`
+			: we proceed if mounted
 		;;
 		*) # status unknown
-			output=`dbasql dbstop dbstart`
+			output=`dbasql dbstop dbstart_mount`
 		;;
 		esac
 	else
-		output=`dbasql dbstart`
+		output="`dbasql dbstart_mount`"
 		# try to cleanup in case of
 		# ORA-01081: cannot start already-running ORACLE - shut it down first
 		if echo "$output" | grep ORA-01081 >/dev/null 2>&1; then
 			ora_cleanup
-			output=`dbasql dbstart`
+			output=`dbasql dbstart_mount`
 		fi
 	fi
+
+	# oracle instance should be mounted.
+	status="`dbasql dbstat`"
+	case "$status" in
+	"MOUNTED")
+		;;
+	*)
+		: error!!
+		ocf_log error "Oracle $ORACLE_SID can not mount."
+		return $OCF_ERR_GENERIC
+		;;
+	esac
+
+	# It is examined whether mode is "online backup mode",
+	# and if it is true, makes clear the mode.
+	# Afterwards, DB is opened.
+	if is_clear_backupmode_set && is_instance_in_backup_mode; then
+		clear_backup_mode
+	fi
+	output=`dbasql dbopen`
+
 	if is_oracle_up && instance_live; then
 		: cool, we are up and running
 		ocf_log info "Oracle instance $ORACLE_SID started: $output"
@@ -477,10 +557,10 @@
 	then
 		#ocf_log info "Oracle instance $ORACLE_SID is alive"
 		return $OCF_SUCCESS
-    else
+	else
 		ocf_log info "Oracle instance $ORACLE_SID is down"
 		return $OCF_NOT_RUNNING
-    fi
+	fi
 }
 
 #
@@ -507,6 +587,15 @@
   *);;
 esac
 
+clear_backupmode=${OCF_RESKEY_clear_backupmode:-"false"}
+shutdown_method=${OCF_RESKEY_shutdown_method:-"checkpoint/abort"}
+
+case "${shutdown_method}" in
+"immediate") ;;
+"checkpoint/abort") ;;
+*) ocf_log error "unsupported shutdown_method, please read meta-data"
+esac
+
 if [ x = "x$OCF_RESKEY_sid" ]
 then
   ocf_log err "Please set OCF_RESKEY_sid to the Oracle SID !"
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/oralsnr /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/oralsnr
--- heartbeat-2.1.3/resources/OCF/oralsnr	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/oralsnr	2008-08-18 13:32:19.000000000 +0100
@@ -169,7 +169,7 @@
 	LD_LIBRARY_PATH=$ORACLE_HOME/lib
 	LIBPATH=$ORACLE_HOME/lib
 	TNS_ADMIN=$ORACLE_HOME/network/admin
-	pATH=$ORACLE_HOME/bin:$ORACLE_HOME/dbs:$PATH
+	PATH=$ORACLE_HOME/bin:$ORACLE_HOME/dbs:$PATH
 	export ORACLE_SID ORACLE_HOME ORACLE_OWNER TNS_ADMIN
 	export LD_LIBRARY_PATH LIBPATH
 }
@@ -181,7 +181,7 @@
 	if [ "$US" = "$ORACLE_OWNER" ]; then
 		$SH
 	else
-		su $ORACLE_OWNER
+		su - $ORACLE_OWNER
 	fi
 }
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/pgsql /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/pgsql
--- heartbeat-2.1.3/resources/OCF/pgsql	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/pgsql	2008-08-18 13:32:19.000000000 +0100
@@ -168,8 +168,8 @@
 	status
 	monitor
 	methods	
-        meta-data
-        validate-all
+	meta-data
+	validate-all
 	!
 }
 
@@ -267,7 +267,15 @@
 #
 
 pgsql_status() {
-     pgrep -u  $OCF_RESKEY_pgdba "postmaster|postgres" >/dev/null 2>&1
+     if [ -f $PIDFILE ]
+     then
+         PID=`head -n 1 $PIDFILE`
+         kill -0 $PID >/dev/null 2>&1 && fuser $OCF_RESKEY_pgdata 2>&1 | grep $PID >/dev/null 2>&1
+         return $?
+     fi
+
+     # No PID file
+     false
 }
 
 #
@@ -347,7 +355,7 @@
 if [ $# -ne 1 ]
 then
     usage
-    exit 1
+    exit $OCF_ERR_GENERIC
 fi
 
 : ${OCF_RESKEY_pgctl=/usr/bin/pg_ctl}
@@ -355,6 +363,7 @@
 : ${OCF_RESKEY_pgdata=/var/lib/pgsql/data}
 : ${OCF_RESKEY_pgdba=postgres}
 : ${OCF_RESKEY_pgport=5432}
+: ${OCF_RESKEY_start_opt="-p $OCF_RESKEY_pgport"}
 : ${OCF_RESKEY_pgdb=template1}
 : ${OCF_RESKEY_logfile=/dev/null}
 : ${OCF_RESKEY_stop_escalate=30}
@@ -368,54 +377,47 @@
     meta-data)  meta_data
                 exit $OCF_SUCCESS;;
 
-    stop)       if ! pgsql_status || ! pgsql_validate_all
-                then
-                   exit $OCF_SUCCESS
-                fi;;
-
-    monitor)    if ! pgsql_validate_all
-                then
-                   echo "Not running!"
-                   exit $OCF_NOT_RUNNING
-                else
-                   pgsql_monitor
-                   exit $?
-                fi;;
-
-    status)     if pgsql_status
-                then
-                    ocf_log info "PostgreSQL is up"
-                    exit $OCF_SUCCESS
-                else
-                    ocf_log info "PostgreSQL is down"
-                    exit $OCF_NOT_RUNNING
-                fi
-                exit $?;;
-
     validate-all) pgsql_validate_all
                 exit $?;;
 esac
 
-US=`id -u -n`
-
-if [ $US != root ]
+if ! pgsql_validate_all
 then
-    ocf_log err "$0 must be run as root"
-    exit 1
+    case "$1" in
+        stop)    exit $OCF_SUCCESS;;
+        monitor) exit $OCF_NOT_RUNNING;;
+        status)  exit $OCF_NOT_RUNNING;;
+        *)       exit $OCF_ERR_INSTALLED;;
+    esac
 fi
 
-if ! pgsql_validate_all
+US=`id -u -n`
+
+if [ $US != root -a $US != $OCF_RESKEY_pgdba ]
 then
-    exit $OCF_ERR_INSTALLED
+    ocf_log err "$0 must be run as root or $OCF_RESKEY_pgdba"
+    exit $OCF_ERR_GENERIC
 fi
 
 # What kind of method was invoked?
 case "$1" in
+    status)     if pgsql_status
+                then
+                    ocf_log info "PostgreSQL is up"
+                    exit $OCF_SUCCESS
+                else
+                    ocf_log info "PostgreSQL is down"
+                    exit $OCF_NOT_RUNNING
+                fi;;
+
+    monitor)    pgsql_monitor
+                exit $?;;
+
     start)      pgsql_start               
                 exit $?;;
 
     stop)       pgsql_stop
                 exit $?;;
+    *)
+                exit $OCF_ERR_UNIMPLEMENTED;;
 esac
-
-usage
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/pingd /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/pingd
--- heartbeat-2.1.3/resources/OCF/pingd	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/pingd	2008-08-18 13:32:19.000000000 +0100
@@ -152,7 +152,7 @@
     pingd_cmd="${HA_BIN}/pingd -D -p $OCF_RESKEY_pidfile -a $OCF_RESKEY_name -d $OCF_RESKEY_dampen $extras"
 
     if [ ! -z $OCF_RESKEY_user ]; then
-	echo "$pingd_cmd" | su - $OCF_RESKEY_user
+	sudo -u $OCF_RESKEY_user $pingd_cmd
     else
 	$pingd_cmd
     fi
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/portblock /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/portblock
--- heartbeat-2.1.3/resources/OCF/portblock	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/portblock	2008-08-18 13:32:19.000000000 +0100
@@ -257,7 +257,7 @@
 #	Examples of valid port: "1080", "1", "0080"
 #	Examples of invalid port: "1080bad", "0", "0000", ""
   case "$1" in
-    *[^0-9]*) #got invalid char
+    *[!0-9]*) #got invalid char
 	false;;
     *[1-9]*) #no invalid char, and has non-zero digit, so is a good port
 	true;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/ra-api-1.dtd /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/ra-api-1.dtd
--- heartbeat-2.1.3/resources/OCF/ra-api-1.dtd	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/resources/OCF/ra-api-1.dtd	2008-08-18 13:32:19.000000000 +0100
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!ELEMENT resource-agent (version,longdesc,shortdesc,parameters?,actions) >
+<!ATTLIST resource-agent
+        name    CDATA   #REQUIRED
+        version CDATA   #IMPLIED>
+
+<!ELEMENT version (#PCDATA)>
+
+<!ELEMENT parameters (parameter*)>
+
+<!ELEMENT actions (action*)>
+
+<!ELEMENT parameter (longdesc+,shortdesc+,content)>
+<!ATTLIST parameter
+        name    CDATA   #REQUIRED
+        required  (1|0)   "0"
+        unique  (1|0)   "0">
+
+<!ELEMENT longdesc ANY>
+<!ATTLIST longdesc
+        lang    NMTOKEN #IMPLIED>
+
+<!ELEMENT shortdesc ANY>
+<!ATTLIST shortdesc
+        lang    NMTOKEN #IMPLIED>
+
+<!ELEMENT content EMPTY>
+<!ATTLIST content
+        type    (string|integer|boolean)        #REQUIRED
+        default CDATA   #IMPLIED>
+
+<!ELEMENT action EMPTY>
+<!ATTLIST action
+        name (start|stop|recover|monitor|restart|migrate_to|migrate_from|promote|demote|notify|status|reload|meta-data|usage|methods|validate-all) #REQUIRED
+        timeout         CDATA   #REQUIRED
+        interval        CDATA   #IMPLIED
+        start-delay     CDATA   #IMPLIED
+        role            CDATA   #IMPLIED
+        depth           CDATA   #IMPLIED>
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/SAPDatabase /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/SAPDatabase
--- heartbeat-2.1.3/resources/OCF/SAPDatabase	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/SAPDatabase	2008-08-18 13:32:19.000000000 +0100
@@ -6,9 +6,9 @@
 #               as a High-Availability OCF compliant resource.
 #
 # Author:       Alexander Krauth, October 2006
-# Support:      liunx@sap.com
+# Support:      linux@sap.com
 # License:      GNU General Public License (GPL)
-# Copyright:    (c) 2006 Alexander Krauth
+# Copyright:    (c) 2006, 2007 Alexander Krauth
 #
 # An example usage: 
 #      See usage() function below for more details...
@@ -19,8 +19,16 @@
 #       OCF_RESKEY_DBTYPE
 #       OCF_RESKEY_NETSERVICENAME   (optional, non standard name of Oracle Listener)
 #       OCF_RESKEY_DBJ2EE_ONLY      (optional, default is false)
+#       OCF_RESKEY_JAVA_HOME        (optional, only needed if DBJ2EE_ONLY is true and JAVA_HOME enviroment variable is not set)
+#       OCF_RESKEY_STRICT_MONITORING (optional, activate application level monitoring - with Oracle a failover will occur in case of an archiver stuck)
+#       OCF_RESKEY_AUTOMATIC_RECOVER (optional, automatic startup recovery, default is false)
 #       OCF_RESKEY_DIR_BOOTSTRAP    (optional, if non standard J2EE server directory)
 #       OCF_RESKEY_DIR_SECSTORE     (optional, if non standard J2EE secure store directory)
+#       OCF_RESKEY_DB_JARS          (optional, if maintained in bootstrap.properties, mandatory for WebAS Java 7.10)
+#	OCF_RESKEY_PRE_START_USEREXIT	(optional, lists a script which can be executed before the resource is started)
+#	OCF_RESKEY_POST_START_USEREXIT	(optional, lists a script which can be executed after the resource is started)
+#	OCF_RESKEY_PRE_STOP_USEREXIT	(optional, lists a script which can be executed before the resource is stopped)
+#	OCF_RESKEY_POST_STOP_USEREXIT	(optional, lists a script which can be executed after the resource is stopped)
 #
 # ToDo:
 # Remove all the database dependend stuff from the agent and use
@@ -49,6 +57,7 @@
 	The 'stop' operation stops the instance.
 	The 'status' operation reports whether the instance is running
 	The 'monitor' operation reports whether the instance seems to be working
+	The 'recover' operation tries to recover the instance after a crash (instance will be stopped first!)
 	The 'validate-all' operation reports whether the parameters are valid
 	The 'methods' operation reports on the methods $0 supports
 
@@ -60,7 +69,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="SAPDatabase">
-<version>1.2</version>
+<version>1.91</version>
 
 <longdesc lang="en">
 Resource script for SAP databases. It manages a SAP database of any type as an HA resource.
@@ -93,6 +102,21 @@
   <shortdesc lang="en">only JAVA stack installed</shortdesc>
   <content type="boolean" default="false"/>
  </parameter>
+ <parameter name="JAVA_HOME" unique="1" required="0">
+  <longdesc lang="en">This is only needed if the DBJ2EE_ONLY parameter is set to true. Enter the path to the Java SDK which is used by the SAP WebAS Java</longdesc>
+  <shortdesc lang="en">Path to Java SDK</shortdesc>
+  <content type="string" default=""/>
+ </parameter>
+ <parameter name="STRICT_MONITORING" unique="1" required="0">
+  <longdesc lang="en">This controls how the resource agent monitors the database. If set to true, it will use SAP tools to test the connect to the database. Do not use with Oracle, because it will result in unwanted failovers in case of an archiver stuck</longdesc>
+  <shortdesc lang="en">Activates application level monitoring</shortdesc>
+  <content type="boolean" default="false"/>
+ </parameter>
+ <parameter name="AUTOMATIC_RECOVER" unique="1" required="0">
+  <longdesc lang="en">The SAPDatabase resource agent tries to recover a failed start attempt automaticaly one time. This is done by running a forced abort of the RDBMS and/or executing recovery commands.</longdesc>
+  <shortdesc lang="en">Enable or disable automatic startup recovery</shortdesc>
+  <content type="boolean" default="false"/>
+ </parameter>
  <parameter name="DIR_BOOTSTRAP" unique="1" required="0">
   <longdesc lang="en">The full qualified path where to find the J2EE instance bootstrap directory. e.g. /usr/sap/P01/J00/j2ee/cluster/bootstrap</longdesc>
   <shortdesc lang="en">path to j2ee bootstrap directory</shortdesc>
@@ -103,6 +127,31 @@
   <shortdesc lang="en">path to j2ee secure store directory</shortdesc>
   <content type="string" default="" />
  </parameter>
+ <parameter name="DB_JARS" unique="1" required="0">
+  <longdesc lang="en">The full qualified filename of the jdbc driver for the database connection test. It will be automaticaly read from the bootstrap.properties file in Java engine 6.40 and 7.00. For Java engine 7.10 the parameter is mandatory.</longdesc>
+  <shortdesc lang="en">file name of the jdbc driver</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="PRE_START_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed before this resource gets started.</longdesc>
+  <shortdesc lang="en">path to a pre-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="POST_START_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed after this resource got started.</longdesc>
+  <shortdesc lang="en">path to a post-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="PRE_STOP_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed before this resource gets stopped.</longdesc>
+  <shortdesc lang="en">path to a pre-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="POST_STOP_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed after this resource got stopped.</longdesc>
+  <shortdesc lang="en">path to a post-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
 </parameters>
 
 <actions>
@@ -221,7 +270,7 @@
 # x_server_status: is the x_server running?
 #
 x_server_status() {
-  sdbuser=`ls -ld /sapdb/$SID | awk '{print $3}'`
+  sdbuser=`grep "^SdbOwner" /etc/opt/sdb | awk -F'=' '{print $2}'`
   # Note: ps cuts off it's output at column $COLUMNS, so "ps -ef" can not be used here
   # as the output might be to long.
   cnt=`ps efo args --user $sdbuser | grep -c vserver`
@@ -281,6 +330,11 @@
 # maxdb_stop: Stop the MaxDB database without any condition
 #
 maxdb_stop() {
+
+# x_Server must be running to stop database
+x_server_status
+if [ $? -ne $OCF_SUCCESS ]; then x_server_start; fi
+
 if [ $DBJ2EE_ONLY -eq 1 ]; then
    userkey=c_J2EE
 else
@@ -341,6 +395,113 @@
 }
 
 #
+# oracle_recover: try to clean up oracle after a crash
+#
+oracle_recover() {
+echo '#!/bin/sh
+LOG=$HOME/recover.log
+date > $LOG
+echo "Logfile written by heartbeat SAPDatabase resource agent" >> $LOG
+
+if [ -x "${ORACLE_HOME}/bin/sqlplus" ]
+then
+    SRVMGRDBA_EXE="${ORACLE_HOME}/bin/sqlplus"
+else
+   echo "Can not find executable sqlplus" >> $LOG
+   exit 1
+fi
+
+$SRVMGRDBA_EXE /NOLOG >> $LOG << !
+connect / as sysdba
+shutdown abort
+startup mount
+WHENEVER SQLERROR EXIT SQL.SQLCODE
+WHENEVER OSERROR EXIT FAILURE
+alter database recover automatic database;
+alter database open;
+exit
+!
+rc=$?
+cat $LOG
+exit $rc' > $TEMPFILE
+
+  chmod 700 $TEMPFILE
+  chown $sidadm $TEMPFILE
+
+  su - $sidadm -c $TEMPFILE
+  retcode=$?
+  rm -f $TEMPFILE
+
+  return $retcode
+}
+
+#
+# maxdb_recover: try to clean up MaxDB after a crash
+#
+maxdb_recover() {
+  # x_Server must be running to stop database
+  x_server_status
+  if [ $? -ne $OCF_SUCCESS ]; then x_server_start; fi
+
+  if [ $DBJ2EE_ONLY -eq 1 ]; then
+     userkey=c_J2EE
+  else
+     userkey=c
+  fi
+
+echo "#!/bin/sh
+LOG=\$HOME/recover.log
+date > \$LOG
+echo \"Logfile written by heartbeat SAPDatabase resource agent\" >> \$LOG
+echo \"Cleanup database with xuserkey >$userkey<\" >> \$LOG
+echo \"db_stop\" >> \$LOG 2>&1
+dbmcli -U ${userkey} db_stop >> \$LOG 2>&1
+echo \"db_clear\" >> \$LOG 2>&1
+dbmcli -U ${userkey} db_clear >> \$LOG 2>&1
+echo \"db_online\" >> \$LOG 2>&1
+dbmcli -U ${userkey} db_online >> \$LOG 2>&1
+rc=\$?
+cat \$LOG
+exit \$rc" > $TEMPFILE
+
+  chmod 700 $TEMPFILE
+  chown $sidadm $TEMPFILE
+
+  su - $sidadm -c $TEMPFILE
+  retcode=$?
+  rm -f $TEMPFILE
+
+  return $retcode
+}
+
+#
+# db6udb_recover: try to recover DB/2 after a crash
+#
+db6udb_recover() {
+  db2sid="db2`echo $SID | tr [:upper:] [:lower:]`"
+
+echo '#!/bin/sh
+LOG=$HOME/recover.log
+date > $LOG
+echo "Logfile written by heartbeat SAPDatabase resource agent" >> $LOG
+$INSTHOME/sqllib/bin/db2_kill >> $LOG  2>&1
+$INSTHOME/sqllib/adm/db2start >> $LOG  2>&1
+$INSTHOME/sqllib/bin/db2 activate database $DB2DBDFT >> $LOG  2>&1
+rc=$?
+cat $LOG
+exit $rc' > $TEMPFILE
+
+  chmod 700 $TEMPFILE
+  chown $db2sid $TEMPFILE
+
+  su - $db2sid -c $TEMPFILE
+  retcode=$?
+  rm -f $TEMPFILE
+
+  return $retcode
+}
+
+#
 # methods: What methods/operations do we support?
 #
 sapdatabase_methods() {
@@ -349,6 +510,7 @@
 	stop
 	status
 	monitor
+        recover
 	validate-all
 	methods
 	meta-data
@@ -358,9 +520,38 @@
 
 
 #
+# sapuserexit : Many SAP customers need some additional processes/tools to run their SAP systems.
+#               This specialties do not allow a totally generic SAP cluster resource agent.
+#               Someone should write a resource agent for each additional process you need, if it
+#               is required to monitor that process within the cluster manager. To enable
+#               you to extent this resource agent without developing a new one, this user exit
+#               was introduced.
+#
+sapuserexit() {
+  NAME="$1"
+  VALUE="$2"
+
+  if [ -n "$VALUE" ]
+  then
+    if [ -x "$VALUE" ]
+    then
+      ocf_log info "Calling userexit ${NAME} with customer script file ${VALUE}"
+      eval "$VALUE" >& /dev/null
+      ocf_log info "Exiting userexit ${NAME} with customer script file ${VALUE}, returncode: $?"
+    else
+      ocf_log warn "Attribute ${NAME} is set to ${VALUE}, but this file is not executable"
+    fi
+  fi
+  return 0
+}
+
+
+#
 # sapdatabase_start : Start the SAP database
 #
 sapdatabase_start() {
+  sapuserexit PRE_START_USEREXIT "$OCF_RESKEY_PRE_START_USEREXIT"
+
   case $DBTYPE in
     ADA) x_server_start
          ;;
@@ -369,14 +560,34 @@
   esac
 
   output=`su - $sidadm -c $SAPSTARTDB`
-  if [ $? -eq 0 ]
+  rc=$?
+
+  if [ $DBJ2EE_ONLY -eq 1 ]
+  then
+    sapdatabase_monitor 1
+    rc=$?
+  fi
+
+  if [ $rc -ne 0 -a $OCF_RESKEY_AUTOMATIC_RECOVER -eq 1 ]
+  then
+    ocf_log warn "SAP database $SID start failed: $output"
+    ocf_log warn "Try to recover database $SID"
+
+    output=''
+    sapdatabase_recover
+    rc=$?
+  fi
+
+  if [ $rc -eq 0 ]
   then
     ocf_log info "SAP database $SID started: $output"
     rc=$OCF_SUCCESS
+    sapuserexit POST_START_USEREXIT "$OCF_RESKEY_POST_START_USEREXIT"
   else
     ocf_log err "SAP database $SID start failed: $output"
     rc=$OCF_ERR_GENERIC
   fi
+
   return $rc
 }
 
@@ -385,6 +596,8 @@
 #
 sapdatabase_stop() {
 
+  sapuserexit PRE_STOP_USEREXIT "$OCF_RESKEY_PRE_STOP_USEREXIT"
+
   # use of the stopdb kernel script is not possible, because there are to may checks in that
   # script. We want to stop the database regardless of anything.
   #output=`su - $sidadm -c $SAPSTOPDB`
@@ -413,6 +626,9 @@
     ADA) x_server_stop
          ;;
   esac
+
+  sapuserexit POST_STOP_USEREXIT "$OCF_RESKEY_POST_STOP_USEREXIT"
+
   return $rc
 }
 
@@ -421,6 +637,7 @@
 # sapdatabase_monitor: Can the given database instance do anything useful?
 #
 sapdatabase_monitor() {
+  strict=$1
   rc=$OCF_SUCCESS
 
   case $DBTYPE in
@@ -432,43 +649,64 @@
          ;;
   esac
 
-  if [ $DBJ2EE_ONLY -eq 0 ]
+  if [ $strict -eq 0 ]
   then
-    output=`echo "$SAPDBCONNECT -d -w /dev/null" | su $sidadm 2>&1`
-    if [ $? -le 4 ]
-    then
-      rc=$OCF_SUCCESS
-    else
-      rc=$OCF_NOT_RUNNING
-    fi
+    sapdatabase_status
+    rc=$?
   else
-    DB_JARS=""
-    if [ -f "$BOOTSTRAP"/bootstrap.properties ]; then
-      DB_JARS=`cat $BOOTSTRAP/bootstrap.properties | grep -i rdbms.driverLocation | sed -e 's/\\\:/:/g' | awk -F= '{print $2}'`
-    fi
-    IAIK_JCE="$SECSTORE"/iaik_jce.jar
-    IAIK_JCE_EXPORT="$SECSTORE"/iaik_jce_export.jar
-    EXCEPTION="$BOOTSTRAP"/exception.jar
-    LOGGING="$BOOTSTRAP"/logging.jar
-    OPENSQLSTA="$BOOTSTRAP"/opensqlsta.jar
-    TC_SEC_SECSTOREFS="$BOOTSTRAP"/tc_sec_secstorefs.jar
-    JDDI="$BOOTSTRAP"/../server0/bin/ext/jdbdictionary/jddi.jar
-    ANTLR="$BOOTSTRAP"/../server0/bin/ext/antlr/antlr.jar
-    FRAME="$BOOTSTRAP"/../server0/bin/system/frame.jar
-
-    # only start jdbcconnect when all jars available
-    if [ -f "$EXCEPTION" -a -f "$LOGGING" -a -f "$OPENSQLSTA" -a -f "$TC_SEC_SECSTOREFS" -a -f "$JDDI" -a -f "$ANTLR" -a -f "$FRAME" -a -f "$SAPDBCONNECT" ]
+    if [ $DBJ2EE_ONLY -eq 0 ]
     then
-      output=`eval java -cp ".:$FRAME:$ANTLR:$JDDI:$IAIK_JCE_EXPORT:$IAIK_JCE:$EXCEPTION:$LOGGING:$OPENSQLSTA:$TC_SEC_SECSTOREFS:$DB_JARS:$SAPDBCONNECT" com.sap.inst.jdbc.connect.JdbcCon -sec $SID:$SID`
-      if [ $? -le 0 ]
+      output=`echo "$SAPDBCONNECT -d -w /dev/null" | su $sidadm 2>&1`
+      if [ $? -le 4 ]
       then
         rc=$OCF_SUCCESS
       else
         rc=$OCF_NOT_RUNNING
       fi
     else
-      output="Cannot find all jar files needed for database monitoring."
-      rc=$OCF_ERR_GENERIC
+      MYCP=""
+      EXECMD=""
+
+      # WebAS Java 6.40+7.00
+      IAIK_JCE="$SECSTORE"/iaik_jce.jar
+      IAIK_JCE_EXPORT="$SECSTORE"/iaik_jce_export.jar
+      EXCEPTION="$BOOTSTRAP"/exception.jar
+      LOGGING="$BOOTSTRAP"/logging.jar
+      OPENSQLSTA="$BOOTSTRAP"/opensqlsta.jar
+      TC_SEC_SECSTOREFS="$BOOTSTRAP"/tc_sec_secstorefs.jar
+      JDDI="$BOOTSTRAP"/../server0/bin/ext/jdbdictionary/jddi.jar
+      ANTLR="$BOOTSTRAP"/../server0/bin/ext/antlr/antlr.jar
+      FRAME="$BOOTSTRAP"/../server0/bin/system/frame.jar
+  
+      # only start jdbcconnect when all jars available
+      if [ -f "$EXCEPTION" -a -f "$LOGGING" -a -f "$OPENSQLSTA" -a -f "$TC_SEC_SECSTOREFS" -a -f "$JDDI" -a -f "$ANTLR" -a -f "$FRAME" -a -f "$SAPDBCONNECT" ]
+      then
+        MYCP=".:$FRAME:$ANTLR:$JDDI:$IAIK_JCE_EXPORT:$IAIK_JCE:$EXCEPTION:$LOGGING:$OPENSQLSTA:$TC_SEC_SECSTOREFS:$DB_JARS:$SAPDBCONNECT" 
+        EXECMD="com.sap.inst.jdbc.connect.JdbcCon -sec $SID:$SID"
+      else
+      # WebAS Java 7.10
+        LAUNCHER=${BOOTSTRAP}/sap.com~tc~bl~offline_launcher~impl.jar
+
+        if [ -f "$DB_JARS" -a -f "$SAPDBCONNECT" -a -f "$LAUNCHER" ]
+        then
+          MYCP="$LAUNCHER"
+          EXECMD="com.sap.engine.offline.OfflineToolStart com.sap.inst.jdbc.connect.JdbcCon ${SAPDBCONNECT}:${SECSTORE}:${DB_JARS}:${BOOTSTRAP} -sec $SID:$SID"
+        fi
+      fi
+
+      if [ -n "$EXECMD" ]
+      then
+        output=`eval ${JAVA_HOME}/bin/java -cp $MYCP $EXECMD`
+        if [ $? -le 0 ]
+        then
+          rc=$OCF_SUCCESS
+        else
+          rc=$OCF_NOT_RUNNING
+        fi
+      else
+        output="Cannot find all jar files needed for database monitoring."
+        rc=$OCF_ERR_GENERIC
+      fi
     fi
   fi
 
@@ -486,7 +724,7 @@
 sapdatabase_status() {
   case $DBTYPE in
     ADA) SEARCH="$SID/db/pgm/kernel"
-         SUSER=`ls -ld /sapdb/$SID | awk  '{print $3}'`
+         SUSER=`grep "^SdbOwner" /etc/opt/sdb | awk -F'=' '{print $2}'`
          SNUM=2
          ;;
     ORA) SEARCH="ora_[a-z][a-z][a-z][a-z]_"
@@ -501,7 +739,7 @@
 
   # Note: ps cuts off it's output at column $COLUMNS, so "ps -ef" can not be used here
   # as the output might be to long.
-  cnt=`ps efo args --user $SUSER | grep -c "$SEARCH"`
+  cnt=`ps efo args --user $SUSER 2> /dev/null | grep -c "$SEARCH"`
   if [ $cnt -ge $SNUM ]
   then
     rc=$OCF_SUCCESS
@@ -514,9 +752,37 @@
 
 
 #
-# sapdatabase_vaildate: Check the symantic of the input parameters 
+# sapdatabase_recover:
 #
-sapdatabase_vaildate() {
+sapdatabase_recover() {
+
+  case $DBTYPE in
+    ORA) recoutput=`oracle_recover`
+         ;;
+    ADA) recoutput=`maxdb_recover`
+         ;;
+    DB6) recoutput=`db6udb_recover`
+         ;;
+  esac
+
+  sapdatabase_monitor 1
+  retcode=$?
+
+  if [ $retcode -eq $OCF_SUCCESS ]
+  then
+    ocf_log info "Recover of SAP database $SID was successful: $recoutput"
+  else
+    ocf_log err "Recover of SAP database $SID failed: $recoutput"
+  fi
+
+  return $retcode
+}
+
+
+#
+# sapdatabase_validate: Check the symantic of the input parameters 
+#
+sapdatabase_validate() {
   rc=$OCF_SUCCESS
   if [ `echo "$SID" | grep -c '^[A-Z][A-Z0-9][A-Z0-9]$'` -ne 1 ]
   then
@@ -546,7 +812,7 @@
 fi
 
 # Set a tempfile and make sure to clean it up again
-TEMPFILE="/tmp/SAPDatabase.tmp"
+TEMPFILE="/tmp/SAPDatabase.$$.tmp"
 trap trap_handler INT TERM
 
 # These operations don't require OCF instance parameters to be set
@@ -583,7 +849,7 @@
   ocf_log err "Please set OCF_RESKEY_DBTYPE to the database vendor specific tag (ORA,ADA,DB6)!"
   exit $OCF_ERR_ARGS
 fi
-DBTYPE="$OCF_RESKEY_DBTYPE"
+DBTYPE=`echo "$OCF_RESKEY_DBTYPE" | tr "[a-z]" "[A-Z]"`
 
 # optional OCF parameters, we try to guess which directories are correct
 EXESTARTDB="startdb"
@@ -613,6 +879,17 @@
   NETSERVICENAME="$OCF_RESKEY_NETSERVICENAME"
 fi
 
+if [ -z "$OCF_RESKEY_STRICT_MONITORING" ]; then
+  OCF_RESKEY_STRICT_MONITORING=0
+else
+  case "$OCF_RESKEY_STRICT_MONITORING" in
+   1|true|TRUE|yes|YES) OCF_RESKEY_STRICT_MONITORING=1;;
+   0|false|FALSE|no|NO) OCF_RESKEY_STRICT_MONITORING=0;;
+   *)  ocf_log err "Parsing parameter STRICT_MONITORING: '$OCF_RESKEY_STRICT_MONITORING' is not a boolean value!"
+       exit $OCF_ERR_ARGS ;;
+  esac
+fi
+
 PATHLIST="
 $OCF_RESKEY_DIR_EXECUTABLE
 /usr/sap/$SID/*/exe
@@ -637,14 +914,10 @@
     fi
   fi
 done
-LSB_STATUS_STOPPED=3
 if [ -z "$DIR_EXECUTABLE" ]
 then
-  [ "$1" = stop ] && exit $OCF_SUCCESS
-  [ "$1" = monitor ] && exit $OCF_NOT_RUNNING
-  [ "$1" = status ] && exit $LSB_STATUS_STOPPED
-  ocf_log err "Cannot find $EXESTARTDB,$EXESTOPDB and $EXEDBCONNECT executable, please set DIR_EXECUTABLE parameter!"
-  exit $OCF_ERR_GENERIC
+  ocf_log warn "Cannot find $EXESTARTDB,$EXESTOPDB and $EXEDBCONNECT executable, please set DIR_EXECUTABLE parameter!"
+  exit $OCF_NOT_RUNNING
 fi
 
 if [ $DBJ2EE_ONLY -eq 1 ]
@@ -662,6 +935,39 @@
   else
     SECSTORE=/usr/sap/$SID/SYS/global/security/lib/tools
   fi
+
+  if [ -n "$OCF_RESKEY_JAVA_HOME" ]
+  then
+    JAVA_HOME="$OCF_RESKEY_JAVA_HOME"
+    PATH=$JAVA_HOME/bin:$PATH
+  else
+    if [ -n "$JAVA_HOME" ]
+    then
+      PATH=$JAVA_HOME/bin:$PATH
+    else
+      ocf_log err "Cannot find JAVA_HOME directory, please set JAVA_HOME parameter!"
+      exit $OCF_NOT_RUNNING
+    fi
+  fi
+
+  if [ -n "$OCF_RESKEY_DB_JARS" ]
+  then
+    DB_JARS=$OCF_RESKEY_DB_JARS
+  else
+    if [ -f "$BOOTSTRAP"/bootstrap.properties ]; then
+      DB_JARS=`cat $BOOTSTRAP/bootstrap.properties | grep -i rdbms.driverLocation | sed -e 's/\\\:/:/g' | awk -F= '{print $2}'`
+    fi
+  fi
+fi
+
+if [ -z "$OCF_RESKEY_AUTOMATIC_RECOVER" ]
+then
+  OCF_RESKEY_AUTOMATIC_RECOVER=0
+else
+  case "$OCF_RESKEY_AUTOMATIC_RECOVER" in
+   1|true|TRUE|yes|YES) OCF_RESKEY_AUTOMATIC_RECOVER=1;;
+   0|false|FALSE|no|NO) OCF_RESKEY_AUTOMATIC_RECOVER=0;;
+  esac
 fi
 
 # as root user we need the library path to the SAP kernel to be able to call executables
@@ -680,14 +986,17 @@
 		exit $?;;
 
   monitor)
-          	sapdatabase_monitor
+          	sapdatabase_monitor $OCF_RESKEY_STRICT_MONITORING
 		exit $?;;
 
   status)
                 sapdatabase_status
                 exit $?;;
 
-  validate-all)	sapdatabase_vaildate
+  recover)      sapdatabase_recover
+                exit $?;;
+
+  validate-all)	sapdatabase_validate
 		exit $?;;
 
   *)		sapdatabase_methods
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/SAPInstance /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/SAPInstance
--- heartbeat-2.1.3/resources/OCF/SAPInstance	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/SAPInstance	2008-08-18 13:32:19.000000000 +0100
@@ -9,18 +9,24 @@
 #               about essential services.
 #
 # Author:       Alexander Krauth, June 2006
-# Support:      liunx@sap.com
+# Support:      linux@sap.com
 # License:      GNU General Public License (GPL)
-# Copyright:    (c) 2006 Alexander Krauth
+# Copyright:    (c) 2006, 2007 Alexander Krauth
 #
 # An example usage: 
 #      See usage() function below for more details...
 #
 # OCF instance parameters:
 #	OCF_RESKEY_InstanceName
-#       OCF_RESKEY_DIR_EXECUTABLE   (optional, well known directories will be searched by default)
-#       OCF_RESKEY_DIR_PROFILE      (optional, well known directories will be searched by default)
-#       OCF_RESKEY_START_PROFILE    (optional, well known directories will be searched by default)
+#	OCF_RESKEY_DIR_EXECUTABLE   (optional, well known directories will be searched by default)
+#	OCF_RESKEY_DIR_PROFILE      (optional, well known directories will be searched by default)
+#	OCF_RESKEY_START_PROFILE    (optional, well known directories will be searched by default)
+#	OCF_RESKEY_START_WAITTIME   (optional, to solve timing problems during J2EE-Addin start)
+#	OCF_RESKEY_AUTOMATIC_RECOVER    (optional, automatic startup recovery using cleanipc, default is false)
+#	OCF_RESKEY_PRE_START_USEREXIT	(optional, lists a script which can be executed before the resource is started)
+#	OCF_RESKEY_POST_START_USEREXIT	(optional, lists a script which can be executed after the resource is started)
+#	OCF_RESKEY_PRE_STOP_USEREXIT	(optional, lists a script which can be executed before the resource is stopped)
+#	OCF_RESKEY_POST_STOP_USEREXIT	(optional, lists a script which can be executed after the resource is stopped)
 #
 #######################################################################
 # Initialization:
@@ -54,7 +60,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="SAPInstance">
-<version>1.6</version>
+<version>1.91</version>
 
 <longdesc lang="en">
 Resource script for SAP. It manages a SAP Instance as an HA resource.
@@ -82,10 +88,41 @@
   <shortdesc lang="en">start profile name</shortdesc>
   <content type="string" default="" />
  </parameter>
+ <parameter name="START_WAITTIME" unique="1" required="0">
+  <longdesc lang="en">After that time in seconds a monitor operation is executed by the resource agent. Does the monitor return SUCCESS, the start is handled as SUCCESS. This is useful to resolve timing problems with e.g. the J2EE-Addin instance.</longdesc>
+  <shortdesc lang="en">Check the successful start after that time (do not wait for J2EE-Addin)</shortdesc>
+  <content type="string" default="3600" />
+ </parameter>
+ <parameter name="AUTOMATIC_RECOVER" unique="1" required="0">
+  <longdesc lang="en">The SAPInstance resource agent tries to recover a failed start attempt automaticaly one time. This is done by killing runing instance processes and executing cleanipc.</longdesc>
+  <shortdesc lang="en">Enable or disable automatic startup recovery</shortdesc>
+  <content type="boolean" default="false"/>
+ </parameter>
+ <parameter name="PRE_START_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed before this resource gets started.</longdesc>
+  <shortdesc lang="en">path to a pre-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="POST_START_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed after this resource got started.</longdesc>
+  <shortdesc lang="en">path to a post-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="PRE_STOP_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed before this resource gets stopped.</longdesc>
+  <shortdesc lang="en">path to a pre-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
+ <parameter name="POST_STOP_USEREXIT" unique="1" required="0">
+  <longdesc lang="en">The full qualified path where to find a script or program which should be executed after this resource got stopped.</longdesc>
+  <shortdesc lang="en">path to a post-start script</shortdesc>
+  <content type="string" default="" />
+ </parameter>
 </parameters>
 
 <actions>
 <action name="start" timeout="180" />
+<action name="recover" timeout="240" />
 <action name="stop" timeout="240" />
 <action name="status" timeout="60" />
 <action name="monitor" depth="0" timeout="60" interval="120" start-delay="240" />
@@ -104,6 +141,7 @@
 sapinstance_methods() {
   cat <<-!
 	start
+	recover
 	stop
 	status
 	monitor
@@ -122,6 +160,9 @@
 #
 check_sapstartsrv() {
   restart=0
+  runninginst=""
+  chkrc=$OCF_SUCCESS
+
   output=`$SAPCONTROL -nr $InstanceNr -function ParameterValue INSTANCE_NAME -format script`
   if [ $? -eq 0 ]
   then
@@ -143,42 +184,154 @@
     pkill -9 -f "sapstartsrv.*$runninginst"
     $SAPSTARTSRV pf=$SAPSTARTPROFILE -D -u $sidadm
 
-    ocf_log info "sapstartsrv for instance $SID-$InstanceName was restarted !"
+    # now make sure the daemon has been started and is able to respond
+    srvrc=1
+    while [ $srvrc -eq 1 -a `pgrep -f "sapstartsrv.*$runninginst" | wc -l` -gt 0 ]
+    do
+      sleep 1
+      $SAPCONTROL -nr $InstanceNr -function GetProcessList > /dev/null 2>&1
+      srvrc=$?
+    done
+
+    if [ $srvrc -ne 1 ]
+    then
+      ocf_log info "sapstartsrv for instance $SID-$InstanceName was restarted !"
+      chkrc=$OCF_SUCCESS
+    else
+      ocf_log error "sapstartsrv for instance $SID-$InstanceName could not be started!"
+      chkrc=$OCF_NOT_RUNNING
+    fi
   fi
 
+  return $chkrc
+}
+
+
+#
+# sapuserexit : Many SAP customers need some additional processes/tools to run their SAP systems.
+#               This specialties do not allow a totally generic SAP cluster resource agent.
+#               Someone should write a resource agent for each additional process you need, if it
+#               is required to monitor that process within the cluster manager. To enable 
+#               you to extent this resource agent without developing a new one, this user exit
+#               was introduced.
+#
+sapuserexit() {
+  NAME="$1"
+  VALUE="$2"
+
+  if [ -n "$VALUE" ]
+  then
+    if [ -x "$VALUE" ]
+    then
+      ocf_log info "Calling userexit ${NAME} with customer script file ${VALUE}"
+      eval "$VALUE" >& /dev/null
+      ocf_log info "Exiting userexit ${NAME} with customer script file ${VALUE}, returncode: $?"
+    else
+      ocf_log warn "Attribute ${NAME} is set to ${VALUE}, but this file is not executable"
+    fi
+  fi
   return 0
 }
 
 
 #
+# cleanup_instance : remove resources (processes and shared memory) from a crashed instance)
+#
+cleanup_instance() {
+  pkill -9 -f -U $sidadm $InstanceName
+  $DIR_EXECUTABLE/cleanipc $InstanceNr remove
+  return 0
+}
+
+#
 # sapinstance_start : Start the SAP instance
 #
 sapinstance_start() {
-  check_sapstartsrv
 
-  output=`$SAPCONTROL -nr $InstanceNr -function Start`
-  if [ $? -eq 0 ]
-  then
-    output=`$SAPCONTROL -nr $InstanceNr -function WaitforStarted 3600 1`
-    if [ $? -eq 0 ]
+  sapuserexit PRE_START_USEREXIT "$OCF_RESKEY_PRE_START_USEREXIT"
+
+  rc=$OCF_NOT_RUNNING
+  loopcount=0
+  while [ $loopcount -lt 2 ]
+  do
+    loopcount=$(($loopcount + 1))
+
+    check_sapstartsrv
+    output=`$SAPCONTROL -nr $InstanceNr -function Start`
+    rc=$?
+    ocf_log info "Starting SAP Instance $SID-$InstanceName: $output"
+
+    if [ $rc -ne 0 ]
     then
-      ocf_log info "SAP Instance $SID-$InstanceName started: $output"
-      rc=$OCF_SUCCESS
-    else
-      ocf_log err "SAP Instance $SID-$InstanceName start failed: $output"
-      rc=$OCF_ERR_GENERIC
+      ocf_log err "SAP Instance $SID-$InstanceName start failed."
+      return $OCF_ERR_GENERIC
     fi
+
+    startrc=1
+    while [ $startrc -gt 0 ]
+    do
+      waittime_start=`date +%s`
+      output=`$SAPCONTROL -nr $InstanceNr -function WaitforStarted $OCF_RESKEY_START_WAITTIME 10`
+      startrc=$?
+      waittime_stop=`date +%s`
+
+      if [ $startrc -ne 0 ]
+      then
+        if [ $(($waittime_stop - $waittime_start)) -ge $OCF_RESKEY_START_WAITTIME ]
+        then
+          sapinstance_monitor NOLOG
+          if [ $? -eq $OCF_SUCCESS ]
+          then
+            output="START_WAITTIME ($OCF_RESKEY_START_WAITTIME) has elapsed, but instance monitor returned SUCCESS. Instance considered running."
+            startrc=0; loopcount=2
+          fi
+        else
+          if [ $loopcount -eq 1 -a $OCF_RESKEY_AUTOMATIC_RECOVER -eq 1 ]
+          then
+            ocf_log warn "SAP Instance $SID-$InstanceName start failed: $output"
+            ocf_log warn "Try to recover $SID-$InstanceName"
+            cleanup_instance
+          else
+            loopcount=2
+          fi
+          startrc=-1
+        fi
+      else
+        loopcount=2
+      fi
+    done
+  done
+
+  if [ $startrc -eq 0 ]
+  then
+    ocf_log info "SAP Instance $SID-$InstanceName started: $output"
+    rc=$OCF_SUCCESS
+    sapuserexit POST_START_USEREXIT "$OCF_RESKEY_POST_START_USEREXIT"
   else
     ocf_log err "SAP Instance $SID-$InstanceName start failed: $output"
-    rc=$OCF_ERR_GENERIC
+    rc=$OCF_NOT_RUNNING
   fi
+
   return $rc
 }
 
+
+#
+# sapinstance_recover: Try startup of failed instance by cleaning up resources
+#
+sapinstance_recover() {
+  cleanup_instance
+  sapinstance_start
+  return $?
+}
+
+
 #
 # sapinstance_stop: Stop the SAP instance
 #
 sapinstance_stop() {
+  sapuserexit PRE_STOP_USEREXIT "$OCF_RESKEY_PRE_STOP_USEREXIT"
+
   check_sapstartsrv
 
   output=`$SAPCONTROL -nr $InstanceNr -function Stop`
@@ -197,6 +350,9 @@
     ocf_log err "SAP Instance $SID-$InstanceName stop failed: $output"
     rc=$OCF_ERR_GENERIC
   fi
+
+  sapuserexit POST_STOP_USEREXIT "$OCF_RESKEY_POST_STOP_USEREXIT"
+
   return $rc
 }
 
@@ -205,50 +361,60 @@
 # sapinstance_monitor: Can the given SAP instance do anything useful?
 #
 sapinstance_monitor() {
+  MONLOG=$1
   check_sapstartsrv
+  rc=$?
 
-  rc=$OCF_SUCCESS
-  count=0
-  LOCALHOST=`hostname`
-  output=`$SAPCONTROL -nr $InstanceNr -host $LOCALHOST -function GetProcessList -format script`
-
-  # we have to parse the output, because the returncode doesn't tell anything about the instance status
-  for SERVNO in `echo "$output" | grep '^[0-9] ' | cut -d' ' -f1 | sort -u`
-  do
-    COLOR=`echo "$output" | grep "^$SERVNO dispstatus: " | cut -d' ' -f3`
-    SERVICE=`echo "$output" | grep "^$SERVNO name: " | cut -d' ' -f3`
-    STATE=0
-
-    case $COLOR in
-      GREEN|YELLOW)       STATE=$OCF_SUCCESS;;
-      *)                  STATE=$OCF_NOT_RUNNING;;
-    esac 
-
-    case $SERVICE in
-      disp+work|msg_server|enserver|enrepserver)
-                    if [ $STATE -eq $OCF_NOT_RUNNING ]
-                    then
-                      ocf_log err "SAP instance service $SERVICE is not running with status $COLOR !"
-                      rc=$STATE
-                    fi
-                    count=1;;
-      *);;
-    esac
-  done
-
-  if [ $count -eq 0 -a $rc -eq $OCF_SUCCESS ]
+  if [ $rc -eq $OCF_SUCCESS ]
   then
-    ocf_log err "The SAP instance does not run any services which this RA could monitor!"
-    rc=$OCF_ERR_ARGS
-  fi
+    count=0
+    LOCALHOST=`hostname`
+    output=`$SAPCONTROL -nr $InstanceNr -host $LOCALHOST -function GetProcessList -format script`
+
+    # we have to parse the output, because the returncode doesn't tell anything about the instance status
+    for SERVNO in `echo "$output" | grep '^[0-9] ' | cut -d' ' -f1 | sort -u`
+    do
+      COLOR=`echo "$output" | grep "^$SERVNO dispstatus: " | cut -d' ' -f3`
+      SERVICE=`echo "$output" | grep "^$SERVNO name: " | cut -d' ' -f3`
+      STATE=0
+
+      case $COLOR in
+        GREEN|YELLOW)       STATE=$OCF_SUCCESS;;
+        *)                  STATE=$OCF_NOT_RUNNING;;
+      esac 
+
+      case $SERVICE in
+        disp+work|msg_server|enserver|enrepserver|jcontrol|jstart)
+                      if [ $STATE -eq $OCF_NOT_RUNNING ]
+                      then
+                        if [ "$MONLOG" != "NOLOG" ]
+                        then
+                          ocf_log err "SAP instance service $SERVICE is not running with status $COLOR !"
+                        fi
+                        rc=$STATE
+                      fi
+                      count=1;;
+        *);;
+      esac
+    done
 
+    if [ $count -eq 0 -a $rc -eq $OCF_SUCCESS ]
+    then
+      if [ "$MONLOG" != "NOLOG" ]
+      then
+        ocf_log err "The SAP instance does not run any services which this RA could monitor!"
+      fi
+      rc=$OCF_ERR_ARGS
+    fi
+  fi
+  
   return $rc
 }
 
 #
-# sapinstance_vaildate: Check the symantic of the input parameters 
+# sapinstance_validate: Check the symantic of the input parameters 
 #
-sapinstance_vaildate() {
+sapinstance_validate() {
   rc=$OCF_SUCCESS
   if [ `echo "$SID" | grep -c '^[A-Z][A-Z0-9][A-Z0-9]$'` -ne 1 ]
   then
@@ -325,7 +491,6 @@
 SAPVIRHOST=`echo "$OCF_RESKEY_InstanceName" | cut -d_ -f3`
 
 # optional OCF parameters, we try to guess which directories are correct
-LSB_STATUS_STOPPED=3
 if  [ -z "$OCF_RESKEY_DIR_EXECUTABLE" ]
 then
   if [ -x /usr/sap/$SID/$InstanceName/exe/sapstartsrv -a -x /usr/sap/$SID/$InstanceName/exe/sapcontrol ]
@@ -339,11 +504,8 @@
     SAPSTARTSRV="/usr/sap/$SID/SYS/exe/run/sapstartsrv"
     SAPCONTROL="/usr/sap/$SID/SYS/exe/run/sapcontrol"
   else
-    [ "$1" = stop ] && exit $OCF_SUCCESS
-    [ "$1" = monitor ] && exit $OCF_NOT_RUNNING
-    [ "$1" = status ] && exit $LSB_STATUS_STOPPED
-    ocf_log err "Cannot find sapstartsrv and sapcontrol executable, please set DIR_EXECUTABLE parameter!"
-    exit $OCF_ERR_GENERIC
+    ocf_log warn "Cannot find sapstartsrv and sapcontrol executable, please set DIR_EXECUTABLE parameter!"
+    exit $OCF_NOT_RUNNING
   fi
 else
   DIR_EXECUTABLE="$OCF_RESKEY_DIR_EXECUTABLE"
@@ -357,8 +519,8 @@
   then
     DIR_PROFILE="/usr/sap/$SID/SYS/profile"
   else
-    ocf_log err "Expected /usr/sap/$SID/SYS/profile/ to be a directory, please set DIR_PROFILE parameter!"
-    exit $OCF_ERR_GENERIC
+    ocf_log warn "Expected /usr/sap/$SID/SYS/profile/ to be a directory, please set DIR_PROFILE parameter!"
+    exit $OCF_NOT_RUNNING
   fi
 else
   DIR_PROFILE="$OCF_RESKEY_DIR_PROFILE"
@@ -369,13 +531,29 @@
   SAPSTARTPROFILE="$DIR_PROFILE/START_${InstanceName}_${SAPVIRHOST}"
   if [ ! -r $SAPSTARTPROFILE ]
   then
-    ocf_log err "Expected $SAPSTARTPROFILE to be the instance START profile, please set START_PROFILE parameter!"
-    exit $OCF_ERR_GENERIC
+    ocf_log warn "Expected $SAPSTARTPROFILE to be the instance START profile, please set START_PROFILE parameter!"
+    exit $OCF_NOT_RUNNING
   fi
 else
   SAPSTARTPROFILE="$OCF_RESKEY_START_PROFILE"
 fi
 
+if [ -z "$OCF_RESKEY_START_WAITTIME" ]
+then
+  OCF_RESKEY_START_WAITTIME=3600
+fi
+
+
+if [ -z "$OCF_RESKEY_AUTOMATIC_RECOVER" ]
+then
+  OCF_RESKEY_AUTOMATIC_RECOVER=0
+else
+  case "$OCF_RESKEY_AUTOMATIC_RECOVER" in
+   1|true|TRUE|yes|YES) OCF_RESKEY_AUTOMATIC_RECOVER=1;;
+   0|false|FALSE|no|NO) OCF_RESKEY_AUTOMATIC_RECOVER=0;;
+  esac
+fi
+
 # as root user we need the library path to the SAP kernel to be able to call sapcontrol
 if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
   LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
@@ -388,6 +566,9 @@
   start)	sapinstance_start
 		exit $?;;
 
+  recover)      sapinstance_recover
+                exit $?;;
+
   stop)		sapinstance_stop
 		exit $?;;
 
@@ -395,7 +576,7 @@
           	sapinstance_monitor
 		exit $?;;
 
-  validate-all)	sapinstance_vaildate
+  validate-all)	sapinstance_validate
 		exit $?;;
 
   *)		sapinstance_methods
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/SendArp /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/SendArp
--- heartbeat-2.1.3/resources/OCF/SendArp	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/SendArp	2008-08-18 13:32:19.000000000 +0100
@@ -103,7 +103,7 @@
 <action name="stop"    timeout="100" />
 <action name="monitor" depth="0"  timeout="20" interval="10" start-delay="10" />
 <action name="meta-data"  timeout="5" />
-<action name="verify-all"  timeout="30" />
+<action name="validate-all"  timeout="30" />
 </actions>
 </resource-agent>
 END
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/SphinxSearchDaemon /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/SphinxSearchDaemon
--- heartbeat-2.1.3/resources/OCF/SphinxSearchDaemon	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/SphinxSearchDaemon	2008-08-18 13:32:19.000000000 +0100
@@ -90,7 +90,7 @@
 <action name="stop"         timeout="100" />
 <action name="monitor"      timeout="20" interval="10" depth="0" start-delay="0" />
 <action name="meta-data"    timeout="5" />
-<action name="verify-all"   timeout="30" />
+<action name="validate-all"   timeout="30" />
 </actions>
 </resource-agent>
 END
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Stateful /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Stateful
--- heartbeat-2.1.3/resources/OCF/Stateful	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Stateful	2008-08-18 13:32:19.000000000 +0100
@@ -29,6 +29,7 @@
 # Initialization:
 
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
+CRM_MASTER="${HA_SBIN_DIR}/crm_master -l reboot"
 
 #######################################################################
 
@@ -61,7 +62,7 @@
 <action name="stop"    timeout="100" />
 <action name="monitor" depth="0"  timeout="20" interval="10"/>
 <action name="meta-data"  timeout="5" />
-<action name="verify-all"  timeout="30" />
+<action name="validate-all"  timeout="30" />
 </actions>
 </resource-agent>
 END
@@ -107,6 +108,7 @@
 	return $OCF_RUNNING_MASTER
     fi
     stateful_update slave
+    $CRM_MASTER -v 5
     return 0
 }
 
@@ -117,6 +119,7 @@
 	return $OCF_NOT_RUNNING
     fi
     stateful_update slave
+    $CRM_MASTER -v 5
     return 0
 }
 
@@ -126,10 +129,12 @@
 	return $OCF_NOT_RUNNING
     fi
     stateful_update master
+    $CRM_MASTER -v 10
     return 0
 }
 
 stateful_stop() {
+    $CRM_MASTER -D
     stateful_check_state master
     if [ $? = 0 ]; then
        	# CRM Error - Should never happen
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/SysInfo /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/SysInfo
--- heartbeat-2.1.3/resources/OCF/SysInfo	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/SysInfo	2008-08-18 13:32:19.000000000 +0100
@@ -135,7 +135,7 @@
 		cpu_type=${cpu_type/*: /}
 		cpu_speed=`grep "bogomips" /proc/cpuinfo | head -n 1`
 		cpu_speed=${cpu_speed/*: /}
-		cpu_cores=`grep "processor" /proc/cpuinfo | wc -l`
+		cpu_cores=`grep "^processor" /proc/cpuinfo | wc -l`
 	    fi
 
 	    if [ -f /proc/meminfo ]; then
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/WAS /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/WAS
--- heartbeat-2.1.3/resources/OCF/WAS	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/WAS	2008-08-18 13:32:19.000000000 +0100
@@ -325,7 +325,8 @@
 #	This is actually faster than WAS_status above...
 #
 WAS_monitor() {
-  tmpfile=`maketempfile`
+  trap '[ -z "$tmpfile" ] || rmtempfile "$tmpfile"' 0
+  tmpfile=`maketempfile` || return 1
   SnoopPort=`GetWASSnoopPort $1`
   output=`$WGET -nv -O$tmpfile  http://localhost:$SnoopPort/servlet/snoop 2>&1`
   rc=$?
@@ -344,7 +345,6 @@
     ocf_log "err" "WAS: $1: wget failure: $output"
     rc=$OCF_ERR_GENERIC
   fi
-  rm -fr $tmpfile
   return $rc
 }
 
@@ -471,7 +471,7 @@
 
 	local port
 	local have_valid_port=false
-	for port in "$WASPorts"; do
+	for port in $WASPorts; do
 	    if CheckPort $port; then
 		have_valid_port=true
 		break
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/WAS6 /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/WAS6
--- heartbeat-2.1.3/resources/OCF/WAS6	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/WAS6	2008-08-18 13:32:19.000000000 +0100
@@ -294,7 +294,8 @@
 #       This is actually faster than WAS_status above...
 #
 WAS_monitor() {
-  tmpfile=`maketempfile`
+  trap '[ -z "$tmpfile" || rmtempfile "$tmpfile"' 0
+  tmpfile=`maketempfile` || exit 1
   SnoopPort=`GetWASSnoopPort $1`
   output=`$WGET -nv -O$tmpfile  http://localhost:$SnoopPort/snoop 2>&1`
   rc=$?
@@ -313,7 +314,6 @@
     ocf_log "err" "WAS: $1: wget failure: $output"
     rc=$OCF_ERR_GENERIC
   fi
-  rm -fr $tmpfile
   return $rc
 }
 
@@ -440,7 +440,7 @@
 
         local port
         local have_valid_port=false
-        for port in "$WASPorts"; do
+        for port in $WASPorts; do
             if CheckPort $port; then
                 have_valid_port=true
                 break
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/WinPopup /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/WinPopup
--- heartbeat-2.1.3/resources/OCF/WinPopup	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/WinPopup	2008-08-18 13:32:19.000000000 +0100
@@ -137,7 +137,7 @@
 CheckIP() {
   ip="$1"
   case $ip in
-    *[^0-9.]*) #got invalid char
+    *[!0-9.]*) #got invalid char
 	false;;
     .*|*.) #begin or end by ".", which is invalid
 	false;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Xen /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Xen
--- heartbeat-2.1.3/resources/OCF/Xen	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Xen	2008-08-18 13:32:19.000000000 +0100
@@ -43,8 +43,6 @@
 : ${OCF_RESKEY_allow_migrate=0}
 : ${OCF_RESKEY_allow_mem_management=0}
 : ${OCF_RESKEY_reserved_Dom0_memory=512}
-DOMAIN_NAME=`awk '$1~/^name(=|$)/{print}' ${OCF_RESKEY_xmfile} | sed 's/.*=[[:space:]]*//' | tr -d "[\"']"`
-: ${DOMAIN_NAME=${OCF_RESOURCE_INSTANCE}}
 
 meta_data() {
 	cat <<END
@@ -55,9 +53,21 @@
 
 <longdesc lang="en">
 Resource Agent for the Xen Hypervisor.
-Manages Xen virtual machine instances by
-mapping cluster resource start and stop,  
-to Xen create and shutdown, respectively.
+Manages Xen virtual machine instances by mapping cluster resource
+start and stop,  to Xen create and shutdown, respectively.
+
+A note on names
+
+We will try to extract the name from the config file (the xmfile
+attribute). If you use a simple assignment statement, then you
+should be fine. Otherwise, if there's some python acrobacy
+involved such as dynamically assigning names depending on other
+variables, and we will try to detect this, then please set the
+name attribute. You should also do that if there is any chance of
+a pathological situation where a config file might be missing,
+for example if it resides on a shared storage. If all fails, we
+finally fall back to the instance id to preserve backward
+compatibility.
 
 Para-virtualized guests can also be migrated by enabling the
 meta_attribute allow_migrate.
@@ -75,7 +85,14 @@
 <shortdesc lang="en">Xen control file</shortdesc>
 <content type="string" default="" />
 </parameter>
-<parameter name="allow_migrate" unique="0" required="1">
+<parameter name="name" unique="0" required="0">
+<longdesc lang="en">
+Name of the virtual machine.
+</longdesc>
+<shortdesc lang="en">Xen DomU name</shortdesc>
+<content type="string" default="" />
+</parameter>
+<parameter name="allow_migrate" unique="0" required="0">
 <longdesc lang="en">
 This bool parameters allows to use live migration
 for paravirtual machines.
@@ -83,7 +100,22 @@
 <shortdesc lang="en">Use live migration</shortdesc>
 <content type="boolean" default="0" />
 </parameter>
-<parameter name="allow_mem_management" unique="0" required="1">
+<parameter name="shutdown_timeout">
+<longdesc lang="en">
+The Xen agent will first try an orderly shutdown using xm shutdown.
+Should this not succeed within this timeout, the agent will escalate to
+xm destroy, forcibly killing the node.
+
+If this is not set, it will default to two-third of the stop action
+timeout.
+
+Setting this value to 0 forces an immediate destroy.
+
+</longdesc>
+<shortdesc lang="en">Shutdown escalation timeout</shortdesc>
+<content type="boolean" default="" />
+</parameter>
+<parameter name="allow_mem_management" unique="0" required="0">
 <longdesc lang="en">
 This parameter enables dynamic adjustment of memory for start 
 and stop actions used for Dom0 and the DomUs. The default is
@@ -92,7 +124,7 @@
 <shortdesc lang="en">Use dynamic memory management</shortdesc>
 <content type="boolean" default="0" />
 </parameter>
-<parameter name="reserved_Dom0_memory" unique="0" required="1">
+<parameter name="reserved_Dom0_memory" unique="0" required="0">
 <longdesc lang="en">
 In case memory management is used, this parameter
 defines the minimum amount of memory to be reserved
@@ -121,7 +153,6 @@
 <action name="stop" timeout="40" />
 <action name="migrate_from" timeout="120" />
 <action name="migrate_to" timeout="120" />
-<action name="status" depth="0" timeout="30" interval="10" start-delay="120" />
 <action name="monitor" depth="0" timeout="30" interval="10" start-delay="120" />
 <action name="meta-data" timeout="5" />
 <action name="validate-all" timeout="5" />
@@ -131,20 +162,20 @@
 }
 
 Xen_Status() {
-  STATUS=`xm list --long $1 | grep status 2>/dev/null`
-  if [ "X${STATUS}" != "X" ];then
+  STATUS=`xm list --long $1 2>/dev/null | grep status 2>/dev/null`
+  if [ "X${STATUS}" != "X" ]; then
     # we have Xen 3.0.4 or higher
     STATUS_NOSPACES=`echo "$STATUS" | awk '{ print $1,$2}'`
-    if [ "$STATUS_NOSPACES" = "(status 2)" -o "$STATUS_NOSPACES" = "(status 1)" ] ; then
+    if [ "$STATUS_NOSPACES" = "(status 2)" -o "$STATUS_NOSPACES" = "(status 1)" ]; then
       return $OCF_SUCCESS
     else 
       return $OCF_NOT_RUNNING
     fi
   else
     # we have Xen 3.0.3 or lower
-    STATUS=`xm list --long $1 | grep state 2>/dev/null`
+    STATUS=`xm list --long $1 2>/dev/null | grep state 2>/dev/null`
     echo "${STATUS}" | grep -qs "[-r][-b][-p]---"
-    if [ $? -ne 0 ];then
+    if [ $? -ne 0 ]; then
       return $OCF_NOT_RUNNING
     else
       return $OCF_SUCCESS
@@ -154,19 +185,19 @@
 }
 
 Xen_Adjust_Memory() {
-    if [ "${OCF_RESKEY_allow_mem_management}" != 0 ];then
+    if [ "${OCF_RESKEY_allow_mem_management}" != 0 ]; then
       CNTNEW=$1
       RUNNING=`Xen_List_running`
       RUNCNT=`Xen_Count_running`
       MAXMEM=`Xen_Total_Memory`
-      if [ ${RUNCNT} -eq 0 -a ${CNTNEW} -eq 0 ];then
+      if [ ${RUNCNT} -eq 0 -a ${CNTNEW} -eq 0 ]; then
 	RUNCNT=1
       fi
       #NEWMEM=`echo "(${MAXMEM}-${OCF_RESKEY_reserved_Dom0_memory})/(${RUNCNT}+${CNTNEW})"|bc`
       NEWMEM=$(( (${MAXMEM} - ${OCF_RESKEY_reserved_Dom0_memory}) / (${RUNCNT} + ${CNTNEW} ) ))
       # do not rely on ballooning add dom0_mem=512 instead to force memory for dom0
       #xm mem-set Domain-0 ${OCF_RESKEY_reserved_Dom0_memory}
-      for DOM in ${RUNNING};do
+      for DOM in ${RUNNING}; do
         xm mem-set ${DOM} ${NEWMEM} 
       done
       ocf_log info "Adjusted memory to: $NEWMEM, for the following $RUNCNT domains: $RUNNING"
@@ -178,8 +209,8 @@
 }
 Xen_List_running() {
 	ALL_DOMS=`Xen_List_all`
-	for DOM in ${ALL_DOMS};do
-		if Xen_Status $DOM;then
+	for DOM in ${ALL_DOMS}; do
+		if Xen_Status $DOM; then
 			echo "${DOM} "
 		fi
 	done
@@ -190,18 +221,19 @@
 
 Xen_Monitor() {
   Xen_Status ${DOMAIN_NAME}
-  if [ $? -eq ${OCF_NOT_RUNNING} ];then
+  if [ $? -eq ${OCF_NOT_RUNNING} ]; then
 	return ${OCF_NOT_RUNNING}
   fi
-  if [ "X${OCF_RESKEY_monitor_scripts}" == "X" ];then
+  if [ "X${OCF_RESKEY_monitor_scripts}" = "X" ]; then
 	return ${OCF_SUCCESS}
   fi
-  for SCRIPT in ${OCF_RESKEY_monitor_scripts};do
+  for SCRIPT in ${OCF_RESKEY_monitor_scripts}; do
 	$SCRIPT
-	if [ $? -ne 0 ];then
-		return ${OCF_NOT_RUNNING}
+	if [ $? -ne 0 ]; then
+		return ${OCF_ERR_GENERIC}
 	fi
   done
+  return ${OCF_SUCCESS}
 }
 
 Xen_Total_Memory() {
@@ -209,76 +241,84 @@
 }
 
 Xen_Start() {
-  if
-    Xen_Status ${DOMAIN_NAME}
-  then
+  if Xen_Status ${DOMAIN_NAME}; then
     ocf_log info "Xen domain $DOMAIN_NAME already running."
     return $OCF_SUCCESS
-  else
+  fi
+
+  if [ ! -f "${OCF_RESKEY_xmfile}" ]; then
+    ocf_log err "Config file ${OCF_RESKEY_xmfile} for $DOMAIN_NAME does not exist."
+    return $OCF_ERR_INSTALLED
+  fi
+
+  if [ "${OCF_RESKEY_allow_mem_management}" != 0 ]; then
     Xen_Adjust_Memory 1
-    if [ "${OCF_RESKEY_allow_mem_management}" != 0 ];then
-      ocf_log info "New memory for virtual domains: ${NEWMEM}"
-      sed -i -e "/^memory=/ s/^memory=.*/memory=${NEWMEM}/" ${OCF_RESKEY_xmfile}
-      xm mem-set ${DOMAIN_NAME} ${NEWMEM} 
-    fi
-    xm create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME
-    rc=$?
-    if
-      [ $rc -ne 0 ]
-    then
-      return $OCF_ERR_GENERIC
-    else 
-      if [ "${OCF_RESKEY_allow_mem_management}" != 0 ];then
-        xm mem-set ${DOMAIN_NAME} ${NEWMEM}
-      fi
-      return $OCF_SUCCESS
+    ocf_log info "New memory for virtual domains: ${NEWMEM}"
+    sed -i -e "/^memory=/ s/^memory=.*/memory=${NEWMEM}/" ${OCF_RESKEY_xmfile}
+    xm mem-set ${DOMAIN_NAME} ${NEWMEM} 
+  fi
+
+  xm create ${OCF_RESKEY_xmfile} name=$DOMAIN_NAME
+  rc=$?
+  if [ $rc -ne 0 ]; then
+    return $OCF_ERR_GENERIC
+  else 
+    if [ "${OCF_RESKEY_allow_mem_management}" != 0 ]; then
+      xm mem-set ${DOMAIN_NAME} ${NEWMEM}
     fi
-  fi  
+  fi
+  while sleep 1; do
+    Xen_Monitor && return $OCF_SUCCESS
+  done
 }
 
 Xen_Stop() {
-  if
-    Xen_Status ${DOMAIN_NAME} 
-  then
-    # xm commands are asynchroneus, therefore wait a bit
-    # to just give it time to shutdown correctly
-    xm shutdown -w ${DOMAIN_NAME}
+  if Xen_Status ${DOMAIN_NAME}; then
+    local timeout
+    if [ -n "$OCF_RESKEY_shutdown_timeout" ]; then
+      timeout=$OCF_RESKEY_shutdown_timeout
+    elif [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
+      # Allow 2/3 of the action timeout for the orderly shutdown
+      # (The origin unit is ms, hence the conversion)
+      timeout=$[OCF_RESKEY_CRM_meta_timeout/1500]
+    else
+      timeout=60
+    fi
 
-    rc=$?
-    sleep 3
-    if
-      [ $rc -ne 0 ]
-    then
-      xm destroy -w ${DOMAIN_NAME}
-      rc2=$?
-      sleep 3
-      if [ $rc2 -ne 0 ];then 
-        return ${OCF_ERR_GENERIC}
-      else
-	Xen_Adjust_Memory 0
-	return ${OCF_SUCCESS}
-      fi
-    else 
-      Xen_Adjust_Memory 0
-      return ${OCF_SUCCESS}
+    if [ "$timeout" -gt 0 ]; then
+      ocf_log info "Xen domain $DOMAIN_NAME will be stopped (timeout: ${timeout}s)"
+      xm shutdown ${DOMAIN_NAME}
+          
+      while Xen_Status ${DOMAIN_NAME} && [ "$timeout" -gt 0 ]; do
+        timeout=$[timeout-1]
+        sleep 1
+      done
+    fi
+    
+    if [ "$timeout" -eq 0 ]; then
+      ocf_log warn "Xen domain $DOMAIN_NAME will be destroyed!"
+      xm destroy ${DOMAIN_NAME}
+      while Xen_Status ${DOMAIN_NAME}; do
+        sleep 1
+      done
+      # Note: This does not give up. stop isn't allowed to to fail.
+      # If xm destroy fails, stop will eventually timeout.
+      # This is the correct behaviour.
     fi
-  else
-    ocf_log info "Xen domain $DOMAIN_NAME already stopped."
-    return $OCF_SUCCESS
   fi
+
+  ocf_log info "Xen domain $DOMAIN_NAME stopped."
+  Xen_Adjust_Memory 0
+  return $OCF_SUCCESS
 }
 
 Xen_Migrate_To() {
   target_node="$OCF_RESKEY_CRM_meta_migrate_target"
-  if 
-    Xen_Status ${DOMAIN_NAME}
-  then
+  if Xen_Status ${DOMAIN_NAME}; then
     ocf_log info "$DOMAIN_NAME: Starting xm migrate to $target_node"
     xm migrate --live $DOMAIN_NAME $target_node
     rc=$?
-    if
-      [ $rc -ne 0 ]
-    then
+    if [ $rc -ne 0 ]; then
       ocf_log err "$DOMAIN_NAME: xm migrate to $target_node failed: $rc"
       return $OCF_ERR_GENERIC
     else 
@@ -293,9 +333,7 @@
 }
 
 Xen_Migrate_From() {
-  if 
-    Xen_Status ${DOMAIN_NAME}
-  then
+  if Xen_Status ${DOMAIN_NAME}; then
     Xen_Adjust_Memory 0
     ocf_log info "$DOMAIN_NAME: Active locally, migration successful"
     return $OCF_SUCCESS
@@ -318,6 +356,35 @@
   meta-data)		meta_data
 			exit $OCF_SUCCESS
 			;;
+  usage)		usage
+			exit $OCF_SUCCESS
+			;;
+esac
+
+# the name business:
+#
+# 1. use the name attribute, or
+# 2. find the name in the config file (if it exists) and use that
+# unless it contains funny characters such as '%' or space, or
+# 3. use the OCF_RESOURCE_INSTANCE
+
+if [ x"${OCF_RESKEY_name}" != x ]; then
+	DOMAIN_NAME="${OCF_RESKEY_name}"
+else
+	if [ -f "${OCF_RESKEY_xmfile}" ]; then
+		DOMAIN_NAME=`awk '$1~/^name(=|$)/{print}' ${OCF_RESKEY_xmfile} | sed 's/.*=[[:space:]]*//' | tr -d "[\"']"`
+		if echo "$DOMAIN_NAME" | grep -qs '[%[:space:]]'; then
+			DOMAIN_NAME=""
+		fi
+	fi
+	DOMAIN_NAME=${DOMAIN_NAME:-${OCF_RESOURCE_INSTANCE}}
+fi
+
+if [ X`which xm` = X ]; then
+	return $OCF_ERR_INSTALLED
+fi
+
+case $1 in
   start)		Xen_Start
 			;;
   stop)			Xen_Stop
@@ -332,9 +399,6 @@
 			;;
   validate-all)		Xen_Validate_All
 			;;
-  usage)		usage
-			exit $OCF_SUCCESS
-			;;
   *)			usage
 			exit $OCF_ERR_UNIMPLEMENTED
 			;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/resources/OCF/Xinetd /tmp/RRBT9Z8NmI/heartbeat-2.1.4/resources/OCF/Xinetd
--- heartbeat-2.1.3/resources/OCF/Xinetd	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/resources/OCF/Xinetd	2008-08-18 13:32:19.000000000 +0100
@@ -155,7 +155,7 @@
   case "$1" in
     "") #empty string 
 	false;;
-    *[^0-9]*) #got invalid char
+    *[!0-9]*) #got invalid char
 	false;;
     *) #no invalid char, and has at least one digit, so is a good integer
 	true;;
@@ -375,11 +375,11 @@
 
 	service*)
 	case $stripped in
-	    *[^\	\ +-]=*)
+	    *[!\	\ +-]=*)
 		ocf_log err "Attribute needs a space before operator ="
 		exit $OCF_ERR_CONFIGURED
 		;;
-	    *[^\	\ ][+-]=*)
+	    *[!\	\ ][+-]=*)
 		ocf_log err "Attribute needs a space before operator [+-]="
 		exit $OCF_ERR_CONFIGURED
 		;;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/hbagent.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/hbagent.c
--- heartbeat-2.1.3/snmp_subagent/hbagent.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/hbagent.c	2008-08-18 13:32:19.000000000 +0100
@@ -429,6 +429,7 @@
         cl_log(LOG_NOTICE, "Status update: Node %s now has status %s"
         ,       node, status);
 	walk_nodetable();
+	walk_iftable();
 
 	nodestatus_trap(node, status);
 }
@@ -1455,6 +1456,7 @@
 
 	/* you're main loop here... */
 	while(keep_running) {
+		int	save_errno;
 	/* if you use select(), see snmp_select_info() in snmp_api(3) */
 	/*     --- OR ---  */
 		/* 0 == don't block */
@@ -1489,9 +1491,10 @@
 		}
 
 		ret = select(numfds, &fdset, 0, 0, tvp);
+		save_errno=errno;
 
 		if (ret < 0) {
-			if (errno == EBADF) {
+			if (errno == EBADF && keep_running) {
 				struct stat	foo;
 				/* Probably the membership layer shut down for some reason. */
 				if (mem_fd >= 0 && fstat(mem_fd, &foo) < 0 && errno == EBADF) {
@@ -1506,7 +1509,11 @@
 			}
 				
 			/* error */
-			cl_perror("select() returned an error. shutting down");
+			if (keep_running) {
+				errno = save_errno;
+				cl_perror("%s: select() returned an error, shutting down."
+				,       __FUNCTION__);
+			}
 			break;
 		} else if (ret == 0) {
 			/* timeout */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/hbagentv2.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/hbagentv2.c
--- heartbeat-2.1.3/snmp_subagent/hbagentv2.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/hbagentv2.c	2008-08-18 13:32:19.000000000 +0100
@@ -393,20 +393,22 @@
     /* get rc_code from transition magic number */
     if (!rc_code) {
         if (t_magic != NULL) {
-            int transition_num = -1;
+            int transition_id = -1;
             int action_id = -1;
             int status = -1;
-            int rc = -1;
+            int op_rc = -1;
+            int target_rc = -1;
             char *uuid = NULL;
 
             if (!decode_transition_magic(
-                    t_magic, &uuid, &transition_num, &action_id, &status, &rc)) {
+                    t_magic, &uuid, &transition_id, &action_id,
+                    &status, &op_rc, &target_rc)) {
                 cl_log(LOG_ERR, "decode_transition_magic() is failed.");
                 free_xml(diff);
                 return;
             }
             crm_free(uuid);
-            sprintf(tmp_rc_str, "%d\n", rc);
+            sprintf(tmp_rc_str, "%d\n", op_rc);
             rc_code = tmp_rc_str;
         }
     }
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/LHANodeTable.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/LHANodeTable.c
--- heartbeat-2.1.3/snmp_subagent/LHANodeTable.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/LHANodeTable.c	2008-08-18 13:32:19.000000000 +0100
@@ -254,6 +254,13 @@
                to be dealt with here */
             case MODE_GET:
                 switch(table_info->colnum) {
+		    case COLUMN_LHANODEINDEX:
+			snmp_set_var_typed_value(var,
+				ASN_INTEGER,
+				(u_char*)&entry->id,
+				sizeof(entry->id));
+			break;
+
                     case COLUMN_LHANODENAME:
                         snmp_set_var_typed_value(var, 
 				ASN_OCTET_STR, 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/Makefile
--- heartbeat-2.1.3/snmp_subagent/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/snmp_subagent/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,772 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# snmp_subagent/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# Linux-HA: SNMP Subagent
+# 
+# Copyright (C) 2002 Yixiong Zou (yixiong.zou@intel.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
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/snmp_subagent
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/snmp_subagent
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+MAINTAINERCLEANFILES = Makefile.in
+hbagent_srces = snmp-config-resolve.h	\
+	hbagent.h			\
+	hbagent.c			\
+	hbagentv2.h			\
+	hbagentv2.c			\
+	LHANodeTable.h			\
+	LHANodeTable_columns.h		\
+	LHANodeTable_enums.h		\
+	LHANodeTable.c			\
+	LHAClusterInfo.h		\
+	LHAClusterInfo.c		\
+	LHAIFStatusTable.h		\
+	LHAIFStatusTable_enums.h	\
+	LHAIFStatusTable_columns.h	\
+	LHAIFStatusTable.c		\
+	LHAMembershipTable_columns.h	\
+	LHAMembershipTable_enums.h	\
+	LHAMembershipTable.h		\
+	LHAMembershipTable.c		\
+	LHAHeartbeatConfigInfo.c	\
+	LHAHeartbeatConfigInfo.h	\
+	LHAResourceGroupTable_columns.h	\
+	LHAResourceGroupTable_enums.h	\
+	LHAResourceGroupTable.h		\
+	LHAResourceGroupTable.c		\
+	LHAResourceTable_columns.h \
+	LHAResourceTable_enums.h \
+	LHAResourceTable.h		\
+	LHAResourceTable.c		\
+	LHAResourceStatusUpdate.h \
+	LHAResourceStatusUpdate.c 
+
+test_scrs = SNMPAgentSanityCheck
+mibsdir = /usr/share/snmp/mibs
+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)/heartbeat
+hbagent_SOURCES = $(hbagent_srces)
+hbagent_LDADD = \
+                        $(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 \
+			$(CURSESLIBS) \
+			$(GLIBLIB)
+
+hbagent_LDFLAGS = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap 
+
+# test cases
+testdir = $(HA_NOARCHDATAHBDIR)
+test_SCRIPTS = $(test_scrs)
+hadir = $(sysconfdir)/ha.d
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)/$@
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+hbagent$(EXEEXT): $(hbagent_OBJECTS) $(hbagent_DEPENDENCIES) 
+	@rm -f hbagent$(EXEEXT)
+	$(hbagent_LINK) $(hbagent_OBJECTS) $(hbagent_LDADD) $(LIBS)
+install-testSCRIPTS: $(test_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-testSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/LHAClusterInfo.Po
+include ./$(DEPDIR)/LHAHeartbeatConfigInfo.Po
+include ./$(DEPDIR)/LHAIFStatusTable.Po
+include ./$(DEPDIR)/LHAMembershipTable.Po
+include ./$(DEPDIR)/LHANodeTable.Po
+include ./$(DEPDIR)/LHAResourceGroupTable.Po
+include ./$(DEPDIR)/LHAResourceStatusUpdate.Po
+include ./$(DEPDIR)/LHAResourceTable.Po
+include ./$(DEPDIR)/hbagent.Po
+include ./$(DEPDIR)/hbagentv2.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-mibsDATA: $(mibs_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(mibsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(mibsdir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 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.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/Makefile.in
--- heartbeat-2.1.3/snmp_subagent/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -62,7 +62,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = SNMPAgentSanityCheck
@@ -92,7 +92,7 @@
 	$(LDFLAGS) -o $@
 testSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(test_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -148,6 +148,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -165,24 +166,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -244,12 +233,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -490,8 +480,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -598,8 +588,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -611,8 +601,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -622,13 +612,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/README /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/README
--- heartbeat-2.1.3/snmp_subagent/README	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/README	2008-08-18 13:32:19.000000000 +0100
@@ -11,9 +11,6 @@
 parameters can be viewed through SNMP command.  In addition, SNMP traps
 will be sent for node, link, and membership events.  
 
-    Cluster Resources are not well supported.  It only displays 
-the resources defined in the /etc/ha.d/haresource file for now.  It 
-does not integrate with the CRM yet.  The work is being planned. 
 
 2. Build 
 
@@ -37,7 +34,10 @@
     Here's what it normally takes in your snmpd.conf file:
 
     # create a SNMPv1/SNMPv2 community
-    rwcommunity  public
+    rocommunity  public 
+    # if you want to limit access to a host you can use
+    # rocommunity  public xxx.xxx.xxx.xxx/24
+    # For more complex setups consult the snmpd.conf man page
 
     # this makes the snmpd a master snmp agent, which can
     # support AgentX subagents.
@@ -47,9 +47,43 @@
     # or rather the SNMPv2 informs, will be sent to localhost.  
     trap2sink localhost
 
-4. Demo Output
+4. Test the setup
+   a) (re)start your master SNMP daemon (e.g. net-snmpd)
+      /etc/init.d/snmpd restart
+   b) start the HB agent 
+      /usr/lib/heartbeat/hbagent -d
+   c) run snmpwalk (while hbagent is running)
+      snmpwalk -c public <YOUR.NODE.NAME> -v2c \
+        -mLINUX-HA-MIB enterprises.4682
 
-    [yzou@matrix mibs]$ snmpwalk -v2c localhost -c public LinuxHA
+      (if you get a error message you may have to copy 
+       /usr/share/snmp/mibs/LINUX-HA-MIB.mib from one of
+       the cluster machines to your management station 
+       to /usr/share/snmp/mibs/)
+
+   You shoud see a output like the one shown in step (7).
+
+   d) end the hbagent process (CRTL+C)
+
+5. Make the snmp subagent started by heartbeat
+
+   # /etc/ha.d/ha.cf
+   #[...]
+   respawn root /usr/lib/heartbeat/hbagent
+
+   (note: also make sure that the snmp master daemon 
+    is startet before heartbeat during system boot)
+
+6. Restart Heartbeat
+
+   note: Watch out on production systems. Restarting heartbeat
+         without proper handling will cause downtime. 
+   hint: You can use is-managed-default=false on heartbeatv2 
+         clusters
+
+7. Demo Output
+
+    yourshell# snmpwalk -c public <YOUR.HOST.NAME> -v2c -mLINUX-HA-MIB enterprises.4682
 
     LINUX-HA-MIB::LHATotalNodeCount.0 = Counter32: 2
     LINUX-HA-MIB::LHALiveNodeCount.0 = Counter32: 2
@@ -97,6 +131,7 @@
     LINUX-HA-MIB::LHADebugFile.0 = STRING: /var/log/ha-debug
     LINUX-HA-MIB::LHALogFacility.0 = STRING: local0
 
-5. Bugs
+8. Bugs
  
     Please forward all bug report to Linux-HA dev mailing list.
+
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/SNMPAgentSanityCheck /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/SNMPAgentSanityCheck
--- heartbeat-2.1.3/snmp_subagent/SNMPAgentSanityCheck	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/snmp_subagent/SNMPAgentSanityCheck	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,222 @@
+#!/bin/sh
+#
+# Copyright (C) 2002 Yixiong Zou (yixiong.zou@intel.com)
+# Support:      linux-ha-dev@lists.tummy.com
+# License:      GNU General Public License (GPL)
+#
+set +x
+
+#
+#	BasicSanityCheck has to run as root.
+#	
+#	Perhaps a better way to do this is to use the cl_status command...
+#		-- AlanR
+#	
+NODE0=`uname -n`
+NODE1=imalwaysdead.com
+
+# make sure the agent and the subagent are dead
+killall -9 hbagent
+killall -9 snmpd
+
+# make sure the snmpd is running and agentX support is turned on
+GenerateSNMPDConf() {
+	cat <<-! >$1
+		rocommunity public
+		master yes
+		trap2sink localhost
+		!
+	chmod 644 $1
+}
+
+which snmpd
+ret=$?
+if test $ret != 0 
+	then echo "snmpd file is not in the path, skip agent test..."
+	exit $ret
+fi
+
+# start the snmpd manually with our own config file
+SNMPDCONF=/var/run/testsnmpd.conf
+SNMPPIDFILE=/var/run/testsnmpd.pid
+SNMPD=`which snmpd`
+GenerateSNMPDConf $SNMPDCONF
+$SNMPD -C -c $SNMPDCONF -p $SNMPPIDFILE
+
+#/etc/init.d/snmpd status 
+#ret=$?
+#if test $ret != 0 
+#	then echo "snmpd cannot be started correctly. skip agent test..."
+#	exit $ret
+#else 
+#	echo "snmpd is already running, good"
+#fi
+
+# we want to wait for a couple seconds to let the master agent fully
+# ready before we start the subagent.
+sleep 3
+
+
+# start the linux-ha snmp subagent
+/usr/lib/heartbeat/hbagent -d &
+HBAGENTPID=$!
+sleep 5
+
+# get the nodename for node0 and node1
+# node0 should be the value of the localhost
+# node1 should be "ImAlwaysDead.com"
+
+export MIBS=ALL
+#snmpwalk -v2c localhost -c public LinuxHA
+node0=`snmpget -v2c localhost -c public LHANodeName.1 | sed -ne 's/LINUX-HA-MIB::LHANodeName.1 = STRING: //p'`
+echo node0 = $node0
+node1=`snmpget -v2c localhost -c public LHANodeName.2 | sed -ne 's/LINUX-HA-MIB::LHANodeName.2 = STRING: //p'`
+echo node1 = $node1
+
+ret=1
+ret2=1
+for name in $NODE0 $NODE1; do
+	echo name = $name, node0 = $node0
+	if test "$node0" = "$name"; then
+		ret=0
+		echo "found $node0"
+		break
+	fi
+done
+
+if test $ret = 0; then
+	for name in $NODE0 $NODE1; do
+		echo name = $name, node1 = $node1
+		if test "$node1" = "$name"; then
+			ret2=0
+			echo "found $node1"
+			break
+		fi
+	done
+fi
+
+if test $ret2 = 0; then
+	echo "BasicSanityCheck for SNMP Subagent passed."
+#	exit 0
+else 
+	echo "BasicSanityCheck for SNMP Subagent failed."
+#	exit 1
+fi
+
+#
+# BasicSanityCheck for SNMP Subagent about CRM resources.
+#
+
+# wait to let cib ready to execute variant_op
+sleep 10
+
+# add CRM resource.
+RSC0NAME="prmDummy"
+RSC0TYPE="primitive(1)"
+RSC0NODE="$NODE0"
+RSC0STATUS="started(2)"
+RSC0ISMANAGED="managed(1)"
+RSC0FAILCOUNT="0"
+RSC0PARENT=""
+
+# clear resources
+cibadmin --cib_replace -X '<resources/>'
+cibadmin --cib_create -o resources \
+  -X '<primitive id="prmDummy" class="ocf" type="Dummy" provider="heartbeat"/>'
+sleep 3
+
+# get resource's information with snmp subagent.
+rsc0name=`snmpget -v2c localhost -c public LHAResourceName.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceName.1 = STRING: //p'`
+rsc0type=`snmpget -v2c localhost -c public LHAResourceType.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceType.1 = INTEGER: //p'`
+rsc0node=`snmpget -v2c localhost -c public LHAResourceNode.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceNode.1 = STRING: //p'`
+rsc0status=`snmpget -v2c localhost -c public LHAResourceStatus.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceStatus.1 = INTEGER: //p'`
+rsc0ismanaged=`snmpget -v2c localhost -c public LHAResourceIsManaged.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceIsManaged.1 = INTEGER: //p'`
+rsc0failcount=`snmpget -v2c localhost -c public LHAResourceFailCount.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceFailCount.1 = INTEGER: //p'`
+rsc0parent=`snmpget -v2c localhost -c public LHAResourceParent.1 \
+  | sed -ne 's/LINUX-HA-MIB::LHAResourceParent.1 = STRING: //p'`
+
+# check for LHAResourceName
+ret=0
+echo "rsc0name = $rsc0name, RSC0NAME = $RSC0NAME" 
+if test "$rsc0name" != "$RSC0NAME"; then
+	echo "failed to get resource name." >&2
+	ret=1
+fi
+
+# check for LHAResourceType
+if test $ret = 0; then
+	echo "rsc0type = $rsc0type, RSC0TYPE = $RSC0TYPE" 
+	if test "$rsc0type" != "$RSC0TYPE"; then
+		echo "failed to get resource type." >&2
+		ret=1
+	fi
+fi
+
+# check for LHAResourceNode
+if test $ret = 0; then
+	echo "rsc0node = $rsc0node, RSC0NODE = $RSC0NODE" 
+	if test "$rsc0node" != "$RSC0NODE"; then
+		echo "failed to get resource node." >&2
+		ret=1
+	fi
+fi
+
+# check for LHAResourceStatus
+if test $ret = 0; then
+	echo "rsc0status = $rsc0status, RSC0STATUS = $RSC0STATUS" 
+	if test "$rsc0status" != "$RSC0STATUS"; then
+		echo "failed to get resource status." >&2
+		ret=1
+	fi
+fi
+
+# check for LHAResourceIsManaged
+if test $ret = 0; then
+	echo "rsc0ismanaged = $rsc0ismanaged, RSC0ISMANAGED = $RSC0ISMANAGED" 
+	if test "$rsc0ismanaged" != "$RSC0ISMANAGED"; then
+		echo "failed to get resource ismanaged." >&2
+		ret=1
+	fi
+fi
+# check for LHAResourceFailCount
+if test $ret = 0; then
+    echo "rsc0failcount = $rsc0failcount, RSC0FAILCOUNT = $RSC0FAILCOUNT"
+    if test "$rsc0failcount" != "$RSC0FAILCOUNT"; then
+        echo "failed to get resource failcount." >&2
+        ret=1
+    fi
+fi
+
+# check for LHAResourceParent
+if test $ret = 0; then
+    echo "rsc0parent = $rsc0parent, RSC0PARENT = $RSC0PARENT"
+    if test "$rsc0parent" != "$RSC0PARENT"; then
+        echo "failed to get resource parent." >&2
+        ret=1
+    fi
+fi
+
+# show the result.
+if test $ret = 0; then
+	echo "BasicSanityCheck for SNMP Subagent about CRM resources passed."
+else 
+	echo "BasicSanityCheck for SNMP Subagent about CRM resources failed."
+fi
+
+kill $HBAGENTPID
+if
+  [ -f $SNMPPIDFILE -a ! -z $SNMPPIDFILE ]
+then
+  kill `cat $SNMPPIDFILE`
+  rm -f $SNMPPIDFILE
+fi
+# clear resources
+cibadmin --cib_replace -X '<resources/>'
+
+exit $ret
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/snmp_subagent/SNMPAgentSanityCheck.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/snmp_subagent/SNMPAgentSanityCheck.in
--- heartbeat-2.1.3/snmp_subagent/SNMPAgentSanityCheck.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/snmp_subagent/SNMPAgentSanityCheck.in	2008-08-18 13:32:19.000000000 +0100
@@ -106,7 +106,9 @@
 #
 # BasicSanityCheck for SNMP Subagent about CRM resources.
 #
-# NOTE:    Heartbeat service for this test has to run without cib.xml.
+
+# wait to let cib ready to execute variant_op
+sleep 10
 
 # add CRM resource.
 RSC0NAME="prmDummy"
@@ -116,6 +118,9 @@
 RSC0ISMANAGED="managed(1)"
 RSC0FAILCOUNT="0"
 RSC0PARENT=""
+
+# clear resources
+cibadmin --cib_replace -X '<resources/>'
 cibadmin --cib_create -o resources \
   -X '<primitive id="prmDummy" class="ocf" type="Dummy" provider="heartbeat"/>'
 sleep 3
@@ -211,5 +216,7 @@
   kill `cat $SNMPPIDFILE`
   rm -f $SNMPPIDFILE
 fi
+# clear resources
+cibadmin --cib_replace -X '<resources/>'
 
 exit $ret
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/apphbd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/apphbd/Makefile
--- heartbeat-2.1.3/telecom/apphbd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/telecom/apphbd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,678 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# telecom/apphbd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom/apphbd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom/apphbd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA telecom code: application heartbeat daemon
+#
+# Copyright (C) 2002 Alan Robertson
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+PIDFILE = $(localstatedir)/run/apphbd.pid
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la	\
+			$(GLIBLIB)					\
+			$(top_builddir)/lib/pils/libpils.la
+
+AM_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char	\
+			-DPIDFILE='"$(PIDFILE)"'
+
+apphbd_SOURCES = apphbd.c
+#
+#	We don't really need libpils/libltdl (yet...)
+#
+apphbd_LDADD = $(COMMONLIBS) 				\
+			$(top_builddir)/lib/pils/libpils.la		\
+			 $(LIBRT)				
+
+apphbd_LDFLAGS = -ldl  -export-dynamic	
+apphbtest_SOURCES = apphbtest.c
+apphbtest_LDADD = $(COMMONLIBS) 				\
+			$(top_builddir)/lib/apphb/libapphb.la		
+
+apphbtest_LDFLAGS = 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+apphbd$(EXEEXT): $(apphbd_OBJECTS) $(apphbd_DEPENDENCIES) 
+	@rm -f apphbd$(EXEEXT)
+	$(apphbd_LINK) $(apphbd_OBJECTS) $(apphbd_LDADD) $(LIBS)
+apphbtest$(EXEEXT): $(apphbtest_OBJECTS) $(apphbtest_DEPENDENCIES) 
+	@rm -f apphbtest$(EXEEXT)
+	$(apphbtest_LINK) $(apphbtest_OBJECTS) $(apphbtest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/apphbd.Po
+include ./$(DEPDIR)/apphbtest.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-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-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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/apphbd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/apphbd/Makefile.in
--- heartbeat-2.1.3/telecom/apphbd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/telecom/apphbd/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -40,7 +40,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -64,7 +64,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -112,6 +112,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -129,24 +130,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -208,12 +197,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -441,8 +431,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -508,8 +498,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -521,8 +511,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -532,13 +522,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/Makefile
--- heartbeat-2.1.3/telecom/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/telecom/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,654 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# telecom/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat telecom directory: Linux-HA code
+#
+# Copyright (C) 2001 Alan Robertson
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = apphbd recoverymgrd
+DIST_SUBDIRS = apphbd recoverymgrd
+all: all-recursive
+
+.SUFFIXES:
+$(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
+.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
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/Makefile.in
--- heartbeat-2.1.3/telecom/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/telecom/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -38,7 +38,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -87,6 +87,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -104,24 +105,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -183,12 +172,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -460,8 +450,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -486,8 +476,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -497,13 +487,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/recoverymgrd/conf_lex.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/recoverymgrd/conf_lex.c
--- heartbeat-2.1.3/telecom/recoverymgrd/conf_lex.c	2007-12-21 20:46:37.000000000 +0000
+++ heartbeat-2.1.4/telecom/recoverymgrd/conf_lex.c	2008-08-18 23:39:10.000000000 +0100
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -30,7 +30,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -53,7 +53,6 @@
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +83,8 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -93,11 +94,12 @@
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -177,14 +179,9 @@
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -547,30 +544,35 @@
 #else
 #	define	MAKE_WARNINGS_GO_AWAY	;
 #endif
+#define	ECHO	{								\
+			if (fwrite(yytext, yyleng, 1, yyout) != 1) {		\
+				perror("fwrite failed");			\
+			}							\
+		}
 
-#line 46 "conf_lex.l"
+#line 51 "conf_lex.l"
 int yyget_lineno(void);
-#line 49 "conf_lex.l"
+#line 54 "conf_lex.l"
 FILE *yyget_in(void);
-#line 52 "conf_lex.l"
+#line 57 "conf_lex.l"
 FILE *yyget_out(void);
-#line 55 "conf_lex.l"
+#line 60 "conf_lex.l"
 int yyget_leng(void);
-#line 58 "conf_lex.l"
+#line 63 "conf_lex.l"
 char *yyget_text(void);
-#line 61 "conf_lex.l"
+#line 66 "conf_lex.l"
 void yyset_lineno(int);
-#line 64 "conf_lex.l"
+#line 69 "conf_lex.l"
 void yyset_in(FILE *);
-#line 67 "conf_lex.l"
+#line 72 "conf_lex.l"
 void yyset_out(FILE *);
-#line 70 "conf_lex.l"
+#line 75 "conf_lex.l"
 int yyget_debug(void);
-#line 73 "conf_lex.l"
+#line 78 "conf_lex.l"
 void yyset_debug(int);
-#line 76 "conf_lex.l"
+#line 81 "conf_lex.l"
 int yylex_destroy(void);
-#line 574 "conf_lex.c"
+#line 576 "conf_lex.c"
 
 #define INITIAL 0
 
@@ -588,6 +590,35 @@
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+int yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -628,7 +659,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -721,10 +752,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 81 "conf_lex.l"
+#line 86 "conf_lex.l"
 
 
-#line 728 "conf_lex.c"
+#line 759 "conf_lex.c"
 
 	if ( !(yy_init) )
 		{
@@ -737,6 +768,8 @@
         /* Create the reject buffer large enough to save one state per allowed character. */
         if ( ! (yy_state_buf) )
             (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
+            if ( ! (yy_state_buf) )
+                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
 
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
@@ -816,89 +849,89 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 83 "conf_lex.l"
+#line 88 "conf_lex.l"
 {return PID;};
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 84 "conf_lex.l"
+#line 89 "conf_lex.l"
 {return APPHB_HUP_L;};
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 85 "conf_lex.l"
+#line 90 "conf_lex.l"
 {return APPHB_NOHB_L;};
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 86 "conf_lex.l"
+#line 91 "conf_lex.l"
 {return APPHB_HBAGAIN_L;};
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 87 "conf_lex.l"
+#line 92 "conf_lex.l"
 {return APPHB_HBWARN_L;};
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 88 "conf_lex.l"
+#line 93 "conf_lex.l"
 {return APPHB_HBUNREG_L;};
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 89 "conf_lex.l"
+#line 94 "conf_lex.l"
 {yylval=(char *)strdup(yytext); return STRING;}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 90 "conf_lex.l"
+#line 95 "conf_lex.l"
 {yylval=(char *)strdup(yytext); return WORD;}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 91 "conf_lex.l"
+#line 96 "conf_lex.l"
 {yylval=(char *)strdup(yytext); return FILENAME;}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 92 "conf_lex.l"
+#line 97 "conf_lex.l"
 /* ignore whitespace */;
 	YY_BREAK
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 93 "conf_lex.l"
+#line 98 "conf_lex.l"
 /* ignore */ MAKE_WARNINGS_GO_AWAY
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 94 "conf_lex.l"
+#line 99 "conf_lex.l"
 {return OPEN_CURLY;}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 95 "conf_lex.l"
+#line 100 "conf_lex.l"
 {return CLOSE_CURLY;}
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 96 "conf_lex.l"
+#line 101 "conf_lex.l"
 {return COLON;}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 97 "conf_lex.l"
+#line 102 "conf_lex.l"
 {return EQUALS;}
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 98 "conf_lex.l"
+#line 103 "conf_lex.l"
 /* ignore lines starting with # */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 100 "conf_lex.l"
+#line 105 "conf_lex.l"
 {REJECT;}/* This makes unused label warning go away */
 	YY_BREAK
 /* This rule is actually never matched because
@@ -906,10 +939,10 @@
 			 */
 case 18:
 YY_RULE_SETUP
-#line 105 "conf_lex.l"
+#line 110 "conf_lex.l"
 ECHO;
 	YY_BREAK
-#line 913 "conf_lex.c"
+#line 946 "conf_lex.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -1111,7 +1144,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1135,6 +1168,14 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1508,7 +1549,9 @@
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1526,6 +1569,8 @@
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1570,7 +1615,7 @@
 
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -1832,7 +1877,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 105 "conf_lex.l"
+#line 110 "conf_lex.l"
 
 
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/recoverymgrd/conf_lex.l /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/recoverymgrd/conf_lex.l
--- heartbeat-2.1.3/telecom/recoverymgrd/conf_lex.l	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/telecom/recoverymgrd/conf_lex.l	2008-08-18 13:32:19.000000000 +0100
@@ -39,6 +39,11 @@
 #else
 #	define	MAKE_WARNINGS_GO_AWAY	;
 #endif
+#define	ECHO	{								\
+			if (fwrite(yytext, yyleng, 1, yyout) != 1) {		\
+				perror("fwrite failed");			\
+			}							\
+		}
 
 %}
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/recoverymgrd/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/recoverymgrd/Makefile
--- heartbeat-2.1.3/telecom/recoverymgrd/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/telecom/recoverymgrd/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,748 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# telecom/recoverymgrd/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom/recoverymgrd
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/telecom/recoverymgrd
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ../..
+top_srcdir = ../..
+
+#
+# heartbeat: Linux-HA telecom code: sample recovery manager daemon
+#
+# Copyright (C) 2002 Intel Corporation
+#
+# 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., 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)/heartbeat
+commmoddir = $(halibdir)/modules/comm
+havarlibdir = $(localstatedir)/lib/heartbeat
+COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la	\
+			$(GLIBLIB)
+
+
+#
+#	Since all this code compiles cleanly without warnings, we
+#	disallow all warnings here just like everywhere else.	
+#	If your version of lex or yacc is broken, then work around	
+#	it.  This has been done for the current Linux lex/yacc
+#	(bison version 1.875  and flex version 2.5.4 and others)
+#
+#	Setting CFLAGS here is specifically disallowed by automake
+#	and causes a warning.
+#
+#	So, I reverted an incorrect  CFLAGS change and restored the comments
+#	above which used to be here for these two reasons.  Before you remove
+#	these comments or turn off warnings *again*, let's discuss this.
+#
+AM_YFLAGS = -d
+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 = -ldl  -export-dynamic 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .o .obj .y
+$(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
+.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)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+conf_yacc.h: conf_yacc.c
+	@if test ! -f $@; then \
+	  rm -f conf_yacc.c; \
+	  $(MAKE) $(AM_MAKEFLAGS) conf_yacc.c; \
+	else :; fi
+recoverymgrd$(EXEEXT): $(recoverymgrd_OBJECTS) $(recoverymgrd_DEPENDENCIES) 
+	@rm -f recoverymgrd$(EXEEXT)
+	$(recoverymgrd_LINK) $(recoverymgrd_OBJECTS) $(recoverymgrd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/recoverymgrd-conf_lex.Po
+include ./$(DEPDIR)/recoverymgrd-conf_yacc.Po
+include ./$(DEPDIR)/recoverymgrd-recoverymgrd.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+recoverymgrd-conf_yacc.o: conf_yacc.c
+	$(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
+	mv -f $(DEPDIR)/recoverymgrd-conf_yacc.Tpo $(DEPDIR)/recoverymgrd-conf_yacc.Po
+#	source='conf_yacc.c' object='recoverymgrd-conf_yacc.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/recoverymgrd-conf_yacc.Tpo $(DEPDIR)/recoverymgrd-conf_yacc.Po
+#	source='conf_yacc.c' object='recoverymgrd-conf_yacc.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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_lex.o: conf_lex.c
+	$(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
+	mv -f $(DEPDIR)/recoverymgrd-conf_lex.Tpo $(DEPDIR)/recoverymgrd-conf_lex.Po
+#	source='conf_lex.c' object='recoverymgrd-conf_lex.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/recoverymgrd-conf_lex.Tpo $(DEPDIR)/recoverymgrd-conf_lex.Po
+#	source='conf_lex.c' object='recoverymgrd-conf_lex.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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-recoverymgrd.o: recoverymgrd.c
+	$(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
+	mv -f $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo $(DEPDIR)/recoverymgrd-recoverymgrd.Po
+#	source='recoverymgrd.c' object='recoverymgrd-recoverymgrd.o' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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
+	$(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`
+	mv -f $(DEPDIR)/recoverymgrd-recoverymgrd.Tpo $(DEPDIR)/recoverymgrd-recoverymgrd.Po
+#	source='recoverymgrd.c' object='recoverymgrd-recoverymgrd.obj' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(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`
+
+.l.c:
+	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+.y.c:
+	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-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."
+	-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
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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
+
+
+conf_lex.c: conf_yacc.h
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/telecom/recoverymgrd/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/telecom/recoverymgrd/Makefile.in
--- heartbeat-2.1.3/telecom/recoverymgrd/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/telecom/recoverymgrd/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -42,7 +42,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES =
@@ -62,7 +62,7 @@
 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@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -118,6 +118,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -135,24 +136,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -214,12 +203,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -454,8 +444,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -572,8 +562,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -585,8 +575,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -596,13 +586,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/attrd_updater.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/attrd_updater.c
--- heartbeat-2.1.3/tools/attrd_updater.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/attrd_updater.c	2008-08-18 13:32:19.000000000 +0100
@@ -32,8 +32,6 @@
 
 #define OPTARGS      "hVn:v:d:s:S:"
 
-const char* crm_system_name = "attrd_updater";
-
 const char *attr_name = NULL;
 const char *attr_value = NULL;
 const char *attr_set = NULL;
@@ -59,7 +57,7 @@
 	int argerr = 0;
 	int flag;
 	
-	crm_log_init(crm_system_name, LOG_ERR, FALSE, FALSE, argc, argv);
+	crm_log_init("attrd_updater", LOG_ERR, FALSE, FALSE, argc, argv);
 	crm_debug_3("Begining option processing");
 
 	while ((flag = getopt(argc, argv, OPTARGS)) != EOF) {
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/ccdv.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/ccdv.c
--- heartbeat-2.1.3/tools/ccdv.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/ccdv.c	2008-08-18 13:32:19.000000000 +0100
@@ -358,8 +358,10 @@
 panic:
 	gDumpCmdArgs = 1;	/* print cmd when there are errors */
 	DumpFormattedOutput();
-	while ((nread = read(fd, emerg, (size_t) sizeof(emerg))) > 0)
-		(void) write(2, emerg, (size_t) nread);
+	while ((nread = read(fd, emerg, (size_t) sizeof(emerg))) > 0) {
+		ssize_t retval;
+		retval = write(2, emerg, (size_t) nread);
+	}
 	Wait();
 	exit(gExitStatus);
 }	/* main */
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/ciblint /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/ciblint
--- heartbeat-2.1.3/tools/ciblint	2007-12-21 20:45:51.000000000 +0000
+++ heartbeat-2.1.4/tools/ciblint	2008-12-29 22:12:09.000000000 +0000
@@ -85,6 +85,8 @@
   - warn about resources not running anywhere
   - note what resources are running where
   - Ensure that <clone> and <master_slave> tags have exactly one child resource
+  - warn about infinity used as a score in rsc_location statements
+  - warn about rsc_colocation without corresponding rsc_order
 
 More documentation can be found online at http://linux-ha.org/ciblint
 '''
@@ -1114,6 +1116,7 @@
 NodeMetadataType = MetadataValueType("enum", {"normal":1})
 OrderMetadataType = MetadataValueType("enum", {"before":1, "after":1})
 StopStartMetadataType = MetadataValueType("enum", {"stop_start":1, "stop_only":1, "block":1})
+OnFailMetadataType = MetadataValueType("enum", {"ignore":1, "block":1, "stop":1, "restart":1, "fence":1})
 RestartMetadataType = MetadataValueType("enum", {"ignore":1, "restart":1})
 OpMetadataType = MetadataValueType("enum", {"lt":1, "lte":1,"gt":1,"gte":1,
 				"eq":1, "neq":1, "defined":1, "not_defined":1})
@@ -1140,28 +1143,33 @@
 #
 AttributeKeys = {
 	"op": {		"id": (StringMetadataType,1),
-                        "name": (StringMetadataType,1),
-	                "timeout": (TimeMetadataType,0),
-                        "start_delay": (TimeMetadataType, 0),
-			"interval": (TimeMetadataType,0),
 			"disabled": (BooleanMetadataType,0),
+			"interval": (TimeMetadataType,0),
+                        "name": (StringMetadataType,1),
+			"on_fail": (OnFailMetadataType,0),
+			"prereq": (PrereqMetadataType,0),
                         "role": (RoleMetadataType,0),
-			"prereq": (PrereqMetadataType,0)},
+                        "start_delay": (TimeMetadataType, 0),
+	                "timeout": (TimeMetadataType,0)},
 
 	"primitive":{	"id": (StringMetadataType,1),
 			"class": (StringMetadataType,1),
+			"description": (StringMetadataType,0),
 			"provider": (StringMetadataType,0),
 			"type": (StringMetadataType,1)},
 	"group": {	"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0),
 			"ordered": (BooleanMetadataType,0),
 			"colocated":(BooleanMetadataType,0)},
-	"clone": {	"id": (StringMetadataType,1)},
+	"clone": {	"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0)},
 
 	"enum":	{},
 	"enumvals":	{},
 	"enumval":	{"value":(StringMetadataType,1)},
 
-	"master_slave":	idonly,
+	"master_slave": {"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0)},
 
 	"nvpair": {	"id": (StringMetadataType,1),
 			"name": (StringMetadataType,1),
@@ -1183,6 +1191,7 @@
 			"num_updates":(IntegerMetadataType,1)},
 
 	"node": {	"id": (UuidMetadataType,1),
+			"description": (StringMetadataType,0),
 			"uname": (StringMetadataType,1),
 			"type": (NodeMetadataType,1)},
 	"instance_attributes": idonly,
@@ -1200,9 +1209,7 @@
 			"from": (ResourceMetadataType,1),
                         "to": (ResourceMetadataType,1),
 			"action":(LrmOpMetadataType,0),
-                        "to_action":(LrmOpMetadataType,0),
-			"score":(ScoreMetadataType,0),
-                        "symmetrical":(BooleanOpMetadataType,0)},
+                        "to_action":(LrmOpMetadataType,0)},
 
 	"rsc_location":	{"id": (StringMetadataType,1),
 			"rsc": (ResourceMetadataType,1),
@@ -1610,7 +1617,6 @@
       if child.nodeType != child.ELEMENT_NODE:
         continue
       if child.tagName == "op":
-        CheckAttributes(child)
         CheckXMLNodeUniqueness(child)
         name = child.getAttribute("name")
         if name == "":
@@ -1624,13 +1630,16 @@
         if child.getAttribute("start_delay") != "" and name != "monitor":
           print ("WARNING: <op name=\"%s\" start_delay=\"%s\"...>: start_delay" \
 	  +   " only appropriate for op \"monitor\".") % (name, child.getAttribute("start_delay"))
+        if child.getAttribute("on_fail") != "" and name != "stop":
+          print ("WARNING: <op name=\"%s\" on_fail=\"%s\"...>: on_fail" \
+	  +   " only appropriate for op \"stop\".") % (name, child.getAttribute("on_fail"))
       else:
         print "ERROR: Don't know how to deal with funky child of <%s>" % xmlnode.tagName
         print "Funky child: " + node2str(child)
         self=None
         return
 
-global AllPrimitives, AllGroups, AllMasterSlave, AllClones
+global AllPrimitives, AllGroups, AllMasterSlave, AllClones, AllRscOrders, AllRscFromOrders, AllRscToOrders
 global AllResourceLocations, AllResourceCoLocations
 AllPrimitives = {}
 AllGroups = {}
@@ -1639,6 +1648,9 @@
 AllResources = {}
 AllResourceLocations = []
 AllResourceCoLocations = []
+AllResourceRscOrders = []
+AllResourceRscFromOrders = {}
+AllResourceRscToOrders = {}
 
 #
 # Base class for all of our Resource Types (PrimitiveTag, GroupTag, etc.)
@@ -1777,6 +1789,9 @@
         self.childrscs.append(PrimitiveTag(child, inclone=0, parent=self, ingroup=1))
       elif child.tagName == "meta_attributes":
         self._process_meta_attributes(child)
+      elif child.tagName == "instance_attributes":
+        print "WARNING: <group> has <instance_attributes> (should be <meta_attributes>)"
+        self._process_meta_attributes(child)
       else:
         print "ERROR: Don't know how to deal with funky child of <%s>" % xmlnode.tagName
         print "Funky child: " + node2str(child)
@@ -1889,6 +1904,39 @@
 
 
 #
+# A class for processing the <rsc_order> tag
+#
+class ResourceOrderTag:
+  def __init__(self, xmlnode):
+    CheckXMLNodeUniqueness(xmlnode)
+    self.rules = []
+    self.name = xmlnode.getAttribute("id")
+    self.fromid = xmlnode.getAttribute("from")
+    self.toid = xmlnode.getAttribute("to")
+    self.action = xmlnode.getAttribute("action")
+    self.to_action = xmlnode.getAttribute("to_action")
+    if not AllResources.has_key(self.fromid):
+      print "ERROR: <rsc_order id=\"%s\"...>: no such resource [%s]" \
+      %		(self.name, self.fromid)
+    elif self.action != "" and not AllMasterSlave.has_key(self.fromid):
+      print ("ERROR: Resource %s must be a master slave" + \
+             " to have specified action %s") % (self.fromid, self.action)
+    if not AllResources.has_key(self.toid):
+      print "ERROR: <rsc_order id=\"%s\"...>: no such resource [%s]" \
+      %		(self.name, self.toid)
+    elif self.to_action != "" and not AllMasterSlave.has_key(self.fromid):
+      print ("ERROR: Resource %s must be a master slave" + \
+             " to have specified action %s") % (self.toid, self.to_action)
+    if self.action != "" and self.to_action != "":
+      print "ERROR: cannot specify both action and to_action in the same <rsc_order> tag"
+    AllResourceRscOrders.append(self)
+    if not AllResourceRscFromOrders.has_key(self.fromid):
+      AllResourceRscFromOrders[self.fromid] = []
+    AllResourceRscFromOrders[self.fromid].append(self)
+    if not AllResourceRscFromOrders.has_key(self.toid):
+      AllResourceRscFromOrders[self.toid] = []
+    AllResourceRscFromOrders[self.toid].append(self)
+#
 # A class for processing the <rsc_location> tag
 #
 class ResourceLocationTag:
@@ -1899,7 +1947,7 @@
     self.rsc = xmlnode.getAttribute("rsc")
     if not AllResources.has_key(self.rsc):
       print "ERROR: <rsc_location id=\"%s\"...>: no such resource [%s]" \
-      %		(self.rsc, self.rsc)
+      %		(self.name, self.rsc)
 
     for child in xmlnode.childNodes:
       if child.nodeType != child.ELEMENT_NODE:
@@ -1995,7 +2043,7 @@
       return lhs >= rhs
     elif self.operation == "eq":
       return lhs == rhs
-    elif self.operation == "neq":
+    elif self.operation == "ne":
       return lhs != rhs
     print "ERROR: unimplemented expression operator [%s] - returning false"\
     %		self.operation
@@ -2008,7 +2056,7 @@
   def __init__(self, xmlnode):
     EvalExpress.__init__(self, xmlnode)
     self.expressions= []
-    self.score = xmlnode.getAttribute("score")
+    self.score = string.lower(xmlnode.getAttribute("score"))
     self.score_attribute = xmlnode.getAttribute("score_attribute")
     self.boolean_op = xmlnode.getAttribute("boolean_op")
     if self.score != "" and self.score_attribute != "":
@@ -2016,7 +2064,9 @@
     if self.score_attribute != "" and not GlobalAttributeNames.has_key(self.score_attribute):
       print "WARNING: score_attribute [%s] does not seem to be defined anywhere in the cluster."\
       %		self.score_attribute
-   
+    if self.score == "infinity" or self.score == "+infinity":
+        print "WARNING: <rule> score of \"%s\" probably not what you want because of common side effects."\
+	%	self.score
     for child in xmlnode.childNodes:
       if child.nodeType != child.ELEMENT_NODE:
         continue
@@ -2259,6 +2309,8 @@
       return ResourceLocationTag(xmlnode)
     if xmlnode.tagName == "rsc_colocation":
       return ResourceCoLocationTag(xmlnode)
+    if xmlnode.tagName == "rsc_order":
+      return ResourceOrderTag(xmlnode)
     #print "Element: " + xmlnode.tagName
     #mymap = xmlnode.attributes
     #if mymap != None:
@@ -2329,6 +2381,29 @@
       #  opstat=ResourceNodeOperationStatuses[r][cn][id]
       #  print "node: %s Op Status: %s" % (cn, opstat)
 
+def analyze_colocations():
+  for colo in AllResourceCoLocations:
+    foundit=0
+    if AllResourceRscFromOrders.has_key(colo.fromid):
+      frlist= AllResourceRscFromOrders[colo.fromid]
+      for order in frlist:
+        if order.toid == colo.toid:
+          foundit=1
+          break
+    if not foundit and AllResourceRscFromOrders.has_key(colo.toid):
+      tolist= AllResourceRscFromOrders[colo.toid]
+      for order in tolist:
+        if order.fromid == colo.toid:
+          foundit=1
+          break
+    if not foundit:
+      print ("WARNING: Specifying <rsc_colocation> between \"%s\" and \"%s\"" \
+	+ " without specifying corresponding <rsc_order> is not common.") \
+	% (colo.fromid, colo.toid)
+     
+AllResourceRscFromOrders = {}
+AllResourceRscToOrders = {}
+
 def analyze_CIB(doc):
   global crmMetadata
   global MetaAttributeMetadata
@@ -2353,7 +2428,7 @@
     if stonithresourcecount == 0:
       stonithwarn=1
       print "ERROR:  STONITH enabled, but No STONITH resources configured.  STONITH is NOT available."
-  elif stonithremarks:
+  elif stonithremarks and len(clusterNodes) >= 2:
     stonithwarn=1
     print "WARNING: STONITH disabled <nvpair name=\"%s\" value=\"%s\">.  STONITH is STRONGLY recommended."\
     %	(stonithtag, enableval)
@@ -2362,6 +2437,7 @@
   if stonithwarn:
     URLinfo("stonith")
     crm_config_url(stonithtag)
+  analyze_colocations()
   look_for_failcounts()
   analyze_op_status()
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/ciblint.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/ciblint.in
--- heartbeat-2.1.3/tools/ciblint.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/ciblint.in	2008-08-18 13:32:19.000000000 +0100
@@ -85,6 +85,8 @@
   - warn about resources not running anywhere
   - note what resources are running where
   - Ensure that <clone> and <master_slave> tags have exactly one child resource
+  - warn about infinity used as a score in rsc_location statements
+  - warn about rsc_colocation without corresponding rsc_order
 
 More documentation can be found online at http://linux-ha.org/ciblint
 '''
@@ -1114,6 +1116,7 @@
 NodeMetadataType = MetadataValueType("enum", {"normal":1})
 OrderMetadataType = MetadataValueType("enum", {"before":1, "after":1})
 StopStartMetadataType = MetadataValueType("enum", {"stop_start":1, "stop_only":1, "block":1})
+OnFailMetadataType = MetadataValueType("enum", {"ignore":1, "block":1, "stop":1, "restart":1, "fence":1})
 RestartMetadataType = MetadataValueType("enum", {"ignore":1, "restart":1})
 OpMetadataType = MetadataValueType("enum", {"lt":1, "lte":1,"gt":1,"gte":1,
 				"eq":1, "neq":1, "defined":1, "not_defined":1})
@@ -1140,28 +1143,33 @@
 #
 AttributeKeys = {
 	"op": {		"id": (StringMetadataType,1),
-                        "name": (StringMetadataType,1),
-	                "timeout": (TimeMetadataType,0),
-                        "start_delay": (TimeMetadataType, 0),
-			"interval": (TimeMetadataType,0),
 			"disabled": (BooleanMetadataType,0),
+			"interval": (TimeMetadataType,0),
+                        "name": (StringMetadataType,1),
+			"on_fail": (OnFailMetadataType,0),
+			"prereq": (PrereqMetadataType,0),
                         "role": (RoleMetadataType,0),
-			"prereq": (PrereqMetadataType,0)},
+                        "start_delay": (TimeMetadataType, 0),
+	                "timeout": (TimeMetadataType,0)},
 
 	"primitive":{	"id": (StringMetadataType,1),
 			"class": (StringMetadataType,1),
+			"description": (StringMetadataType,0),
 			"provider": (StringMetadataType,0),
 			"type": (StringMetadataType,1)},
 	"group": {	"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0),
 			"ordered": (BooleanMetadataType,0),
 			"colocated":(BooleanMetadataType,0)},
-	"clone": {	"id": (StringMetadataType,1)},
+	"clone": {	"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0)},
 
 	"enum":	{},
 	"enumvals":	{},
 	"enumval":	{"value":(StringMetadataType,1)},
 
-	"master_slave":	idonly,
+	"master_slave": {"id": (StringMetadataType,1),
+			"description": (StringMetadataType,0)},
 
 	"nvpair": {	"id": (StringMetadataType,1),
 			"name": (StringMetadataType,1),
@@ -1183,6 +1191,7 @@
 			"num_updates":(IntegerMetadataType,1)},
 
 	"node": {	"id": (UuidMetadataType,1),
+			"description": (StringMetadataType,0),
 			"uname": (StringMetadataType,1),
 			"type": (NodeMetadataType,1)},
 	"instance_attributes": idonly,
@@ -1200,9 +1209,7 @@
 			"from": (ResourceMetadataType,1),
                         "to": (ResourceMetadataType,1),
 			"action":(LrmOpMetadataType,0),
-                        "to_action":(LrmOpMetadataType,0),
-			"score":(ScoreMetadataType,0),
-                        "symmetrical":(BooleanOpMetadataType,0)},
+                        "to_action":(LrmOpMetadataType,0)},
 
 	"rsc_location":	{"id": (StringMetadataType,1),
 			"rsc": (ResourceMetadataType,1),
@@ -1610,7 +1617,6 @@
       if child.nodeType != child.ELEMENT_NODE:
         continue
       if child.tagName == "op":
-        CheckAttributes(child)
         CheckXMLNodeUniqueness(child)
         name = child.getAttribute("name")
         if name == "":
@@ -1624,13 +1630,16 @@
         if child.getAttribute("start_delay") != "" and name != "monitor":
           print ("WARNING: <op name=\"%s\" start_delay=\"%s\"...>: start_delay" \
 	  +   " only appropriate for op \"monitor\".") % (name, child.getAttribute("start_delay"))
+        if child.getAttribute("on_fail") != "" and name != "stop":
+          print ("WARNING: <op name=\"%s\" on_fail=\"%s\"...>: on_fail" \
+	  +   " only appropriate for op \"stop\".") % (name, child.getAttribute("on_fail"))
       else:
         print "ERROR: Don't know how to deal with funky child of <%s>" % xmlnode.tagName
         print "Funky child: " + node2str(child)
         self=None
         return
 
-global AllPrimitives, AllGroups, AllMasterSlave, AllClones
+global AllPrimitives, AllGroups, AllMasterSlave, AllClones, AllRscOrders, AllRscFromOrders, AllRscToOrders
 global AllResourceLocations, AllResourceCoLocations
 AllPrimitives = {}
 AllGroups = {}
@@ -1639,6 +1648,9 @@
 AllResources = {}
 AllResourceLocations = []
 AllResourceCoLocations = []
+AllResourceRscOrders = []
+AllResourceRscFromOrders = {}
+AllResourceRscToOrders = {}
 
 #
 # Base class for all of our Resource Types (PrimitiveTag, GroupTag, etc.)
@@ -1777,6 +1789,9 @@
         self.childrscs.append(PrimitiveTag(child, inclone=0, parent=self, ingroup=1))
       elif child.tagName == "meta_attributes":
         self._process_meta_attributes(child)
+      elif child.tagName == "instance_attributes":
+        print "WARNING: <group> has <instance_attributes> (should be <meta_attributes>)"
+        self._process_meta_attributes(child)
       else:
         print "ERROR: Don't know how to deal with funky child of <%s>" % xmlnode.tagName
         print "Funky child: " + node2str(child)
@@ -1889,6 +1904,39 @@
 
 
 #
+# A class for processing the <rsc_order> tag
+#
+class ResourceOrderTag:
+  def __init__(self, xmlnode):
+    CheckXMLNodeUniqueness(xmlnode)
+    self.rules = []
+    self.name = xmlnode.getAttribute("id")
+    self.fromid = xmlnode.getAttribute("from")
+    self.toid = xmlnode.getAttribute("to")
+    self.action = xmlnode.getAttribute("action")
+    self.to_action = xmlnode.getAttribute("to_action")
+    if not AllResources.has_key(self.fromid):
+      print "ERROR: <rsc_order id=\"%s\"...>: no such resource [%s]" \
+      %		(self.name, self.fromid)
+    elif self.action != "" and not AllMasterSlave.has_key(self.fromid):
+      print ("ERROR: Resource %s must be a master slave" + \
+             " to have specified action %s") % (self.fromid, self.action)
+    if not AllResources.has_key(self.toid):
+      print "ERROR: <rsc_order id=\"%s\"...>: no such resource [%s]" \
+      %		(self.name, self.toid)
+    elif self.to_action != "" and not AllMasterSlave.has_key(self.fromid):
+      print ("ERROR: Resource %s must be a master slave" + \
+             " to have specified action %s") % (self.toid, self.to_action)
+    if self.action != "" and self.to_action != "":
+      print "ERROR: cannot specify both action and to_action in the same <rsc_order> tag"
+    AllResourceRscOrders.append(self)
+    if not AllResourceRscFromOrders.has_key(self.fromid):
+      AllResourceRscFromOrders[self.fromid] = []
+    AllResourceRscFromOrders[self.fromid].append(self)
+    if not AllResourceRscFromOrders.has_key(self.toid):
+      AllResourceRscFromOrders[self.toid] = []
+    AllResourceRscFromOrders[self.toid].append(self)
+#
 # A class for processing the <rsc_location> tag
 #
 class ResourceLocationTag:
@@ -1899,7 +1947,7 @@
     self.rsc = xmlnode.getAttribute("rsc")
     if not AllResources.has_key(self.rsc):
       print "ERROR: <rsc_location id=\"%s\"...>: no such resource [%s]" \
-      %		(self.rsc, self.rsc)
+      %		(self.name, self.rsc)
 
     for child in xmlnode.childNodes:
       if child.nodeType != child.ELEMENT_NODE:
@@ -1995,7 +2043,7 @@
       return lhs >= rhs
     elif self.operation == "eq":
       return lhs == rhs
-    elif self.operation == "neq":
+    elif self.operation == "ne":
       return lhs != rhs
     print "ERROR: unimplemented expression operator [%s] - returning false"\
     %		self.operation
@@ -2008,7 +2056,7 @@
   def __init__(self, xmlnode):
     EvalExpress.__init__(self, xmlnode)
     self.expressions= []
-    self.score = xmlnode.getAttribute("score")
+    self.score = string.lower(xmlnode.getAttribute("score"))
     self.score_attribute = xmlnode.getAttribute("score_attribute")
     self.boolean_op = xmlnode.getAttribute("boolean_op")
     if self.score != "" and self.score_attribute != "":
@@ -2016,7 +2064,9 @@
     if self.score_attribute != "" and not GlobalAttributeNames.has_key(self.score_attribute):
       print "WARNING: score_attribute [%s] does not seem to be defined anywhere in the cluster."\
       %		self.score_attribute
-   
+    if self.score == "infinity" or self.score == "+infinity":
+        print "WARNING: <rule> score of \"%s\" probably not what you want because of common side effects."\
+	%	self.score
     for child in xmlnode.childNodes:
       if child.nodeType != child.ELEMENT_NODE:
         continue
@@ -2259,6 +2309,8 @@
       return ResourceLocationTag(xmlnode)
     if xmlnode.tagName == "rsc_colocation":
       return ResourceCoLocationTag(xmlnode)
+    if xmlnode.tagName == "rsc_order":
+      return ResourceOrderTag(xmlnode)
     #print "Element: " + xmlnode.tagName
     #mymap = xmlnode.attributes
     #if mymap != None:
@@ -2329,6 +2381,29 @@
       #  opstat=ResourceNodeOperationStatuses[r][cn][id]
       #  print "node: %s Op Status: %s" % (cn, opstat)
 
+def analyze_colocations():
+  for colo in AllResourceCoLocations:
+    foundit=0
+    if AllResourceRscFromOrders.has_key(colo.fromid):
+      frlist= AllResourceRscFromOrders[colo.fromid]
+      for order in frlist:
+        if order.toid == colo.toid:
+          foundit=1
+          break
+    if not foundit and AllResourceRscFromOrders.has_key(colo.toid):
+      tolist= AllResourceRscFromOrders[colo.toid]
+      for order in tolist:
+        if order.fromid == colo.toid:
+          foundit=1
+          break
+    if not foundit:
+      print ("WARNING: Specifying <rsc_colocation> between \"%s\" and \"%s\"" \
+	+ " without specifying corresponding <rsc_order> is not common.") \
+	% (colo.fromid, colo.toid)
+     
+AllResourceRscFromOrders = {}
+AllResourceRscToOrders = {}
+
 def analyze_CIB(doc):
   global crmMetadata
   global MetaAttributeMetadata
@@ -2353,7 +2428,7 @@
     if stonithresourcecount == 0:
       stonithwarn=1
       print "ERROR:  STONITH enabled, but No STONITH resources configured.  STONITH is NOT available."
-  elif stonithremarks:
+  elif stonithremarks and len(clusterNodes) >= 2:
     stonithwarn=1
     print "WARNING: STONITH disabled <nvpair name=\"%s\" value=\"%s\">.  STONITH is STRONGLY recommended."\
     %	(stonithtag, enableval)
@@ -2362,6 +2437,7 @@
   if stonithwarn:
     URLinfo("stonith")
     crm_config_url(stonithtag)
+  analyze_colocations()
   look_for_failcounts()
   analyze_op_status()
 
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/cl_status.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/cl_status.c
--- heartbeat-2.1.3/tools/cl_status.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/cl_status.c	2008-08-18 13:32:19.000000000 +0100
@@ -355,7 +355,7 @@
 	const char * node, * type;
 
 	do {
-		option_char = getopt(argc, argv, optstr);
+		option_char = getopt(argc-1, argv+1, optstr);
 
 		if (option_char == -1) {
 			break;
@@ -711,7 +711,7 @@
 	char *		pvalue;
 
 	do {
-		option_char = getopt(argc, argv, optstr);
+		option_char = getopt(argc-1, argv+1, optstr);
 
 		if (option_char == -1) {
 			break;
@@ -766,7 +766,7 @@
 {
 	int option_char;
 	do {
-		option_char = getopt(argc, argv, optstr);
+		option_char = getopt(argc-1, argv+1, optstr);
 
 		if (option_char == -1) {
 			break;
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/haresources2cib.py /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/haresources2cib.py
--- heartbeat-2.1.3/tools/haresources2cib.py	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/tools/haresources2cib.py	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,519 @@
+#!/usr/bin/python
+
+'''haresources2cib.py.in, convert the haresources file of heartbeat 1.x
+   to cib.xml for heartbeat 2.x
+'''
+
+__copyright__='''
+Author: Huang Zhen <zhenhltc@cn.ibm.com>
+Copyright (C) 2005 International Business Machines
+'''
+
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+import sys,string,os
+import xml.dom.minidom
+
+using_ocf = 1
+using_mon = 1
+enable_stonith = False
+
+ocf_ra_setting = {
+	"apache"    :{"params":["configfile","httpd","port","statusurl","options","testregex"],"time":["120s","60s"]},
+	"IPaddr"    :{"params":["ip","nic","cidr_netmask","broadcast","iflabel","lvs_support","local_stop_script","local_start_script","ARP_INTERVAL_MS","ARP_REPEAT","ARP_BACKGROUND","ARP_NETMASK"],"time":["5s","5s"]},
+	"IPaddr2"   :{"params":["ip","nic","cidr_netmask","broadcast","iflabel","lvs_support","mac","clusterip_hash","arp_interval","arp_count","arp_bg","arp_mac"],"time":["5s","5s"]},
+	"db2"       :{"params":["instance","admin"],"time":["120s","60s"]},
+	"oracle"    :{"params":["sid","home","user","ipcrm"],"time":["120s","60s"]},
+	"oralsnr"   :{"params":["sid","home","user","listener"],"time":["120s","60s"]},
+	"AudibleAlarm":{"params":["nodelist"],"time":["120s","60s"]},
+	"Delay"     :{"params":["startdelay","stopdelay","mondelay"],"time":["120s","60s"]},
+	"Filesystem":{"params":["device","directory","fstype","options","ocfs2_cluster","ocfs2_configfs"],"time":["120s","60s"]},
+	"ICP"       :{"params":["driveid","device"],"time":["120s","60s"]},
+	"IPsrcaddr" :{"params":["ipaddress"],"time":["5s","5s"]},
+	"IPv6addr"  :{"params":["ipv6addr"],"time":["5s","5s"]},
+	"LinuxSCSI" :{"params":["scsi"],"time":["120s","60s"]},
+	"LVM"       :{"params":["volgrpname"],"time":["120s","60s"]},
+	"MailTo"    :{"params":["email","subject"],"time":["120s","60s"]},
+	"portblock" :{"params":["protocol","portno","action"],"time":["120s","60s"]},
+	"Raid1"     :{"params":["raidconf","raiddev","homehost"],"time":["120s","60s"]},
+	"ServeRAID" :{"params":["serveraid","mergegroup"],"time":["120s","60s"]},
+	"WinPopup"  :{"params":["hostfile"],"time":["120s","60s"]},
+	"Xinetd"    :{"params":["service"],"time":["120s","60s"]},
+	"ClusterMon"	:{"params":["user","update","extra_options","pidfile","htmlfile"],"time":["120s","60s"]},
+	"Dummy"	:{"params":["state"],"time":["120s","60s"]},
+	"EvmsSCC"	:{"params":[],"time":["120s","60s"]},
+	"Evmsd"	:{"params":[],"time":["120s","60s"]},
+	"ManageRAID"	:{"params":["raidname"],"time":["120s","60s"]},
+	"ManageVE"	:{"params":["veid"],"time":["120s","60s"]},
+	"Pure-FTPd"	:{"params":["script","conffile","daemon_type","pidfile"],"time":["120s","60s"]},
+	"SAPDatabase"	:{"params":["SID","DIR_EXECUTABLE","DBTYPE","NETSERVICENAME","DBJ2EE_ONLY","DIR_BOOTSTRAP","DIR_SECSTORE"],"time":["120s","60s"]},
+	"SAPInstance"	:{"params":["InstanceName","DIR_EXECUTABLE","DIR_PROFILE","START_PROFILE"],"time":["120s","60s"]},
+	"SendArp"	:{"params":["ip","nic"],"time":["120s","60s"]},
+	"Stateful"	:{"params":["state"],"time":["120s","60s"]},
+	"SysInfo"	:{"params":["pidfile","delay"],"time":["120s","60s"]},
+	"VIPArip"	:{"params":["ip","nic"],"time":["120s","60s"]},
+	"WAS"	:{"params":["config","port"],"time":["120s","60s"]},
+	"WAS6"	:{"params":["profile"],"time":["120s","60s"]},
+	"Xen"	:{"params":["xmfile"],"time":["120s","60s"]},
+	"drbd"	:{"params":["drbd_resource","drbdconf","clone_overrides_hostname","clone_max","clone_node_max","master_max","master_node_max"],"time":["120s","60s"]},
+	"eDir88"	:{"params":["eDir_config_file","eDir_monitor_ldap","eDir_monitor_idm","eDir_jvm_initial_heap","eDir_jvm_max_heap","eDir_jvm_options"],"time":["120s","60s"]},
+	"ids"	:{"params":["informixdir","informixserver","onconfig","dbname","sqltestquery"],"time":["120s","60s"]},
+	"iscsi"	:{"params":["portal","target","discovery_type","iscsiadm"],"time":["120s","60s"]},
+	"mysql"	:{"params":["binary","config","datadir","user","group","log","pid","socket","test_table","test_user","test_passwd","enable_creation","additional_parameters"],"time":["120s","60s"]},
+	"o2cb"	:{"params":["netdev","port","ocfs2_cluster"],"time":["120s","60s"]},
+	"pgsql"	:{"params":["pgctl","start_opt","ctl_opt","psql","pgdata","pgdba","pghost","pgport","pgdb","logfile","stop_escalate"],"time":["120s","60s"]},
+	"pingd"	:{"params":["pidfile","user","dampen","set","name","section","multiplier","host_list"],"time":["120s","60s"]},
+	"rsyncd"	:{"params":["binpath","conffile","bwlimit"],"time":["120s","60s"]},
+	"tomcat"	:{"params":["tomcat_name","script_log","tomcat_stop_timeout","tomcat_suspend_trialcount","tomcat_user","statusurl","java_home","catalina_home","catalina_pid"],"time":["120s","60s"]}
+	}
+
+config_defaults = [
+	"symmetric-cluster=true",
+	"no-quorum-policy=stop",
+	"default-resource-stickiness=0",
+	"default-resource-failure-stickiness=0",
+	"stonith-enabled=false",
+	"stonith-action=reboot",
+	"startup-fencing=true",
+	"stop-orphan-resources=true",
+	"stop-orphan-actions=true",
+	"remove-after-stop=false",
+	"short-resource-names=true",
+	"transition-idle-timeout=5min",
+	"default-action-timeout=20s",
+	"is-managed-default=true",
+	"cluster-delay=60s",
+	"pe-error-series-max=-1",
+	"pe-warn-series-max=-1",
+	"pe-input-series-max=-1",
+]
+
+def create_cib() :
+	doc = xml.dom.minidom.Document()
+	cib = doc.createElement("cib")
+	doc.appendChild(cib)
+
+	configuration = doc.createElement("configuration")
+	cib.appendChild(configuration)
+	cib.setAttribute("admin_epoch","0")
+	cib.setAttribute("epoch","0")
+	cib.setAttribute("num_updates","0")
+
+	crm_config = doc.createElement("crm_config")
+	configuration.appendChild(crm_config)
+
+	option_set = doc.createElement("cluster_property_set")
+	option_set.setAttribute("id","cib-bootstrap-options")
+	crm_config.appendChild(option_set)
+
+	attr_list = doc.createElement("attributes")
+	option_set.appendChild(attr_list)
+
+	for option in config_defaults:
+		option_details = string.split(option, '=')
+		nvpair = doc.createElement("nvpair")
+		attr_list.appendChild(nvpair)
+		nvpair.setAttribute("id",    "cib-bootstrap-options-"+option_details[0])
+		nvpair.setAttribute("name",  option_details[0])
+		nvpair.setAttribute("value", option_details[1])
+		if option_details[0] == "stonith-enabled" and enable_stonith:
+			nvpair.setAttribute("value", "true")
+			
+
+	configuration.appendChild(doc.createElement("nodes"))
+	resources = doc.createElement("resources")
+	configuration.appendChild(resources)
+	constraints = doc.createElement("constraints")
+	configuration.appendChild(constraints)
+
+	status = doc.createElement("status")
+	cib.appendChild(status)
+
+	return doc, resources, constraints
+	
+def get_ra_class(type) :
+	if os.path.exists("/etc/ha.d/resource.d/"+"/"+type) :
+		return "heartbeat"
+	if os.path.exists("/etc/init.d"+"/"+type) :
+		return "lsb"
+	sys.stderr.write(type+" is an unknown Resource Agent. " \
+			"Please refer to http://www.linux-ha.org/ResourceAgent\n")
+	return "UNKNOWN"
+		
+def cib_resource(doc,user_res_id,index, rsc):
+
+	id, type, params = None, None, None
+	
+	#if no parameters in rsc, like "apache", "192.168.0.11"
+	if string.find(rsc, "::") == -1 :
+		#if there is a IP address in rsc, like "192.168.0.11"
+		if len(string.split(string.split(rsc,'/')[0],'.')) == 4 :
+			type = "IPaddr"
+			params = [rsc]
+		#no IP address, like "apache"
+		else :
+			type = rsc
+	#else there have "::" in rsc,
+	#like "IPaddr::192.168.0.11", "IPaddr2::192.168.0.11"
+	else :
+		if string.find(rsc, "IPaddr") == 0 :
+			type = string.split(rsc, "::")[0]
+			params = [string.split(rsc, "::")[1]]
+		else :			
+			fields = string.split(rsc,"::")
+			type = fields[0]
+			params = fields[1:]
+		
+	if user_res_id == "" :
+		if type == "IPaddr" :
+			id = type+"_"+string.replace(string.split(params[0],'/')[0],'.','_')
+		else :
+			id = type+"_"+str(index)
+	else :
+		id = user_res_id
+	
+	resource = doc.createElement("primitive")
+	resource.setAttribute("id",id)
+	resource.setAttribute("type",type)
+	if using_ocf and type in ocf_ra_setting:
+		resource.setAttribute("class","ocf")
+	else :
+		ra_class = get_ra_class(type)
+		resource.setAttribute("class",ra_class)
+	resource.setAttribute("provider","heartbeat")
+
+	if using_mon :
+		operations = doc.createElement("operations")
+		resource.appendChild(operations)
+		mon_op = doc.createElement("op")
+		operations.appendChild(mon_op)
+		mon_op.setAttribute("id", id + "_mon")
+		mon_op.setAttribute("name","monitor")
+		interval = "120s"
+		timeout = "60s"
+		if using_ocf and type in ocf_ra_setting :
+			interval = ocf_ra_setting[type]["time"][0]
+			timeout = ocf_ra_setting[type]["time"][1]
+		mon_op.setAttribute("interval", interval)
+		mon_op.setAttribute("timeout", timeout)
+
+	if params != None and len(params) != 0:
+		instance_attributes = doc.createElement("instance_attributes")
+		instance_attributes.setAttribute("id", id + "_inst_attr")
+		resource.appendChild(instance_attributes)
+		attributes = doc.createElement("attributes")
+		instance_attributes.appendChild(attributes)
+		if using_ocf and type in ocf_ra_setting :
+			if type in ["IPaddr", "IPaddr2"] :
+				unsort = string.split(params[0], "/")
+				params = [None, None, None, None]
+				#ip
+				params[0] = unsort[0]
+				for param in unsort[1:] :
+					if len(string.split(param, ".")) == 4 :
+						#broadcast
+						params[3] = param
+						break
+					try :
+						int(param)
+						#netmask bits
+						params[1] = param
+					except ValueError:
+						#nic
+						params[2] = param
+			for i in range(0,len(params)) :
+				if params[i] == None :
+					continue
+				nvpair = doc.createElement("nvpair")
+				name = ocf_ra_setting[type]["params"][i]
+				nvpair.setAttribute("id",id + "_attr_" + str(i))
+				nvpair.setAttribute("name",name)
+				if i == len(ocf_ra_setting[type]["params"]) - 1 :
+					nvpair.setAttribute("value",string.join(params[i:]))
+					attributes.appendChild(nvpair)
+					break
+				else :						
+					nvpair.setAttribute("value",str(params[i]))
+					attributes.appendChild(nvpair)
+		else :
+			i = 1
+			for param in params :
+				nvpair = doc.createElement("nvpair")
+				nvpair.setAttribute("id",id + "_attr_" + str(i))
+				nvpair.setAttribute("name",str(i))
+				nvpair.setAttribute("value",str(param))
+				attributes.appendChild(nvpair)
+				i += 1
+	return id, resource
+
+def cib_rsc_order(doc, args):
+	rsc_order = doc.createElement("rsc_order")
+	rsc_order.setAttribute("id","rsc_order_"+args[0]+"_"+args[3])
+	rsc_order.setAttribute("from",args[0])
+	rsc_order.setAttribute("action",args[1])
+	rsc_order.setAttribute("type",args[2])
+	rsc_order.setAttribute("to",args[3])
+	rsc_order.setAttribute("symmetrical","true")
+	return rsc_order
+
+def cib_rsc_colocation(doc, args):
+	if len(args) != 3 :
+		sys.stderr.write("rsc_colocation: bad usage\n")
+		return
+	rsc_colocation = doc.createElement("rsc_colocation")
+	rsc_colocation.setAttribute("id","rsc_colocation_"+args[0]+"_"+args[1])
+	rsc_colocation.setAttribute("from",args[0])
+	rsc_colocation.setAttribute("to",args[1])
+	rsc_colocation.setAttribute("score",args[2])
+	return rsc_colocation
+
+def cib_rsc_location(doc, id, node):
+	rsc_location = doc.createElement("rsc_location")
+	rsc_location.setAttribute("id","rsc_location_"+id)
+	rsc_location.setAttribute("rsc",id)
+	rule = doc.createElement("rule")
+	rule.setAttribute("id","prefered_location_"+id)
+	rule.setAttribute("score","100")
+	rsc_location.appendChild(rule)
+	expression = doc.createElement("expression")
+	expression.setAttribute("id","prefered_location_"+id+"_expr")
+	expression.setAttribute("attribute","#uname")
+	expression.setAttribute("operation","eq")
+	expression.setAttribute("value", node)
+	rule.appendChild(expression)
+	return rsc_location
+
+def cib_resource_group(doc, id):
+	resource_group = doc.createElement("group")
+	resource_group.setAttribute("id",id)
+	return resource_group
+
+def cib_resource_clone(doc, id, clone_max, clone_node_max):
+	resource_clone = doc.createElement("clone")
+	resource_clone.setAttribute("id",id)
+	instance_attributes = doc.createElement("instance_attributes")
+	instance_attributes.setAttribute("id", id + "_inst_attr")
+	resource_clone.appendChild(instance_attributes)
+	attributes = doc.createElement("attributes")
+	instance_attributes.appendChild(attributes)
+	nvpair = doc.createElement("nvpair")
+	nvpair.setAttribute("id",id + "_attr_1")
+	nvpair.setAttribute("name", "clone_max")
+	nvpair.setAttribute("value", str(clone_max))
+	attributes.appendChild(nvpair)
+	nvpair = doc.createElement("nvpair")
+	nvpair.setAttribute("id",id + "_attr_2")
+	nvpair.setAttribute("name", "clone_node_max")
+	nvpair.setAttribute("value", str(clone_node_max))
+	attributes.appendChild(nvpair)
+	return resource_clone
+
+def add_resource(cib,user_res_id,index,node,rsc):
+	id,resource = cib_resource(cib[0],user_res_id,index,rsc)
+	cib[1].appendChild(resource)
+	rsc_location = cib_rsc_location(cib[0],id,node)
+	cib[2].appendChild(rsc_location)
+
+def add_resource_group(cib,user_res_id,index,node,rscs):
+	if user_res_id == "" :
+		groupid = "group_"+str(group_index)
+	else :
+		groupid = user_res_id
+	resource_group = cib_resource_group(cib[0],groupid)
+	cib[1].appendChild(resource_group)
+	for rsc in rscs :
+		rid,resource = cib_resource(cib[0],"",index,rsc)
+		resource_group.appendChild(resource)
+		index += 1
+	rsc_location = cib_rsc_location(cib[0],groupid,node)
+	cib[2].appendChild(rsc_location)
+
+def add_clone(cib,user_res_id, index,rsc) :
+	if user_res_id == "" :
+		cloneid = "clone_"+str(index)
+	else :
+		cloneid = user_res_id
+	clone = cib_resource_clone(cib[0], cloneid, node_num, 1)
+	cib[1].appendChild(clone)
+	id,resource = cib_resource(cib[0],"",index,rsc)
+	clone.appendChild(resource)
+
+def add_stonith_clone(cib, index, params, node_num) :
+	clone = cib_resource_clone(cib[0], "clone_"+str(index), node_num, 1)
+	cib[1].appendChild(clone)
+	id, stonith = cib_stonith(cib[0], index, params)
+	clone.appendChild(stonith)
+
+def cib_stonith(doc, index, params):
+	id = "stonith_"+str(index)
+	resource = doc.createElement("primitive")
+	resource.setAttribute("id",id)
+	resource.setAttribute("type",params[1])
+	resource.setAttribute("class","stonith")
+	resource.setAttribute("provider","heartbeat")
+	if using_mon :
+		operations = doc.createElement("operations")
+		resource.appendChild(operations)
+		mon_op = doc.createElement("op")
+		operations.appendChild(mon_op)
+		mon_op.setAttribute("id", id + "_mon")
+		mon_op.setAttribute("name","monitor")
+		mon_op.setAttribute("interval", "5s")
+		mon_op.setAttribute("timeout", "20s")
+		mon_op.setAttribute("prereq", "nothing")
+		start_op = doc.createElement("op")
+		operations.appendChild(start_op)
+		start_op.setAttribute("id", id + "_start")
+		start_op.setAttribute("name","start")
+		start_op.setAttribute("timeout", "20s")
+		start_op.setAttribute("prereq", "nothing")
+	if len(params) > 2 :
+		instance_attributes = doc.createElement("instance_attributes")
+		instance_attributes.setAttribute("id", id + "_inst_attr")
+		resource.appendChild(instance_attributes)
+		attributes = doc.createElement("attributes")
+		instance_attributes.appendChild(attributes)
+		names = string.split(os.popen("stonith -n -t "+params[1]).readline())
+		for i in range(2, len(params)) :
+			nvpair = doc.createElement("nvpair")
+			nvpair.setAttribute("id", id + "_attr_" + str(i))
+			nvpair.setAttribute("name", names[i-2])
+			nvpair.setAttribute("value", params[i])
+			attributes.appendChild(nvpair)
+		
+	return id, resource
+
+def add_stonith_host(cib, stonith_host, index, node_num) :
+	params = string.split(stonith_host)[1:]
+	if params[0] == "*" :
+		add_stonith_clone(cib, index, params, node_num)
+	else :
+		id, resource = cib_stonith(cib[0], index, params)
+		cib[1].appendChild(resource)
+		stonith_location = cib_rsc_location(cib[0],id,params[0])
+		cib[2].appendChild(stonith_location)
+
+def get_directive_list(config, directive) :
+	directive_list = []
+	for line in config :
+		line = line.lstrip()
+		if len (line) == 0 or line[0] == "#" :
+			continue
+		if string.split(line)[0] == directive :
+			directive_list.append(line)
+	return directive_list
+		
+if __name__=="__main__" :
+	resource_file = "/etc/ha.d/haresources"
+	config_file = "/etc/ha.d/ha.cf"
+	target_file = "/var/lib/heartbeat/crm/cib.xml"
+	to_stdout = False
+	
+	# Process arguments...
+	skipthis = None
+	args = sys.argv[1:]
+	for i in range(0, len(args)) :
+		if skipthis :
+			skipthis = None
+			continue
+		elif args[i] == "--no-ocf" :
+			using_ocf = 0
+		elif args[i] == "--stdout" :
+			to_stdout = True
+		elif args[i] == "--no-monitor" :
+			using_mon = 0
+		elif args[i] == "--config" or args[i] == "-c" :
+			skipthis = True
+			config_file = args[i+1]
+		elif args[i] == "--help" or args[i] == "-h" :
+			print "usage: " + sys.argv[0]  \
+				+  " [--no-ocf]"\
+				+  " [--stdout]"\
+				+  " [--no-monitor]"\
+				+  " [--config|-c configfile]"\
+				+  " [--help|-h]"\
+				+  " [resourcefile]"
+			sys.exit(1)
+		else:
+			resource_file = args[i]
+	
+	config = open(config_file, "r").readlines()
+	
+	node_list = get_directive_list(config, "node")
+	node_num = 0
+	for nodes in node_list :
+		node_num += len(string.split(nodes)) -1
+	stonith_host_list = get_directive_list(config, "stonith_host")
+	
+	if len(stonith_host_list) != 0 :
+		enable_stonith = True
+	
+	file = open(resource_file, "r")
+	cib = create_cib()
+	pre_line = ""
+	id_index = 1
+	group_index = 1
+	for line in file.readlines() :
+		line = string.strip(line)
+		if len (line) == 0 :
+			continue
+		if line[0] == '#' and string.find(line,"#rsc_order") != 0 and string.find(line,"#rsc_colocation") != 0 :
+			continue
+		if line[-1] == '\\' :
+			pre_line += line[:-1] + " "
+			continue
+		else :
+			line = pre_line + line
+			pre_line = ""
+		fields = string.split(line)
+		if fields[len(fields)-1][0] == '#' :
+			user_res_id = fields[len(fields)-1][1:]
+			fields.pop()
+		else :
+			user_res_id = ""
+		if fields[0] == "#rsc_order" and len(fields) == 5 :
+			rsc_order = cib_rsc_order(cib[0],fields[1:])
+			cib[2].appendChild(rsc_order)
+		elif fields[0] == "#rsc_colocation" and len(fields) == 4 :
+			rsc_colocation = cib_rsc_colocation(cib[0],fields[1:])
+			cib[2].appendChild(rsc_colocation)
+		elif string.find(user_res_id, "clone:") == 0 :
+			add_clone(cib, user_res_id[len("clone:"):], group_index, fields[1])
+			group_index += 10
+			id_index += 1
+		elif len(fields) == 2 :
+			add_resource(cib, user_res_id, id_index, fields[0], fields[1])
+			id_index += 1
+		elif len(fields) > 2 :
+			add_resource_group(cib, user_res_id, group_index, fields[0], fields[1:])
+			group_index += 10
+			id_index += len(fields)
+		else :
+			sys.stderr.write("can not parse this line:"+line+"\n")
+	if enable_stonith :
+		for stonith_host in stonith_host_list :
+			add_stonith_host(cib, stonith_host, id_index, node_num)
+			id_index += 1
+	if to_stdout :		
+		print cib[0].toprettyxml()
+	elif os.access(target_file, os.F_OK) or os.access(target_file+".sig", os.F_OK) :
+		sys.stderr.write("cib.xml or cib.xml.sig exist in /var/lib/heartbeat/crm/\n")
+		sys.stderr.write("please remove them before generating new cib.xml\n")
+	else :
+		cib_file = open(target_file, "w")
+		cib_file.write(cib[0].toprettyxml())
+		cib_file.close()
+		os.system("chown  hacluster.haclient "+target_file)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/haresources2cib.py.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/haresources2cib.py.in
--- heartbeat-2.1.3/tools/haresources2cib.py.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/haresources2cib.py.in	2008-08-18 13:32:19.000000000 +0100
@@ -129,7 +129,7 @@
 		nvpair.setAttribute("id",    "cib-bootstrap-options-"+option_details[0])
 		nvpair.setAttribute("name",  option_details[0])
 		nvpair.setAttribute("value", option_details[1])
-		if option_details[0] == "stonith_enabled" and enable_stonith:
+		if option_details[0] == "stonith-enabled" and enable_stonith:
 			nvpair.setAttribute("value", "true")
 			
 
@@ -147,7 +147,7 @@
 def get_ra_class(type) :
 	if os.path.exists("@HB_RA_DIR@"+"/"+type) :
 		return "heartbeat"
-	if os.path.exists("@LSB_RA_DIR@"+"/"+type) :
+	if os.path.exists("@INITDIR@"+"/"+type) :
 		return "lsb"
 	sys.stderr.write(type+" is an unknown Resource Agent. " \
 			"Please refer to http://www.linux-ha.org/ResourceAgent\n")
@@ -419,7 +419,7 @@
 if __name__=="__main__" :
 	resource_file = "@HA_HBCONF_DIR@/haresources"
 	config_file = "@HA_HBCONF_DIR@/ha.cf"
-	target_file = "@HA_VARLIBHBDIR@/crm/cib.xml"
+	target_file = "@HA_VARLIBDIR@/heartbeat/crm/cib.xml"
 	to_stdout = False
 	
 	# Process arguments...
@@ -510,7 +510,7 @@
 	if to_stdout :		
 		print cib[0].toprettyxml()
 	elif os.access(target_file, os.F_OK) or os.access(target_file+".sig", os.F_OK) :
-		sys.stderr.write("cib.xml or cib.xml.sig exist in @HA_VARLIBHBDIR@/crm/\n")
+		sys.stderr.write("cib.xml or cib.xml.sig exist in @HA_VARLIBDIR@/heartbeat/crm/\n")
 		sys.stderr.write("please remove them before generating new cib.xml\n")
 	else :
 		cib_file = open(target_file, "w")
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/hb_report /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/hb_report
--- heartbeat-2.1.3/tools/hb_report	2007-12-21 20:45:52.000000000 +0000
+++ heartbeat-2.1.4/tools/hb_report	2008-12-29 22:12:09.000000000 +0000
@@ -30,12 +30,31 @@
 		PROGDIR=$HA_NOARCHBIN
 }
 
+# the default syslog facility is not (yet) exported by heartbeat
+# to shell scripts
+#
+DEFAULT_HA_LOGFACILITY="daemon"
+export DEFAULT_HA_LOGFACILITY
 LOGD_CF=`findlogdcf /etc $HA_DIR`
 export LOGD_CF
 
 : ${SSH_OPTS="-T"}
 LOG_PATTERNS="CRIT: ERROR:"
-PEINPUTS_PATT="peng.*PEngine Input stored"
+# PEINPUTS_PATT="peng.*PEngine Input stored"
+
+# the goods
+ANALYSIS_F=analysis.txt
+DESCRIPTION_F=description.txt
+HALOG_F=ha-log.txt
+BT_F=backtraces.txt
+SYSINFO_F=sysinfo.txt
+SYSSTATS_F=sysstats.txt
+export ANALYSIS_F DESCRIPTION_F HALOG_F BT_F SYSINFO_F SYSSTATS_F
+CRM_MON_F=crm_mon.txt
+CCMTOOL_F=ccm_tool.txt
+CRM_VERIFY_F=crm_verify.txt
+CIB_F=cib.xml
+export CRM_MON_F CCMTOOL_F CRM_VERIFY_F CIB_F
 
 #
 # the instance where user runs hb_report is the master
@@ -47,18 +66,21 @@
 
 usage() {
 	cat<<EOF
-usage: hb_report -f {time|"cts:"testnum} [-t time] [-u user] [-l file] [-p patt]
-       [-L patt] [-e prog] [-SDC] dest
+usage: hb_report -f {time|"cts:"testnum} [-t time] [-u user] [-l file]
+       [-E files] [-p patt] [-L patt] [-e prog] [-MSDC] dest
 
 	-f time: time to start from or a CTS test number
 	-t time: time to finish at (dflt: now)
 	-u user: ssh user to access other nodes (dflt: empty, hacluster, root)
 	-l file: log file
+	-E file: extra logs to collect; this option is additive
+	         (dflt: /var/log/messages)
 	-p patt: regular expression to match variables to be removed;
 	         this option is additive (dflt: "passw.*")
 	-L patt: regular expression to match in log files for analysis;
 	         this option is additive (dflt: $LOG_PATTERNS)
 	-e prog: your favourite editor
+	-M     : don't collect extra logs (/var/log/messages)
 	-D     : don't invoke editor to write description
 	-C     : remove the destination directory
 	-S     : single node operation; don't try to start report
@@ -76,6 +98,9 @@
 	  preferred
 	. we try to figure where is the logfile; if we can't, please
 	  clue us in
+	. we collect only one logfile and /var/log/messages; if you
+	  have more than one logfile, then use '-E' option to supply
+	  as many as you want ('-M' empties the list)
 
 	Examples
 
@@ -91,6 +116,9 @@
 	  have more sensitive information, please supply additional
 	  patterns yourself. The logs and the crm_mon, ccm_tool, and
 	  crm_verify output are *not* sanitized.
+	  Additional system logs (/var/log/messages) are collected in
+	  order to have a more complete report. If you don't want that
+	  specify -M.
 	  IT IS YOUR RESPONSIBILITY TO PROTECT THE DATA FROM EXPOSURE!
 EOF
 	exit
@@ -109,6 +137,10 @@
 	UNIQUE_MSG="Mark:HB_REPORT:$now"
 	SANITIZE="passw.*"
 	REMOVE_DEST=""
+	# logs to collect in addition
+	# NB: they all have to be in syslog format
+	#
+	EXTRA_LOGS="/var/log/messages"
 	# used only by the master
 	NO_SSH=""
 	SSH_USER=""
@@ -128,7 +160,7 @@
 	[ "$1" ] || fatal "bad time specification: $2"
 }
 msgcleanup() {
-	fatal "destination directory $DESTDIR exists, please cleanup"
+	fatal "destination directory $DESTDIR exists on $1, please cleanup"
 }
 nodistdirectory() {
 	fatal "could not create the destination directory $DESTDIR"
@@ -153,9 +185,17 @@
 		fi
 	done
 }
+#
+# first try syslog files, if none found then use the
+# logfile/debugfile settings
+#
 findlog() {
+	logf=""
 	if [ "$HA_LOGFACILITY" ]; then
-		findmsg $UNIQUE_MSG | awk '{print $1}'
+		logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
+	fi
+	if [ -f "$logf" ]; then
+		echo $logf
 	else
 		echo ${HA_DEBUGFILE:-$HA_LOGFILE}
 	fi
@@ -189,14 +229,14 @@
 	logf=$1
 	testnum=$2
 
-	FROM_LINE=`grep -n "Running test.*\[$testnum\]" $logf | sed 's/:.*//'`
+	FROM_LINE=`grep -n "Running test.*\[$testnum\]" $logf | tail -1 | sed 's/:.*//'`
 	if [ -z "$FROM_LINE" ]; then
 		warning "couldn't find line for CTS test $testnum; corrupt log file?"
 		return
 	else
 		FROM_TIME=`linetime $logf $FROM_LINE`
 	fi
-	TO_LINE=`grep -n "Running test.*\[$((testnum+1))\]" $logf | sed 's/:.*//'`
+	TO_LINE=`grep -n "Running test.*\[$(($testnum+1))\]" $logf | tail -1 | sed 's/:.*//'`
 	[ "$TO_LINE" ] ||
 		TO_LINE=`wc -l < $logf`
 	TO_TIME=`linetime $logf $TO_LINE`
@@ -215,6 +255,7 @@
 DESTDIR=$DESTDIR
 UNIQUE_MSG=$UNIQUE_MSG
 SANITIZE="$SANITIZE"
+EXTRA_LOGS="$EXTRA_LOGS"
 REMOVE_DEST="$REMOVE_DEST"
 EOF
 }
@@ -266,20 +307,8 @@
 		getbt $flist > $3
 }
 getpeinputs() {
-	if [ "$HA_LOGFACILITY" ]; then
-		n=`basename $3`
-		patt=" $n $PEINPUTS_PATT"
-	else
-		patt="$PEINPUTS_PATT"
-	fi
 	flist=$(
-	if [ -f $3/ha-log ]; then
-		grep "$patt" $3/ha-log | awk '{print $NF}'
-	elif [ -f $3/../ha-log ]; then # central log
-		grep "$patt" $3/../ha-log | awk '{print $NF}'
-	else
-		find_files $HA_VARLIB/pengine $1 $2
-	fi | sed "s,$HA_VARLIB/,,g"
+		find_files $HA_VARLIB/pengine $1 $2 | sed "s,$HA_VARLIB/,,g"
 	)
 	[ "$flist" ] &&
 		(cd $HA_VARLIB && tar cf - $flist) | (cd $3 && tar xf -)
@@ -305,12 +334,20 @@
 }
 sys_stats() {
 	set -x
+	uname -n
 	uptime
 	ps axf
 	ps auxw
 	top -b -n 1
+	ifconfig
 	netstat -i
 	arp -an
+	test -d /proc && {
+		cat /proc/cpuinfo
+		test -f /proc/scsi/scsi && cat /proc/scsi/scsi
+	}
+	mount
+	df
 	set +x
 }
 
@@ -318,7 +355,7 @@
 # replace sensitive info with '****'
 #
 sanitize() {
-	for f in $1/ha.cf $1/cib.xml $1/pengine/*; do
+	for f in $1/ha.cf $1/$CIB_F $1/pengine/*; do
 		[ -f "$f" ] && sanitize_one $f
 	done
 }
@@ -342,25 +379,27 @@
 #
 checkcrmvfy() {
 	for n in `getnodes`; do
-		if [ -s $1/$n/crm_verify.txt ]; then
+		if [ -s $1/$n/$CRM_VERIFY_F ]; then
 			echo "WARN: crm_verify reported warnings at $n:"
-			cat $1/$n/crm_verify.txt
+			cat $1/$n/$CRM_VERIFY_F
 		fi
 	done
 }
 checkbacktraces() {
 	for n in `getnodes`; do
-		[ -s $1/$n/backtraces.txt ] && {
+		[ -s $1/$n/$BT_F ] && {
 			echo "WARN: coredumps found at $n:"
 			egrep 'Core was generated|Program terminated' \
-					$1/$n/backtraces.txt |
+					$1/$n/$BT_F |
 				sed 's/^/	/'
 		}
 	done
 }
 checklogs() {
-	logs=`find $1 -name ha-log`
+	logs=$(find $1 -name $HALOG_F;
+		for l in $EXTRA_LOGS; do find $1/* -name `basename $l`; done)
 	[ "$logs" ] || return
+	trap '[ -z "$pattfile" ] || rmtempfile "$pattfile"]' 0
 	pattfile=`maketempfile` ||
 		fatal "cannot create temporary files"
 	for p in $LOG_PATTERNS; do
@@ -371,7 +410,8 @@
 	for n in `getnodes`; do
 		cat $logs | grep -f $pattfile
 	done
-	rm -f $pattfile
+	rmtempfile $pattfile
+	trap "" 0
 }
 
 #
@@ -400,13 +440,13 @@
 		return 1
 	}
 	case `basename $1` in
-	ccm_tool.txt)
+	$CCMTOOL_F)
 		txtdiff $1 $2;; # worddiff?
-	cib.xml)
+	$CIB_F)
 		cibdiff $1 $2;;
 	ha.cf)
 		txtdiff $1 $2;; # confdiff?
-	crm_mon.txt|sysinfo.txt)
+	$CRM_MON_F|$SYSINFO_F)
 		txtdiff $1 $2;;
 	esac
 }
@@ -416,7 +456,7 @@
 	for n in `getnodes`; do
 		if [ "$node0" ]; then
 			diffcheck $1/$node0/$2 $1/$n/$2
-			rc=$((rc+$?))
+			rc=$(($rc+$?))
 		else
 			node0=$n
 		fi
@@ -424,13 +464,13 @@
 	return $rc
 }
 analyze() {
-	flist="hostcache ccm_tool.txt cib.xml crm_mon.txt ha.cf logd.cf sysinfo.txt"
+	flist="hostcache $CCMTOOL_F $CIB_F $CRM_MON_F ha.cf logd.cf $SYSINFO_F"
 	for f in $flist; do
 		perl -e "printf \"Diff $f... \""
 		ls $1/*/$f >/dev/null 2>&1 || continue
 		if analyze_one $1 $f; then
 			echo "OK"
-			[ "$f" != cib.xml ] &&
+			[ "$f" != $CIB_F ] &&
 				consolidate $1 $f
 		else
 			echo "varies"
@@ -450,7 +490,7 @@
 encountered. Then, post to
 	Linux-HA@lists.linux-ha.org
 or file a bug at
-	http://old.linux-foundation.org/developer_bugzilla/
+	http://developerbugs.linux-foundation.org/
 
 See http://linux-ha.org/ReportingProblems for detailed
 description on how to report problems.
@@ -470,14 +510,14 @@
 
 EOF
 
-	if [ -f $DESTDIR/sysinfo.txt ]; then
+	if [ -f $DESTDIR/$SYSINFO_F ]; then
 		echo "Common system info found:"
-		cat $DESTDIR/sysinfo.txt
+		cat $DESTDIR/$SYSINFO_F
 	else
 		for n in `getnodes`; do
-			if [ -f $DESTDIR/$n/sysinfo.txt ]; then
+			if [ -f $DESTDIR/$n/$SYSINFO_F ]; then
 				echo "System info $n:"
-				sed 's/^/	/' $DESTDIR/$n/sysinfo.txt
+				sed 's/^/	/' $DESTDIR/$n/$SYSINFO_F
 			fi
 		done
 	fi
@@ -531,7 +571,7 @@
 if [ "$SLAVE" = "" ]; then
 	setvarsanddefaults
 	userargs="$@"
-	while getopts f:t:l:u:p:L:e:SDCh o; do
+	while getopts f:t:l:u:p:L:e:E:MSDCh o; do
 		case "$o" in
 			h) usage;;
 			f)
@@ -554,10 +594,12 @@
 			S) NO_SSH=1;;
 			D) NO_DESCRIPTION=1;;
 			C) REMOVE_DEST=1;;
+			M) EXTRA_LOGS="";;
+			E) EXTRA_LOGS="$EXTRA_LOGS $OPTARG";;
 			[?]) usage short;;
 		esac
 	done
-	shift $((OPTIND-1))
+	shift $(($OPTIND-1))
 	[ $# -ne 1 ] && usage short
 	DESTDIR=`echo $1 | sed 's,/*$,,'`
 	chkdirname $DESTDIR
@@ -584,12 +626,12 @@
 		fi
 	fi
 # final check: don't run if the destination directory exists
-	[ -d $DESTDIR ] && msgcleanup
+	[ -d $DESTDIR ] && msgcleanup "local node"
 	[ "$ssh_good" ] &&
 		for node in `getnodes`; do
 			[ "$node" = "$WE" ] && continue
 			ssh $ssh_opts $node "test -d $DESTDIR" &&
-				msgcleanup
+				msgcleanup $node
 		done
 fi
 
@@ -646,16 +688,22 @@
 		warning "a log found; but we cannot slice it"
 		warning "please install the perl Date::Parse module"
 	else
-		if [ "$CTS" ]; then
-			cts_findlogseg $HA_LOG $CTS
-		else
-			findlogseg $HA_LOG $FROM_TIME $TO_TIME
-		fi
-		dumplog $HA_LOG $FROM_LINE $TO_LINE |
-		if [ "$THIS_IS_NODE" ]; then
-			cat > $DESTDIR/$WE/ha-log
+		getstampproc=`find_getstampproc < $HA_LOG`
+		if [ "$getstampproc" ]; then
+			export getstampproc # used by linetime
+			if [ "$CTS" ]; then
+				cts_findlogseg $HA_LOG $CTS
+			else
+				findlogseg $HA_LOG $FROM_TIME $TO_TIME
+			fi
+			dumplog $HA_LOG $FROM_LINE $TO_LINE |
+			if [ "$THIS_IS_NODE" ]; then
+				cat > $DESTDIR/$WE/$HALOG_F
+			else
+				cat > $DESTDIR/$HALOG_F # we are log server, probably
+			fi
 		else
-			cat > $DESTDIR/ha-log # we are log server, probably
+			warning "could not figure out the log format of $HA_LOG"
 		fi
 	fi
 else
@@ -683,11 +731,24 @@
 if [ "$THIS_IS_NODE" ]; then
 	getconfig $DESTDIR/$WE
 	getpeinputs $FROM_TIME $TO_TIME $DESTDIR/$WE
-	getbacktraces $FROM_TIME $TO_TIME $DESTDIR/$WE/backtraces.txt
+	getbacktraces $FROM_TIME $TO_TIME $DESTDIR/$WE/$BT_F
 	touch_DC_if_dc $DESTDIR/$WE
 	sanitize $DESTDIR/$WE
-	sys_info > $DESTDIR/$WE/sysinfo.txt
-	sys_stats > $DESTDIR/$WE/sysstats.txt 2>&1
+	sys_info > $DESTDIR/$WE/$SYSINFO_F
+	sys_stats > $DESTDIR/$WE/$SYSSTATS_F 2>&1
+
+	for l in $EXTRA_LOGS; do
+		[ "$NO_str2time" ] && break
+		[ "$l" = "$HA_LOG" -o ! -f "$l" ] && continue
+		getstampproc=`find_getstampproc < $l`
+		if [ "$getstampproc" ]; then
+			export getstampproc # used by linetime
+			findlogseg $l $FROM_TIME $TO_TIME
+			dumplog $l $FROM_LINE $TO_LINE > $DESTDIR/$WE/`basename $l`
+		else
+			warning "could not figure out the log format of $l"
+		fi
+	done
 fi
 
 #
@@ -700,12 +761,12 @@
 	(cd $DESTDIR && tar cf - $WE)
 else
 	wait $SLAVEPIDS
-	analyze $DESTDIR > $DESTDIR/analysis.txt
-	mktemplate > $DESTDIR/description.txt
+	analyze $DESTDIR > $DESTDIR/$ANALYSIS_F
+	mktemplate > $DESTDIR/$DESCRIPTION_F
 	[ "$NO_DESCRIPTION" ] || {
 		echo press enter to edit the problem description...
 		read junk
-		edittemplate $DESTDIR/description.txt
+		edittemplate $DESTDIR/$DESCRIPTION_F
 	}
 	cd $DESTDIR/..
 	tar czf $DESTDIR.tar.gz `basename $DESTDIR`
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/hb_report.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/hb_report.in
--- heartbeat-2.1.3/tools/hb_report.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/hb_report.in	2008-08-18 13:32:19.000000000 +0100
@@ -30,12 +30,31 @@
 		PROGDIR=$HA_NOARCHBIN
 }
 
+# the default syslog facility is not (yet) exported by heartbeat
+# to shell scripts
+#
+DEFAULT_HA_LOGFACILITY="daemon"
+export DEFAULT_HA_LOGFACILITY
 LOGD_CF=`findlogdcf @sysconfdir@ $HA_DIR`
 export LOGD_CF
 
 : ${SSH_OPTS="-T"}
 LOG_PATTERNS="CRIT: ERROR:"
-PEINPUTS_PATT="peng.*PEngine Input stored"
+# PEINPUTS_PATT="peng.*PEngine Input stored"
+
+# the goods
+ANALYSIS_F=analysis.txt
+DESCRIPTION_F=description.txt
+HALOG_F=ha-log.txt
+BT_F=backtraces.txt
+SYSINFO_F=sysinfo.txt
+SYSSTATS_F=sysstats.txt
+export ANALYSIS_F DESCRIPTION_F HALOG_F BT_F SYSINFO_F SYSSTATS_F
+CRM_MON_F=crm_mon.txt
+CCMTOOL_F=ccm_tool.txt
+CRM_VERIFY_F=crm_verify.txt
+CIB_F=cib.xml
+export CRM_MON_F CCMTOOL_F CRM_VERIFY_F CIB_F
 
 #
 # the instance where user runs hb_report is the master
@@ -47,18 +66,21 @@
 
 usage() {
 	cat<<EOF
-usage: hb_report -f {time|"cts:"testnum} [-t time] [-u user] [-l file] [-p patt]
-       [-L patt] [-e prog] [-SDC] dest
+usage: hb_report -f {time|"cts:"testnum} [-t time] [-u user] [-l file]
+       [-E files] [-p patt] [-L patt] [-e prog] [-MSDC] dest
 
 	-f time: time to start from or a CTS test number
 	-t time: time to finish at (dflt: now)
 	-u user: ssh user to access other nodes (dflt: empty, hacluster, root)
 	-l file: log file
+	-E file: extra logs to collect; this option is additive
+	         (dflt: /var/log/messages)
 	-p patt: regular expression to match variables to be removed;
 	         this option is additive (dflt: "passw.*")
 	-L patt: regular expression to match in log files for analysis;
 	         this option is additive (dflt: $LOG_PATTERNS)
 	-e prog: your favourite editor
+	-M     : don't collect extra logs (/var/log/messages)
 	-D     : don't invoke editor to write description
 	-C     : remove the destination directory
 	-S     : single node operation; don't try to start report
@@ -76,6 +98,9 @@
 	  preferred
 	. we try to figure where is the logfile; if we can't, please
 	  clue us in
+	. we collect only one logfile and /var/log/messages; if you
+	  have more than one logfile, then use '-E' option to supply
+	  as many as you want ('-M' empties the list)
 
 	Examples
 
@@ -91,6 +116,9 @@
 	  have more sensitive information, please supply additional
 	  patterns yourself. The logs and the crm_mon, ccm_tool, and
 	  crm_verify output are *not* sanitized.
+	  Additional system logs (/var/log/messages) are collected in
+	  order to have a more complete report. If you don't want that
+	  specify -M.
 	  IT IS YOUR RESPONSIBILITY TO PROTECT THE DATA FROM EXPOSURE!
 EOF
 	exit
@@ -109,6 +137,10 @@
 	UNIQUE_MSG="Mark:HB_REPORT:$now"
 	SANITIZE="passw.*"
 	REMOVE_DEST=""
+	# logs to collect in addition
+	# NB: they all have to be in syslog format
+	#
+	EXTRA_LOGS="/var/log/messages"
 	# used only by the master
 	NO_SSH=""
 	SSH_USER=""
@@ -128,7 +160,7 @@
 	[ "$1" ] || fatal "bad time specification: $2"
 }
 msgcleanup() {
-	fatal "destination directory $DESTDIR exists, please cleanup"
+	fatal "destination directory $DESTDIR exists on $1, please cleanup"
 }
 nodistdirectory() {
 	fatal "could not create the destination directory $DESTDIR"
@@ -153,9 +185,17 @@
 		fi
 	done
 }
+#
+# first try syslog files, if none found then use the
+# logfile/debugfile settings
+#
 findlog() {
+	logf=""
 	if [ "$HA_LOGFACILITY" ]; then
-		findmsg $UNIQUE_MSG | awk '{print $1}'
+		logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
+	fi
+	if [ -f "$logf" ]; then
+		echo $logf
 	else
 		echo ${HA_DEBUGFILE:-$HA_LOGFILE}
 	fi
@@ -189,14 +229,14 @@
 	logf=$1
 	testnum=$2
 
-	FROM_LINE=`grep -n "Running test.*\[$testnum\]" $logf | sed 's/:.*//'`
+	FROM_LINE=`grep -n "Running test.*\[$testnum\]" $logf | tail -1 | sed 's/:.*//'`
 	if [ -z "$FROM_LINE" ]; then
 		warning "couldn't find line for CTS test $testnum; corrupt log file?"
 		return
 	else
 		FROM_TIME=`linetime $logf $FROM_LINE`
 	fi
-	TO_LINE=`grep -n "Running test.*\[$((testnum+1))\]" $logf | sed 's/:.*//'`
+	TO_LINE=`grep -n "Running test.*\[$(($testnum+1))\]" $logf | tail -1 | sed 's/:.*//'`
 	[ "$TO_LINE" ] ||
 		TO_LINE=`wc -l < $logf`
 	TO_TIME=`linetime $logf $TO_LINE`
@@ -215,6 +255,7 @@
 DESTDIR=$DESTDIR
 UNIQUE_MSG=$UNIQUE_MSG
 SANITIZE="$SANITIZE"
+EXTRA_LOGS="$EXTRA_LOGS"
 REMOVE_DEST="$REMOVE_DEST"
 EOF
 }
@@ -266,20 +307,8 @@
 		getbt $flist > $3
 }
 getpeinputs() {
-	if [ "$HA_LOGFACILITY" ]; then
-		n=`basename $3`
-		patt=" $n $PEINPUTS_PATT"
-	else
-		patt="$PEINPUTS_PATT"
-	fi
 	flist=$(
-	if [ -f $3/ha-log ]; then
-		grep "$patt" $3/ha-log | awk '{print $NF}'
-	elif [ -f $3/../ha-log ]; then # central log
-		grep "$patt" $3/../ha-log | awk '{print $NF}'
-	else
-		find_files $HA_VARLIB/pengine $1 $2
-	fi | sed "s,$HA_VARLIB/,,g"
+		find_files $HA_VARLIB/pengine $1 $2 | sed "s,$HA_VARLIB/,,g"
 	)
 	[ "$flist" ] &&
 		(cd $HA_VARLIB && tar cf - $flist) | (cd $3 && tar xf -)
@@ -305,12 +334,20 @@
 }
 sys_stats() {
 	set -x
+	uname -n
 	uptime
 	ps axf
 	ps auxw
 	top -b -n 1
+	ifconfig
 	netstat -i
 	arp -an
+	test -d /proc && {
+		cat /proc/cpuinfo
+		test -f /proc/scsi/scsi && cat /proc/scsi/scsi
+	}
+	mount
+	df
 	set +x
 }
 
@@ -318,7 +355,7 @@
 # replace sensitive info with '****'
 #
 sanitize() {
-	for f in $1/ha.cf $1/cib.xml $1/pengine/*; do
+	for f in $1/ha.cf $1/$CIB_F $1/pengine/*; do
 		[ -f "$f" ] && sanitize_one $f
 	done
 }
@@ -342,25 +379,27 @@
 #
 checkcrmvfy() {
 	for n in `getnodes`; do
-		if [ -s $1/$n/crm_verify.txt ]; then
+		if [ -s $1/$n/$CRM_VERIFY_F ]; then
 			echo "WARN: crm_verify reported warnings at $n:"
-			cat $1/$n/crm_verify.txt
+			cat $1/$n/$CRM_VERIFY_F
 		fi
 	done
 }
 checkbacktraces() {
 	for n in `getnodes`; do
-		[ -s $1/$n/backtraces.txt ] && {
+		[ -s $1/$n/$BT_F ] && {
 			echo "WARN: coredumps found at $n:"
 			egrep 'Core was generated|Program terminated' \
-					$1/$n/backtraces.txt |
+					$1/$n/$BT_F |
 				sed 's/^/	/'
 		}
 	done
 }
 checklogs() {
-	logs=`find $1 -name ha-log`
+	logs=$(find $1 -name $HALOG_F;
+		for l in $EXTRA_LOGS; do find $1/* -name `basename $l`; done)
 	[ "$logs" ] || return
+	trap '[ -z "$pattfile" ] || rmtempfile "$pattfile"]' 0
 	pattfile=`maketempfile` ||
 		fatal "cannot create temporary files"
 	for p in $LOG_PATTERNS; do
@@ -371,7 +410,8 @@
 	for n in `getnodes`; do
 		cat $logs | grep -f $pattfile
 	done
-	rm -f $pattfile
+	rmtempfile $pattfile
+	trap "" 0
 }
 
 #
@@ -400,13 +440,13 @@
 		return 1
 	}
 	case `basename $1` in
-	ccm_tool.txt)
+	$CCMTOOL_F)
 		txtdiff $1 $2;; # worddiff?
-	cib.xml)
+	$CIB_F)
 		cibdiff $1 $2;;
 	ha.cf)
 		txtdiff $1 $2;; # confdiff?
-	crm_mon.txt|sysinfo.txt)
+	$CRM_MON_F|$SYSINFO_F)
 		txtdiff $1 $2;;
 	esac
 }
@@ -416,7 +456,7 @@
 	for n in `getnodes`; do
 		if [ "$node0" ]; then
 			diffcheck $1/$node0/$2 $1/$n/$2
-			rc=$((rc+$?))
+			rc=$(($rc+$?))
 		else
 			node0=$n
 		fi
@@ -424,13 +464,13 @@
 	return $rc
 }
 analyze() {
-	flist="hostcache ccm_tool.txt cib.xml crm_mon.txt ha.cf logd.cf sysinfo.txt"
+	flist="hostcache $CCMTOOL_F $CIB_F $CRM_MON_F ha.cf logd.cf $SYSINFO_F"
 	for f in $flist; do
 		perl -e "printf \"Diff $f... \""
 		ls $1/*/$f >/dev/null 2>&1 || continue
 		if analyze_one $1 $f; then
 			echo "OK"
-			[ "$f" != cib.xml ] &&
+			[ "$f" != $CIB_F ] &&
 				consolidate $1 $f
 		else
 			echo "varies"
@@ -450,7 +490,7 @@
 encountered. Then, post to
 	Linux-HA@lists.linux-ha.org
 or file a bug at
-	http://old.linux-foundation.org/developer_bugzilla/
+	http://developerbugs.linux-foundation.org/
 
 See http://linux-ha.org/ReportingProblems for detailed
 description on how to report problems.
@@ -470,14 +510,14 @@
 
 EOF
 
-	if [ -f $DESTDIR/sysinfo.txt ]; then
+	if [ -f $DESTDIR/$SYSINFO_F ]; then
 		echo "Common system info found:"
-		cat $DESTDIR/sysinfo.txt
+		cat $DESTDIR/$SYSINFO_F
 	else
 		for n in `getnodes`; do
-			if [ -f $DESTDIR/$n/sysinfo.txt ]; then
+			if [ -f $DESTDIR/$n/$SYSINFO_F ]; then
 				echo "System info $n:"
-				sed 's/^/	/' $DESTDIR/$n/sysinfo.txt
+				sed 's/^/	/' $DESTDIR/$n/$SYSINFO_F
 			fi
 		done
 	fi
@@ -531,7 +571,7 @@
 if [ "$SLAVE" = "" ]; then
 	setvarsanddefaults
 	userargs="$@"
-	while getopts f:t:l:u:p:L:e:SDCh o; do
+	while getopts f:t:l:u:p:L:e:E:MSDCh o; do
 		case "$o" in
 			h) usage;;
 			f)
@@ -554,10 +594,12 @@
 			S) NO_SSH=1;;
 			D) NO_DESCRIPTION=1;;
 			C) REMOVE_DEST=1;;
+			M) EXTRA_LOGS="";;
+			E) EXTRA_LOGS="$EXTRA_LOGS $OPTARG";;
 			[?]) usage short;;
 		esac
 	done
-	shift $((OPTIND-1))
+	shift $(($OPTIND-1))
 	[ $# -ne 1 ] && usage short
 	DESTDIR=`echo $1 | sed 's,/*$,,'`
 	chkdirname $DESTDIR
@@ -584,12 +626,12 @@
 		fi
 	fi
 # final check: don't run if the destination directory exists
-	[ -d $DESTDIR ] && msgcleanup
+	[ -d $DESTDIR ] && msgcleanup "local node"
 	[ "$ssh_good" ] &&
 		for node in `getnodes`; do
 			[ "$node" = "$WE" ] && continue
 			ssh $ssh_opts $node "test -d $DESTDIR" &&
-				msgcleanup
+				msgcleanup $node
 		done
 fi
 
@@ -646,16 +688,22 @@
 		warning "a log found; but we cannot slice it"
 		warning "please install the perl Date::Parse module"
 	else
-		if [ "$CTS" ]; then
-			cts_findlogseg $HA_LOG $CTS
-		else
-			findlogseg $HA_LOG $FROM_TIME $TO_TIME
-		fi
-		dumplog $HA_LOG $FROM_LINE $TO_LINE |
-		if [ "$THIS_IS_NODE" ]; then
-			cat > $DESTDIR/$WE/ha-log
+		getstampproc=`find_getstampproc < $HA_LOG`
+		if [ "$getstampproc" ]; then
+			export getstampproc # used by linetime
+			if [ "$CTS" ]; then
+				cts_findlogseg $HA_LOG $CTS
+			else
+				findlogseg $HA_LOG $FROM_TIME $TO_TIME
+			fi
+			dumplog $HA_LOG $FROM_LINE $TO_LINE |
+			if [ "$THIS_IS_NODE" ]; then
+				cat > $DESTDIR/$WE/$HALOG_F
+			else
+				cat > $DESTDIR/$HALOG_F # we are log server, probably
+			fi
 		else
-			cat > $DESTDIR/ha-log # we are log server, probably
+			warning "could not figure out the log format of $HA_LOG"
 		fi
 	fi
 else
@@ -683,11 +731,24 @@
 if [ "$THIS_IS_NODE" ]; then
 	getconfig $DESTDIR/$WE
 	getpeinputs $FROM_TIME $TO_TIME $DESTDIR/$WE
-	getbacktraces $FROM_TIME $TO_TIME $DESTDIR/$WE/backtraces.txt
+	getbacktraces $FROM_TIME $TO_TIME $DESTDIR/$WE/$BT_F
 	touch_DC_if_dc $DESTDIR/$WE
 	sanitize $DESTDIR/$WE
-	sys_info > $DESTDIR/$WE/sysinfo.txt
-	sys_stats > $DESTDIR/$WE/sysstats.txt 2>&1
+	sys_info > $DESTDIR/$WE/$SYSINFO_F
+	sys_stats > $DESTDIR/$WE/$SYSSTATS_F 2>&1
+
+	for l in $EXTRA_LOGS; do
+		[ "$NO_str2time" ] && break
+		[ "$l" = "$HA_LOG" -o ! -f "$l" ] && continue
+		getstampproc=`find_getstampproc < $l`
+		if [ "$getstampproc" ]; then
+			export getstampproc # used by linetime
+			findlogseg $l $FROM_TIME $TO_TIME
+			dumplog $l $FROM_LINE $TO_LINE > $DESTDIR/$WE/`basename $l`
+		else
+			warning "could not figure out the log format of $l"
+		fi
+	done
 fi
 
 #
@@ -700,12 +761,12 @@
 	(cd $DESTDIR && tar cf - $WE)
 else
 	wait $SLAVEPIDS
-	analyze $DESTDIR > $DESTDIR/analysis.txt
-	mktemplate > $DESTDIR/description.txt
+	analyze $DESTDIR > $DESTDIR/$ANALYSIS_F
+	mktemplate > $DESTDIR/$DESCRIPTION_F
 	[ "$NO_DESCRIPTION" ] || {
 		echo press enter to edit the problem description...
 		read junk
-		edittemplate $DESTDIR/description.txt
+		edittemplate $DESTDIR/$DESCRIPTION_F
 	}
 	cd $DESTDIR/..
 	tar czf $DESTDIR.tar.gz `basename $DESTDIR`
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/Makefile /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/Makefile
--- heartbeat-2.1.3/tools/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ heartbeat-2.1.4/tools/Makefile	2008-12-29 22:12:09.000000000 +0000
@@ -0,0 +1,883 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# tools/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+pkgdatadir = $(datadir)/heartbeat
+pkglibdir = $(libdir)/heartbeat
+pkgincludedir = $(includedir)/heartbeat
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+habin_PROGRAMS = cl_status$(EXEEXT) cl_respawn$(EXEEXT)
+halib_PROGRAMS = attrd$(EXEEXT) pingd$(EXEEXT)
+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 = $(install_sh) -d
+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
+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 = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run aclocal-1.10
+ALIGN = 
+AMTAR = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run automake-1.10
+AWK = /usr/bin/mawk
+CC = gcc -std=gnu99
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing   -ggdb3 -funsigned-char
+CIMOM = 
+CMPI_HEADER_PATH = 
+CMPI_PROVIDER_DIR = 
+CPP = gcc -std=gnu99 -E
+CPPFLAGS =  -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -I/usr/include/libxml2
+CRM_DIR = crm
+CRM_ENABLED = 1
+CRYPTOLIB = -lcrypto
+CURSESLIBS = -lncurses
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DISABLE_TIMES_KLUDGE = 
+DISTDIR = heartbeat-2.1.4
+DISTRO_STYLE_RPMS = 0
+DLOPEN_FORCE_FLAGS = 
+DSYMUTIL = 
+ECHO = echo
+ECHO_C = 
+ECHO_CMD = echo
+ECHO_E = 
+ECHO_N = 
+ECHO_T = 
+EGREP = /bin/grep -E
+EXEEXT = 
+F77 = 
+FFLAGS = 
+GETENT = /usr/bin/getent
+GLIBHEAD = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GLIBLIB = -lglib-2.0  
+GNUTLSHEAD = -I/usr/include -I/usr/include
+GNUTLSLIBS = -lgnutls
+GREP = /bin/grep
+GZIP_PROG = /bin/gzip
+HA_APIGID = 65
+HA_APIGROUP = haclient
+HA_CCMUID = 17
+HA_CCMUSER = hacluster
+HA_COREDIR = /var/lib/heartbeat/cores
+HA_DATADIR = /usr/share
+HA_HBCONF_DIR = /etc/ha.d
+HA_LIBDIR = /usr/lib
+HA_LIBHBDIR = /usr/lib/heartbeat
+HA_LOGDAEMON_IPC = /var/lib/log_daemon
+HA_NOARCHDATAHBDIR = /usr/share/heartbeat
+HA_PLUGIN_DIR = /usr/lib/heartbeat/plugins
+HA_RC_DIR = /etc/ha.d/rc.d
+HA_URLBASE = http://linux-ha.org/
+HA_VARLIBDIR = /var/lib
+HA_VARLIBHBDIR = /var/lib/heartbeat
+HA_VARLOCKDIR = /var/lock
+HA_VARLOGDIR = /var/log
+HA_VARRUNDIR = /var/run
+HA_VARRUNHBDIR = /var/run/heartbeat
+HA_VARRUNHBRSCDIR = /var/run/heartbeat/rsctmp
+HB_INITSTARTPRI = 75
+HB_INITSTOPPRI = 05
+HB_PKG = heartbeat
+HB_RA_DIR = /etc/ha.d/resource.d/
+HG = /usr/local/hg
+HTML2TXT = /usr/bin/lynx
+IFCONFIG = /sbin/ifconfig
+IFCONFIG_A_OPT = -a
+INCLTDL = 
+INITDIR = /etc/init.d
+INIT_EXT = 
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+IP2UTIL = /sbin/ip
+IPCSOCKET_C = ipcsocket.c
+IPCSOCKET_LO = ipcsocket.lo
+JAVA_HOME = 
+LDFLAGS = 
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
+LIBADD_DL = -ldl
+LIBADD_INTL = 
+LIBGNUTLS_CONFIG = /usr/bin/libgnutls-config
+LIBLTDL = 
+LIBLTDL_DIR = 
+LIBNETCONFIG = /usr/bin/libnet-config
+LIBNETDEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H 
+LIBNETLIBS = -lnet
+LIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.o ${LIBOBJDIR}strlcpy$U.o ${LIBOBJDIR}strlcat$U.o
+LIBRT = 
+LIBS = -lbz2 -lz -lxml2 -lc -luuid -lpam -lrt -ldl  -lltdl
+LIBTOOL = $(SHELL) $(top_builddir)/libtool --tag=CC $(QUIET_LIBTOOL_OPTS)
+LN_S = ln -s
+LOCALE = /usr/share/locale
+LRM_ENABLED = 1
+LRM_PLUGIN_DIR = /usr/lib/heartbeat/plugins/RAExec
+LSB_RA_DIR = /etc/init.d
+LTLIBOBJS =  ${LIBOBJDIR}NoSuchFunctionName$U.lo ${LIBOBJDIR}strlcpy$U.lo ${LIBOBJDIR}strlcat$U.lo
+MAILCMD = mailx
+MAKE = make $(QUIET_MAKE_OPTS)
+MAKEINFO = ${SHELL} /scratch/ubuntu/build/hardy/heartbeat-2.1.4/missing --run makeinfo
+MD5 = 
+MGMT_DIR = mgmt
+MIBS_DIR = /usr/share/snmp/mibs
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGHDR_TYPE = msghdr
+NETSTAT = /bin/netstat
+NMEDIT = 
+NON_FATAL_CFLAGS = -g -O2 -fgnu89-inline  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wdeclaration-after-statement -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Wno-strict-aliasing
+OBJEXT = o
+OCF_RA_DIR = /usr/lib/ocf/resource.d/
+OCF_ROOT_DIR = /usr/lib/ocf
+PACKAGE = heartbeat
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PILSPKG = pils
+PING = /bin/ping
+PING_TIMEOUT_OPT = -w1
+PKGCONFIG = /usr/bin/pkg-config
+PKGNAME = LXHAhb
+POD2MAN = /usr/bin/pod2man
+POWEROFF_CMD = /sbin/poweroff
+POWEROFF_OPTIONS = -nf
+PRETTY_CC = 
+PROCROUTE = 
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_INCLUDES = -I/usr/include/python2.5
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.5
+QUIET_LIBTOOL_OPTS = 
+QUIET_MAKE_OPTS = 
+QUORUMD_ENABLED = 1
+RANLIB = ranlib
+REBOOT = /sbin/reboot
+REBOOT_OPTIONS = -nf
+ROUTE = /sbin/route
+ROUTEPARM = 
+RPM = 
+RPMREL = 1
+RPMTARGET = 
+RPM_ENABLE_MGMT_CONFIG = 1
+RPM_ENABLE_OPENHPI = 1
+RPM_ENABLE_SNMP_SUBAGENT = 1
+SCP = /usr/bin/scp
+SED = /bin/sed
+SET_MAKE = 
+SHELL = /bin/bash
+SNMPAGENTLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp -Wl,-E -lwrap
+SNMPCONFIG = /usr/bin/net-snmp-config
+SNMPLIB = -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp
+SNMP_RPM_BUILD_REQUIRES = BuildRequires: net-snmp tcp_wrappers
+SSH = /usr/bin/ssh
+STONITHPKG = stonith
+STONITH_RA_DIR = /usr/lib/heartbeat/stonith.d/
+STRIP = strip
+SWIG = /usr/bin/swig
+TAR = /bin/tar
+TARFILE = heartbeat-2.1.4.tar.gz
+TEST = /usr/bin/test
+TIPC_INCLUDE = 
+TSA_DIR = 
+UCDSNMPDEVEL = 
+USE_MODULES = 1
+VALGRIND_BIN = 
+VERSION = 2.1.4
+WHOAMI = /usr/bin/whoami
+XML2CONFIG = /usr/bin/xml2-config
+XPERIMENTALDIRS = 
+YACC = bison -y
+YFLAGS = 
+abs_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/tools
+abs_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4/tools
+abs_top_builddir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+abs_top_srcdir = /scratch/ubuntu/build/hardy/heartbeat-2.1.4
+ac_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+base_includedir = /usr/include
+bindir = /usr/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+cleaned_configure_args =  '--prefix=/usr' '--sysconfdir=/etc' '--localstatedir=/var' '--mandir=/usr/share/man' '--with-group-name=haclient' '--with-ccmuser-name=hacluster' '--enable-snmp-subagent' '--with-mibsdir=/usr/share/snmp/mibs' '--disable-fatal-warnings' '--enable-mgmt' '--enable-libc-malloc' '--enable-ltdl-convenience'
+datadir = /usr/share
+datarootdir = /usr/share
+docdir = /usr/share/doc/heartbeat-2.1.4
+dvidir = ${docdir}
+exec_prefix = /usr
+hb_libdir = /usr/lib/heartbeat
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+includedir = /usr/include
+infodir = /usr/share/info
+install_sh = $(SHELL) /scratch/ubuntu/build/hardy/heartbeat-2.1.4/install-sh
+libdir = /usr/lib
+libexecdir = /usr/lib
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = /usr/share/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+pils_includedir = /usr/include/pils
+pils_plugindir = /usr/lib/pils/plugins
+pkgpyexecdir = ${pyexecdir}/heartbeat
+pkgpythondir = ${pythondir}/heartbeat
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+pyexecdir = ${exec_prefix}/lib/python2.5/site-packages
+pythondir = ${prefix}/lib/python2.5/site-packages
+saf_includedir = /usr/include/saf
+sbindir = /usr/sbin
+sharedstatedir = /usr/com
+srcdir = .
+stonith_ext_plugindir = /usr/lib/stonith/plugins/external
+stonith_includedir = /usr/include/stonith
+stonith_plugindir = /usr/lib/stonith/plugins
+subdirs = 
+sysconfdir = /etc
+target_alias = 
+top_builddir = ..
+top_srcdir = ..
+
+#
+# heartbeat: Linux-HA heartbeat code
+#
+# Copyright (C) 2001 Michael Moerz
+#
+# 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., 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 = 65
+habindir = /usr/bin
+halibdir = $(libdir)/heartbeat
+hanoarchdir = /usr/share/heartbeat
+gliblib = -lglib-2.0  
+halib_SCRIPTS = haresources2cib.py
+hanoarch_DATA = utillib.sh
+sbin_SCRIPTS = ciblint hb_report ocf-tester
+cl_status_SOURCES = cl_status.c
+# A little trick. Now ccdv can be auto-built but not auto-cleaned.
+cl_status_DEPENDENCIES = ccdv
+cl_status_LDADD = $(top_builddir)/lib/hbclient/libhbclient.la	\
+			  $(top_builddir)/lib/clplumbing/libplumb.la	\
+			  $(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		\
+		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
+		  $(top_builddir)/lib/hbclient/libhbclient.la		\
+		  $(top_builddir)/lib/crm/cib/libcib.la			\
+		  $(GLIBLIB)						\
+		  $(LIBRT)
+
+pingd_SOURCES = pingd.c
+pingd_LDADD = \
+		  $(top_builddir)/lib/clplumbing/libplumb.la		\
+		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
+		  $(top_builddir)/lib/hbclient/libhbclient.la		\
+		  $(GLIBLIB)						\
+		  $(LIBRT)
+
+attrd_updater_SOURCES = attrd_updater.c
+attrd_updater_LDADD = \
+		  $(top_builddir)/lib/clplumbing/libplumb.la		\
+		  $(top_builddir)/lib/crm/common/libcrmcommon.la	\
+		  $(GLIBLIB)						\
+		  $(LIBRT)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(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
+.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 $(srcdir)/haresources2cib.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+hb_report: $(top_builddir)/config.status $(srcdir)/hb_report.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ocf-tester: $(top_builddir)/config.status $(srcdir)/ocf-tester.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-habinPROGRAMS: $(habin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(habinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(habindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(habinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(habindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-habinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-habinPROGRAMS:
+	@list='$(habin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+install-halibPROGRAMS: $(halib_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-halibPROGRAMS:
+	@$(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"; \
+	done
+
+clean-halibPROGRAMS:
+	@list='$(halib_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-sbinPROGRAMS:
+	@$(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"; \
+	done
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+attrd$(EXEEXT): $(attrd_OBJECTS) $(attrd_DEPENDENCIES) 
+	@rm -f attrd$(EXEEXT)
+	$(LINK) $(attrd_OBJECTS) $(attrd_LDADD) $(LIBS)
+attrd_updater$(EXEEXT): $(attrd_updater_OBJECTS) $(attrd_updater_DEPENDENCIES) 
+	@rm -f attrd_updater$(EXEEXT)
+	$(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_OBJECTS) $(cl_respawn_LDADD) $(LIBS)
+cl_status$(EXEEXT): $(cl_status_OBJECTS) $(cl_status_DEPENDENCIES) 
+	@rm -f cl_status$(EXEEXT)
+	$(LINK) $(cl_status_OBJECTS) $(cl_status_LDADD) $(LIBS)
+pingd$(EXEEXT): $(pingd_OBJECTS) $(pingd_DEPENDENCIES) 
+	@rm -f pingd$(EXEEXT)
+	$(LINK) $(pingd_OBJECTS) $(pingd_LDADD) $(LIBS)
+install-halibSCRIPTS: $(halib_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-halibSCRIPTS:
+	@$(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"; \
+	done
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	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"; \
+	  else :; fi; \
+	done
+
+uninstall-sbinSCRIPTS:
+	@$(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"; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/attrd.Po
+include ./$(DEPDIR)/attrd_updater.Po
+include ./$(DEPDIR)/cl_respawn.Po
+include ./$(DEPDIR)/cl_status.Po
+include ./$(DEPDIR)/pingd.Po
+
+.c.o:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c $<
+
+.c.obj:
+	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+#	source='$<' object='$@' libtool=no \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+#	source='$<' object='$@' libtool=yes \
+#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-hanoarchDATA: $(hanoarch_DATA)
+	@$(NORMAL_INSTALL)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(hanoarchdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(hanoarchdir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-habinPROGRAMS clean-halibPROGRAMS \
+	clean-libtool clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-habinPROGRAMS install-halibPROGRAMS \
+	install-halibSCRIPTS install-hanoarchDATA
+	@$(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
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-habinPROGRAMS uninstall-halibPROGRAMS \
+	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 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-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
+	gcc $(AM_CFLAGS) $(CFLAGS) -o ccdv $(top_srcdir)/tools/ccdv.c
+
+install-data-hook:    # install-exec-hook doesn't work (!)
+	-chgrp $(apigid) $(DESTDIR)/$(habindir)/cl_status
+	-chmod g+s,a-w $(DESTDIR)/$(habindir)/cl_status
+
+.PHONY: install-exec-hook
+# 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.
+.NOEXPORT:
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/Makefile.in
--- heartbeat-2.1.3/tools/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/tools/Makefile.in	2008-08-18 23:38:10.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -46,7 +46,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = ciblint haresources2cib.py hb_report ocf-tester
@@ -87,7 +87,7 @@
 halibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(halib_SCRIPTS) $(sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -145,6 +145,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -162,24 +163,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -241,12 +230,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -503,8 +493,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(habinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(habindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(habinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(habindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -531,8 +521,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(halibdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(halibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(halibdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -559,8 +549,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -693,8 +683,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -706,8 +696,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -717,13 +707,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/ocf-tester /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/ocf-tester
--- heartbeat-2.1.3/tools/ocf-tester	2007-12-21 20:45:52.000000000 +0000
+++ heartbeat-2.1.4/tools/ocf-tester	2008-12-29 22:12:09.000000000 +0000
@@ -27,6 +27,7 @@
 
 LRMD=/usr/lib/heartbeat/lrmd
 LRMADMIN=/usr/lib/heartbeat/lrmadmin
+METADATA_LINT="xmllint --noout --valid -"
 
 num_errors=0
 
@@ -44,7 +45,7 @@
     exit_code=$1; shift
     if [ $rc -ne $target ]; then
 	num_errors=`expr $num_errors + 1`
-	echo -e "* rc=$rc: $msg"
+	echo "* rc=$rc: $msg"
 	if [ ! -z $exit_code ]; then
 	    echo "Aborting tests"
 	    exit $exit_code
@@ -165,6 +166,27 @@
 	exec_resource $action "$lrm_ra_args"
 }
 
+test_permissions() {
+    action=meta-data
+    msg=${1:-"Testing permissions with uid nobody"}
+    if [ $verbose -ne 0 ]; then
+    	echo $msg
+    fi
+    su nobody -s /bin/sh $agent $action > /dev/null
+}
+
+test_metadata() {
+    action=meta-data
+    msg=${1:-"Testing: $action"}
+    if [ $verbose -ne 0 ]; then
+    	echo $msg
+    fi
+    bash $agent $action | (cd /usr/share/heartbeat && $METADATA_LINT)
+    rc=$?
+    #echo rc: $rc
+    return $rc
+}
+
 test_command() {
     action=$1; shift
     msg=${1:-"Testing: $action"}
@@ -173,7 +195,6 @@
     	return $?
     fi
     #echo Running: "export $ra_args; bash $agent $action 2>&1 > /dev/null"
-    export $ra_args; 
     if [ $verbose -eq 0 ]; then
 	bash $agent $action >/dev/null 2>&1
     else
@@ -192,6 +213,16 @@
     assert 7 0 "Could not find file: $agent"
 fi
 
+if [ `id -u` = 0 ]; then
+	test_permissions
+	assert $? 0 "Your agent has too restrictive permissions: should be 755"
+else
+	echo "WARN: Can't check agent's permissions because we're not root; they should be 755"
+fi
+
+test_metadata
+assert $? 0 "Your agent produces meta-data which does not conform to ra-api-1.dtd"
+
 test_command meta-data
 rc=$?
 if [ $rc -eq 3 ]; then
@@ -200,6 +231,8 @@
     assert $rc 0 "The meta-data action cannot fail and must return 0"
 fi
 
+export $ra_args;
+
 test_command validate-all
 rc=$?
 if [ $rc -eq 3 ]; then
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/ocf-tester.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/ocf-tester.in
--- heartbeat-2.1.3/tools/ocf-tester.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/ocf-tester.in	2008-08-18 13:32:19.000000000 +0100
@@ -27,6 +27,7 @@
 
 LRMD=@libdir@/heartbeat/lrmd
 LRMADMIN=@libdir@/heartbeat/lrmadmin
+METADATA_LINT="xmllint --noout --valid -"
 
 num_errors=0
 
@@ -44,7 +45,7 @@
     exit_code=$1; shift
     if [ $rc -ne $target ]; then
 	num_errors=`expr $num_errors + 1`
-	echo -e "* rc=$rc: $msg"
+	echo "* rc=$rc: $msg"
 	if [ ! -z $exit_code ]; then
 	    echo "Aborting tests"
 	    exit $exit_code
@@ -165,6 +166,27 @@
 	exec_resource $action "$lrm_ra_args"
 }
 
+test_permissions() {
+    action=meta-data
+    msg=${1:-"Testing permissions with uid nobody"}
+    if [ $verbose -ne 0 ]; then
+    	echo $msg
+    fi
+    su nobody -s /bin/sh $agent $action > /dev/null
+}
+
+test_metadata() {
+    action=meta-data
+    msg=${1:-"Testing: $action"}
+    if [ $verbose -ne 0 ]; then
+    	echo $msg
+    fi
+    bash $agent $action | (cd @HA_NOARCHDATAHBDIR@ && $METADATA_LINT)
+    rc=$?
+    #echo rc: $rc
+    return $rc
+}
+
 test_command() {
     action=$1; shift
     msg=${1:-"Testing: $action"}
@@ -173,7 +195,6 @@
     	return $?
     fi
     #echo Running: "export $ra_args; bash $agent $action 2>&1 > /dev/null"
-    export $ra_args; 
     if [ $verbose -eq 0 ]; then
 	bash $agent $action >/dev/null 2>&1
     else
@@ -192,6 +213,16 @@
     assert 7 0 "Could not find file: $agent"
 fi
 
+if [ `id -u` = 0 ]; then
+	test_permissions
+	assert $? 0 "Your agent has too restrictive permissions: should be 755"
+else
+	echo "WARN: Can't check agent's permissions because we're not root; they should be 755"
+fi
+
+test_metadata
+assert $? 0 "Your agent produces meta-data which does not conform to ra-api-1.dtd"
+
 test_command meta-data
 rc=$?
 if [ $rc -eq 3 ]; then
@@ -200,6 +231,8 @@
     assert $rc 0 "The meta-data action cannot fail and must return 0"
 fi
 
+export $ra_args;
+
 test_command validate-all
 rc=$?
 if [ $rc -eq 3 ]; then
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/pingd.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/pingd.c
--- heartbeat-2.1.3/tools/pingd.c	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/pingd.c	2008-08-18 13:32:19.000000000 +0100
@@ -46,8 +46,6 @@
 #endif
 
 /* GMainLoop *mainloop = NULL; */
-const char *crm_system_name = "pingd";
-
 #define OPTARGS	"V?p:a:d:s:S:h:Dm:"
 
 IPC_Channel *attrd = NULL;
@@ -235,7 +233,6 @@
 	};
 #endif
 	pid_file = crm_strdup("/tmp/pingd.pid");
-	crm_system_name = basename(argv[0]);
 
 	G_main_add_SignalHandler(
 		G_PRIORITY_HIGH, SIGTERM, pingd_shutdown, NULL, NULL);
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tools/utillib.sh /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tools/utillib.sh
--- heartbeat-2.1.3/tools/utillib.sh	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tools/utillib.sh	2008-08-18 13:32:19.000000000 +0100
@@ -45,7 +45,7 @@
 	shift 1
 	logtag=""
 	[ "$HA_LOGTAG" ] && logtag="-t $HA_LOGTAG"
-	logger -p ${HA_LOGFACILITY:-"daemon"}.$severity $logtag $*
+	logger -p ${HA_LOGFACILITY:-$DEFAULT_HA_LOGFACILITY}.$severity $logtag $*
 }
 
 #
@@ -74,19 +74,20 @@
 	return 1
 }
 getlogvars() {
-	savecf=$HA_CF
+	HA_LOGFACILITY=${HA_LOGFACILITY:-$DEFAULT_HA_LOGFACILITY}
 	if uselogd; then
 		[ -f "$LOGD_CF" ] ||
-			fatal "could not find logd.cf or ha_logd.cf"
-		HA_CF=$LOGD_CF
+			return  # no configuration: use defaults
 	fi
+	savecf=$HA_CF
+	HA_CF=$LOGD_CF
+	# unless logfacility is set to none, heartbeat/ha_logd are
+	# going to log through syslog
 	HA_LOGFACILITY=`getcfvar logfacility`
+	[ "" = "$HA_LOGFACILITY" ] && HA_LOGFACILITY=$DEFAULT_HA_LOGFACILITY
 	[ none = "$HA_LOGFACILITY" ] && HA_LOGFACILITY=""
 	HA_LOGFILE=`getcfvar logfile`
 	HA_DEBUGFILE=`getcfvar debugfile`
-	HA_SYSLOGMSGFMT=""
-	iscfvartrue syslogmsgfmt &&
-		HA_SYSLOGMSGFMT=1
 	HA_CF=$savecf
 }
 findmsg() {
@@ -119,40 +120,57 @@
 	}
 	'
 }
-getstamp() {
-	if [ "$HA_SYSLOGMSGFMT" -o "$HA_LOGFACILITY" ]; then
-		awk '{print $1,$2,$3}'
-	else
-		awk '{print $2}' | sed 's/_/ /'
-	fi
+getstamp_syslog() {
+	awk '{print $1,$2,$3}'
+}
+getstamp_legacy() {
+	awk '{print $2}' | sed 's/_/ /'
 }
 linetime() {
-	l=`tail -n +$2 $1 | head -1 | getstamp`
+	l=`tail -n +$2 $1 | head -1 | $getstampproc`
 	str2time "$l"
 }
+find_getstampproc() {
+	t=0 l="" func=""
+	trycnt=10
+	while [ $trycnt -gt 0 ] && read l; do
+		t=$(str2time `echo $l | getstamp_syslog`)
+		if [ "$t" ]; then
+			func="getstamp_syslog"
+			break
+		fi
+		t=$(str2time `echo $l | getstamp_legacy`)
+		if [ "$t" ]; then
+			func="getstamp_legacy"
+			break
+		fi
+		trycnt=$(($trycnt-1))
+	done
+	echo $func
+}
 findln_by_time() {
 	logf=$1
 	tm=$2
 	first=1
 	last=`wc -l < $logf`
 	while [ $first -le $last ]; do
-		mid=$(((last+first)/2))
+		mid=$((($last+$first)/2))
 		trycnt=10
 		while [ $trycnt -gt 0 ]; do
 			tmid=`linetime $logf $mid`
 			[ "$tmid" ] && break
 			warning "cannot extract time: $logf:$mid; will try the next one"
-			trycnt=$((trycnt-1))
-			mid=$((mid+1))
+			trycnt=$(($trycnt-1))
+			mid=$(($mid+1))
 		done
 		if [ -z "$tmid" ]; then
 			warning "giving up on log..."
 			return
 		fi
 		if [ $tmid -gt $tm ]; then
-			last=$((mid-1))
+			last=$(($mid-1))
 		elif [ $tmid -lt $tm ]; then
-			first=$((mid+1))
+			first=$(($mid+1))
 		else
 			break
 		fi
@@ -168,7 +186,7 @@
 		return
 	tail -n +$from_line $logf |
 		if [ "$to_line" ]; then
-			head -$((to_line-from_line+1))
+			head -$(($to_line-$from_line+1))
 		else
 			cat
 		fi
@@ -185,6 +203,12 @@
 	perl -e "\$file=\"$t\"; \$tm=$1;" -e 'utime $tm, $tm, $file;' &&
 	echo $t
 }
+find_files_clean() {
+	[ -z "$to_stamp" ] || rmtempfile "$to_stamp"
+	to_stamp=""
+	[ -z "$from_stamp" ] || rmtempfile "$from_stamp"
+	from_stamp=""
+}
 find_files() {
 	dir=$1
 	from_time=$2
@@ -193,14 +217,24 @@
 		warning "sorry, can't find files based on time if you don't supply time"
 		return
 	}
-	from_stamp=`touchfile $from_time`
+	trap find_files_clean 0
+	if ! from_stamp=`touchfile $from_time`; then
+		warning "sorry, can't create temoary file for find_files"
+		return
+	fi
 	findexp="-newer $from_stamp"
 	if isnumber "$to_time" && [ "$to_time" -gt 0 ]; then
-		to_stamp=`touchfile $to_time`
+		if ! to_stamp=`touchfile $to_time`; then
+			warning "sorry, can't create temoary file for" \
+				"find_files"
+			find_files_clean
+			return
+		fi
 		findexp="$findexp ! -newer $to_stamp"
 	fi
 	find $dir -type f $findexp
-	rm -f $from_stamp $to_stamp
+	find_files_clean
+	trap "" 0
 }
 
 #
@@ -244,7 +278,7 @@
 	maxwait=10
 	while kill -0 $pid 2>/dev/null && [ $maxwait -gt 0 ]; do
 		sleep 1
-		maxwait=$((maxwait-1))
+		maxwait=$(($maxwait-1))
 	done
 	if kill -0 $pid 2>/dev/null; then
 		kill $pid
@@ -254,9 +288,9 @@
 	fi
 }
 dumpstate() {
-	crm_mon -1 | grep -v '^Last upd' > $1/crm_mon.txt
-	cibadmin -Ql > $1/cib.xml
-	ccm_tool -p > $1/ccm_tool.txt 2>&1
+	crm_mon -1 | grep -v '^Last upd' > $1/$CRM_MON_F
+	cibadmin -Ql > $1/$CIB_F
+	ccm_tool -p > $1/$CCMTOOL_F 2>&1
 }
 getconfig() {
 	[ -f "$HA_CF" ] &&
@@ -267,12 +301,12 @@
 		dumpstate $1
 		touch $1/RUNNING
 	else
-		cp -p $HA_VARLIB/crm/cib.xml $1/ 2>/dev/null
+		cp -p $HA_VARLIB/crm/$CIB_F $1/ 2>/dev/null
 		touch $1/STOPPED
 	fi
 	cp -p $HA_VARLIB/hostcache $1/ 2>/dev/null
-	[ -f "$1/cib.xml" ] &&
-		crm_verify -V -x $1/cib.xml >$1/crm_verify.txt 2>&1
+	[ -f "$1/$CIB_F" ] &&
+		crm_verify -V -x $1/$CIB_F >$1/$CRM_VERIFY_F 2>&1
 }
 
 #
@@ -293,6 +327,12 @@
 	{print}
 	'
 }
+sanitize_one_clean() {
+	[ -z "$tmp" ] || rmtempfile "$tmp"
+	tmp=""
+	[ -z "$ref" ] || rmtempfile "$ref"
+	ref=""
+}
 sanitize_one() {
 	file=$1
 	compress=""
@@ -304,8 +344,13 @@
 		compress=cat
 		decompress=cat
 	fi
-	tmp=`maketempfile` && ref=`maketempfile` ||
+	trap sanitize_one_clean 0
+	tmp=`maketempfile`
+	ref=`maketempfile`
+	if [ -z "$tmp" -o -z "$ref" ]; then
+		sanitize_one_clean
 		fatal "cannot create temporary files"
+	fi
 	touch -r $file $ref  # save the mtime
 	if [ "`basename $file`" = ha.cf ]; then
 		sanitize_hacf
@@ -313,8 +358,12 @@
 		$decompress | sanitize_xml_attrs | $compress
 	fi < $file > $tmp
 	mv $tmp $file
+	# note: cleaning $tmp up is still needed even after it's renamed
+	# because its temp directory is still there.
+
 	touch -r $ref $file
-	rm -f $ref
+	sanitize_one_clean
+	trap "" 0
 }
 
 #
@@ -372,7 +421,8 @@
 	}
 	# for Linux .rpm based systems
 	which rpm > /dev/null 2>&1 && {
-		rpm -q --qf '%{version}' heartbeat &&
+		rpm -q --qf '%{version}-%{release}' heartbeat &&
+		echo &&
 		rpm --verify heartbeat
 		return
 	}
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tsa_plugin/ha_mgmt_client_wrap.c /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tsa_plugin/ha_mgmt_client_wrap.c
--- heartbeat-2.1.3/tsa_plugin/ha_mgmt_client_wrap.c	2007-12-21 20:46:42.000000000 +0000
+++ heartbeat-2.1.4/tsa_plugin/ha_mgmt_client_wrap.c	2008-08-18 23:39:14.000000000 +0100
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.36
  * 
  * 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
@@ -15,14 +15,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
 
@@ -50,6 +50,12 @@
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -105,6 +111,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
+
+
 
 /* Fix for jlong on some versions of gcc on Windows */
 #if defined(__GNUC__) && !defined(__INTELC__)
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tsa_plugin/linuxha-adapter.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tsa_plugin/linuxha-adapter.in
--- heartbeat-2.1.3/tsa_plugin/linuxha-adapter.in	2007-12-21 15:32:27.000000000 +0000
+++ heartbeat-2.1.4/tsa_plugin/linuxha-adapter.in	2008-08-18 13:32:19.000000000 +0100
@@ -17,6 +17,8 @@
 
 UNAME=`uname -s`
 
+. @sysconfdir@/ha.d/shellfuncs
+
 function logit ()
 {
 	if [ $LOG_LVL -ge $1 ]
@@ -114,22 +116,14 @@
 	RC=$?
 	if [ $RC -eq $OFFLINE ] ; then
 		if [ "$UNAME" = AIX ] ; then
-			MKTEMP=''
 			LSOF=''
 		else  #linux
-			MKTEMP=`whereis mktemp | cut -d' ' -f2 | cut -d' ' -f3`
 			LSOF=`whereis lsof | cut -d' ' -f2 | cut -d' ' -f3`
 		fi
 		rm -f /tmp/$adapter.* 
 		# Create a tempfile to capture the first few lines of the output
-		if [ -n "$MKTEMP" ] ; then
-			TMPFILE=`$MKTEMP -q /tmp/$adapter.XXXXXX`
-		else
-			# It's better to use mktemp, but we don't have it, we make it cryptic
-			RNDM=$(echo $RANDOM)
-			TMPFILE=/tmp/$adapter.XXXXXX-RNDM
-			touch $TMPFILE
-		fi
+		trap '[ -z "$TMPFILE" ] || rmtempfile "$TMPFILE"' 0
+		TMPFILE=`maketempfile` || exit 1
 		# set LIBRAY path for jni parts
 		NATIVE_LIBPATH=/lib:/usr/lib
 		if [ "$UNAME" = "AIX" ] ; then
@@ -163,7 +157,7 @@
               	fi
 
 		# cat the output to the screen and remove the tempfile
-		cat $TMPFILE && rm -f $TMPFILE
+		cat $TMPFILE
 		echo "$adapter has started."
 		logit 0 "$adapter has started."
 		RC=0
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/tsa_plugin/Makefile.in /tmp/RRBT9Z8NmI/heartbeat-2.1.4/tsa_plugin/Makefile.in
--- heartbeat-2.1.3/tsa_plugin/Makefile.in	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/tsa_plugin/Makefile.in	2008-08-18 23:38:11.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -66,7 +66,7 @@
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h \
 	$(top_builddir)/include/hb_config.h
 CONFIG_CLEAN_FILES = testrun.sh linuxha-adapter
@@ -107,7 +107,7 @@
 tsa_hacli_DEPENDENCIES = $(am__DEPENDENCIES_2) $(MGMTLIBS)
 adapterSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(adapter_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -159,6 +159,7 @@
 DISTDIR = @DISTDIR@
 DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@
 DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_CMD = @ECHO_CMD@
@@ -176,24 +177,12 @@
 GNUTLSLIBS = @GNUTLSLIBS@
 GREP = @GREP@
 GZIP_PROG = @GZIP_PROG@
-HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@
-HAVE_STRLCPY = @HAVE_STRLCPY@
 HA_APIGID = @HA_APIGID@
 HA_APIGROUP = @HA_APIGROUP@
 HA_CCMUID = @HA_CCMUID@
 HA_CCMUSER = @HA_CCMUSER@
 HA_COREDIR = @HA_COREDIR@
 HA_DATADIR = @HA_DATADIR@
-HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@
-HA_HAVE_DAEMON = @HA_HAVE_DAEMON@
-HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@
-HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@
-HA_HAVE_SETENV = @HA_HAVE_SETENV@
-HA_HAVE_STRERROR = @HA_HAVE_STRERROR@
-HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@
-HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@
-HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@
-HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@
 HA_HBCONF_DIR = @HA_HBCONF_DIR@
 HA_LIBDIR = @HA_LIBDIR@
 HA_LIBHBDIR = @HA_LIBHBDIR@
@@ -255,12 +244,13 @@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MD5 = @MD5@
+MGMT_DIR = @MGMT_DIR@
 MIBS_DIR = @MIBS_DIR@
 MKDIR_P = @MKDIR_P@
-MKTEMP = @MKTEMP@
 MSGFMT = @MSGFMT@
 MSGHDR_TYPE = @MSGHDR_TYPE@
 NETSTAT = @NETSTAT@
+NMEDIT = @NMEDIT@
 NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@
 OBJEXT = @OBJEXT@
 OCF_RA_DIR = @OCF_RA_DIR@
@@ -500,8 +490,8 @@
 	@list='$(hamgmtlib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    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"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(hamgmtlibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(hamgmtlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(hamgmtlibdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -509,8 +499,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hamgmtlib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(hamgmtlibdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(hamgmtlibdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(hamgmtlibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(hamgmtlibdir)/$$p"; \
 	done
 
 clean-hamgmtlibLTLIBRARIES:
@@ -532,8 +522,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cliPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(clidir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(cliPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(clidir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -567,8 +557,8 @@
 	     || 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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tsaPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(tsadir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tsaPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(tsadir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -699,8 +689,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -712,8 +702,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -723,13 +713,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/version.Debian /tmp/RRBT9Z8NmI/heartbeat-2.1.4/version.Debian
--- heartbeat-2.1.3/version.Debian	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/version.Debian	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2.1.3-2
diff -Nru /tmp/RGiEJF5kLi/heartbeat-2.1.3/ylwrap /tmp/RRBT9Z8NmI/heartbeat-2.1.4/ylwrap
--- heartbeat-2.1.3/ylwrap	2008-12-29 22:12:08.000000000 +0000
+++ heartbeat-2.1.4/ylwrap	2008-08-18 23:38:10.000000000 +0100
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2005-05-14.22
+scriptversion=2007-11-22.22
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
+# 2007  Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
@@ -101,14 +101,14 @@
 # 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
+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" ;;
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
 esac
 ret=$?