- Every .c file should include "config.h" to get the right defines...

- services/Makefile.am: add include search paths for config.h

- include/corosync/cs_config.h.in exports LCRSODIR and SOCKETDIR

- tools/Makefile.am: drop -D defines for dirs that are now in
cs_config.h or config.h

- configure.ac: sanitize prefix and exec_prefix paths. Export DIRS in
*config.h

- lib/Makefile.am: : drop -D defines for dirs that are now in
cs_config.h or config.h. Add rule to build lcr_ifact.o or building from
lib/ fails miserably



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

configure.ac

@@ -109,6 +109,19 @@ cc_supports_flag() {
 	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 Heartbeat, map NONE->$prefix
+  NONE)   exec_prefix=$prefix;;
+  prefix) exec_prefix=$prefix;;
+esac
+
 ## local defines
 PKG_FEATURES=""
 
@@ -304,6 +317,11 @@ AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
 
 AC_SUBST([LINT_FLAGS])
 
+AC_DEFINE_UNQUOTED([LCRSODIR], "$(eval echo ${LCRSODIR})", [LCRSO directory])
+AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket directory])
+AC_DEFINE_UNQUOTED([LOCALSTATEDIR], "$(eval echo ${localstatedir})", [localstate directory])
+AC_DEFINE_UNQUOTED([SYSCONFDIR], "$(eval echo ${sysconfdir})", [sysconfig directory])
+
 AC_OUTPUT
 
 AC_MSG_RESULT([])

exec/Makefile.am

@@ -32,10 +32,6 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		= -fPIC
-AM_CPPFLAGS		= -DSYSCONFDIR=\"${sysconfdir}\" \
-			  -DLOCALSTATEDIR=\"${localstatedir}\" \
-			  -DLCRSODIR=\"${LCRSODIR}\" \
-			  -DSOCKETDIR=\"${SOCKETDIR}\"
 
 INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
 

exec/apidef.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>

exec/coroparse.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>

exec/coropoll.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <errno.h>
 #include <pthread.h>
 #include <sys/poll.h>

exec/crypto.c

@@ -8,6 +8,9 @@
  *
  * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.com
  */
+
+#include <config.h>
+
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>

exec/ipc.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
@@ -87,8 +90,6 @@
 #include <corosync/engine/coroapi.h>
 #include "service.h"
 
-#include "config.h"
-
 LOGSYS_DECLARE_SUBSYS ("IPC", LOG_INFO);
 
 #include "util.h"

exec/logsys.c

@@ -33,6 +33,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>

exec/main.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <pthread.h>
 #include <assert.h>
 #include <sys/types.h>

exec/mainconfig.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

exec/mempool.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

exec/objdb.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <errno.h>
 

exec/quorum.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>

exec/service.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>

exec/sync.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>

exec/timer.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <pthread.h>
 #include <assert.h>
 #include <pwd.h>

exec/totemconfig.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

exec/totemip.c

@@ -35,6 +35,7 @@
 /* IPv4/6 abstraction */
 
 #include <config.h>
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>

exec/totemmrp.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <assert.h>
 #include <sys/mman.h>
 #include <sys/types.h>

exec/totemnet.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <pthread.h>
 #include <sys/mman.h>

exec/totempg.c

@@ -82,6 +82,8 @@
  *	
  */
 
+#include <config.h>
+
 #include <netinet/in.h>
 #include <sys/uio.h>
 #include <stdio.h>

exec/totemrrp.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <pthread.h>
 #include <sys/mman.h>

exec/totemsrp.c

@@ -47,6 +47,8 @@
  *   usage on 1.6ghz xeon from 35% to less then .1 % as measured by top
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <sys/mman.h>
 #include <sys/types.h>

exec/util.c

@@ -33,6 +33,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

exec/vsf_quorum.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <pwd.h>
 #include <grp.h>

exec/vsf_ykd.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <pwd.h>
 #include <grp.h>

exec/wthread.c

@@ -37,6 +37,9 @@
  * Add work to a work group and have threads process the work
  * Provide blocking for all work to complete 
  */
+
+#include <config.h>
+
 #include <stdlib.h>
 #include <pthread.h>
 #include <errno.h>

include/corosync/cs_config.h.in

@@ -0,0 +1,5 @@
+/* Location of lcrso plugins */
+#undef LCRSODIR
+
+/* Location of sockets */
+#undef SOCKETDIR

lcr/Makefile.am

@@ -31,8 +31,6 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
-AM_CPPFLAGS		= -DLCRSODIR=\"${LCRSODIR}\" -DLOCALSTATEDIR=\"${localstatedir}\" \
-			  -DSOCKETDIR=\"${SOCKETDIR}\"
 
 INCLUDES 		= -I$(top_builddir)/include -I$(top_srcdir)/include
 

lcr/lcr_ifact.c

@@ -28,6 +28,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <dlfcn.h>
 #include <dirent.h>
