[Ocfs2-tools-commits] manish commits r932 - in trunk: . fsck.ocfs2 o2cb_ctl ocfs2_hb_ctl

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-06-09 20:38:08 -0500 (Thu, 09 Jun 2005)
New Revision: 932

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fsck.ocfs2/Makefile
   trunk/o2cb_ctl/Makefile
   trunk/ocfs2_hb_ctl/Makefile
Log:
Build o2cb_ctl, ocfs2_hb_ctl, and fsck.ocfs2 statically by default


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-06-06 11:23:05 UTC (rev 931)
+++ trunk/Config.make.in	2005-06-10 01:38:08 UTC (rev 932)
@@ -67,4 +67,7 @@
 
 OCFS2_DEBUG_EXE = @OCFS2_DEBUG_EXE@
 
+OCFS2_DYNAMIC_FSCK = @OCFS2_DYNAMIC_FSCK@
+OCFS2_DYNAMIC_CTL = @OCFS2_DYNAMIC_CTL@
+
 B0RKEN_ENDIAN = @B0RKEN_ENDIAN@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-06-06 11:23:05 UTC (rev 931)
+++ trunk/configure.in	2005-06-10 01:38:08 UTC (rev 932)
@@ -110,6 +110,24 @@
 AC_SUBST(OCFS2_DEBUG_EXE)
 AC_MSG_RESULT($enable_debugexe)
 
+AC_MSG_CHECKING(whether to build fsck dynamically)
+AC_ARG_ENABLE([dynamic-fsck], [  --enable-dynamic-fsck=[yes/no]    Build fsck dynamically [default=no]],,enable_dynamic_fsck=no)
+OCFS2_DYNAMIC_FSCK=
+if test "x$enable_dynamic_fsck" = "xyes"; then
+    OCFS2_DYNAMIC_FSCK=yes
+fi
+AC_SUBST(OCFS2_DYNAMIC_FSCK)
+AC_MSG_RESULT($enable_dynamic_fsck)
+
+AC_MSG_CHECKING(whether to build cluster control tools dynamically)
+AC_ARG_ENABLE([dynamic-ctl], [  --enable-dynamic-ctl=[yes/no]    Build cluster control tools dynamically [default=no]],,enable_dynamic_ctl=no)
+OCFS2_DYNAMIC_CTL=
+if test "x$enable_dynamic_ctl" = "xyes"; then
+    OCFS2_DYNAMIC_CTL=yes
+fi
+AC_SUBST(OCFS2_DYNAMIC_CTL)
+AC_MSG_RESULT($enable_dynamic_ctl)
+
 GLIB_REQUIRED_VERSION=2.2.3
 GTK_REQUIRED_VERSION=2.2.4
 PYGTK_REQUIRED_VERSION=1.99.16

Modified: trunk/fsck.ocfs2/Makefile
===================================================================
--- trunk/fsck.ocfs2/Makefile	2005-06-06 11:23:05 UTC (rev 931)
+++ trunk/fsck.ocfs2/Makefile	2005-06-10 01:38:08 UTC (rev 932)
@@ -21,6 +21,10 @@
 OPTS += -O2
 endif
 
+ifndef OCFS2_DYNAMIC_FSCK
+LDFLAGS += -static
+endif
+
 CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 

Modified: trunk/o2cb_ctl/Makefile
===================================================================
--- trunk/o2cb_ctl/Makefile	2005-06-06 11:23:05 UTC (rev 931)
+++ trunk/o2cb_ctl/Makefile	2005-06-10 01:38:08 UTC (rev 932)
@@ -19,6 +19,10 @@
 OPTS += -O2
 endif
 
+ifndef OCFS2_DYNAMIC_CTL
+LDFLAGS += -static
+endif
+
 CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 

Modified: trunk/ocfs2_hb_ctl/Makefile
===================================================================
--- trunk/ocfs2_hb_ctl/Makefile	2005-06-06 11:23:05 UTC (rev 931)
+++ trunk/ocfs2_hb_ctl/Makefile	2005-06-10 01:38:08 UTC (rev 932)
@@ -20,6 +20,10 @@
 OPTS += -O2
 endif
 
+ifndef OCFS2_DYNAMIC_CTL
+LDFLAGS += -static
+endif
+
 CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations