Index: configure
--- configure.orig	2006-08-14 06:38:08 +0200
+++ configure	2006-08-15 09:03:14 +0200
@@ -2091,8 +2091,7 @@
 
 pf_argv_set=""
 case "$host_os" in
-*bsd*)		LIBS="-L/usr/local/lib"
-		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+*bsd*)	
 		INIT_EXT=".sh"
 		;;
 
@@ -2318,7 +2317,7 @@
 _ACEOF
 
 
-HA_VARLIBDIR="${localstatedir}/lib"
+HA_VARLIBDIR="${localstatedir}/heartbeat"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23363,13 +23362,13 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for getopt_long in -lgnugetopt" >&5
-echo $ECHO_N "checking for getopt_long in -lgnugetopt... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for getopt_long in -lgetopt" >&5
+echo $ECHO_N "checking for getopt_long in -lgetopt... $ECHO_C" >&6
 if test "${ac_cv_lib_gnugetopt_getopt_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnugetopt  $LIBS"
+LIBS="-lgetopt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23432,7 +23431,7 @@
 #define HAVE_LIBGNUGETOPT 1
 _ACEOF
 
-  LIBS="-lgnugetopt $LIBS"
+  LIBS="-lgetopt $LIBS"
 
 fi
 
@@ -36221,7 +36220,6 @@
 	# We had to eliminate -Wnested-externs because of libtool changes
         WARNLIST="all missing-prototypes
 		missing-declarations
-		strict-prototypes
 		declaration-after-statement
 		pointer-arith
 		write-strings
@@ -40767,7 +40765,7 @@
 _ACEOF
 
 
-HB_RC_DIR=$HB_HA_DIR/rc.d
+HB_RC_DIR=$sysconfdir/rc.d
 
 
 cat >>confdefs.h <<_ACEOF
Index: crm/admin/Makefile.in
--- crm/admin/Makefile.in.orig	2006-08-14 06:37:51 +0200
+++ crm/admin/Makefile.in	2006-08-15 09:01:02 +0200
@@ -480,8 +480,7 @@
 noinst_HEADERS = 
 crmadmin_SOURCES = crmadmin.c
 crmadmin_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crmadmin_LDADD = $(COMMONLIBS) \
-			$(top_builddir)/lib/crm/pengine/libpe_status.la
+crmadmin_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la $(COMMONLIBS)
 
 crm_uuid_SOURCES = crm_uuid.c
 crm_uuid_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
@@ -491,24 +490,23 @@
 cibadmin_LDADD = $(COMMONLIBS)
 ccm_tool_SOURCES = ccm_epoche.c
 ccm_tool_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-ccm_tool_LDADD = $(COMMONLIBS) \
-			  $(top_builddir)/membership/ccm/libccmclient.la
+ccm_tool_LDADD = $(top_builddir)/membership/ccm/libccmclient.la $(COMMONLIBS)
 
 crm_diff_SOURCES = xml_diff.c
 crm_diff_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
 crm_diff_LDADD = $(COMMONLIBS)
 crm_mon_SOURCES = crm_mon.c
 crm_mon_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_mon_LDADD = $(COMMONLIBS) \
-			$(top_builddir)/lib/crm/pengine/libpe_status.la
+crm_mon_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la $(COMMONLIBS)
 
 
 # Arguments could be made that this should live in crm/pengine
 crm_verify_SOURCES = crm_verify.c
 crm_verify_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_verify_LDADD = $(COMMONLIBS) \
-			$(top_builddir)/lib/crm/pengine/libpe_status.la \
-			$(top_builddir)/crm/pengine/libpengine.la
+crm_verify_LDADD = \
+            $(top_builddir)/lib/crm/pengine/libpe_status.la \
+			$(top_builddir)/crm/pengine/libpengine.la \
+            $(COMMONLIBS)
 
 crm_master_SOURCES = crm_attribute.c
 crm_master_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
@@ -524,8 +522,7 @@
 crm_failcount_LDADD = $(COMMONLIBS)
 crm_resource_SOURCES = crm_resource.c
 crm_resource_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
-crm_resource_LDADD = $(COMMONLIBS) \
-			$(top_builddir)/lib/crm/pengine/libpe_status.la
+crm_resource_LDADD = $(top_builddir)/lib/crm/pengine/libpe_status.la $(COMMONLIBS)
 
 iso8601_SOURCES = test.iso8601.c
 iso8601_CFLAGS = -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
Index: replace/Makefile.in
--- replace/Makefile.in.orig	2006-08-14 06:38:05 +0200
+++ replace/Makefile.in	2006-08-15 09:01:02 +0200
@@ -431,7 +431,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libreplace.la: $(libreplace_la_OBJECTS) $(libreplace_la_DEPENDENCIES) 
-	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD) $(LIBS)
+	$(LINK)  $(libreplace_la_LDFLAGS) $(libreplace_la_OBJECTS) $(libreplace_la_LIBADD)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
Index: replace/uuid_parse.c
--- replace/uuid_parse.c.orig	2005-11-09 17:06:21 +0100
+++ replace/uuid_parse.c	2006-08-15 09:01:02 +0200
@@ -496,7 +496,7 @@
 			 * with IEEE 802 addresses obtained from
 			 * network cards
 			 */
-			node_id[0] |= 0x80;
+			node_id[0] |= 0x01;
 		}
 		has_init = 1;
 	}