Merge pull request #800 from wferi/build-fixes

Build fixes

configure.ac

@@ -1205,6 +1205,7 @@ fi
 
 AC_DEFINE_UNQUOTED(SUPPORT_UPSTART, $HAVE_upstart, Support upstart based system services)
 AM_CONDITIONAL(BUILD_UPSTART, test $HAVE_upstart = 1)
+AC_SUBST(SUPPORT_UPSTART)
 
 if
     $PKGCONFIG --exists systemd
@@ -1224,6 +1225,7 @@ fi
 
 AC_DEFINE_UNQUOTED(SUPPORT_SYSTEMD, $HAVE_systemd, Support systemd based system services)
 AM_CONDITIONAL(BUILD_SYSTEMD, test $HAVE_systemd = 1)
+AC_SUBST(SUPPORT_SYSTEMD)
 
 case $SUPPORT_NAGIOS in
      1|yes|true|try)
@@ -1402,6 +1404,7 @@ AC_DEFINE_UNQUOTED(HAVE_ATOMIC_ATTRD, $BUILD_ATOMIC_ATTRD, Support the new atomi
 
 AC_SUBST(SUPPORT_CMAN)
 AC_SUBST(SUPPORT_CS)
+AC_SUBST(SUPPORT_PLUGIN)
 
 dnl
 dnl    Cluster stack - Sanity

doc/Makefile.am

@@ -23,7 +23,7 @@ helpdir		= $(datadir)/$(PACKAGE)
 
 ascii		= crm_fencing.txt acls.txt
 docbook		= Pacemaker_Explained Clusters_from_Scratch Pacemaker_Remote
-doc_DATA	= README.hb2openais $(ascii) $(generated_docs)
+doc_DATA	= $(ascii) $(generated_docs)
 
 # rsync destination for www targets
 RSYNC_DEST      = root@www.clusterlabs.org:/var/www/html/doc/
@@ -149,7 +149,7 @@ install-data-local: all-local
 	    for f in $$filelist; do							\
 		p=`echo $$f | sed s:publish/:: | sed s:Pacemaker/::`;			\
 		if [ -d $$f ]; then							\
-			$(INSTALL) -d 775 $(DESTDIR)$(docdir)/$$p;			\
+			$(INSTALL) -d -m 775 $(DESTDIR)$(docdir)/$$p;			\
 		else									\
 			$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$p;			\
 		fi									\

lib/common/Makefile.am

@@ -39,7 +39,7 @@ libcrmcommon_la_SOURCES	+= cib_secrets.c
 endif
 
 libcrmcommon_la_LDFLAGS	= -version-info 8:0:5
-libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS)
+libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
 libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 
 clean-generic:

lib/pacemaker.pc.in

@@ -31,6 +31,6 @@ Version:      @PACKAGE_VERSION@
 Description:  Pacemaker cluster manager v@PACKAGE_SERIES@
 Requires:     
 Conflicts:    
-Cflags:       -I${includedir} -lcrmcommon
-Libs:         -L${libdir} 
+Cflags:       -I${includedir}
+Libs:         -L${libdir} -lcrmcommon
 Libs.private: