pacemaker-libs.patch

   1 --- pacemaker-Pacemaker-1.1.11/configure.ac.orig        2014-02-14 19:38:11.914625405 +0100
   2 +++ pacemaker-Pacemaker-1.1.11/configure.ac     2014-02-14 19:43:35.904611808 +0100
   3 @@ -614,17 +614,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 @@ -772,8 +776,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 @@ -838,7 +844,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 @@ -1000,7 +1007,8 @@
  56
  57  PKG_CHECK_MODULES(libqb, libqb, HAVE_libqb=1, HAVE_libqb=0)
  58  AC_CHECK_HEADERS(qb/qbipc_common.h)
  59 -AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
  60 +AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [LIBQB=-lqb])
  61 +AC_SUBST([LIBQB])
  62
  63  LIBQB_LOG=1
  64  PCMK_FEATURES="$PCMK_FEATURES libqb-logging libqb-ipc"
  65 @@ -1013,7 +1021,6 @@
  66     AC_MSG_FAILURE(Version of libqb is too old: v0.13 or greater requried)
  67  fi
  68
  69 -LIBS="$LIBS $libqb_LIBS"
  70
  71  AC_CHECK_HEADERS(heartbeat/hb_config.h)
  72  AC_CHECK_HEADERS(heartbeat/glue_config.h)
  73 @@ -1040,8 +1047,10 @@
  74  if test $HAVE_GLUE = 1; then
  75     dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols
  76     dnl So check for all the depenancies (so they're added to LIBS) before checking for -lplumb
  77 -   AC_CHECK_LIB(pils, PILLoadPlugin)
  78 -   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel)
  79 +   AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils])
  80 +   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb])
  81 +   AC_SUBST([LIBPILS])
  82 +   AC_SUBST([LIBPLUMB])
  83  fi
  84
  85  dnl ===============================================
  86 @@ -1545,7 +1554,7 @@
  87      AC_MSG_RESULT($SUPPORT_ACL)
  88
  89      SUPPORT_ACL=1
  90 -    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
  91 +    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:])
  92      if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
  93          SUPPORT_ACL=0
  94      fi
  95 @@ -1611,8 +1620,11 @@
  96         GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
  97         AC_MSG_RESULT($GNUTLSLIBS)
  98  fi
  99 -AC_CHECK_LIB(gnutls, gnutls_init)
 100 +AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])
 101 +oldLIBS="$LIBS"
 102 +LIBS="$LIBS $GNUTLSLIBS"
 103  AC_CHECK_FUNCS(gnutls_priority_set_direct)
 104 +LIBS="$oldLIBS"
 105
 106  AC_SUBST(GNUTLSHEAD)
 107  AC_SUBST(GNUTLSLIBS)
 108 --- pacemaker-Pacemaker-1.1.10/pengine/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
 109 +++ pacemaker-Pacemaker-1.1.10/pengine/Makefile.am      2013-09-08 15:19:23.022774335 +0200
 110 @@ -65,10 +65,10 @@
 111  libpengine_la_SOURCES  += native.c group.c clone.c master.c graph.c
 112
 113  libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
 114 -       $(top_builddir)/lib/cib/libcib.la
 115 +       $(top_builddir)/lib/cib/libcib.la $(LIBXML2)
 116
 117  pengine_SOURCES        = main.c
 118 -pengine_LDADD  = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
 119 +pengine_LDADD  = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(LIBQB)
 120  # libcib for get_object_root()
 121  #              $(top_builddir)/lib/hbclient/libhbclient.la
 122
 123 --- pacemaker-Pacemaker-1.1.11/lib/common/Makefile.am.orig      2014-02-14 19:44:12.731276928 +0100
 124 +++ pacemaker-Pacemaker-1.1.11/lib/common/Makefile.am   2014-02-14 19:53:20.877920591 +0100
 125 @@ -38,7 +38,7 @@
 126  endif
 127
 128  libcrmcommon_la_LDFLAGS        = -version-info 5:0:2
 129 -libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS)
 130 +libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(LIBQB) $(LIBBZ2) $(LIBUUID)
 131  libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 132
 133  clean-generic:
 134 --- pacemaker-Pacemaker-1.1.10/lib/cib/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
 135 +++ pacemaker-Pacemaker-1.1.10/lib/cib/Makefile.am      2013-09-08 15:20:01.962772701 +0200
 136 @@ -33,7 +33,7 @@
 137  endif
 138
 139  libcib_la_LDFLAGS      = -version-info 3:1:0 -L$(top_builddir)/lib/pengine/.libs
 140 -libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
 141 +libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS)
 142  libcib_la_CFLAGS       = -I$(top_srcdir)
 143
 144  clean-generic:
 145 --- pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am.orig     2013-07-26 02:02:31.000000000 +0200
 146 +++ pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am  2013-09-08 15:20:26.939438320 +0200
 147 @@ -32,7 +32,7 @@
 148
 149  libpe_status_la_LDFLAGS        = -version-info 6:0:2
 150  libpe_status_la_SOURCES        =  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
 151 -libpe_status_la_LIBADD =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
 152 +libpe_status_la_LIBADD =  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
 153
 154  clean-generic:
 155         rm -f *.log *.debug *~
 156 --- pacemaker-Pacemaker-1.1.10/lib/fencing/Makefile.am.orig     2013-07-26 02:02:31.000000000 +0200
 157 +++ pacemaker-Pacemaker-1.1.10/lib/fencing/Makefile.am  2013-09-08 17:10:35.692494309 +0200
 158 @@ -26,6 +26,6 @@
 159
 160  libstonithd_la_SOURCES = st_client.c
 161  libstonithd_la_LDFLAGS = -version-info 3:0:1
 162 -libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
 163 +libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
 164
 165  AM_CFLAGS = $(INCLUDES)
 166 --- pacemaker-Pacemaker-1.1.10/cib/Makefile.am.orig     2013-07-26 02:02:31.000000000 +0200
 167 +++ pacemaker-Pacemaker-1.1.10/cib/Makefile.am  2013-09-08 17:11:22.042492364 +0200
 168 @@ -48,7 +48,7 @@
 169                         callbacks.c main.c remote.c common.c
 170
 171  cib_LDADD              = $(top_builddir)/lib/cluster/libcrmcluster.la \
 172 -                         $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
 173 +                         $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
 174
 175  cibmon_SOURCES         = cibmon.c
 176  cibmon_LDADD           = $(COMMONLIBS)