From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
:100644 100644 182b001... 15113dd... M Makefile.am
:100644 100644 7ce168f... 567e9c7... M configure.ac
:000000 100644 0000000... f71be61... A qdevices/Makefile.am
Makefile.am | 2 +-
configure.ac | 19 ++++++++++++++-----
qdevices/Makefile.am | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 182b001..15113dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
dist_doc_DATA = LICENSE INSTALL README.recovery SECURITY TODO AUTHORS
SUBDIRS = include common_lib lib exec tools test cts pkgconfig \
- man init conf
+ man init conf qdevices
coverity:
rm -rf cov
diff --git a/configure.ac b/configure.ac
index 7ce168f..567e9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,8 @@ AC_CONFIG_FILES([Makefile
cts/CTSvars.py
tools/Makefile
conf/Makefile
- Doxyfile])
+ qdevices/Makefile
+ Doxyfile])
### Local business
@@ -296,14 +297,19 @@ AC_ARG_WITH([initwrappersdir],
[ INITWRAPPERSDIR="$datarootdir/corosync" ])
AC_ARG_ENABLE([snmp],
- [ --enable-snmp : SNMP protocol support ],
- [ default="no" ])
+ [ --enable-snmp : SNMP protocol support ],
+ [ default="no" ])
AC_ARG_ENABLE([xmlconf],
- [ --enable-xmlconf : XML configuration support ],,
- [ enable_xmlconf="no" ])
+ [ --enable-xmlconf : XML configuration support ],,
+ [ enable_xmlconf="no" ])
AM_CONDITIONAL(INSTALL_XMLCONF, test x$enable_xmlconf = xyes)
+AC_ARG_ENABLE([qdevices],
+ [ --enable-qdevices : Quorum devices support ],,
+ [ enable_qdevices="no" ])
+AM_CONDITIONAL(BUILD_QDEVICES, test x$enable_qdevices = xyes)
+
# OS detection
# THIS SECTION MUST DIE!
CP=cp
@@ -453,6 +459,9 @@ fi
if test "x${enable_xmlconf}" = xyes; then
PACKAGE_FEATURES="$PACKAGE_FEATURES xmlconf"
fi
+if test "x${enable_qdevices}" = xyes; then
+ PACKAGE_FEATURES="$PACKAGE_FEATURES qdevices"
+fi
if test "x${enable_snmp}" = xyes; then
SNMPCONFIG=""
diff --git a/qdevices/Makefile.am b/qdevices/Makefile.am
new file mode 100644
index 0000000..f71be61
--- /dev/null
+++ b/qdevices/Makefile.am
@@ -0,0 +1,37 @@
+# Copyright (c) 2012 Red Hat, Inc.
+#
+# Authors: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
+#
+# This software licensed under BSD license, the text of which follows:
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# - Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+# - Neither the name of the MontaVista Software, Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+MAINTAINERCLEANFILES = Makefile.in
+
+if BUILD_QDEVICES
+
+SUBDIRS =
+
+endif
--
1.7.7.6
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
