hg: branch merge

--HG--
extra : convert_revision : 3831115381136a0412d44a6ec34eac01c3d4b3ef

configure.in

@@ -39,7 +39,7 @@ AC_ARG_WITH(hapkgversion,
 )
 
 if test -z "$HAPKGVERSION" ; then
-   HAPKGVERSION="2.1.1.1"
+   HAPKGVERSION="2.1.2"
 fi
 AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)
 
@@ -213,6 +213,7 @@ localstatedir_orig="$localstatedir"
 exec_prefix=`var "$exec_prefix" "$prefix"`
 bindir=`var "$bindir" "$exec_prefix/bin"`
 sbindir=`var "$sbindir" "$exec_prefix/sbin"`
+datarootdir=`var "$datarootdir" "$prefix/share"`
 datadir=`var "$datadir" "$prefix/share"`
 sysconfdir=`var "$sysconfdir" "$prefix/etc"`
 sharedstatedir=`var "$sharedstatedir" "$prefix/com"`
@@ -1032,7 +1033,7 @@ CPPFLAGS="$CPPFLAGS $XML2HEAD"
 
 dnl ************************************************************************
 dnl * Check for linux/icmpv6.h to make enable the IPv6addr resource agent
-AC_CHECK_HEADERS(linux/icmpv6.h,[],[],[#include <sys/types.h>])
+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 )
 AC_CHECK_HEADERS(libxml/xpath.h)