Qdevice: Add qnetd configure option

Qnetd is no longer build as a part of --qneable-qdevices. Instead
--enable-qnetd is used.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

configure.ac

@@ -406,6 +406,10 @@ AC_ARG_ENABLE([qdevices],
 	[  --enable-qdevices               : Quorum devices support ],,
 	[ enable_qdevices="no" ])
 AM_CONDITIONAL(BUILD_QDEVICES, test x$enable_qdevices = xyes)
+AC_ARG_ENABLE([qnetd],
+	[  --enable-qnetd                  : Quorum Net Daemon support ],,
+	[ enable_qnetd="no" ])
+AM_CONDITIONAL(BUILD_QNETD, test x$enable_qnetd = xyes)
 
 # *FLAGS handling goes here
 
@@ -487,6 +491,9 @@ fi
 if test "x${enable_qdevices}" = xyes; then
 	PACKAGE_FEATURES="$PACKAGE_FEATURES qdevices"
 fi
+if test "x${enable_qnetd}" = xyes; then
+	PACKAGE_FEATURES="$PACKAGE_FEATURES qnetd"
+fi
 
 do_snmp=0
 if test "x${enable_snmp}" = xyes; then

qdevices/Makefile.am

@@ -31,16 +31,20 @@
 
 MAINTAINERCLEANFILES    = Makefile.in
 
-if BUILD_QDEVICES
-
 SUBDIRS			=
 
-sbin_PROGRAMS		= corosync-qnetd corosync-qdevice corosync-qnetd-tool \
-                          corosync-qdevice-tool
+bin_PROGRAMS		=
+sbin_PROGRAMS		=
+sbin_SCRIPTS		=
+EXTRA_DIST		=
+
+if BUILD_QNETD
 
-sbin_SCRIPTS            = corosync-qnetd-certutil corosync-qdevice-net-certutil
+bin_PROGRAMS		+= corosync-qnetd corosync-qnetd-tool
 
-EXTRA_DIST		= corosync-qdevice-net-certutil.sh corosync-qnetd-certutil.sh
+sbin_SCRIPTS            += corosync-qnetd-certutil
+
+EXTRA_DIST		+= corosync-qnetd-certutil.sh
 
 corosync_qnetd_SOURCES	= corosync-qnetd.c \
                           dynar.c dynar.h msg.c msg.h msgio.c msgio.h \
@@ -69,6 +73,28 @@ corosync_qnetd_SOURCES	= corosync-qnetd.c \
                           qnetd-poll-array-user-data.h qnet-config.h dynar-getopt-lex.c \
                           dynar-getopt-lex.h qnetd-advanced-settings.c qnetd-advanced-settings.h
 
+corosync_qnetd_tool_SOURCES = corosync-qnetd-tool.c unix-socket.c unix-socket.h dynar.c dynar.h \
+                              dynar-str.c dynar-str.h
+
+corosync_qnetd_CFLAGS		= $(nss_CFLAGS)
+corosync_qnetd_LDADD		= $(nss_LIBS)
+
+corosync-qnetd-certutil: corosync-qnetd-certutil.sh
+	sed -e 's#@''DATADIR@#${datadir}#g' \
+	    -e 's#@''BASHPATH@#${BASHPATH}#g' \
+	    -e 's#@''COROSYSCONFDIR@#${COROSYSCONFDIR}#g' \
+	    $< > $@
+
+endif
+
+if BUILD_QDEVICES
+
+sbin_PROGRAMS		+= corosync-qdevice corosync-qdevice-tool
+
+sbin_SCRIPTS            += corosync-qdevice-net-certutil
+
+EXTRA_DIST		+= corosync-qdevice-net-certutil.sh
+
 corosync_qdevice_SOURCES = corosync-qdevice.c \
                            qdevice-cmap.c qdevice-cmap.h \
                            qdevice-instance.c qdevice-instance.h node-list.c node-list.h \
@@ -103,24 +129,12 @@ corosync_qdevice_SOURCES = corosync-qdevice.c \
                            qdevice-model-type.h qdevice-advanced-settings.c \
                            qdevice-advanced-settings.h dynar-getopt-lex.c dynar-getopt-lex.h
 
-corosync_qnetd_tool_SOURCES = corosync-qnetd-tool.c unix-socket.c unix-socket.h dynar.c dynar.h \
-                              dynar-str.c dynar-str.h
-
 corosync_qdevice_tool_SOURCES = corosync-qdevice-tool.c unix-socket.c unix-socket.h dynar.c dynar.h \
                                 dynar-str.c dynar-str.h
 
-corosync_qnetd_CFLAGS		= $(nss_CFLAGS)
-corosync_qnetd_LDADD		= $(nss_LIBS)
-
 corosync_qdevice_CFLAGS	= $(nss_CFLAGS)
 corosync_qdevice_LDADD	= $(nss_LIBS) $(LIBQB_LIBS) $(top_builddir)/lib/libcmap.la \
-				    $(top_builddir)/lib/libvotequorum.la
-
-corosync-qnetd-certutil: corosync-qnetd-certutil.sh
-	sed -e 's#@''DATADIR@#${datadir}#g' \
-	    -e 's#@''BASHPATH@#${BASHPATH}#g' \
-	    -e 's#@''COROSYSCONFDIR@#${COROSYSCONFDIR}#g' \
-	    $< > $@
+                          $(top_builddir)/lib/libvotequorum.la
 
 corosync-qdevice-net-certutil: corosync-qdevice-net-certutil.sh
 	sed -e 's#@''DATADIR@#${datadir}#g' \