cluster-glue-link.patch

   1 --- Reusable-Cluster-Components-glue--glue-1.0.11/lib/plugins/stonith/Makefile.am.orig  2012-10-15 15:58:55.000000000 +0200
   2 +++ Reusable-Cluster-Components-glue--glue-1.0.11/lib/plugins/stonith/Makefile.am       2013-09-06 15:41:19.579970814 +0200
   3 @@ -156,7 +156,7 @@
   4
   5  rhcs_la_SOURCES        = rhcs.c        $(INCFILES)
   6  rhcs_la_LDFLAGS        = -export-dynamic -module -avoid-version
   7 -rhcs_la_LIBADD = $(top_builddir)/lib/stonith/libstonith.la $(top_builddir)/replace/libreplace.la
   8 +rhcs_la_LIBADD = $(top_builddir)/lib/stonith/libstonith.la $(top_builddir)/replace/libreplace.la $(LIBXML2)
   9
  10  ibmhmc_la_SOURCES      = ibmhmc.c      $(INCFILES)
  11  ibmhmc_la_LDFLAGS      = -export-dynamic -module -avoid-version
  12 @@ -196,7 +196,7 @@
  13
  14  vacm_la_SOURCES                = vacm.c $(INCFILES)
  15  vacm_la_LDFLAGS                = -export-dynamic -module -avoid-version
  16 -vacm_la_LIBADD         = $(top_builddir)/lib/stonith/libstonith.la $(top_builddir)/replace/libreplace.la
  17 +vacm_la_LIBADD         = $(top_builddir)/lib/stonith/libstonith.la $(top_builddir)/replace/libreplace.la -lvacmclient
  18
  19  wti_nps_la_SOURCES     = wti_nps.c $(INCFILES)
  20  wti_nps_la_LDFLAGS     = -export-dynamic -module -avoid-version
  21 --- Reusable-Cluster-Components-glue--glue-1.0.11/configure.ac.orig     2013-09-06 16:40:51.983154227 +0200
  22 +++ Reusable-Cluster-Components-glue--glue-1.0.11/configure.ac  2013-09-06 17:26:50.276371805 +0200
  23 @@ -545,14 +545,13 @@
  24  dnl ===============================================
  25  dnl Libraries
  26  dnl ===============================================
  27 -AC_CHECK_LIB(socket, socket)
  28 -AC_CHECK_LIB(c, dlopen)                                dnl if dlopen is in libc...
  29 -AC_CHECK_LIB(dl, dlopen)                       dnl for Linux
  30 -AC_CHECK_LIB(rt, sched_getscheduler)            dnl for Tru64
  31 -AC_CHECK_LIB(gnugetopt, getopt_long)           dnl if available
  32 -AC_CHECK_LIB(uuid, uuid_parse)                 dnl e2fsprogs
  33 -AC_CHECK_LIB(uuid, uuid_create)                        dnl ossp
  34 -AC_CHECK_LIB(posix4, sched_getscheduler)
  35 +AC_SEARCH_LIBS(socket, [socket])
  36 +AC_SEARCH_LIBS(dlopen, [dl])
  37 +AC_SEARCH_LIBS(sched_getscheduler, [rt posix4])
  38 +AC_SEARCH_LIBS(getopt_long, [gnugetopt])               dnl if available
  39 +AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid])       dnl e2fsprogs
  40 +AC_CHECK_LIB(uuid, uuid_create, [LIBUUID=-luuid])      dnl ossp
  41 +AC_SUBST([LIBUUID])
  42
  43  if test x"${PKGCONFIG}" = x""; then
  44     AC_MSG_ERROR(You need pkgconfig installed in order to build ${PACKAGE})
  45 @@ -699,7 +697,8 @@
  46  else
  47     XML2HEAD="`$XML2CONFIG --cflags`"
  48     AC_MSG_RESULT($XML2HEAD)
  49 -   AC_CHECK_LIB(xml2, xmlReadMemory)
  50 +   AC_CHECK_LIB(xml2, xmlReadMemory, [LIBXML2=-lxml2])
  51 +   AC_SUBST([LIBXML2])
  52  fi
  53
  54  CPPFLAGS="$CPPFLAGS $XML2HEAD"
  55 @@ -1107,7 +1105,7 @@
  56  dnl check if header file and lib are there for zlib
  57  zlib_installed="yes"
  58  AC_CHECK_HEADERS(zlib.h, , [zlib_installed="no"],)
  59 -AC_CHECK_LIB(z, compress , , [zlib_installed="no"])
  60 +AC_CHECK_LIB(z, compress , [LIBZ=-lz], [zlib_installed="no"])
  61  AM_CONDITIONAL(BUILD_ZLIB_COMPRESS_MODULE, test "x${zlib_installed}" = "xyes")
  62  if test "x${zlib_installed}" = "xno"; then
  63         FatalMissingThing "zlib" \
  64 @@ -1116,7 +1114,7 @@
  65
  66  bz2_installed="yes"
  67  AC_CHECK_HEADERS(bzlib.h, , [bz2_installed="no"],)
  68 -AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , , [bz2_installed="no"])
  69 +AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , [LIBBZ2=-lbz2], [bz2_installed="no"])
  70  AM_CONDITIONAL(BUILD_BZ2_COMPRESS_MODULE, test "x${bz2_installed}" = "xyes")
  71
  72  #if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
  73 --- Reusable-Cluster-Components-glue--glue-1.0.11/lib/clplumbing/Makefile.am.orig       2012-10-15 15:58:55.000000000 +0200
  74 +++ Reusable-Cluster-Components-glue--glue-1.0.11/lib/clplumbing/Makefile.am    2013-09-06 17:39:45.736339262 +0200
  75 @@ -61,7 +61,7 @@
  76                         uids.c
  77
  78  libplumb_la_LIBADD      = $(top_builddir)/replace/libreplace.la \
  79 -                       $(top_builddir)/lib/pils/libpils.la
  80 +                       $(top_builddir)/lib/pils/libpils.la $(LIBUUID)
  81  libplumb_la_LDFLAGS    = -version-info 3:0:1
  82
  83  libplumbgpl_la_SOURCES = setproctitle.c
  84 --- Reusable-Cluster-Components-glue--glue-1.0.11/lib/stonith/Makefile.am.orig  2012-10-15 15:58:55.000000000 +0200
  85 +++ Reusable-Cluster-Components-glue--glue-1.0.11/lib/stonith/Makefile.am       2013-09-06 17:49:16.516315308 +0200
  86 @@ -33,7 +33,7 @@
  87
  88  stonith_SOURCES                = main.c
  89
  90 -stonith_LDADD          = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB) \
  91 +stonith_LDADD          = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB) $(LIBXML2) \
  92                         $(top_builddir)/lib/clplumbing/libplumb.la      \
  93                         $(top_builddir)/lib/clplumbing/libplumbgpl.la
  94  stonith_LDFLAGS                =  @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@ @LIBADD_INTL@
  95 --- Reusable-Cluster-Components-glue--glue-1.0.11/lib/plugins/lrm/Makefile.am.orig      2012-10-15 15:58:55.000000000 +0200
  96 +++ Reusable-Cluster-Components-glue--glue-1.0.11/lib/plugins/lrm/Makefile.am   2013-09-06 17:59:43.946288978 +0200
  97 @@ -44,6 +44,7 @@
  98
  99  lsb_la_SOURCES = raexeclsb.c
 100  lsb_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 101 +lsb_la_LIBADD = $(LIBXML2)
 102
 103  ocf_la_SOURCES = raexecocf.c
 104  ocf_la_LDFLAGS = -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version