[Linux-ha-dev] minor build patch for 2.0.7

[Dan Taylor]

I was doing a cross-compile, and tripped over a couple of minor and one 
very annoying issue.

Patch attached:




Disclaimer: The information contained in this transmission, including any 
attachments, may contain confidential information of Panasonic Avionics
Corporation.  This transmission is intended only for the use of the 
addressee(s) listed above.  Unauthorized review, dissemination or other use 
of the information contained in this transmission is strictly prohibited. 
If you have received this transmission in error or have reason to believe 
you are not authorized to receive it, please notify the sender by return 
email and promptly delete the transmission.


-------------- next part --------------
--- heartbeat-2.0.7/lib/crm/common/xml.c	2006-08-04 02:47:21.000000000 -0700
+++ heartbeat/lib/crm/common/xml.c	2006-10-23 18:13:37.000000000 -0700
@@ -497,7 +497,9 @@
 crm_data_t*
 file2xml(FILE *input, gboolean compressed)
 {
+#if HAVE_BZLIB_H
 	int rc = 0;
+#endif
 	char *buffer = NULL;
 	gboolean work_done = FALSE;
 	crm_data_t *new_obj = NULL;
--- heartbeat-2.0.7/heartbeat/libnet_util/Makefile.am	2005-08-05 12:34:55.000000000 -0700
+++ heartbeat/heartbeat/libnet_util/Makefile.am	2006-10-23 18:56:24.000000000 -0700
@@ -38,6 +38,6 @@
 
 send_arp_SOURCES	= send_arp.c
 send_arp_LDADD	 	= $(top_builddir)/lib/clplumbing/libplumb.la	\
-			$(gliblib) -L$(libdir) @LIBNETLIBS@	\
+			$(gliblib) @LIBNETLIBS@	\
 			  $(top_builddir)/lib/pils/libpils.la
 
--- heartbeat-2.0.7/heartbeat/libnet_util/Makefile.in	2006-08-13 21:37:54.000000000 -0700
+++ heartbeat/heartbeat/libnet_util/Makefile.in	2006-10-23 20:08:13.000000000 -0700
@@ -402,7 +402,7 @@
 
 send_arp_SOURCES = send_arp.c
 send_arp_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la	\
-			$(gliblib) -L$(libdir) @LIBNETLIBS@	\
+			$(gliblib) @LIBNETLIBS@	\
 			  $(top_builddir)/lib/pils/libpils.la
 
 all: all-am
--- heartbeat-2.0.7/crm/admin/crm_mon.c	2006-07-17 23:15:54.000000000 -0700
+++ heartbeat/crm/admin/crm_mon.c	2006-10-23 19:13:24.000000000 -0700
@@ -213,11 +213,13 @@
 	
 	make_daemon(daemonize, pid_file);
 
+#if CURSES_ENABLED
 	if(as_console) {
 		initscr();
 		cbreak();
 		noecho();
 	}
+#endif
 
 	crm_info("Starting %s", crm_system_name);
 	mainloop = g_main_new(FALSE);
@@ -243,11 +245,13 @@
 	
 	crm_info("Exiting %s", crm_system_name);	
 	
+#if CURSES_ENABLED
 	if(as_console) {
 		echo();
 		nocbreak();
 		endwin();
 	}
+#endif
 	return 0;
 }