build: make path to bash configurable at build time

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

configure.ac

@@ -77,6 +77,7 @@ AC_CHECK_PROGS([DOT], [dot])
 AC_CHECK_PROGS([DOXYGEN], [doxygen])
 AC_CHECK_PROGS([AWK], [awk])
 AC_CHECK_PROGS([SED], [sed])
+AC_PATH_PROG([BASHPATH], [bash])
 
 # Checks for compiler characteristics.
 AC_PROG_GCC_TRADITIONAL
@@ -601,6 +602,7 @@ CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
 LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
 
 # substitute what we need:
+AC_SUBST([BASHPATH])
 AC_SUBST([INITDDIR])
 AC_SUBST([SYSTEMDDIR])
 INITWRAPPERSDIR=$(eval echo ${INITWRAPPERSDIR})

cts/agents/Makefile.am

@@ -31,6 +31,9 @@
 
 MAINTAINERCLEANFILES		= Makefile.in
 
+EXTRA_DIST			= cmap-dispatch-deadlock.sh.in \
+				  shm_leak_audit.sh.in
+
 TEST_AGENTS			= cpg_test_agent \
 				  sam_test_agent \
 				  votequorum_test_agent
@@ -51,6 +54,14 @@ noinst_PROGRAMS			= $(TEST_AGENTS)
 noinst_SCRIPTS			= $(SHELL_TESTS)
 endif
 
+cmap-dispatch-deadlock.sh: cmap-dispatch-deadlock.sh.in
+	sed -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
+	chmod 755 $@
+
+shm_leak_audit.sh: shm_leak_audit.sh.in
+	sed -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
+	chmod 755 $@
+
 AM_CPPFLAGS			= -I$(top_builddir)/include \
 				  -I$(top_srcdir)/include \
 				  -I$(top_builddir)/include/corosync
@@ -77,6 +88,9 @@ votequorum_test_agent_LDADD	= $(LIBQB_LIBS) \
 				  $(top_builddir)/lib/libvotequorum.la \
 				  $(top_builddir)/common_lib/libcorosync_common.la
 
+clean-local:
+	rm -f shm_leak_audit.sh cmap-dispatch-deadlock.sh
+
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c
 

cts/agents/cmap-dispatch-deadlock.sh → cts/agents/cmap-dispatch-deadlock.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 export TIMEOUT=600
 export PID=$$

cts/agents/shm_leak_audit.sh → cts/agents/shm_leak_audit.sh.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 
 service corosync status >/dev/null

init/Makefile.am

@@ -53,6 +53,7 @@ initscript_SCRIPTS  = corosync corosync-notifyd
 		-e 's#@''INITDDIR@#$(INITDDIR)#g' \
 		-e 's#@''INITWRAPPERSDIR@#$(INITWRAPPERSDIR)#g' \
 		-e 's#@''LOCALSTATEDIR@#$(localstatedir)#g' \
+		-e 's#@''BASHPATH@#${BASHPATH}#g' \
 	    > $@-t
 	mv $@-t $@
 

init/corosync-notifyd.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 # Authors:
 #  Angus Salkeld <asalkeld@redhat.com>

init/corosync.in

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 # Authors:
 #  Andrew Beekhof <abeekhof@redhat.com>

test/Makefile.am

@@ -64,7 +64,7 @@ cpgbenchzc_LDADD	= $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la
 testsam_LDADD		= $(LIBQB_LIBS) $(top_builddir)/lib/libsam.la
 
 ploadstart: ploadstart.sh
-	cp $^ $@
+	sed -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
 	chmod 755 $@
 
 LINT_FILES1:=$(filter-out sa_error.c, $(wildcard *.c))

test/ploadstart.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 set -e
 

tools/Makefile.am

@@ -47,7 +47,9 @@ EXTRA_DIST		= $(bin_SCRIPTS) corosync-xmlproc.sh \
                           corosync-blackbox.sh
 
 corosync-xmlproc: corosync-xmlproc.sh
-	sed -e 's#@''DATADIR@#${datadir}#g' $< > $@
+	sed -e 's#@''DATADIR@#${datadir}#g' \
+	    -e 's#@''BASHPATH@#${BASHPATH}#g' \
+	    $< > $@
 
 corosync-blackbox: corosync-blackbox.sh
 	sed -e 's#@''LOCALSTATEDIR@#${localstatedir}#g' $< > $@

tools/corosync-xmlproc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASHPATH@
 
 # Copyright (c) 2011 Red Hat, Inc.
 #