pacemaker-libs.patch

   1 diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/Makefile.am
   2 --- ClusterLabs-pacemaker-1f8858c.orig/lib/Makefile.am  2012-09-20 11:43:41.000000000 +0200
   3 +++ ClusterLabs-pacemaker-1f8858c/lib/Makefile.am       2012-10-25 14:00:13.000000000 +0200
   4 @@ -39,7 +39,7 @@
   5         rm -f *.pc
   6
   7  ## Subdirectories...
   8 -SUBDIRS        = gnu common pengine transition cib fencing services lrmd cluster
   9 +SUBDIRS        = gnu common pengine cib transition fencing services lrmd cluster
  10  DIST_SUBDIRS =  $(SUBDIRS) ais
  11
  12  if BUILD_CS_PLUGIN
  13 diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/pengine/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/pengine/Makefile.am
  14 --- ClusterLabs-pacemaker-1f8858c.orig/lib/pengine/Makefile.am  2012-09-20 11:43:41.000000000 +0200
  15 +++ ClusterLabs-pacemaker-1f8858c/lib/pengine/Makefile.am       2012-10-25 14:00:13.000000000 +0200
  16 @@ -28,10 +28,12 @@
  17
  18  libpe_rules_la_LDFLAGS = -version-info 2:1:0
  19  libpe_rules_la_SOURCES = rules.c common.c
  20 +libpe_rules_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la
  21
  22  libpe_status_la_LDFLAGS        = -version-info 4:0:0
  23  libpe_status_la_SOURCES        =  status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
  24 -libpe_status_la_LIBADD =  @CURSESLIBS@
  25 +libpe_status_la_LIBADD =  @CURSESLIBS@ \
  26 +                          $(top_builddir)/lib/common/libcrmcommon.la
  27
  28  clean-generic:
  29         rm -f *.log *.debug *~
  30 diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/services/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/services/Makefile.am
  31 --- ClusterLabs-pacemaker-1f8858c.orig/lib/services/Makefile.am 2012-09-20 11:43:41.000000000 +0200
  32 +++ ClusterLabs-pacemaker-1f8858c/lib/services/Makefile.am      2012-10-25 14:01:45.000000000 +0200
  33 @@ -26,7 +26,8 @@
  34  libcrmservice_la_SOURCES = services.c services_linux.c
  35  libcrmservice_la_LDFLAGS = -version-info 1:0:0
  36  libcrmservice_la_CFLAGS  = $(GIO_CFLAGS)
  37 -libcrmservice_la_LIBADD   = $(GIO_LIBS)
  38 +libcrmservice_la_LIBADD   = $(GIO_LIBS) \
  39 +                           $(top_builddir)/lib/common/libcrmcommon.la
  40
  41  if BUILD_UPSTART
  42  libcrmservice_la_SOURCES += upstart.c
  43 diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/transition/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/transition/Makefile.am
  44 --- ClusterLabs-pacemaker-1f8858c.orig/lib/transition/Makefile.am       2012-09-20 11:43:41.000000000 +0200
  45 +++ ClusterLabs-pacemaker-1f8858c/lib/transition/Makefile.am    2012-10-25 14:00:13.000000000 +0200
  46 @@ -29,6 +29,7 @@
  47
  48  libtransitioner_la_LDFLAGS     = -version-info 2:0:0
  49  libtransitioner_la_CFLAGS      = -I$(top_builddir)
  50 +libtransitioner_la_LIBADD      = $(top_builddir)/lib/common/libcrmcommon.la
  51
  52  clean-generic:
  53         rm -f *~