No OneTemporary
Actions

Size

48 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/configure.ac b/configure.ac
	index d6820f52..aca792a2 100644
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,797 +1,805 @@
	# -- Autoconf --
	# Process this file with autoconf to produce a configure script.

	# bootstrap / init
	AC_PREREQ([2.61])

	AC_INIT([corosync],
	m4_esyscmd([build-aux/git-version-gen .tarball-version]),
	[users@clusterlabs.org])

	AC_USE_SYSTEM_EXTENSIONS

	AM_INIT_AUTOMAKE([foreign 1.11])

	LT_PREREQ([2.2.6])
	LT_INIT

	AM_SILENT_RULES([yes])

	AC_CONFIG_SRCDIR([lib/cpg.c])
	AC_CONFIG_HEADER([include/corosync/config.h])
	AC_CONFIG_MACRO_DIR([m4])

	AC_CANONICAL_HOST

	AC_LANG([C])

	AC_SUBST(WITH_LIST, [""])

	#Enable inter-library dependencies
	AC_ARG_ENABLE(interlib-deps,
	[AC_HELP_STRING([--disable-interlib-deps ],[disable inter-library dependencies (might break builds)])],
	[enable_interlib_deps="$enableval"],
	[enable_interlib_deps="yes"])

	AC_MSG_NOTICE([enable inter-library dependencies: $enable_interlib_deps])
	if test "${enable_interlib_deps}" == "yes"; then
	link_all_deplibs=yes
	link_all_deplibs_CXX=yes
	else
	link_all_deplibs=no
	link_all_deplibs_CXX=no
	fi

	dnl Fix default variables - "prefix" variable if not specified
	if test "$prefix" = "NONE"; then
	prefix="/usr"

	dnl Fix "localstatedir" variable if not specified
	if test "$localstatedir" = "\${prefix}/var"; then
	localstatedir="/var"
	fi
	dnl Fix "sysconfdir" variable if not specified
	if test "$sysconfdir" = "\${prefix}/etc"; then
	sysconfdir="/etc"
	fi
	dnl Fix "libdir" variable if not specified
	if test "$libdir" = "\${exec_prefix}/lib"; then
	if test -e /usr/lib64; then
	libdir="/usr/lib64"
	else
	libdir="/usr/lib"
	fi
	fi
	fi

	if test "$srcdir" = "."; then
	AC_MSG_NOTICE([building in place srcdir:$srcdir])
	AC_DEFINE([BUILDING_IN_PLACE], 1, [building in place])
	else
	AC_MSG_NOTICE([building out of tree srcdir:$srcdir])
	fi

	# Checks for programs.

	# check stolen from gnulib/m4/gnu-make.m4
	if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
	AC_MSG_ERROR([you don't seem to have GNU make; it is required])
	fi

	sinclude(corosync-default.m4)

	AC_PROG_CC
	AC_PROG_CC_C99
	if test "x$ac_cv_prog_cc_c99" = "xno"; then
	AC_MSG_ERROR(["C99 support is required"])
	fi
	AC_PROG_INSTALL
	AC_PROG_LN_S
	AC_PROG_MAKE_SET
	AC_PROG_SED

	AC_CHECK_PROGS([GROFF], [groff])
	AC_CHECK_PROGS([PKGCONFIG], [pkg-config])
	AC_CHECK_PROGS([AUGTOOL], [augtool])
	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
	AC_C_CONST
	AC_C_INLINE
	AC_C_VOLATILE

	# Checks for header files.
	AC_HEADER_DIRENT
	AC_HEADER_STDC
	AC_HEADER_SYS_WAIT
	AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
	stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
	sys/time.h syslog.h unistd.h sys/types.h getopt.h malloc.h \
	utmpx.h ifaddrs.h stddef.h sys/file.h sys/uio.h])

	# Check entries in specific structs
	AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
	[AC_DEFINE_UNQUOTED([HAVE_SOCK_SIN_LEN], [1], [sockaddr_in needs sin_len])],
	[], [[#include <netinet/in.h>]])
	AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
	[AC_DEFINE_UNQUOTED([HAVE_SOCK_SIN6_LEN], [1], [sockaddr_in6 needs sin6_len])],
	[], [[#include <netinet/in.h>]])
	AC_CHECK_MEMBER([struct msghdr.msg_control],
	[AC_DEFINE_UNQUOTED([HAVE_MSGHDR_CONTROL], [1], [msghdr has msg_control])],
	[], [[#include <sys/socket.h>]])
	AC_CHECK_MEMBER([struct msghdr.msg_controllen],
	[AC_DEFINE_UNQUOTED([HAVE_MSGHDR_CONTROLLEN], [1], [msghdr has msg_controllen])],
	[], [[#include <sys/socket.h>]])
	AC_CHECK_MEMBER([struct msghdr.msg_flags],
	[AC_DEFINE_UNQUOTED([HAVE_MSGHDR_FLAGS], [1], [msghdr has msg_flags])],
	[], [[#include <sys/socket.h>]])
	AC_CHECK_MEMBER([struct msghdr.msg_accrights],
	[AC_DEFINE_UNQUOTED([HAVE_MSGHDR_ACCRIGHTS], [1], [msghdr has msg_accrights])],
	[], [[#include <sys/socket.h>]])
	AC_CHECK_MEMBER([struct msghdr.msg_accrightslen],
	[AC_DEFINE_UNQUOTED([HAVE_MSGHDR_ACCRIGHTSLEN], [1], [msghdr has msg_accrightslen])],
	[], [[#include <sys/socket.h>]])

	# Checks for typedefs.
	AC_TYPE_UID_T
	AC_TYPE_INT16_T
	AC_TYPE_INT32_T
	AC_TYPE_INT64_T
	AC_TYPE_INT8_T
	AC_TYPE_UINT16_T
	AC_TYPE_UINT32_T
	AC_TYPE_UINT64_T
	AC_TYPE_UINT8_T
	AC_TYPE_SIZE_T
	AC_TYPE_SSIZE_T

	# Checks for libraries.
	PKG_CHECK_MODULES([nss],[nss])
	SAVE_CPPFLAGS="$CPPFLAGS"
	SAVE_LIBS="$LIBS"
	PKG_CHECK_MODULES([LIBQB], [libqb])
	CPPFLAGS="$CPPFLAGS $LIBQB_CFLAGS"
	LIBS="$LIBS $LIBQB_LIBS"
	AC_CHECK_LIB([qb], [qb_log_thread_priority_set], \
	have_qb_log_thread_priority_set="yes", \
	have_qb_log_thread_priority_set="no")
	if test "x${have_qb_log_thread_priority_set}" = xyes; then
	AC_DEFINE_UNQUOTED([HAVE_QB_LOG_THREAD_PRIORITY_SET], 1, [have qb_log_thread_priority_set])
	fi
	CPPFLAGS="$SAVE_CPPFLAGS"
	LIBS="$SAVE_LIBS"
	AC_CHECK_LIB([pthread], [pthread_create])
	AC_CHECK_LIB([socket], [socket])
	PKG_CHECK_MODULES([KNET],[libknet])
	AC_CHECK_LIB([nsl], [t_open])
	AC_CHECK_LIB([rt], [sched_getscheduler])
	AC_CHECK_LIB([z], [crc32],
	AM_CONDITIONAL([BUILD_CPGHUM], true),
	AM_CONDITIONAL([BUILD_CPGHUM], false))

	# Checks for library functions.
	AC_FUNC_ALLOCA
	AC_FUNC_CLOSEDIR_VOID
	AC_FUNC_ERROR_AT_LINE
	AC_FUNC_FORK
	AC_FUNC_MALLOC
	AC_FUNC_MEMCMP
	AC_FUNC_MMAP
	AC_FUNC_REALLOC
	AC_FUNC_SELECT_ARGTYPES
	AC_FUNC_VPRINTF

	AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fdatasync \
	fcntl getcwd getpeerucred getpeereid gettimeofday inet_ntoa \
	memmove memset mkdir scandir select socket strcasecmp strchr \
	strdup strerror strrchr strspn strstr pthread_setschedparam \
	sched_get_priority_max sched_setscheduler getifaddrs \
	clock_gettime ftruncate gethostname localtime_r munmap strtol])

	AC_CONFIG_FILES([Makefile
	exec/Makefile
	include/Makefile
	init/Makefile
	lib/Makefile
	common_lib/Makefile
	man/Makefile
	pkgconfig/Makefile
	test/Makefile
	cts/Makefile
	cts/agents/Makefile
	cts/CTSvars.py
	tools/Makefile
	conf/Makefile
	qdevices/Makefile
	vqsim/Makefile
	Doxyfile
	conf/logrotate/Makefile
	conf/tmpfiles.d/Makefile])

	### Local business

	dnl ===============================================
	dnl Functions / global M4 variables
	dnl ===============================================
	dnl Global list of LIB names
	m4_define([local_soname_list], [])dnl

	dnl Upcase parameter
	m4_define([local_upcase], [translit([$*], [a-z], [A-Z])])dnl

	dnl M4 macro for include lib/lib$1.soname and subst that
	m4_define([LIB_SONAME_IMPORT],[dnl
	m4_define([local_libname], local_upcase($1)[_SONAME])dnl
	m4_define([local_soname], translit(m4_sinclude(lib/lib$1.verso), [
	], []))dnl
	local_libname="local_soname"dnl
	m4_define([local_soname_list], m4_defn([local_soname_list])[,]local_libname[,]local_upcase($1))dnl
	AC_SUBST(local_libname)dnl
	])dnl

	dnl M4 macro for print padspaces (used in LIB_MSG_RESULT). It takes 2 arguments, length of string to pad and desired
	dnl (padded) length
	m4_define([m4_printpadspace],[ifelse(m4_eval([$2 - $1 < 1]),[1],,[ ][m4_printpadspace([$1],m4_eval([$2 - 1]))])])dnl

	dnl Show AC_MSG_RESULT for specific libraries
	m4_define([LIB_MSG_RESULT], [ifelse([$#], [1], ,[dnl
	AC_MSG_RESULT([ $2 Library SONAME m4_printpadspace(len($2),8) = ${$1}])
	LIB_MSG_RESULT(m4_shift(m4_shift($@)))dnl
	])])dnl

	# ===============================================
	# Helpers
	# ===============================================

	## check if the compiler supports -Werror -Wunknown-warning-option
	AC_MSG_CHECKING([whether $CC supports -Wunknown-warning-option -Werror])
	BACKUP="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS -Werror -Wunknown-warning-option"
	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])],
	[unknown_warnings_as_errors='-Wunknown-warning-option -Werror'; AC_MSG_RESULT([yes])],
	[unknown_warnings_as_errors=''; AC_MSG_RESULT([no])])
	CPPFLAGS="$BACKUP"

	## helper for CC stuff
	cc_supports_flag() {
	BACKUP="$CPPFLAGS"
	CPPFLAGS="$CPPFLAGS $@ $unknown_warnings_as_errors"
	AC_MSG_CHECKING([whether $CC supports "$@"])
	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([])],
	[RC=0; AC_MSG_RESULT([yes])],
	[RC=1; AC_MSG_RESULT([no])])
	CPPFLAGS="$BACKUP"
	return $RC
	}

	## cleanup
	AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
	case $prefix in
	NONE) prefix=/usr/local;;
	esac

	AC_MSG_NOTICE(Sanitizing exec_prefix: ${exec_prefix})
	case $exec_prefix in
	dnl For consistency with Corosync, map NONE->$prefix
	NONE) exec_prefix=$prefix;;
	prefix) exec_prefix=$prefix;;
	esac

	## local defines
	PACKAGE_FEATURES=""

	LINT_FLAGS="-weak -unrecog +posixlib +ignoresigns -fcnuse \
	-badflag -D__gnuc_va_list=va_list -D__attribute$x$="

	# default libraries SONAME
	SOMAJOR="5"
	SOMINOR="0"
	SOMICRO="0"
	SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"

	# specific libraries SONAME
	LIB_SONAME_IMPORT([cfg])
	LIB_SONAME_IMPORT([cpg])
	LIB_SONAME_IMPORT([quorum])
	LIB_SONAME_IMPORT([sam])
	LIB_SONAME_IMPORT([votequorum])
	LIB_SONAME_IMPORT([cmap])

	# local options
	AC_ARG_ENABLE([ansi],
	[ --enable-ansi : force to build with ANSI standards. ],
	[ default="no" ])

	AC_ARG_ENABLE([fatal-warnings],
	[ --enable-fatal-warnings : enable fatal warnings. ],
	[ default="no" ])

	AC_ARG_ENABLE([debug],
	[ --enable-debug : enable debug build. ],
	[ default="no" ])

	AC_ARG_ENABLE([secure-build],
	[ --enable-secure-build : enable PIE/RELRO build. ],
	[],
	[enable_secure_build="yes"])

	AC_ARG_ENABLE([user-flags],
	[ --enable-user-flags : rely on user environment. ],
	[ default="no" ])

	AC_ARG_ENABLE([coverage],
	[ --enable-coverage : coverage analysis of the codebase. ],
	[ default="no" ])

	AC_ARG_ENABLE([small-memory-footprint],
	[ --enable-small-memory-footprint : Use small message queues and small messages sizes. ],
	[ default="no" ])

	AC_ARG_ENABLE([dbus],
	[ --enable-dbus : dbus events. ],,
	[ enable_dbus="no" ])

	AC_ARG_ENABLE([testagents],
	[ --enable-testagents : Install Test Agents. ],,
	[ default="no" ])

	AC_ARG_ENABLE([monitoring],
	[ --enable-monitoring : resource monitoring ],,
	[ default="no" ])
	AM_CONDITIONAL(BUILD_MONITORING, test x$enable_monitoring = xyes)

	AC_ARG_ENABLE([watchdog],
	[ --enable-watchdog : Watchdog support ],,
	[ default="no" ])
	AM_CONDITIONAL(BUILD_WATCHDOG, test x$enable_watchdog = xyes)

	AC_ARG_ENABLE([augeas],
	[ --enable-augeas : Install the augeas lens for corosync.conf ],,
	[ enable_augeas="no" ])
	AM_CONDITIONAL(INSTALL_AUGEAS, test x$enable_augeas = xyes)

	AC_ARG_ENABLE([systemd],
	[ --enable-systemd : Install systemd service files],,
	[ enable_systemd="no" ])
	AM_CONDITIONAL(INSTALL_SYSTEMD, test x$enable_systemd = xyes)

	AC_ARG_ENABLE([upstart],
	[ --enable-upstart : Install upstart service files],,
	[ enable_upstart="no" ])
	AM_CONDITIONAL(INSTALL_UPSTART, test x$enable_upstart = xyes)

	+AC_ARG_WITH([initconfigdir],
	+ [AS_HELP_STRING([--with-initconfigdir=DIR],
	+ [configuration directory @<:@SYSCONFDIR/sysconfig@:>@])],
	+ [INITCONFIGDIR="$withval"],
	+ [INITCONFIGDIR='${sysconfdir}/sysconfig'])
	+AC_SUBST([INITCONFIGDIR])
	+
	AC_ARG_WITH([initddir],
	[ --with-initddir=DIR : path to init script directory. ],
	[ INITDDIR="$withval" ],
	[ INITDDIR="$sysconfdir/init.d" ])

	AC_ARG_WITH([systemddir],
	[ --with-systemddir=DIR : path to systemd unit files directory. ],
	[ SYSTEMDDIR="$withval" ],
	[ SYSTEMDDIR="/lib/systemd/system" ])

	AC_ARG_WITH([upstartdir],
	[ --with-upstartdir=DIR : path to upstart config files directory. ],
	[ UPSTARTDIR="$withval" ],
	[ UPSTARTDIR="$sysconfdir/init" ])

	AC_ARG_WITH([initwrappersdir],
	[ --with-initwrappersdir=DIR : path to init wrappers files directory. ],
	[ INITWRAPPERSDIR="$withval" ],
	[ INITWRAPPERSDIR="$datarootdir/corosync" ])

	AC_ARG_WITH([logdir],
	[ --with-logdir=DIR : the base directory for corosync logging files. ],
	[ LOGDIR="$withval" ],
	[ LOGDIR="$localstatedir/log/cluster" ])

	AC_ARG_WITH([logrotatedir],
	[ --with-logrotatedir=DIR : the base directory for logrorate.d files. ],
	[ LOGROTATEDIR="$withval" ],
	[ LOGROTATEDIR="$sysconfdir/logrotate.d" ])

	AC_ARG_WITH([tmpfilesdir],
	[ --with-tmpfilesdir=DIR : path to tmpfiles.d configuration files directory. ],
	[ TMPFILESDIR="$withval" ],
	[ TMPFILESDIR="/lib/tmpfiles.d" ])

	AC_ARG_ENABLE([snmp],
	[ --enable-snmp : SNMP protocol support ],
	[ default="no" ])

	AC_ARG_ENABLE([xmlconf],
	[ --enable-xmlconf : XML configuration support ],,
	[ enable_xmlconf="no" ])
	AM_CONDITIONAL(INSTALL_XMLCONF, test x$enable_xmlconf = xyes)

	AC_ARG_ENABLE([qdevices],
	[ --enable-qdevices : Quorum devices support ],,
	[ enable_qdevices="no" ])
	AM_CONDITIONAL(BUILD_QDEVICES, test x$enable_qdevices = xyes)
	AC_ARG_ENABLE([qnetd],
	[ --enable-qnetd : Quorum Net Daemon support ],,
	[ enable_qnetd="no" ])
	AM_CONDITIONAL(BUILD_QNETD, test x$enable_qnetd = xyes)
	AC_ARG_ENABLE([libcgroup],
	[ --enable-libcgroup : Enable libcgroup support ],,
	[ enable_libcgroup="no" ])
	AM_CONDITIONAL(ENABLE_LIBCGROUP, test x$enable_libcgroup = xyes)

	AC_ARG_ENABLE([vqsim],
	[ --enable-vqsim : Quorum simulator support ],,
	[ enable_vqsim="no" ])
	AM_CONDITIONAL(BUILD_VQSIM, test x$enable_vqsim = xyes)

	# *FLAGS handling goes here

	ENV_CFLAGS="$CFLAGS"
	ENV_CPPFLAGS="$CPPFLAGS"
	ENV_LDFLAGS="$LDFLAGS"

	# debug build stuff
	if test "x${enable_debug}" = xyes; then
	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
	OPT_CFLAGS="-O0"
	PACKAGE_FEATURES="$PACKAGE_FEATURES debug"
	else
	OPT_CFLAGS="-O3"
	fi

	# gdb flags
	if test "x${GCC}" = xyes; then
	GDB_FLAGS="-ggdb3"
	else
	GDB_FLAGS="-g"
	fi

	# Look for dbus-1
	if test "x${enable_dbus}" = xyes; then
	PKG_CHECK_MODULES([DBUS],[dbus-1])
	AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [have dbus])
	PACKAGE_FEATURES="$PACKAGE_FEATURES dbus"
	WITH_LIST="$WITH_LIST --with dbus"
	fi

	if test "x${enable_testagents}" = xyes; then
	AC_DEFINE_UNQUOTED([HAVE_TESTAGENTS], 1, [have testagents])
	PACKAGE_FEATURES="$PACKAGE_FEATURES testagents"
	WITH_LIST="$WITH_LIST --with testagents"
	fi

	if test "x${enable_monitoring}" = xyes; then
	PKG_CHECK_MODULES([statgrab], [libstatgrab])
	PKG_CHECK_MODULES([statgrabge090], [libstatgrab >= 0.90],
	AC_DEFINE_UNQUOTED([HAVE_LIBSTATGRAB_GE_090], 1, [have libstatgrab >= 0.90]),
	TMP_VARIABLE=1)
	AC_DEFINE_UNQUOTED([HAVE_MONITORING], 1, [have resource monitoring])
	PACKAGE_FEATURES="$PACKAGE_FEATURES monitoring"
	WITH_LIST="$WITH_LIST --with monitoring"
	fi

	if test "x${enable_watchdog}" = xyes; then
	AC_CHECK_HEADER([linux/watchdog.h], [], [AC_MSG_ERROR([watchdog requires linux/watchdog.h])])
	AC_CHECK_HEADER([linux/reboot.h], [], [AC_MSG_ERROR([watchdog requires linux/reboot.h])])
	AC_DEFINE_UNQUOTED([HAVE_WATCHDOG], 1, [have watchdog])
	PACKAGE_FEATURES="$PACKAGE_FEATURES watchdog"
	WITH_LIST="$WITH_LIST --with watchdog"
	fi

	if test "x${enable_augeas}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES augeas"
	fi
	if test "x${enable_systemd}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES systemd"
	WITH_LIST="$WITH_LIST --with systemd"
	fi
	if test "x${enable_upstart}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES upstart"
	WITH_LIST="$WITH_LIST --with upstart"
	fi
	if test "x${enable_xmlconf}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES xmlconf"
	WITH_LIST="$WITH_LIST --with xmlconf"
	fi
	if test "x${enable_qdevices}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES qdevices"
	fi

	if test "x${enable_vqsim}" = xyes; then
	vqsim_readline=no
	AC_CHECK_HEADERS([readline/readline.h readline/history.h],
	[],
	AC_MSG_WARN([vqsim will lack readline support]))
	PACKAGE_FEATURES="$PACKAGE_FEATURES vqsim"
	fi
	AM_CONDITIONAL(VQSIM_READLINE, [test "x${ac_cv_header_readline_readline_h}" = xyes])

	if test "x${enable_qnetd}" = xyes; then
	PACKAGE_FEATURES="$PACKAGE_FEATURES qnetd"
	fi

	do_snmp=0
	if test "x${enable_snmp}" = xyes; then
	AC_PATH_PROGS([SNMPCONFIG], [net-snmp-config])

	if test "x${SNMPCONFIG}" != "x"; then
	AC_MSG_CHECKING([for snmp includes])
	SNMP_PREFIX=`$SNMPCONFIG --prefix`
	SNMP_INCLUDES="-I$SNMP_PREFIX/include"
	AC_MSG_RESULT([$SNMP_INCLUDES])

	AC_MSG_CHECKING([for snmp libraries])
	SNMP_LIBS=`$SNMPCONFIG --libs`
	AC_MSG_RESULT([$SNMP_LIBS])
	AC_SUBST([SNMP_LIBS])

	saveCFLAGS="$CFLAGS"
	CFLAGS="$CFLAGS $SNMP_INCLUDES"
	AC_CHECK_HEADERS([net-snmp/net-snmp-config.h])
	CFLAGS="$saveCFLAGS"

	if test "x${ac_cv_header_net_snmp_net_snmp_config_h}" != "xyes"; then
	AC_MSG_ERROR([Unable to use net-snmp/net-snmp-config.h])
	fi

	savedLibs=$LIBS
	LIBS="$LIBS $SNMP_LIBS"
	AC_CHECK_FUNCS([netsnmp_transport_open_client])
	if test $ac_cv_func_netsnmp_transport_open_client != yes; then
	AC_CHECK_FUNCS([netsnmp_tdomain_transport])
	if test $ac_cv_func_netsnmp_tdomain_transport != yes; then
	AC_MSG_ERROR([No usable SNMP client transport implementation found])
	fi
	else
	AC_DEFINE_UNQUOTED([NETSNMPV54], $NETSNMP_NEW_SUPPORT, [have net-snmp5.4 over])
	fi
	LIBS=$savedLibs

	do_snmp=1
	PACKAGE_FEATURES="$PACKAGE_FEATURES snmp"
	WITH_LIST="$WITH_LIST --with snmp"
	AC_DEFINE_UNQUOTED([ENABLE_SNMP], $do_snmp, [Build in support for sending SNMP traps])
	else
	AC_MSG_ERROR([You need the net_snmp development package to continue.])
	fi
	fi
	AM_CONDITIONAL(BUILD_SNMP, test "${do_snmp}" = "1")

	if test "x${enable_libcgroup}" = xyes; then
	PKG_CHECK_MODULES([libcgroup], [libcgroup])
	AC_DEFINE_UNQUOTED([HAVE_LIBCGROUP], 1, [have libcgroup])
	PACKAGE_FEATURES="$PACKAGE_FEATURES libcgroup"
	WITH_LIST="$WITH_LIST --with libcgroup"
	fi

	# extra warnings
	EXTRA_WARNINGS=""

	WARNLIST="
	all
	shadow
	missing-prototypes
	missing-declarations
	strict-prototypes
	pointer-arith
	write-strings
	cast-align
	bad-function-cast
	missing-format-attribute
	format=2
	format-security
	format-nonliteral
	no-long-long
	unsigned-char
	no-strict-aliasing
	"

	for j in $WARNLIST; do
	if cc_supports_flag -W$j; then
	EXTRA_WARNINGS="$EXTRA_WARNINGS -W$j";
	fi
	done

	if test "x${enable_coverage}" = xyes && \
	cc_supports_flag -ftest-coverage && \
	cc_supports_flag -fprofile-arcs ; then
	AC_MSG_NOTICE([Enabling Coverage (enable -O0 by default)])
	OPT_CFLAGS="-O0"
	COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
	COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
	PACKAGE_FEATURES="$PACKAGE_FEATURES coverage"
	else
	COVERAGE_CFLAGS=""
	COVERAGE_LDFLAGS=""
	fi

	if test "x${enable_small_memory_footprint}" = xyes ; then
	AC_DEFINE_UNQUOTED([HAVE_SMALL_MEMORY_FOOTPRINT], 1, [have small_memory_footprint])
	PACKAGE_FEATURES="$PACKAGE_FEATURES small-memory-footprint"
	fi

	if test "x${enable_ansi}" = xyes && \
	cc_supports_flag -std=iso9899:199409 ; then
	AC_MSG_NOTICE([Enabling ANSI Compatibility])
	ANSI_CPPFLAGS="-ansi -DANSI_ONLY"
	PACKAGE_FEATURES="$PACKAGE_FEATURES ansi"
	else
	ANSI_CPPFLAGS=""
	fi

	if test "x${enable_fatal_warnings}" = xyes && \
	cc_supports_flag -Werror ; then
	AC_MSG_NOTICE([Enabling Fatal Warnings (-Werror)])
	WERROR_CFLAGS="-Werror"
	PACKAGE_FEATURES="$PACKAGE_FEATURES fatal-warnings"
	else
	WERROR_CFLAGS=""
	fi

	# don't add addtional cflags
	if test "x${enable_user_flags}" = xyes; then
	OPT_CFLAGS=""
	GDB_FLAGS=""
	EXTRA_WARNINGS=""
	fi

	if test "x${enable_secure_build}" = xyes; then
	# stolen from apache configure snippet
	AC_CACHE_CHECK([whether $CC accepts PIE flags], [ap_cv_cc_pie], [
	save_CFLAGS=$CFLAGS
	save_LDFLAGS=$LDFLAGS
	CFLAGS="$CFLAGS -fPIE"
	LDFLAGS="$LDFLAGS -pie"
	AC_TRY_RUN([static int foo[30000]; int main () { return 0; }],
	[ap_cv_cc_pie=yes], [ap_cv_cc_pie=no], [ap_cv_cc_pie=yes])
	CFLAGS=$save_CFLAGS
	LDFLAGS=$save_LDFLAGS
	])
	if test "$ap_cv_cc_pie" = "yes"; then
	SEC_FLAGS="$SEC_FLAGS -fPIE"
	SEC_LDFLAGS="$SEC_LDFLAGS -pie"
	PACKAGE_FEATURES="$PACKAGE_FEATURES pie"
	fi

	# similar to above
	AC_CACHE_CHECK([whether $CC accepts RELRO flags], [ap_cv_cc_relro], [
	save_LDFLAGS=$LDFLAGS
	LDFLAGS="$LDFLAGS -Wl,-z,relro"
	AC_TRY_RUN([static int foo[30000]; int main () { return 0; }],
	[ap_cv_cc_relro=yes], [ap_cv_cc_relro=no], [ap_cv_cc_relro=yes])
	LDFLAGS=$save_LDFLAGS
	])
	if test "$ap_cv_cc_relro" = "yes"; then
	SEC_LDFLAGS="$SEC_LDFLAGS -Wl,-z,relro"
	PACKAGE_FEATURES="$PACKAGE_FEATURES relro"
	fi

	AC_CACHE_CHECK([whether $CC accepts BINDNOW flags], [ap_cv_cc_bindnow], [
	save_LDFLAGS=$LDFLAGS
	LDFLAGS="$LDFLAGS -Wl,-z,now"
	AC_TRY_RUN([static int foo[30000]; int main () { return 0; }],
	[ap_cv_cc_bindnow=yes], [ap_cv_cc_bindnow=no], [ap_cv_cc_bindnow=yes])
	LDFLAGS=$save_LDFLAGS
	])
	if test "$ap_cv_cc_bindnow" = "yes"; then
	SEC_LDFLAGS="$SEC_LDFLAGS -Wl,-z,now"
	PACKAGE_FEATURES="$PACKAGE_FEATURES bindnow"
	fi
	fi

	AC_CACHE_CHECK([whether $CC accepts "--as-needed"], [ap_cv_cc_as_needed], [
	save_LDFLAGS=$LDFLAGS
	LDFLAGS="$LDFLAGS -Wl,--as-needed"
	AC_TRY_RUN([static int foo[30000]; int main () { return 0; }],
	[ap_cv_cc_as_needed=yes], [ap_cv_cc_as_needed=no], [ap_cv_cc_as_needed=yes])
	LDFLAGS=$save_LDFLAGS
	])

	AC_CACHE_CHECK([whether $CC accepts "--version-script"], [ap_cv_cc_version_script], [
	save_LDFLAGS=$LDFLAGS
	LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.versions"
	echo "CONFTEST { };" >conftest.versions
	AC_TRY_RUN([static int foo[30000]; int main () { return 0; }],
	[ap_cv_cc_version_script=yes], [ap_cv_cc_version_script=no], [ap_cv_cc_version_script=yes])
	rm -f conftest.versions
	LDFLAGS=$save_LDFLAGS
	])
	if test "$ap_cv_cc_version_script" = "yes"; then
	AC_SUBST(VERSCRIPT_LDFLAGS, ["-Wl,--version-script=\$(srcdir)/lib\$(call get_libname,\$<).versions"])
	else
	AC_SUBST(VERSCRIPT_LDFLAGS, [""])
	fi

	# define global include dirs
	INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include -I\$(top_srcdir)/include"
	INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync"

	# final build of *FLAGS
	CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \
	$COVERAGE_CFLAGS $EXTRA_WARNINGS \
	$WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \
	$SNMP_INCLUDES"
	CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $INCLUDE_DIRS"
	LDFLAGS="$ENV_LDFLAGS $lt_prog_compiler_pic $SEC_LDFLAGS $COVERAGE_LDFLAGS"

	if test "$ap_cv_cc_as_needed" = "yes"; then
	LDFLAGS="$LDFLAGS -Wl,--as-needed"
	fi

	# substitute what we need:
	AC_SUBST([BASHPATH])
	AC_SUBST([INITDDIR])
	AC_SUBST([SYSTEMDDIR])
	AC_SUBST([UPSTARTDIR])
	INITWRAPPERSDIR=$(eval echo ${INITWRAPPERSDIR})
	AC_SUBST([INITWRAPPERSDIR])
	AC_SUBST([LOGDIR])
	AC_SUBST([LOGROTATEDIR])
	AC_SUBST([TMPFILESDIR])

	AC_SUBST([SOMAJOR])
	AC_SUBST([SOMINOR])
	AC_SUBST([SOMICRO])
	AC_SUBST([SONAME])

	AM_CONDITIONAL(INSTALL_TESTAGENTS, test "${enable_testagents}" = "yes")
	AM_CONDITIONAL(INSTALL_MIB, test "${do_snmp}" = "1")
	AM_CONDITIONAL(INSTALL_DBUSCONF, test "${enable_dbus}" = "yes")
	AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
	AC_SUBST([NSS_LDFLAGS])

	AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")

	AC_SUBST([LINT_FLAGS])

	AC_DEFINE_UNQUOTED([LOCALSTATEDIR], "$(eval echo ${localstatedir})", [localstate directory])

	COROSYSCONFDIR=${sysconfdir}/corosync
	AC_SUBST([COROSYSCONFDIR])
	AC_DEFINE_UNQUOTED([COROSYSCONFDIR], "$(eval echo ${COROSYSCONFDIR})", [corosync config directory])

	AC_DEFINE_UNQUOTED([PACKAGE_FEATURES], "${PACKAGE_FEATURES}", [corosync built-in features])

	AC_OUTPUT

	AC_MSG_RESULT([])
	AC_MSG_RESULT([$PACKAGE configuration:])
	AC_MSG_RESULT([ Version = ${VERSION}])
	AC_MSG_RESULT([ Prefix = ${prefix}])
	AC_MSG_RESULT([ Executables = ${sbindir}])
	AC_MSG_RESULT([ Man pages = ${mandir}])
	AC_MSG_RESULT([ Doc dir = ${docdir}])
	AC_MSG_RESULT([ Libraries = ${libdir}])
	AC_MSG_RESULT([ Header files = ${includedir}])
	AC_MSG_RESULT([ Arch-independent files = ${datadir}])
	AC_MSG_RESULT([ State information = ${localstatedir}])
	AC_MSG_RESULT([ System configuration = ${sysconfdir}])
	AC_MSG_RESULT([ System init.d directory = ${INITDDIR}])
	AC_MSG_RESULT([ System systemd directory = ${SYSTEMDDIR}])
	AC_MSG_RESULT([ System upstart directory = ${UPSTARTDIR}])
	AC_MSG_RESULT([ System init wraps dir = ${INITWRAPPERSDIR}])
	AC_MSG_RESULT([ System tmpfiles.d = ${TMPFILESDIR}])
	AC_MSG_RESULT([ Log directory = ${LOGDIR}])
	AC_MSG_RESULT([ Log rotate directory = ${LOGROTATEDIR}])
	AC_MSG_RESULT([ corosync config dir = ${COROSYSCONFDIR}])
	+AC_MSG_RESULT([ init config directory = ${INITCONFIGDIR}])
	AC_MSG_RESULT([ Features =${PACKAGE_FEATURES}])
	AC_MSG_RESULT([])
	AC_MSG_RESULT([$PACKAGE build info:])
	AC_MSG_RESULT([ Library SONAME = ${SONAME}])
	LIB_MSG_RESULT(m4_shift(local_soname_list))dnl
	AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
	AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
	AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
	AC_MSG_RESULT([ Env. defined CFLAG = ${ENV_CFLAGS}])
	AC_MSG_RESULT([ Env. defined CPPFLAGS = ${ENV_CPPFLAGS}])
	AC_MSG_RESULT([ Env. defined LDFLAGS = ${ENV_LDFLAGS}])
	AC_MSG_RESULT([ ANSI defined CPPFLAGS = ${ANSI_CPPFLAGS}])
	AC_MSG_RESULT([ Coverage CFLAGS = ${COVERAGE_CFLAGS}])
	AC_MSG_RESULT([ Coverage LDFLAGS = ${COVERAGE_LDFLAGS}])
	AC_MSG_RESULT([ Fatal War. CFLAGS = ${WERROR_CFLAGS}])
	AC_MSG_RESULT([ Final CFLAGS = ${CFLAGS}])
	AC_MSG_RESULT([ Final CPPFLAGS = ${CPPFLAGS}])
	AC_MSG_RESULT([ Final LDFLAGS = ${LDFLAGS}])
	diff --git a/init/Makefile.am b/init/Makefile.am
	index 379249fc..3161979e 100644
	--- a/init/Makefile.am
	+++ b/init/Makefile.am
	@@ -1,89 +1,90 @@
	# Copyright (c) 2004 MontaVista Software, Inc.
	# Copyright (c) 2009 Red Hat, Inc.
	#
	# Authors: Steven Dake (sdake@redhat.com)
	# Fabio M. Di Nitto (fdinitto@redhat.com)
	#
	# All rights reserved.
	#
	# This software licensed under BSD license, the text of which follows:
	#
	# Redistribution and use in source and binary forms, with or without
	# modification, are permitted provided that the following conditions are met:
	#
	# - Redistributions of source code must retain the above copyright notice,
	# this list of conditions and the following disclaimer.
	# - Redistributions in binary form must reproduce the above copyright notice,
	# this list of conditions and the following disclaimer in the documentation
	# and/or other materials provided with the distribution.
	# - Neither the name of the MontaVista Software, Inc. nor the names of its
	# contributors may be used to endorse or promote products derived from this
	# software without specific prior written permission.
	#
	# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	# THE POSSIBILITY OF SUCH DAMAGE.

	MAINTAINERCLEANFILES = Makefile.in

	EXTRA_DIST = corosync.in corosync-notifyd.in corosync.service.in \
	corosync-notifyd.service.in corosync.conf.in corosync-notifyd.conf.in \
	corosync.sysconfig.example \
	corosync-qdevice.sysconfig.example corosync-qdevice.in \
	corosync-qdevice.service.in \
	corosync-qnetd.sysconfig.example corosync-qnetd.in \
	corosync-qnetd.service.in

	if INSTALL_SYSTEMD
	systemdconfdir = $(SYSTEMDDIR)
	systemdconf_DATA = corosync.service corosync-notifyd.service
	initscriptdir = $(INITWRAPPERSDIR)
	else
	initscriptdir = $(INITDDIR)
	endif
	initscript_SCRIPTS = corosync corosync-notifyd

	if BUILD_QDEVICES
	initscript_SCRIPTS += corosync-qdevice
	if INSTALL_SYSTEMD
	systemdconf_DATA += corosync-qdevice.service
	endif
	endif

	if BUILD_QNETD
	initscript_SCRIPTS += corosync-qnetd
	if INSTALL_SYSTEMD
	systemdconf_DATA += corosync-qnetd.service
	endif
	endif

	if INSTALL_UPSTART
	upstartconfdir = $(UPSTARTDIR)
	upstartconf_DATA = corosync.conf corosync-notifyd.conf
	endif

	%: %.in Makefile
	rm -f $@-t $@
	cat $< \| sed \
	-e 's#@''SBINDIR@#$(sbindir)#g' \
	-e 's#@''BINDIR@#$(bindir)#g' \
	-e 's#@''SYSCONFDIR@#$(sysconfdir)#g' \
	+ -e 's#@''INITCONFIGDIR@#$(INITCONFIGDIR)#g' \
	-e 's#@''INITDDIR@#$(INITDDIR)#g' \
	-e 's#@''INITWRAPPERSDIR@#$(INITWRAPPERSDIR)#g' \
	-e 's#@''LOCALSTATEDIR@#$(localstatedir)#g' \
	-e 's#@''BASHPATH@#${BASHPATH}#g' \
	> $@-t
	mv $@-t $@

	all-local: $(initscript_SCRIPTS) $(systemdconf_DATA) $(upstartconf_DATA)

	clean-local:
	rm -rf $(initscript_SCRIPTS) $(systemdconf_DATA) $(upstartconf_DATA)
	diff --git a/init/corosync-notifyd.conf.in b/init/corosync-notifyd.conf.in
	index b1ac70c8..168a7817 100644
	--- a/init/corosync-notifyd.conf.in
	+++ b/init/corosync-notifyd.conf.in
	@@ -1,38 +1,34 @@
	# corosync-notifyd - Corosync Dbus and snmp notifier
	#
	# Starts corosync-notifyd

	expect fork
	respawn

	env prog=corosync-notifyd
	-env rpm_sysconf=@SYSCONFDIR@/sysconfig/corosync-notifyd
	+env initconf=@INITCONFIGDIR@/corosync-notifyd
	env rpm_lockfile=@LOCALSTATEDIR@/lock/subsys/corosync-notifyd
	-env deb_sysconf=@SYSCONFDIR@/default/corosync-notifyd
	env deb_lockfile=@LOCALSTATEDIR@/lock/corosync-notifyd

	script
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	exec $prog $OPTIONS
	end script

	pre-start script
	mkdir -p @LOCALSTATEDIR@/run
	end script

	post-start script
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/sysconfig ] && LOCK_FILE="$rpm_lockfile"
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/default ] && LOCK_FILE="$deb_lockfile"
	touch $LOCK_FILE
	end script

	post-stop script
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/sysconfig ] && LOCK_FILE="$rpm_lockfile"
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/default ] && LOCK_FILE="$deb_lockfile"
	rm -f $LOCK_FILE
	end script
	diff --git a/init/corosync-notifyd.in b/init/corosync-notifyd.in
	index 62101421..cc944b4e 100755
	--- a/init/corosync-notifyd.in
	+++ b/init/corosync-notifyd.in
	@@ -1,153 +1,153 @@
	#!@BASHPATH@

	# Authors:
	# Angus Salkeld <asalkeld@redhat.com>
	#
	# License: Revised BSD

	# chkconfig: - 23 77
	# description: Corosync Dbus and snmp notifier
	# processname: corosync-notifyd
	#
	### BEGIN INIT INFO
	# Provides: corosync-notifyd
	# Required-Start: corosync cman
	# Required-Stop: corosync cman
	# Default-Start:
	# Default-Stop:
	# Short-Description: Starts and stops Corosync Notifier.
	# Description: Starts and stops Corosync Notifier.
	### END INIT INFO

	desc="Corosync Notifier"
	prog="corosync-notifyd"

	# set secure PATH
	PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"

	success()
	{
	echo -ne "[ OK ]\r"
	}

	failure()
	{
	echo -ne "[FAILED]\r"
	}

	status()
	{
	pid=$(pidof $1 2>/dev/null)
	rtrn=$?
	if [ $rtrn -ne 0 ]; then
	echo "$1 is stopped"
	else
	echo "$1 (pid $pid) is running..."
	fi
	return $rtrn
	}

	+[ -f @INITCONFIGDIR@/$prog ] && . @INITCONFIGDIR@/$prog
	+
	# rpm based distros
	if [ -d @SYSCONFDIR@/sysconfig ]; then
	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
	- [ -f @SYSCONFDIR@/sysconfig/$prog ] && . @SYSCONFDIR@/sysconfig/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/subsys/$prog"
	fi

	# deb based distros
	if [ -d @SYSCONFDIR@/default ]; then
	- [ -f @SYSCONFDIR@/default/$prog ] && . @SYSCONFDIR@/default/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
	fi

	# The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
	# This means it matches scripts, including this one.
	# Redefine it here so that status (from the same file) works.
	# Otherwise simultaneous calls to stop() will loop forever
	__pids_pidof() {
	pidof -c -o $$ -o $PPID -o %PPID "$1" \|\| \
	pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
	}

	start()
	{
	echo -n "Starting $desc ($prog): "

	# most recent distributions use tmpfs for @LOCALSTATEDIR@/run
	# to avoid to clean it up on every boot.
	# they also assume that init scripts will create
	# required subdirectories for proper operations
	mkdir -p @LOCALSTATEDIR@/run

	if status $prog > /dev/null 2>&1; then
	success
	else
	$prog $OPTIONS > /dev/null 2>&1

	# give it time to fail
	sleep 2
	if status $prog > /dev/null 2>&1; then
	touch $LOCK_FILE
	success
	else
	failure
	rtrn=1
	fi
	fi
	echo
	}

	stop()
	{
	! status $prog > /dev/null 2>&1 && return

	echo -n "Signaling $desc ($prog) to terminate: "
	kill -TERM $(pidof $prog) > /dev/null 2>&1
	success
	echo

	echo -n "Waiting for $prog services to unload:"
	while status $prog > /dev/null 2>&1; do
	sleep 1
	echo -n "."
	done

	rm -f $LOCK_FILE
	success
	echo
	}

	restart()
	{
	stop
	start
	}

	rtrn=0

	case "$1" in
	start)
	start
	;;
	restart\|reload\|force-reload)
	restart
	;;
	condrestart\|try-restart)
	if status $prog > /dev/null 2>&1; then
	restart
	fi
	;;
	status)
	status $prog
	rtrn=$?
	;;
	stop)
	stop
	;;
	*)
	echo "usage: $0 {start\|stop\|restart\|reload\|force-reload\|condrestart\|try-restart\|status}"
	rtrn=2
	;;
	esac

	exit $rtrn
	diff --git a/init/corosync-notifyd.service.in b/init/corosync-notifyd.service.in
	index 689ab8ea..f74ca330 100644
	--- a/init/corosync-notifyd.service.in
	+++ b/init/corosync-notifyd.service.in
	@@ -1,14 +1,14 @@
	[Unit]
	Description=Corosync Dbus and snmp notifier
	Documentation=man:corosync-notifyd
	Wants=corosync.service
	After=corosync.service

	[Service]
	-EnvironmentFile=@SYSCONFDIR@/sysconfig/corosync-notifyd
	+EnvironmentFile=-@INITCONFIGDIR@/corosync-notifyd
	ExecStart=@SBINDIR@/corosync-notifyd -f $OPTIONS
	Type=simple
	Restart=on-failure

	[Install]
	WantedBy=multi-user.target
	diff --git a/init/corosync-qdevice.in b/init/corosync-qdevice.in
	index 71127e10..c69299fc 100755
	--- a/init/corosync-qdevice.in
	+++ b/init/corosync-qdevice.in
	@@ -1,167 +1,167 @@
	#!@BASHPATH@

	# Authors:
	# Jan Friesse <jfriesse@redhat.com>
	#
	# License: Revised BSD

	# chkconfig: - 20 80
	# description: Corosync Qdevice daemon
	# processname: corosync-qdevice
	#
	### BEGIN INIT INFO
	# Provides: corosync-qdevice
	# Required-Start: corosync
	# Required-Stop: corosync
	# Default-Start:
	# Default-Stop:
	# Short-Description: Starts and stops Corosync Qdevice daemon.
	# Description: Starts and stops Corosync Qdevice daemon.
	### END INIT INFO

	desc="Corosync Qdevice daemon"
	prog="corosync-qdevice"

	# set secure PATH
	PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"

	success()
	{
	echo -ne "[ OK ]\r"
	}

	failure()
	{
	echo -ne "[FAILED]\r"
	}

	status()
	{
	pid=$(pidof $1 2>/dev/null)
	res=$?
	if [ $res -ne 0 ]; then
	echo "$1 is stopped"
	else
	echo "$1 (pid $pid) is running..."
	fi
	return $res
	}

	+[ -f @INITCONFIGDIR@/$prog ] && . @INITCONFIGDIR@/$prog
	+
	# rpm based distros
	if [ -d @SYSCONFDIR@/sysconfig ]; then
	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
	- [ -f @SYSCONFDIR@/sysconfig/$prog ] && . @SYSCONFDIR@/sysconfig/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/subsys/$prog"
	fi

	# deb based distros
	if [ -d @SYSCONFDIR@/default ]; then
	- [ -f @SYSCONFDIR@/default/$prog ] && . @SYSCONFDIR@/default/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
	fi

	# The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
	# This means it matches scripts, including this one.
	# Redefine it here so that status (from the same file) works.
	# Otherwise simultaneous calls to stop() will loop forever
	__pids_pidof() {
	pidof -c -o $$ -o $PPID -o %PPID "$1" \|\| \
	pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
	}

	cluster_disabled_at_boot()
	{
	if grep -q nocluster /proc/cmdline && \
	[ "$(tty)" = "/dev/console" ]; then
	echo -e "not configured to run at boot"
	failure
	return 1
	fi
	return 0
	}

	start()
	{
	echo -n "Starting $desc ($prog): "

	! cluster_disabled_at_boot && return

	# most recent distributions use tmpfs for @LOCALSTATEDIR@/run
	# to avoid to clean it up on every boot.
	# they also assume that init scripts will create
	# required subdirectories for proper operations
	if [ ! -d "@LOCALSTATEDIR@/run/corosync-qdevice" ];then
	mkdir -p "@LOCALSTATEDIR@/run/corosync-qdevice"
	chmod 0770 "@LOCALSTATEDIR@/run/corosync-qdevice"
	fi

	if status $prog > /dev/null 2>&1; then
	success
	else
	$prog $COROSYNC_QDEVICE_OPTIONS > /dev/null 2>&1

	if [ "$?" != 0 ]; then
	failure
	rtrn=1
	else
	touch $LOCK_FILE
	success
	fi
	fi
	echo
	}

	stop()
	{
	! status $prog > /dev/null 2>&1 && return

	echo -n "Signaling $desc ($prog) to terminate: "
	kill -TERM $(pidof $prog) > /dev/null 2>&1
	success
	echo

	echo -n "Waiting for $prog services to unload:"
	while status $prog > /dev/null 2>&1; do
	sleep 1
	echo -n "."
	done

	rm -f $LOCK_FILE
	success
	echo
	}

	restart()
	{
	stop
	start
	}

	rtrn=0

	case "$1" in
	start)
	start
	;;
	restart\|reload\|force-reload)
	restart
	;;
	condrestart\|try-restart)
	if status $prog > /dev/null 2>&1; then
	restart
	fi
	;;
	status)
	status $prog
	rtrn=$?
	;;
	stop)
	stop
	;;
	*)
	echo "usage: $0 {start\|stop\|restart\|reload\|force-reload\|condrestart\|try-restart\|status}"
	rtrn=2
	;;
	esac

	exit $rtrn
	diff --git a/init/corosync-qnetd.in b/init/corosync-qnetd.in
	index 15d30eab..beee03a4 100755
	--- a/init/corosync-qnetd.in
	+++ b/init/corosync-qnetd.in
	@@ -1,174 +1,174 @@
	#!@BASHPATH@

	# Authors:
	# Jan Friesse <jfriesse@redhat.com>
	#
	# License: Revised BSD

	# chkconfig: - 20 80
	# description: Corosync Qdevice Network daemon
	# processname: corosync-qnetd
	#
	### BEGIN INIT INFO
	# Provides: corosync-qnetd
	# Required-Start: $network $syslog
	# Required-Stop: $network $syslog
	# Default-Start:
	# Default-Stop:
	# Short-Description: Starts and stops Corosync Qdevice Network daemon.
	# Description: Starts and stops Corosync Qdevice Network daemon.
	### END INIT INFO

	desc="Corosync Qdevice Network daemon"
	prog="corosync-qnetd"

	# set secure PATH
	PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"

	success()
	{
	echo -ne "[ OK ]\r"
	}

	failure()
	{
	echo -ne "[FAILED]\r"
	}

	status()
	{
	pid=$(pidof $1 2>/dev/null)
	res=$?
	if [ $res -ne 0 ]; then
	echo "$1 is stopped"
	else
	echo "$1 (pid $pid) is running..."
	fi
	return $res
	}

	+[ -f @INITCONFIGDIR@/$prog ] && . @INITCONFIGDIR@/$prog
	+
	# rpm based distros
	if [ -d @SYSCONFDIR@/sysconfig ]; then
	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
	- [ -f @SYSCONFDIR@/sysconfig/$prog ] && . @SYSCONFDIR@/sysconfig/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/subsys/$prog"
	fi

	# deb based distros
	if [ -d @SYSCONFDIR@/default ]; then
	- [ -f @SYSCONFDIR@/default/$prog ] && . @SYSCONFDIR@/default/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
	fi

	# The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
	# This means it matches scripts, including this one.
	# Redefine it here so that status (from the same file) works.
	# Otherwise simultaneous calls to stop() will loop forever
	__pids_pidof() {
	pidof -c -o $$ -o $PPID -o %PPID "$1" \|\| \
	pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
	}

	cluster_disabled_at_boot()
	{
	if grep -q nocluster /proc/cmdline && \
	[ "$(tty)" = "/dev/console" ]; then
	echo -e "not configured to run at boot"
	failure
	return 1
	fi
	return 0
	}

	start()
	{
	echo -n "Starting $desc ($prog): "

	! cluster_disabled_at_boot && return

	# most recent distributions use tmpfs for @LOCALSTATEDIR@/run
	# to avoid to clean it up on every boot.
	# they also assume that init scripts will create
	# required subdirectories for proper operations
	if [ ! -d "@LOCALSTATEDIR@/run/corosync-qnetd" ];then
	mkdir -p "@LOCALSTATEDIR@/run/corosync-qnetd"
	chmod 0770 "@LOCALSTATEDIR@/run/corosync-qnetd"
	if [ ! -z "$COROSYNC_QNETD_RUNAS" ];then
	chown "$COROSYNC_QNETD_RUNAS:$COROSYNC_QNETD_RUNAS" "@LOCALSTATEDIR@/run/corosync-qnetd"
	fi
	fi

	if status $prog > /dev/null 2>&1; then
	success
	else
	if [ -z "$COROSYNC_QNETD_RUNAS" ];then
	$prog $COROSYNC_QNETD_OPTIONS > /dev/null 2>&1
	else
	runuser -s @BASHPATH@ $COROSYNC_QNETD_RUNAS -c "$prog $COROSYNC_QNETD_OPTIONS > /dev/null 2>&1"
	fi

	if [ "$?" != 0 ]; then
	failure
	rtrn=1
	else
	touch $LOCK_FILE
	success
	fi
	fi
	echo
	}

	stop()
	{
	! status $prog > /dev/null 2>&1 && return

	echo -n "Signaling $desc ($prog) to terminate: "
	kill -TERM $(pidof $prog) > /dev/null 2>&1
	success
	echo

	echo -n "Waiting for $prog services to unload:"
	while status $prog > /dev/null 2>&1; do
	sleep 1
	echo -n "."
	done

	rm -f $LOCK_FILE
	success
	echo
	}

	restart()
	{
	stop
	start
	}

	rtrn=0

	case "$1" in
	start)
	start
	;;
	restart\|reload\|force-reload)
	restart
	;;
	condrestart\|try-restart)
	if status $prog > /dev/null 2>&1; then
	restart
	fi
	;;
	status)
	status $prog
	rtrn=$?
	;;
	stop)
	stop
	;;
	*)
	echo "usage: $0 {start\|stop\|restart\|reload\|force-reload\|condrestart\|try-restart\|status}"
	rtrn=2
	;;
	esac

	exit $rtrn
	diff --git a/init/corosync-qnetd.service.in b/init/corosync-qnetd.service.in
	index c6cf8c99..cae98feb 100644
	--- a/init/corosync-qnetd.service.in
	+++ b/init/corosync-qnetd.service.in
	@@ -1,17 +1,17 @@
	[Unit]
	Description=Corosync Qdevice Network daemon
	Documentation=man:corosync-qnetd
	ConditionKernelCommandLine=!nocluster
	Requires=network-online.target
	After=network-online.target

	[Service]
	-EnvironmentFile=@SYSCONFDIR@/sysconfig/corosync-qnetd
	+EnvironmentFile=-@INITCONFIGDIR@/corosync-qnetd
	ExecStart=@BINDIR@/corosync-qnetd -f $COROSYNC_QNETD_OPTIONS
	Type=simple
	Restart=on-abnormal
	# Uncomment and set user who should be used for executing qnetd
	#User=coroqnetd

	[Install]
	WantedBy=multi-user.target
	diff --git a/init/corosync.conf.in b/init/corosync.conf.in
	index 373565a0..0352d2bb 100644
	--- a/init/corosync.conf.in
	+++ b/init/corosync.conf.in
	@@ -1,59 +1,54 @@
	# corosync - Corosync Cluster Engine
	#
	# Starts corosync

	expect fork

	env prog=corosync
	-env rpm_sysconf=@SYSCONFDIR@/sysconfig/corosync
	+env initconf=@INITCONFIGDIR@/corosync
	env rpm_lockfile=@LOCALSTATEDIR@/lock/subsys/corosync
	-env deb_sysconf=@SYSCONFDIR@/default/corosync
	env deb_lockfile=@LOCALSTATEDIR@/lock/corosync

	script
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	exec $prog $COROSYNC_OPTIONS
	end script

	pre-start script
	mkdir -p @LOCALSTATEDIR@/run
	# rewrite according to environment.
	#[ -c /dev/watchdog ] \|\| modprobe softdog
	end script

	post-start script
	wait_for_ipc()
	{
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	try=0
	max_try=$((COROSYNC_INIT_TIMEOUT*2-1))
	[ "$max_try" -le "0" ] && max_try=120

	while [ "$try" -le "$max_try" ]; do
	if corosync-cfgtool -s > /dev/null 2>&1; then
	return 0
	fi
	sleep 0.5
	try=$((try + 1))
	done
	logger -i -t "$UPSTART_JOB" "ERROR: Any interfaces are faulty!"
	return 1
	}
	wait_for_ipc \|\| { stop; exit 1; }

	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/sysconfig ] && LOCK_FILE="$rpm_lockfile"
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/default ] && LOCK_FILE="$deb_lockfile"
	touch $LOCK_FILE
	end script

	post-stop script
	- [ -f "$rpm_sysconf" ] && . $rpm_sysconf
	- [ -f "$deb_sysconf" ] && . $deb_sysconf
	+ [ -f "$initconf" ] && . $initconf
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/sysconfig ] && LOCK_FILE="$rpm_lockfile"
	[ -z "$LOCK_FILE" -a -d @SYSCONFDIR@/default ] && LOCK_FILE="$deb_lockfile"
	rm -f $LOCK_FILE
	end script
	diff --git a/init/corosync.in b/init/corosync.in
	index c93f9719..a258c363 100755
	--- a/init/corosync.in
	+++ b/init/corosync.in
	@@ -1,182 +1,182 @@
	#!@BASHPATH@

	# Authors:
	# Andrew Beekhof <abeekhof@redhat.com>
	# Fabio M. Di Nitto <fdinitto@redhat.com>
	#
	# License: Revised BSD

	# chkconfig: - 20 80
	# description: Corosync Cluster Engine
	# processname: corosync
	#
	### BEGIN INIT INFO
	# Provides: corosync
	# Required-Start: $network $syslog
	# Required-Stop: $network $syslog
	# Default-Start:
	# Default-Stop:
	# Short-Description: Starts and stops Corosync Cluster Engine.
	# Description: Starts and stops Corosync Cluster Engine.
	### END INIT INFO

	desc="Corosync Cluster Engine"
	prog="corosync"

	# set secure PATH
	PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"

	success()
	{
	echo -ne "[ OK ]\r"
	}

	failure()
	{
	echo -ne "[FAILED]\r"
	}

	status()
	{
	pid=$(pidof $1 2>/dev/null)
	res=$?
	if [ $res -ne 0 ]; then
	echo "$1 is stopped"
	else
	echo "$1 (pid $pid) is running..."
	fi
	return $res
	}

	+[ -f @INITCONFIGDIR@/$prog ] && . @INITCONFIGDIR@/$prog
	+
	# rpm based distros
	if [ -d @SYSCONFDIR@/sysconfig ]; then
	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
	- [ -f @SYSCONFDIR@/sysconfig/$prog ] && . @SYSCONFDIR@/sysconfig/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/subsys/$prog"
	fi

	# deb based distros
	if [ -d @SYSCONFDIR@/default ]; then
	- [ -f @SYSCONFDIR@/default/$prog ] && . @SYSCONFDIR@/default/$prog
	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
	fi

	# The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
	# This means it matches scripts, including this one.
	# Redefine it here so that status (from the same file) works.
	# Otherwise simultaneous calls to stop() will loop forever
	__pids_pidof() {
	pidof -c -o $$ -o $PPID -o %PPID "$1" \|\| \
	pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
	}

	cluster_disabled_at_boot()
	{
	if grep -q nocluster /proc/cmdline && \
	[ "$(tty)" = "/dev/console" ]; then
	echo -e "not configured to run at boot"
	failure
	return 1
	fi
	return 0
	}

	wait_for_ipc()
	{
	try=0
	max_try=$((COROSYNC_INIT_TIMEOUT*2-1))
	[ "$max_try" -le "0" ] && max_try=120

	while [ "$try" -le "$max_try" ]; do
	if corosync-cfgtool -s > /dev/null 2>&1; then
	return 0
	fi
	sleep 0.5
	try=$((try + 1))
	done

	return 1
	}

	start()
	{
	echo -n "Starting $desc ($prog): "

	! cluster_disabled_at_boot && return

	# most recent distributions use tmpfs for @LOCALSTATEDIR@/run
	# to avoid to clean it up on every boot.
	# they also assume that init scripts will create
	# required subdirectories for proper operations
	mkdir -p @LOCALSTATEDIR@/run

	if status $prog > /dev/null 2>&1; then
	success
	else
	$prog $COROSYNC_OPTIONS > /dev/null 2>&1

	if [ "$?" != 0 ] \|\| ! wait_for_ipc; then
	failure
	rtrn=1
	else
	touch $LOCK_FILE
	success
	fi
	fi
	echo
	}

	stop()
	{
	! status $prog > /dev/null 2>&1 && return

	echo -n "Signaling $desc ($prog) to terminate: "
	kill -TERM $(pidof $prog) > /dev/null 2>&1
	success
	echo

	echo -n "Waiting for $prog services to unload:"
	while status $prog > /dev/null 2>&1; do
	sleep 1
	echo -n "."
	done

	rm -f $LOCK_FILE
	success
	echo
	}

	restart()
	{
	stop
	start
	}

	rtrn=0

	case "$1" in
	start)
	start
	;;
	restart\|reload\|force-reload)
	restart
	;;
	condrestart\|try-restart)
	if status $prog > /dev/null 2>&1; then
	restart
	fi
	;;
	status)
	status $prog
	rtrn=$?
	;;
	stop)
	stop
	;;
	*)
	echo "usage: $0 {start\|stop\|restart\|reload\|force-reload\|condrestart\|try-restart\|status}"
	rtrn=2
	;;
	esac

	exit $rtrn

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 5:01 AM (9 h, 26 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018248
Default Alt Text: (48 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions