[packages/pacemaker.git] / pacemaker-libs.patch

--- pacemaker-Pacemaker-1.1.14/configure.ac.orig	2016-04-09 21:49:56.760659968 +0200
+++ pacemaker-Pacemaker-1.1.14/configure.ac	2016-04-09 22:00:07.427301010 +0200
@@ -619,17 +619,21 @@
 dnl ===============================================
 dnl Libraries
 dnl ===============================================
-AC_CHECK_LIB(socket, socket)			dnl -lsocket
-AC_CHECK_LIB(c, dlopen)				dnl if dlopen is in libc...
-AC_CHECK_LIB(dl, dlopen)			dnl -ldl (for Linux)
-AC_CHECK_LIB(rt, sched_getscheduler)            dnl -lrt (for Tru64)
-AC_CHECK_LIB(gnugetopt, getopt_long)		dnl -lgnugetopt ( if available )
-AC_CHECK_LIB(pam, pam_start)			dnl -lpam (if available)
+AC_SEARCH_LIBS(socket, socket)			dnl -lsocket
+AC_SEARCH_LIBS(dlopen, [dl])			dnl if dlopen is in libc... or -ldl (for Linux)
+AC_SEARCH_LIBS(sched_getscheduler, [rt])	dnl -lrt (for Tru64)
+AC_SEARCH_LIBS(getopt_long, [gnugetopt])	dnl -lgnugetopt ( if available )
+AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam])	dnl -lpam (if available)
+AC_SUBST([LIBPAM])
 
 AC_CHECK_FUNCS([sched_setscheduler])
 
-AC_CHECK_LIB(uuid, uuid_parse)			dnl load the library if necessary
+AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid])	dnl load the library if necessary
+AC_SUBST([LIBUUID])
+oldLIBS="$LIBS"
+LIBS="$LIBS $LIBUUID"
 AC_CHECK_FUNCS(uuid_unparse)			dnl OSX ships uuid_* as standard functions
+LIBS="$oldLIBS"
 
 AC_CHECK_HEADERS(uuid/uuid.h)
 
@@ -777,8 +781,10 @@
 else
    XML2HEAD="`$XML2CONFIG --cflags`"
    AC_MSG_RESULT($XML2HEAD)
-   AC_CHECK_LIB(xml2, xmlReadMemory)
-   AC_CHECK_LIB(xslt, xsltApplyStylesheet)
+   AC_CHECK_LIB(xml2, xmlReadMemory, [LIBXML2=-lxml2])
+   AC_CHECK_LIB(xslt, xsltApplyStylesheet, [LIBXSLT=-lxslt])
+   AC_SUBST([LIBXML2])
+   AC_SUBST([LIBXSLT])
 fi
 
 CPPFLAGS="$CPPFLAGS $XML2HEAD"
@@ -846,7 +852,8 @@
 dnl   bzip2
 dnl ========================================================================
 AC_CHECK_HEADERS(bzlib.h)
-AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress)
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [LIBBZ2=-lbz2])
+AC_SUBST([LIBBZ2])
 
 if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
    AC_MSG_ERROR(BZ2 libraries not found)
@@ -1023,7 +1030,6 @@
 
 AC_CHECK_FUNCS(qb_ipcs_connection_get_buffer_size, AC_DEFINE(HAVE_IPCS_GET_BUFFER_SIZE,  1, [Have qb_ipcc_get_buffer_size function]))
 
-LIBS="$LIBS $libqb_LIBS"
 
 AC_CHECK_HEADERS(heartbeat/hb_config.h)
 AC_CHECK_HEADERS(heartbeat/glue_config.h)
@@ -1050,8 +1056,10 @@
 if test $HAVE_GLUE = 1; then
    dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols
    dnl So check for all the depenancies (so they're added to LIBS) before checking for -lplumb
-   AC_CHECK_LIB(pils, PILLoadPlugin)
-   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel)
+   AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils])
+   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb])
+   AC_SUBST([LIBPILS])
+   AC_SUBST([LIBPLUMB])
 fi
 
 dnl ===============================================
@@ -1563,7 +1571,7 @@
     AC_MSG_RESULT($SUPPORT_ACL)
 
     SUPPORT_ACL=1
-    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
+    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:])
     if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
         SUPPORT_ACL=0
     fi
@@ -1629,8 +1637,11 @@
 	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
 	AC_MSG_RESULT($GNUTLSLIBS)
 fi
-AC_CHECK_LIB(gnutls, gnutls_init)
+AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])
+oldLIBS="$LIBS"
+LIBS="$LIBS $GNUTLSLIBS"
 AC_CHECK_FUNCS(gnutls_priority_set_direct)
+LIBS="$oldLIBS"
 
 AC_SUBST(GNUTLSHEAD)
 AC_SUBST(GNUTLSLIBS)
--- pacemaker-Pacemaker-1.1.10/pengine/Makefile.am.orig	2013-07-26 02:02:31.000000000 +0200
+++ pacemaker-Pacemaker-1.1.10/pengine/Makefile.am	2013-09-08 15:19:23.022774335 +0200
@@ -65,10 +65,10 @@
 libpengine_la_SOURCES  += native.c group.c clone.c master.c graph.c
 
 libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
-	$(top_builddir)/lib/cib/libcib.la
+	$(top_builddir)/lib/cib/libcib.la $(LIBXML2)
 
 pengine_SOURCES	= main.c
-pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
+pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS)
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 
--- pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am.orig	2016-04-09 22:00:51.310632499 +0200
+++ pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am	2016-04-09 22:03:00.857293731 +0200
@@ -41,7 +41,7 @@
 endif
 
 libcrmcommon_la_LDFLAGS	= -version-info 8:0:5
-libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
+libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
 libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 
 clean-generic:
--- pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am.orig	2016-04-09 22:03:33.010625713 +0200
+++ pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am	2016-04-09 22:04:03.627291096 +0200
@@ -29,7 +29,7 @@
 libcib_la_SOURCES      += cib_file.c cib_remote.c
 
 libcib_la_LDFLAGS	= -version-info 5:0:1 -L$(top_builddir)/lib/pengine/.libs
-libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
+libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS)
 libcib_la_CFLAGS	= -I$(top_srcdir)
 
 clean-generic:
--- pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am.orig	2013-07-26 02:02:31.000000000 +0200
+++ pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am	2013-09-08 15:20:26.939438320 +0200
@@ -32,7 +32,7 @@
 
 libpe_status_la_LDFLAGS	= -version-info 8:0:4
 libpe_status_la_SOURCES	=  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
-libpe_status_la_LIBADD	=  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
+libpe_status_la_LIBADD	=  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
 
 clean-generic:
 	rm -f *.log *.debug *~
--- pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am.orig	2016-04-09 22:03:33.013959047 +0200
+++ pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am	2016-04-09 22:04:30.660623301 +0200
@@ -26,6 +26,6 @@
 
 libstonithd_la_SOURCES = st_client.c
 libstonithd_la_LDFLAGS = -version-info 4:0:2
-libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
 
 AM_CFLAGS = $(AM_CPPFLAGS)
--- pacemaker-Pacemaker-1.1.10/cib/Makefile.am.orig	2013-07-26 02:02:31.000000000 +0200
+++ pacemaker-Pacemaker-1.1.10/cib/Makefile.am	2013-09-08 17:11:22.042492364 +0200
@@ -48,7 +48,7 @@
 			callbacks.c main.c remote.c common.c
 
 cib_LDADD		= $(top_builddir)/lib/cluster/libcrmcluster.la \
-			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
+			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
 
 cibmon_SOURCES		= cibmon.c
 cibmon_LDADD		= $(COMMONLIBS)
Commit	Line	Data
73114340 JB	1	--- pacemaker-Pacemaker-1.1.14/configure.ac.orig 2016-04-09 21:49:56.760659968 +0200
	2	+++ pacemaker-Pacemaker-1.1.14/configure.ac 2016-04-09 22:00:07.427301010 +0200
	3	@@ -619,17 +619,21 @@
650f9adf JB	4	dnl ===============================================
	5	dnl Libraries
	6	dnl ===============================================
	7	-AC_CHECK_LIB(socket, socket) dnl -lsocket
	8	-AC_CHECK_LIB(c, dlopen) dnl if dlopen is in libc...
	9	-AC_CHECK_LIB(dl, dlopen) dnl -ldl (for Linux)
	10	-AC_CHECK_LIB(rt, sched_getscheduler) dnl -lrt (for Tru64)
	11	-AC_CHECK_LIB(gnugetopt, getopt_long) dnl -lgnugetopt ( if available )
	12	-AC_CHECK_LIB(pam, pam_start) dnl -lpam (if available)
	13	+AC_SEARCH_LIBS(socket, socket) dnl -lsocket
	14	+AC_SEARCH_LIBS(dlopen, [dl]) dnl if dlopen is in libc... or -ldl (for Linux)
