pacemaker-libs.patch

   1 --- pacemaker-Pacemaker-1.1.15/configure.ac.orig        2016-10-16 18:23:45.477084475 +0200
   2 +++ pacemaker-Pacemaker-1.1.15/configure.ac     2016-10-16 18:28:32.400414530 +0200
   3 @@ -655,17 +655,21 @@
   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)
  15 +AC_SEARCH_LIBS(sched_getscheduler, [rt])       dnl -lrt (for Tru64)
  16 +AC_SEARCH_LIBS(getopt_long, [gnugetopt])       dnl -lgnugetopt ( if available )
  17 +AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam])   dnl -lpam (if available)
  18 +AC_SUBST([LIBPAM])
  19
  20  AC_CHECK_FUNCS([sched_setscheduler])
  21
  22 -AC_CHECK_LIB(uuid, uuid_parse)                 dnl load the library if necessary
  23 +AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid])       dnl load the library if necessary
  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
  32 @@ -813,8 +817,10 @@
  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"
  45 @@ -882,7 +888,8 @@
  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)
  55 @@ -1052,7 +1059,6 @@
  56
  57  PKG_CHECK_MODULES(libqb, libqb >= 0.13, HAVE_libqb=1)
  58  CPPFLAGS="$libqb_CFLAGS $CPPFLAGS"
  59 -LIBS="$libqb_LIBS $LIBS"
  60  AC_CHECK_HEADERS(qb/qbipc_common.h)
  61  AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
  62
  63 @@ -1086,8 +1092,10 @@
  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 dependencies (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 ===============================================
  76 @@ -1599,7 +1607,7 @@
  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
  85 @@ -1665,8 +1673,11 @@
  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)
 109 +pengine_LDADD  = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS)
 110  # libcib for get_object_root()
 111  #              $(top_builddir)/lib/hbclient/libhbclient.la
 112
 113 --- pacemaker-Pacemaker-1.1.15/lib/common/Makefile.am.orig      2016-10-16 18:29:06.350414143 +0200
 114 +++ pacemaker-Pacemaker-1.1.15/lib/common/Makefile.am   2016-10-16 18:32:31.890411797 +0200
 115 @@ -41,7 +41,7 @@
 116  endif
 117
 118  libcrmcommon_la_LDFLAGS        = -version-info 9:0:6
 119 -libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
 120 +libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
 121  libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 122
 123  clean-generic:
 124 --- pacemaker-Pacemaker-1.1.15/lib/cib/Makefile.am.orig 2016-04-09 22:03:33.010625713 +0200
 125 +++ pacemaker-Pacemaker-1.1.15/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
 128
 129  libcib_la_LDFLAGS      = -version-info 5:1:1 -L$(top_builddir)/lib/pengine/.libs
 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.15/lib/pengine/Makefile.am.orig     2016-10-16 18:34:09.067077354 +0200
 136 +++ pacemaker-Pacemaker-1.1.15/lib/pengine/Makefile.am  2016-10-16 18:35:12.180409966 +0200
 137 @@ -33,7 +33,7 @@
 138  libpe_status_la_LDFLAGS        = -version-info 11:0:1
 139  libpe_status_la_SOURCES        =  status.c unpack.c utils.c complex.c native.c \
 140                            group.c clone.c rules.c common.c remote.c
 141 -libpe_status_la_LIBADD =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
 142 +libpe_status_la_LIBADD =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
 143
 144  clean-generic:
 145         rm -f *.log *.debug *~
 146 --- pacemaker-Pacemaker-1.1.15/lib/fencing/Makefile.am.orig     2016-04-09 22:03:33.013959047 +0200
 147 +++ pacemaker-Pacemaker-1.1.15/lib/fencing/Makefile.am  2016-04-09 22:04:30.660623301 +0200
 148 @@ -26,6 +26,6 @@
 149
 150  libstonithd_la_SOURCES = st_client.c
 151  libstonithd_la_LDFLAGS = -version-info 4:1:2
 152 -libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
 153 +libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
 154
 155  AM_CFLAGS = $(AM_CPPFLAGS)
 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)