[Ocfs2-tools-commits] jlbec commits r1366 - branches/cman-based

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-07-16 15:40:02 -0700 (Mon, 16 Jul 2007)
New Revision: 1366

Modified:
   branches/cman-based/Config.make.in
   branches/cman-based/Makefile
   branches/cman-based/configure.in
Log:

Teach configure.in to detect libcman and build o2cb_controld as appropriate.



Modified: branches/cman-based/Config.make.in
===================================================================
--- branches/cman-based/Config.make.in	2007-07-16 22:23:13 UTC (rev 1365)
+++ branches/cman-based/Config.make.in	2007-07-16 22:40:02 UTC (rev 1366)
@@ -70,6 +70,7 @@
 
 BUILD_OCFS2CDSL = @BUILD_OCFS2CDSL@
 BUILD_DEBUGOCFS2 = @BUILD_DEBUGOCFS2@
+BUILD_CMAN_SUPPORT = @BUILD_CMAN_SUPPORT@
 
 OCFS2_DEBUG = @OCFS2_DEBUG@
 

Modified: branches/cman-based/Makefile
===================================================================
--- branches/cman-based/Makefile	2007-07-16 22:23:13 UTC (rev 1365)
+++ branches/cman-based/Makefile	2007-07-16 22:40:02 UTC (rev 1366)
@@ -20,7 +20,7 @@
 COMPILE_PY = 1
 endif
 
-SUBDIRS = libo2dlm libo2cb libocfs2 fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 listuuid sizetest extras patches o2cb_controld
+SUBDIRS = libo2dlm libo2cb libocfs2 fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 listuuid sizetest extras patches
 
 ifdef BUILD_OCFS2CDSL
 SUBDIRS += ocfs2cdsl
@@ -30,6 +30,10 @@
 SUBDIRS += ocfs2console
 endif
 
+ifdef BUILD_CMAN_SUPPORT
+SUBDIRS += o2cb_controld
+endif
+
 SUBDIRS += vendor
 
 PKGCONFIG_SOURCES =	\

Modified: branches/cman-based/configure.in
===================================================================
--- branches/cman-based/configure.in	2007-07-16 22:23:13 UTC (rev 1365)
+++ branches/cman-based/configure.in	2007-07-16 22:40:02 UTC (rev 1366)
@@ -168,6 +168,15 @@
 AC_SUBST(BUILD_OCFS2CDSL)
 AC_SUBST(BUILD_DEBUGOCFS2)
 
+# We use cman_replyto_shutdown to insure a new enough libcman
+BUILD_CMAN_SUPPORT=
+AC_CHECK_LIB(cman, cman_replyto_shutdown,
+  [AC_CHECK_HEADER(libcman.h, BUILD_CMAN_SUPPORT=yes,
+    [AC_MSG_WARN([libcman not found, cman support will not be built])])],
+  [AC_MSG_WARN([libcman not found, cman support will not be built])])
+
+AC_SUBST(BUILD_CMAN_SUPPORT)
+
 BUILD_OCFS2CONSOLE=
 AC_ARG_ENABLE(ocfs2console, [  --enable-ocfs2console=[yes/no]    Build GUI frontend [default=yes]],,enable_ocfs2console=yes)