68084dab JB	15	+AC_SEARCH_LIBS(sched_getscheduler, [rt]) dnl -lrt (for Tru64)
68084dab JB	16	+AC_SEARCH_LIBS(getopt_long, [gnugetopt]) dnl -lgnugetopt ( if available )
650f9adf JB	17	+AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam]) dnl -lpam (if available)
	18	+AC_SUBST([LIBPAM])
	19
68084dab	20	AC_CHECK_FUNCS([sched_setscheduler])
650f9adf JB	21
650f9adf JB	22	-AC_CHECK_LIB(uuid, uuid_parse) dnl load the library if necessary
68084dab	23	+AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid]) dnl load the library if necessary
650f9adf JB	24	+AC_SUBST([LIBUUID])
	25	+oldLIBS="$LIBS"
	26	+LIBS="$LIBS $LIBUUID"
	27	AC_CHECK_FUNCS(uuid_unparse) dnl OSX ships uuid_* as standard functions
	28	+LIBS="$oldLIBS"
	29
	30	AC_CHECK_HEADERS(uuid/uuid.h)
	31
73114340	32	@@ -777,8 +781,10 @@
650f9adf JB	33	else
	34	XML2HEAD="`$XML2CONFIG --cflags`"
	35	AC_MSG_RESULT($XML2HEAD)
	36	- AC_CHECK_LIB(xml2, xmlReadMemory)
	37	- AC_CHECK_LIB(xslt, xsltApplyStylesheet)
	38	+ AC_CHECK_LIB(xml2, xmlReadMemory, [LIBXML2=-lxml2])
	39	+ AC_CHECK_LIB(xslt, xsltApplyStylesheet, [LIBXSLT=-lxslt])
	40	+ AC_SUBST([LIBXML2])
	41	+ AC_SUBST([LIBXSLT])
	42	fi
	43
	44	CPPFLAGS="$CPPFLAGS $XML2HEAD"
73114340	45	@@ -846,7 +852,8 @@
650f9adf JB	46	dnl bzip2
	47	dnl ========================================================================
	48	AC_CHECK_HEADERS(bzlib.h)
	49	-AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress)
	50	+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [LIBBZ2=-lbz2])
	51	+AC_SUBST([LIBBZ2])
	52
	53	if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
	54	AC_MSG_ERROR(BZ2 libraries not found)
73114340 JB	55	@@ -1023,7 +1030,6 @@
	56
	57	AC_CHECK_FUNCS(qb_ipcs_connection_get_buffer_size, AC_DEFINE(HAVE_IPCS_GET_BUFFER_SIZE, 1, [Have qb_ipcc_get_buffer_size function]))
650f9adf JB	58
	59	-LIBS="$LIBS $libqb_LIBS"
	60
	61	AC_CHECK_HEADERS(heartbeat/hb_config.h)
	62	AC_CHECK_HEADERS(heartbeat/glue_config.h)
73114340	63	@@ -1050,8 +1056,10 @@
650f9adf JB	64	if test $HAVE_GLUE = 1; then
	65	dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols
	66	dnl So check for all the depenancies (so they're added to LIBS) before checking for -lplumb
	67	- AC_CHECK_LIB(pils, PILLoadPlugin)
	68	- AC_CHECK_LIB(plumb, G_main_add_IPC_Channel)
	69	+ AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils])
	70	+ AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb])
	71	+ AC_SUBST([LIBPILS])
	72	+ AC_SUBST([LIBPLUMB])
	73	fi
	74
	75	dnl ===============================================
73114340	76	@@ -1563,7 +1571,7 @@
650f9adf JB	77	AC_MSG_RESULT($SUPPORT_ACL)
	78
	79	SUPPORT_ACL=1
	80	- AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
	81	+ AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:])
	82	if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
	83	SUPPORT_ACL=0
	84	fi
73114340	85	@@ -1629,8 +1637,11 @@
650f9adf JB	86	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
	87	AC_MSG_RESULT($GNUTLSLIBS)
	88	fi
	89	-AC_CHECK_LIB(gnutls, gnutls_init)
	90	+AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])
	91	+oldLIBS="$LIBS"
	92	+LIBS="$LIBS $GNUTLSLIBS"
	93	AC_CHECK_FUNCS(gnutls_priority_set_direct)
	94	+LIBS="$oldLIBS"
	95
	96	AC_SUBST(GNUTLSHEAD)
	97	AC_SUBST(GNUTLSLIBS)
	98	--- pacemaker-Pacemaker-1.1.10/pengine/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
	99	+++ pacemaker-Pacemaker-1.1.10/pengine/Makefile.am 2013-09-08 15:19:23.022774335 +0200
	100	@@ -65,10 +65,10 @@
	101	libpengine_la_SOURCES += native.c group.c clone.c master.c graph.c
	102
	103	libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \
	104	- $(top_builddir)/lib/cib/libcib.la
	105	+ $(top_builddir)/lib/cib/libcib.la $(LIBXML2)
	106
	107	pengine_SOURCES = main.c
	108	-pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
73114340	109	+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS)
650f9adf JB	110	# libcib for get_object_root()
	111	# $(top_builddir)/lib/hbclient/libhbclient.la
	112
73114340 JB	113	--- pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am.orig 2016-04-09 22:00:51.310632499 +0200
	114	+++ pacemaker-Pacemaker-1.1.14/lib/common/Makefile.am 2016-04-09 22:03:00.857293731 +0200
	115	@@ -41,7 +41,7 @@
650f9adf JB	116	endif
650f9adf JB	117
73114340 JB	118	libcrmcommon_la_LDFLAGS = -version-info 8:0:5
	119	-libcrmcommon_la_LIBADD = @LIBADD_DL@ $(GNUTLSLIBS) -lm
	120	+libcrmcommon_la_LIBADD = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
650f9adf JB	121	libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
	122
	123	clean-generic:
73114340 JB	124	--- pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am.orig 2016-04-09 22:03:33.010625713 +0200
	125	+++ pacemaker-Pacemaker-1.1.14/lib/cib/Makefile.am 2016-04-09 22:04:03.627291096 +0200
	126	@@ -29,7 +29,7 @@
	127	libcib_la_SOURCES += cib_file.c cib_remote.c
650f9adf	128
73114340	129	libcib_la_LDFLAGS = -version-info 5:0:1 -L$(top_builddir)/lib/pengine/.libs
650f9adf JB	130	-libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
	131	+libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS)
	132	libcib_la_CFLAGS = -I$(top_srcdir)
	133
	134	clean-generic:
	135	--- pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
	136	+++ pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am 2013-09-08 15:20:26.939438320 +0200
	137	@@ -32,7 +32,7 @@
	138
46cb3c8b	139	libpe_status_la_LDFLAGS = -version-info 8:0:4
ed3071d2	140	libpe_status_la_SOURCES = status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
650f9adf JB	141	-libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
650f9adf JB	142	+libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
07ce3f2c MM	143
	144	clean-generic:
	145	rm -f .log .debug *~
73114340 JB	146	--- pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am.orig 2016-04-09 22:03:33.013959047 +0200
73114340 JB	147	+++ pacemaker-Pacemaker-1.1.14/lib/fencing/Makefile.am 2016-04-09 22:04:30.660623301 +0200
650f9adf	148	@@ -26,6 +26,6 @@
07ce3f2c	149
650f9adf	150	libstonithd_la_SOURCES = st_client.c
73114340	151	libstonithd_la_LDFLAGS = -version-info 4:0:2
650f9adf JB	152	-libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
	153	+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
	154
73114340	155	AM_CFLAGS = $(AM_CPPFLAGS)
650f9adf JB	156	--- pacemaker-Pacemaker-1.1.10/cib/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
	157	+++ pacemaker-Pacemaker-1.1.10/cib/Makefile.am 2013-09-08 17:11:22.042492364 +0200
	158	@@ -48,7 +48,7 @@
	159	callbacks.c main.c remote.c common.c
	160
	161	cib_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la \
	162	- $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
	163	+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
	164
	165	cibmon_SOURCES = cibmon.c
	166	cibmon_LDADD = $(COMMONLIBS)