gfs2-utils: Make building gfs2_controld optional

As of Fedora 17 gfs_controld isn't required and also doesn't build. This patch adds an --enable-gfs_controld option to allow it to be built on older systems while defaulting to future norm of not building it.

Signed-off-by Andrew Price <[email protected]>

---
 README.build      |    6 ++++++
 configure.ac      |   27 ++++++++++++++++++---------
 group/Makefile.am |    6 +++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

README.build +6 -0

index 007f2d7..27e022a 100644
@@ -21,6 +21,12 @@ Plus the following libraries:
   - libcfg
  - openaislib
 
+By default gfs_controld is not built as it is not required in Fedora 17 and
+later and cannot build on it. To re-enable it for older systems, use
+--enable-gfs_controld when running the configure script (see below). The
+library dependencies for gfs_controld are only required when this option is
+given.
+
 Run the following commands:
 
 ./autogen.sh

configure.ac +18 -9

index 570f826..d56cfac 100644
@@ -95,6 +95,10 @@ AC_ARG_ENABLE([debug],
 	[  --enable-debug          enable debug build. ],
 	[ default="no" ])
 
+AC_ARG_ENABLE([gfs_controld],
+	[  --enable-gfs_controld   build gfs_controld. ],
+	[ default="no" ])
+
 AC_ARG_WITH([syslogfacility],
 	[  --syslogfacility=FACILITY
                           cluster default syslog facility. ],

@@ -114,15 +118,20 @@ AC_ARG_WITH([kernel],
 
 KERNEL_CPPFLAGS="-I$KERNEL_DIR/include"
 
-PKG_CHECK_MODULES([corosync],[corosync])
-PKG_CHECK_MODULES([cpg],[libcpg])
-PKG_CHECK_MODULES([sackpt],[libSaCkpt])
-PKG_CHECK_MODULES([logt],[liblogthread])
-PKG_CHECK_MODULES([ccs],[libccs])
-PKG_CHECK_MODULES([cfg],[libcfg])
-PKG_CHECK_MODULES([fenced],[libfenced])
-PKG_CHECK_MODULES([dlmcontrol],[libdlmcontrol])
-PKG_CHECK_MODULES([quorum],[libquorum])
+# gfs_controld isn't required in the latest versions of cluster
+AM_CONDITIONAL([BUILD_GFS_CONTROLD], [test "x$enable_gfs_controld" = "xyes"])
+AS_IF([test "x$enable_gfs_controld" = "xyes"], [
+	PKG_CHECK_MODULES([corosync],[corosync])
+	PKG_CHECK_MODULES([cpg],[libcpg])
+	PKG_CHECK_MODULES([sackpt],[libSaCkpt])
+	PKG_CHECK_MODULES([logt],[liblogthread])
+	PKG_CHECK_MODULES([ccs],[libccs])
+	PKG_CHECK_MODULES([cfg],[libcfg])
+	PKG_CHECK_MODULES([fenced],[libfenced])
+	PKG_CHECK_MODULES([dlmcontrol],[libdlmcontrol])
+	PKG_CHECK_MODULES([quorum],[libquorum])
+])
+
 PKG_CHECK_MODULES([zlib],[zlib])
 
 # old versions of ncurses don't ship pkg-config files

group/Makefile.am +5 -1

index 5b7d0f8..2904ce1 100644
@@ -1,3 +1,7 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-SUBDIRS			= libgfscontrol gfs_control gfs_controld man include
+if BUILD_GFS_CONTROLD
+DIR_GFS_CONTROLD	= gfs_controld
+endif
+
+SUBDIRS			= libgfscontrol gfs_control $(DIR_GFS_CONTROLD) man include

group/Makefile.am +0 -0

index 5b7d0f8..2904ce1 100644

The previous commit only disabled gfs_controld from building when --enable-gfs_controld was omitted. When we're not building gfs_controld there really is no reason to build anything else in the group/ directory so this patch disables it by default.

Signed-off-by Andrew Price <[email protected]>

---
 Makefile.am       |    6 +++++-
 group/Makefile.am |    6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Makefile.am +5 -1

index 2e5d9ae..0af3e04 100644
@@ -12,7 +12,11 @@ noinst_HEADERS		= make/copyright.cf
 
 ACLOCAL_AMFLAGS		= -I m4
 
-SUBDIRS			= po group gfs2 doc
+if BUILD_GFS_CONTROLD
+DIR_GROUP		= group
+endif
+
+SUBDIRS			= po $(DIR_GROUP) gfs2 doc
 
 install-exec-local:
 			$(INSTALL) -d $(DESTDIR)/$(LOGDIR)

group/Makefile.am +1 -5

index 2904ce1..5b7d0f8 100644
@@ -1,7 +1,3 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-if BUILD_GFS_CONTROLD
-DIR_GFS_CONTROLD	= gfs_controld
-endif
-
-SUBDIRS			= libgfscontrol gfs_control $(DIR_GFS_CONTROLD) man include
+SUBDIRS			= libgfscontrol gfs_control gfs_controld man include