As configure.in currently stands, as of the hg dev tree 54723736ab18,
make dist fails because autogenerated files in tsa_plugin/, in
parcicular tsa_plugin/Makefile.am, are not created.

Andrew Beekhof tells me that this is because tsa_plugin can't build
without the crm, which is now in the pacemaker tree along with
tsa_plugin.

This fairly minimal patch allows make dist to succeed by not
distributing tsa_plugin/. I have found that building the resulting
tarball also succeeds.

A fuller patch would either fix tsa_plugin so that it can compile,
or remove it completely from tsa_plugin/, configure.in and
heartbeat.rpm.spec. I don't feel that it is within my jurisdiction
to make either change at this time.

Signed-off-by: Simon Horman <[EMAIL PROTECTED]>

Index: hertbeat-strip/Makefile.am
===================================================================
--- hertbeat-strip.orig/Makefile.am     2008-03-28 11:22:10.000000000 +0900
+++ hertbeat-strip/Makefile.am  2008-03-28 11:22:42.000000000 +0900
@@ -55,10 +55,6 @@ hauser =             @HA_CCMUSER@
 
 ## proc-ha is left out from SUBDIRS (completely obsolete)
 
-if TSA_PLUGIN_BUILD
-TSA_PLUGIN_DIR = tsa_plugin
-endif
-
 if LDIRECTORD_BUILD
 LDIRECTORD_DIR = ldirectord
 endif
@@ -67,7 +63,7 @@ endif
 SUBDIRS        = buildtools $(LIBLTDL_DIR) debian pkg port replace include lib 
\
           heartbeat membership telecom resources lrm $(CRM_DIR)                
\
           fencing logd tools doc cts $(MGMT_DIR)   \
-          $(LDIRECTORD_DIR) config $(TSA_PLUGIN_DIR) contrib
+          $(LDIRECTORD_DIR) config contrib
 
 HANDY_DOCS = doc/ChangeLog doc/GettingStarted.html doc/DirectoryMap.txt
 HBDOCS = doc/heartbeat_api.html

-- 

-- 
Horms

_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

Reply via email to