1 diff -ru heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am heartbeat-3.0.2-rc2/lib/apphb/Makefile.am
2 --- heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am 2009-12-19 19:46:52.000000000 +0100
3 +++ heartbeat-3.0.2-rc2/lib/apphb/Makefile.am 2011-04-27 16:03:17.553343763 +0200
5 libapphb_la_CFLAGS = -lpthread
8 -libapphb_la_LDFLAGS = -version-info 2:0:0
9 +libapphb_la_LDFLAGS = -version-info 2:0:0 -lglib-2.0 -lplumb
10 diff -ru heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am
11 --- heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am 2011-04-27 15:59:06.973343764 +0200
12 +++ heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am 2011-04-27 16:03:17.553343763 +0200
14 lib_LTLIBRARIES = libhbclient.la
16 libhbclient_la_SOURCES = client_lib.c
17 -libhbclient_la_LDFLAGS = -version-info 1:0:0
18 -libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la
19 +libhbclient_la_LDFLAGS = -version-info 1:0:0 -lplumb
20 +libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la $(gliblib)
23 halib_PROGRAMS = api_test
24 diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2/membership/ccm/Makefile.am
25 --- heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am 2009-12-19 19:46:52.000000000 +0100
26 +++ heartbeat-3.0.2-rc2/membership/ccm/Makefile.am 2011-04-27 16:07:02.910011000 +0200
30 libccmclient_la_SOURCES = ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
31 -libccmclient_la_LDFLAGS = -version-info 1:0:0
32 +libccmclient_la_LDFLAGS = -version-info 1:0:0 $(gliblib) -lplumb
38 ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
39 libclm_la_CFLAGS = -g #-DPOSIX_THREADS
40 -libclm_la_LDFLAGS = -version-info 1:0:0
41 +libclm_la_LDFLAGS = -version-info 1:0:0 \
44 +libclm_la_LIBADD = libccmclient.la
46 clmtest_SOURCES = clmtest.c
47 clmtest_LDADD = libclm.la libccmclient.la \
48 --- Heartbeat-3-0-STABLE-3.0.5/configure.in.orig 2013-09-06 19:02:36.552797324 +0200
49 +++ Heartbeat-3-0-STABLE-3.0.5/configure.in 2013-09-06 21:47:09.149049676 +0200
52 AC_SUBST(DLOPEN_FORCE_FLAGS)
55 dnl ************ uuid **********************
57 [ --with-uuid=UUID mechanism for uuid {e2fsprogs|ossp|any|no}
62 - AC_CHECK_LIB(uuid, uuid_parse,,
63 + AC_CHECK_LIB(uuid, uuid_parse,[LIBUUID=-luuid],
64 AC_MSG_ERROR([e2fsprogs uuid library was explicitly requested but not found])
68 - AC_CHECK_LIB(uuid, uuid_create,,
69 + AC_CHECK_LIB(uuid, uuid_create,[LIBUUID=-luuid],
70 AC_MSG_ERROR([ossp uuid library was explicitly requested but not found])
73 no) # Do not define anything; so use inbuilt (replace) implementation.
75 any) # Default: try to discover an implementation that we can use.
76 - AC_CHECK_LIB(uuid, uuid_parse) dnl e2fsprogs
77 + AC_CHECK_LIB(uuid, uuid_parse,[LIBUUID=-luuid]) dnl e2fsprogs
78 dnl AC_CHECK_LIB(uuid, uuid_create) dnl ossp
81 AC_MSG_ERROR([An invalid uuid library was explicitly requested])
89 dnl getopt: If this is valid, define HAVE_DECL_GETOPT to make the getopt.h header compile cleanly.
92 -AC_REPLACE_FUNCS(alphasort inet_pton NoSuchFunctionName scandir setenv strerror unsetenv strnlen strndup daemon uuid_parse strlcpy strlcat)
93 +AC_REPLACE_FUNCS(alphasort inet_pton NoSuchFunctionName scandir setenv strerror unsetenv strnlen strndup daemon strlcpy strlcat)
94 dnl AC_CHECK_FUNCS(alphasort inet_pton NoSuchFunctionName scandir setenv strerror unsetenv strnlen strndup daemon uuid_parse)
96 AC_CHECK_FUNCS(getopt,
98 dnl check if header file and lib are there for zlib
100 AC_CHECK_HEADERS(zlib.h, , [zlib_installed="no"],)
101 -AC_CHECK_LIB(z, compress , , [zlib_installed="no"])
102 +AC_CHECK_LIB(z, compress , [LIBZ=-lz] , [zlib_installed="no"])
103 AM_CONDITIONAL(BUILD_ZLIB_COMPRESS_MODULE, test "x${zlib_installed}" = "xyes")
104 if test "x${zlib_installed}" = "xno"; then
105 FatalMissingThing "zlib" \
106 @@ -1962,13 +1964,13 @@
107 dnl check if header file and lib are there for zlib
109 AC_CHECK_HEADERS(bzlib.h, , [bz2_installed="no"],)
110 -AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , , [bz2_installed="no"])
111 +AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , [LIBBZ2=-lbz2], [bz2_installed="no"])
112 AM_CONDITIONAL(BUILD_BZ2_COMPRESS_MODULE, test "x${bz2_installed}" = "xyes")
114 dnl check if header file and lib are there for openais module
115 openais_installed="yes"
116 AC_CHECK_HEADERS(evs.h, , [openais_installed="no"],)
117 -AC_CHECK_LIB(evs, evs_initialize , , [openais_installed="no"])
118 +AC_CHECK_LIB(evs, evs_initialize , [LIBEVS=-levs] , [openais_installed="no"])
119 AM_CONDITIONAL(BUILD_OPENAIS_MODULE, test "x${openais_installed}" = "xyes")
121 dnl check if there are getpid() inconsistency
122 @@ -2086,7 +2086,7 @@
123 GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
124 AC_MSG_RESULT($GNUTLSLIBS)
126 - AC_CHECK_LIB(gnutls, gnutls_init)
127 + AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])