[Ocfs2-tools-devel] [PATCH 1/4] ocfs2-tools: fsck.ocfs2 and *ctl built dynamically by default
Sunil Mushran
sunil.mushran at oracle.com
Thu Feb 24 14:03:02 PST 2011
This patch changes the default build of tools fsck.ocfs2, o2cb_ctl, o2cb and
ocfs2_hb_ctl from static to dynamic.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
---
configure.in | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/configure.in b/configure.in
index 21bce81..ff4e428 100644
--- a/configure.in
+++ b/configure.in
@@ -172,41 +172,27 @@ CFLAGS="$dyn_save_CFLAGS"
LIBS="$dyn_save_LIBS"
-OCFS2_DYNAMIC_FSCK=
+OCFS2_DYNAMIC_FSCK=yes
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=detect)
-if test "x$enable_dynamic_fsck" = "xdetect"; then
- if test "x$static_lib_link" = "xyes"; then
- enable_dynamic_fsck=no
- else
- enable_dynamic_fsck=yes
- fi
-fi
+AC_ARG_ENABLE([dynamic-fsck], [ --enable-dynamic-fsck=[yes/no] Build fsck dynamically [default=yes]],,enable_dynamic_fsck=yes)
AC_MSG_RESULT($enable_dynamic_fsck)
-if test "x$static_lib_link" = "xno" -a "x$enable_dynamic_fsck" = "xno"; then
+if test "x$enable_dynamic_fsck" = "xno" -a "x$static_lib_link" = "xno"; then
AC_MSG_ERROR([Unable to statically link fsck.ocfs2])
fi
-if test "x$enable_dynamic_fsck" = "xyes"; then
- OCFS2_DYNAMIC_FSCK=yes
+if test "x$enable_dynamic_fsck" = "xno"; then
+ OCFS2_DYNAMIC_FSCK=
fi
AC_SUBST(OCFS2_DYNAMIC_FSCK)
-OCFS2_DYNAMIC_CTL=
+OCFS2_DYNAMIC_CTL=yes
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=detect)
-if test "x$enable_dynamic_ctl" = "xdetect"; then
- if test "x$static_lib_link" = "xyes"; then
- enable_dynamic_ctl=no
- else
- enable_dynamic_ctl=yes
- fi
-fi
+AC_ARG_ENABLE([dynamic-ctl], [ --enable-dynamic-ctl=[yes/no] Build cluster control tools dynamically [default=yes]],,enable_dynamic_ctl=yes)
AC_MSG_RESULT($enable_dynamic_ctl)
-if test "x$static_lib_link" = "xno" -a "x$enable_dynamic_ctl" = "xno"; then
+if test "x$enable_dynamic_ctl" = "xno" -a "x$static_lib_link" = "xno"; then
AC_MSG_ERROR([Unable to statically link cluster control tools])
fi
-if test "x$enable_dynamic_ctl" = "xyes"; then
- OCFS2_DYNAMIC_CTL=yes
+if test "x$enable_dynamic_ctl" = "xno"; then
+ OCFS2_DYNAMIC_CTL=
fi
AC_SUBST(OCFS2_DYNAMIC_CTL)
--
1.7.1
More information about the Ocfs2-tools-devel
mailing list