From 2feb8f959ceeed81170cf4d07f663baec554df98 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Tue, 17 Mar 2009 10:46:19 +0000
Subject: [PATCH] Add support for SOCKETDIR

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1856 fd59a12c-fef9-0310-b244-a6a79926bd2f
---
 configure.ac             | 7 +++++++
 exec/Makefile.am         | 3 ++-
 exec/ipc.c               | 2 +-
 lcr/Makefile.am          | 3 ++-
 lcr/uic.c                | 2 +-
 lcr/uis.c                | 2 +-
 lib/Makefile.am          | 1 +
 lib/coroipc.c            | 2 +-
 pkgconfig/Makefile.am    | 1 +
 pkgconfig/corosync.pc.in | 1 +
 10 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index b954fefa..b35d1f79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,11 @@ AC_ARG_WITH([lcrso-dir],
 	[ LCRSODIR="$withval" ],
 	[ LCRSODIR="$libexecdir/lcrso" ])
 
+AC_ARG_WITH([socket-dir],
+	[  --with-socket-dir=DIR   : corosync socket dir. ],
+	[ SOCKETDIR="$withval" ],
+	[ SOCKETDIR="$localstatedir/run" ])
+
 # OS detection
 # THIS SECTION MUST DIE!
 
@@ -282,6 +287,7 @@ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 
 # substitute what we need:
 AC_SUBST([LCRSODIR])
+AC_SUBST([SOCKETDIR])
 
 AC_SUBST([SOMAJOR])
 AC_SUBST([SOMINOR])
@@ -311,6 +317,7 @@ AC_MSG_RESULT([  Arch-independent files   = ${datadir}])
 AC_MSG_RESULT([  State information        = ${localstatedir}])
 AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
 AC_MSG_RESULT([  LCRSO                    = ${LCRSODIR}])
+AC_MSG_RESULT([  SOCKETDIR                = ${SOCKETDIR}])
 AC_MSG_RESULT([  Features                 =${PKG_FEATURES}])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([$PACKAGE build info:])
diff --git a/exec/Makefile.am b/exec/Makefile.am
index 51861c14..75248c43 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -32,7 +32,8 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS	= -fPIC
-AM_CPPFLAGS	= -DSYSCONFDIR=\"${sysconfdir}\" -DLCRSODIR=\"${LCRSODIR}\" -DLOCALSTATEDIR=\"${localstatedir}\"
+AM_CPPFLAGS	= -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
+		  -DLCRSODIR=\"${LCRSODIR}\" -DSOCKETDIR=\"${SOCKETDIR}\"
 INCLUDES       	= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
 LCR_SRC		= objdb.c vsf_ykd.c coroparse.c quorum.c vsf_quorum.c
diff --git a/exec/ipc.c b/exec/ipc.c
index 3bdf1078..3cd04ffc 100644
--- a/exec/ipc.c
+++ b/exec/ipc.c
@@ -689,7 +689,7 @@ static int conn_info_create (int fd)
 #if defined(COROSYNC_LINUX)
 const char *socketname = "libais.socket";
 #else
-const char *socketname = LOCALSTATEDIR "/run/libais.socket";
+const char *socketname = SOCKETDIR "/libais.socket";
 #endif
 
 static int poll_handler_accept (
diff --git a/lcr/Makefile.am b/lcr/Makefile.am
index c18f7a65..7f6acd09 100644
--- a/lcr/Makefile.am
+++ b/lcr/Makefile.am
@@ -31,7 +31,8 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
-AM_CPPFLAGS		= -DLCRSODIR=\"${LCRSODIR}\" -DLOCALSTATEDIR=\"${localstatedir}\"
+AM_CPPFLAGS		= -DLCRSODIR=\"${LCRSODIR}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
+			  -DSOCKETDIR=\"${SOCKETDIR}\"
 INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
 LCRSO			= libtest_a.lcrso libtest_b.lcrso
diff --git a/lcr/uic.c b/lcr/uic.c
index 4fd64265..bbbbd278 100755
--- a/lcr/uic.c
+++ b/lcr/uic.c
@@ -59,7 +59,7 @@
 #ifdef COROSYNC_LINUX
 static const char *socketname = "lcr.socket";
 #else
-static const char *socketname = LOCALSTATEDIR "/run/lcr.socket";
+static const char *socketname = SOCKETDIR "/lcr.socket";
 #endif
 
 static int uic_connect (int *fd);
diff --git a/lcr/uis.c b/lcr/uis.c
index 49fa9380..49ffdb09 100755
--- a/lcr/uis.c
+++ b/lcr/uis.c
@@ -61,7 +61,7 @@
 #ifdef COROSYNC_LINUX
 static char *socketname = "lcr.socket";
 #else
-static char *socketname = LOCALSTATEDIR "/run/lcr.socket";
+static char *socketname = SOCKETDIR "/lcr.socket";
 #endif
 
 static void uis_lcr_bind (int *server_fd)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 211bb164..bd0276af 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,6 +33,7 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
+AM_CPPFLAGS		= -DLOCALSTATEDIR=\"${localstatedir}\" -DSOCKETDIR=\"${SOCKETDIR}\"
 INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
 lib_LIBRARIES	= libcpg.a libconfdb.a libevs.a libcfg.a libquorum.a libvotequorum.a libpload.a libcoroipc.a
diff --git a/lib/coroipc.c b/lib/coroipc.c
index 09247de0..86ae23ff 100644
--- a/lib/coroipc.c
+++ b/lib/coroipc.c
@@ -93,7 +93,7 @@ static const char *socketname = "libais.socket";
 #else
 #define AIS_SUN_LEN(a) SUN_LEN(a)
 
-static const char *socketname = LOCALSTATEDIR "/run/libais.socket";
+static const char *socketname = SOCKETDIR "/libais.socket";
 #endif
 
 #ifdef SO_NOSIGPIPE
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 1b25b6ec..ea9f3358 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -51,6 +51,7 @@ corosync.pc:
 		-e 's#@LIBDIR@#$(libdir)#g' \
 		-e 's#@LIBVERSION@#$(VERSION)#g' \
 		-e 's#@COROLCRSODIR@#$(LCRSODIR)#g' \
+		-e 's#@COROSOCKETDIR@#$(SOCKETDIR)#g' \
 	> $@
 
 all-local: $(pkgconf_LIBS) corosync.pc
diff --git a/pkgconfig/corosync.pc.in b/pkgconfig/corosync.pc.in
index fc3766a3..8b7ce2a7 100644
--- a/pkgconfig/corosync.pc.in
+++ b/pkgconfig/corosync.pc.in
@@ -3,6 +3,7 @@ exec_prefix=${prefix}
 libdir=@LIBDIR@
 includedir=${prefix}/include
 lcrsodir=@COROLCRSODIR@
+socketdir=@COROSOCKETDIR@
 
 Name: corosync
 Version: @LIBVERSION@