@@ -43,7 +45,6 @@
 #include <corosync/lcr/lcr_ifact.h>
 #include <corosync/hdb.h>
 #include <stdlib.h>
-#include "config.h"
 
 struct lcr_component_instance {
 	struct lcr_iface *ifaces;

lcr/libtest_a.c

@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <corosync/lcr/lcr_comp.h>
 

lcr/libtest_b.c

@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <corosync/lcr/lcr_comp.h>
 

lcr/test.c

@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include <corosync/hdb.h>

lcr/uic.c

@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/uio.h>
 #include <sys/mman.h>
 #include <sys/types.h>

lcr/uis.c

@@ -27,6 +27,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/uio.h>
 #include <sys/mman.h>
 #include <sys/types.h>

lib/Makefile.am

@@ -33,8 +33,6 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
-AM_CPPFLAGS		= -DLOCALSTATEDIR=\"${localstatedir}\" \
-			  -DSOCKETDIR=\"${SOCKETDIR}\"
 
 INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
@@ -59,6 +57,9 @@ noinst_HEADERS		= sa-confdb.h util.h \
 			  libevs.versions libpload.versions \
 			  libquorum.versions libvotequorum.versions
 
+../lcr/lcr_ifact.o:
+	$(MAKE) -C ../lcr lcr_ifact.o
+
 if BUILD_DARWIN
 
 libcoroipc.so.$(SONAME): coroipc.o

lib/cfg.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

lib/confdb.c

@@ -35,6 +35,8 @@
  * Provides access to data in the corosync object database
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/coroipc.c

@@ -35,6 +35,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -59,8 +61,6 @@
 #include <corosync/ipc_gen.h>
 #include <corosync/coroipc.h>
 
-#include "config.h"
-
 enum SA_HANDLE_STATE {
 	SA_HANDLE_STATE_EMPTY,
 	SA_HANDLE_STATE_PENDINGREMOVAL,

lib/cpg.c

@@ -37,6 +37,8 @@
  * Provides a closed process group API using the cslib executive
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/evs.c

@@ -38,6 +38,8 @@
  * Provides an extended virtual synchrony API using the cslib executive
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/pload.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/quorum.c

@@ -35,6 +35,8 @@
  * Provides a quorum API using the corosync executive
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/sa-confdb.c

@@ -36,6 +36,8 @@
  * when aisexec is not running.
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/votequorum.c

@@ -36,6 +36,8 @@
  * Provides a quorum API using the corosync executive
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

services/Makefile.am

@@ -33,7 +33,9 @@ MAINTAINERCLEANFILES    = Makefile.in
 
 AM_CFLAGS		= -fPIC
 
-INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include \
+			  -I$(top_builddir)/include/corosync \
+			  -I$(top_srcdir)/include/corosync
 
 LCRSO			= service_evs.lcrso service_cfg.lcrso \
 			  service_cpg.lcrso service_confdb.lcrso \

services/cfg.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>

services/confdb.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>

services/cpg.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #ifndef COROSYNC_BSD
 #include <alloca.h>
 #endif

services/evs.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>

services/pload.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>

services/testquorum.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <assert.h>
 #include <pwd.h>
 #include <grp.h>

services/votequorum.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #ifndef COROSYNC_BSD
 #include <alloca.h>

test/cpgbench.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

test/evsbench.c

@@ -33,6 +33,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>

test/evsverify.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>

test/logsys_s.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <syslog.h>
 #include "../exec/logsys.h"

test/logsys_s1.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <syslog.h>
 #include "../exec/logsys.h"

test/logsys_s2.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <syslog.h>
 #include "../exec/logsys.h"

test/logsys_t1.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <syslog.h>
 #include "../exec/logsys.h"

test/logsys_t2.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdint.h>
 #include "../exec/logsys.h"

test/logsysbench.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>

test/logsysrec.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdint.h>
 #include <corosync/engine/logsys.h>

test/sa_error.c

@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

test/testconfdb.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

test/testcpg.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

test/testcpg2.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <poll.h>

test/testevs.c

@@ -32,6 +32,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>

test/testevsth.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>

test/testparse.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "../include/saAis.h"

test/testquorum.c

@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>

test/testtimer.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/time.h>

test/testvotequorum1.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>

test/testvotequorum2.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdint.h>

tools/Makefile.am

@@ -32,8 +32,6 @@
 MAINTAINERCLEANFILES    = Makefile.in
 INCLUDES       		= -I$(top_builddir)/include  -I$(top_srcdir)/include
 
-AM_CPPFLAGS		= -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\"
-
 sbin_PROGRAMS		= corosync-fplay corosync-cfgtool \
 			  corosync-keygen corosync-objctl \
 			  corosync-pload

tools/corosync-cfgtool.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

tools/corosync-fplay.c

@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

tools/corosync-keygen.c

@@ -31,6 +31,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

tools/corosync-objctl.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <sys/select.h>
 #include <stdio.h>
 #include <stdlib.h>

tools/corosync-pload.c

@@ -32,6 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>