Fix merge conflicts.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2636 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/service.c

@@ -354,6 +354,7 @@ static unsigned int service_unlink_and_exit (
 	unsigned short *service_id;
 	unsigned int *found_service_ver;
 	hdb_handle_t object_find_handle;
+	hdb_handle_t *found_service_handle;
 	char *name_sufix;
 	int res;
 

tools/Makefile.am

@@ -42,7 +42,8 @@ corosync_objctl_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc
 corosync_objctl_LDFLAGS	= -L../lib
 corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
 corosync_cfgtool_LDFLAGS= -L../lib
-corosync_cpgtool_LDADD	= ../lib/libcfg.a ../lib/libcpg.a ../lib/libcoroipcc.a
+corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
+corosync_cpgtool_LDFLAGS= -L../lib
 corosync_quorumtool_LDADD = -lconfdb -lcfg -lquorum \
 			    -lvotequorum -lcoroipcc ../lcr/liblcr.a
 corosync_quorumtool_LDFLAGS = -L../lib