Expose utils to the user

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1442 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile

@@ -71,10 +71,11 @@ clean:
 	rm -rf doc/api
 
 AIS_LIBS	= ais SaAmf SaClm SaCkpt SaEvt SaLck SaMsg evs cpg \
-		  cfg
+		  cfg aisutil
 
 AIS_HEADERS	= saAis.h saAmf.h saClm.h saCkpt.h saEvt.h saEvt.h saLck.h \
-		  saMsg.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h 
+		  saMsg.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h 	   \
+		  ais_util.h
 
 install: all
 	mkdir -p $(DESTDIR)$(SBINDIR)

exec/ipc.c

@@ -383,7 +383,9 @@ static void conn_info_destroy (struct conn_info *conn_info)
 	free (conn_info);
 }
 
-static int libais_connection_active (struct conn_info *conn_info)
+int libais_connection_active (struct conn_info *conn_info);
+
+int libais_connection_active (struct conn_info *conn_info)
 {
 	return (conn_info->state == CONN_STATE_ACTIVE);
 }

lib/Makefile

@@ -44,7 +44,8 @@ all:libSaClm.a libSaClm.so.2.0.0 \
 	libcpg.a libcpg.so.2.0.0 \
 	libais.a libais.so.2.0.0 \
 	libevs.a libevs.so.2.0.0 \
-	libcfg.a libcfg.so.2.0.0
+	libcfg.a libcfg.so.2.0.0 \
+	libaisutil.a libaisutil.so.2.0.0
 
 LIBAIS_SRC = util.c amf.c clm.c ckpt.c evt.c
 
@@ -53,8 +54,14 @@ LIBEVS_SRC = util.c evs.c
 libSaClm.a: util.o clm.o
 	$(AR) -rc libSaClm.a util.o clm.o
 
+libaisutil.a: util.o
+	$(AR) -rc libaisutil.a util.o
+
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
+libaisutil.so.2.0.0: util.o
+	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o -o $@
+
 libSaClm.so.2.0.0: util.o clm.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o clm.o -o $@
 
@@ -87,6 +94,9 @@ libcfg.so.2.0.0: util.o cfg.o
 
 else
 
+libaisutil.so.2.0.0: util.o
+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libaisutil.so.2,-version-script=libaisutil.versions util.o -o $@
+
 libSaClm.so.2.0.0: util.o clm.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=libSaClm.versions util.o clm.o -o $@
 
@@ -160,19 +170,19 @@ depend:
 	makedepend -Y -- $(CFLAGS) $(CPPFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1
 # DO NOT DELETE
 
-util.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h util.h
+util.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h ../include/ais_util.h
 amf.o: ../include/saAis.h ../include/saAmf.h ../include/saAis.h
 amf.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_amf.h
-amf.o: ../include/ipc_gen.h ../include/saAmf.h util.h
+amf.o: ../include/ipc_gen.h ../include/saAmf.h ../include/ais_util.h
 clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
 clm.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_clm.h
-clm.o: ../include/saClm.h ../include/ipc_gen.h util.h
+clm.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h
 ckpt.o: ../include/saAis.h ../include/list.h ../include/saCkpt.h
 ckpt.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_ckpt.h
-ckpt.o: ../include/saAis.h ../include/saCkpt.h ../include/ipc_gen.h util.h
+ckpt.o: ../include/saAis.h ../include/saCkpt.h ../include/ipc_gen.h ../include/ais_util.h
 evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
-evt.o: ../include/saClm.h ../include/ipc_gen.h util.h ../include/ipc_gen.h
+evt.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h ../include/ipc_gen.h
 evt.o: ../exec/totemip.h ../exec/totem.h ../exec/totemip.h ../include/list.h
 cpg.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h
 cpg.o: ../include/ipc_cpg.h ../include/saAis.h ../include/saClm.h
-cpg.o: ../include/ipc_gen.h util.h
+cpg.o: ../include/ipc_gen.h ../include/ais_util.h

lib/amf.c

@@ -49,7 +49,7 @@
 #include <saAmf.h>
 #include <ipc_gen.h>
 #include <ipc_amf.h>
-#include "util.h"
+#include <ais_util.h>
 
 
 struct res_overlay {

lib/cfg.c

@@ -51,7 +51,7 @@
 #include <mar_gen.h>
 #include <ipc_gen.h>
 #include <ipc_cfg.h>
-#include "util.h"
+#include <ais_util.h>
 
 struct res_overlay {
 	mar_res_header_t header;

lib/ckpt.c

@@ -54,7 +54,7 @@
 #include <ipc_gen.h>
 #include <ipc_ckpt.h>
 
-#include "util.h"
+#include <ais_util.h>
 
 struct message_overlay {
 	mar_res_header_t header __attribute__((aligned(8)));

lib/clm.c

@@ -54,7 +54,7 @@
 #include <mar_gen.h>
 #include <mar_clm.h>
 
-#include "util.h"
+#include <ais_util.h>
 
 struct res_overlay {
 	mar_res_header_t header;

lib/cpg.c

@@ -49,7 +49,7 @@
 #include <cpg.h>
 #include <ipc_cpg.h>
 #include <mar_cpg.h>
-#include "util.h"
+#include <ais_util.h>
 
 struct cpg_inst {
 	int response_fd;

lib/evs.c

@@ -51,7 +51,7 @@
 #include <saAis.h>
 #include <evs.h>
 #include <ipc_evs.h>
-#include "util.h"
+#include <ais_util.h>
 
 struct evs_inst {
 	int response_fd;

lib/evt.c

@@ -40,7 +40,7 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <ipc_evt.h>
-#include "util.h"
+#include <ais_util.h>
 #include "../exec/totem.h"
 #include <list.h>
 

lib/lck.c

@@ -51,7 +51,7 @@
 #include <ipc_gen.h>
 #include <ipc_lck.h>
 
-#include "util.h"
+#include <ais_util.h>
 
 struct message_overlay {
 	mar_res_header_t header __attribute__((aligned(8)));

lib/msg.c

@@ -51,7 +51,7 @@
 #include <ipc_gen.h>
 #include <ipc_msg.h>
 
-#include "util.h"
+#include <ais_util.h>
 
 struct message_overlay {
 	mar_res_header_t header __attribute__((aligned(8)));

lib/util.c

@@ -55,7 +55,7 @@
 
 #include <saAis.h>
 #include <ipc_gen.h>
-#include "util.h"
+#include <ais_util.h>
 
 enum SA_HANDLE_STATE {
 	SA_HANDLE_STATE_EMPTY,