Disable realtime support by default.

This code is used only in a under development feature and it's not used
anywhere in the tree.

Allow to build it conditionally.

diff --git a/WHATS_NEW b/WHATS_NEW
index 23457ee4f49c3952a864f22e6ff149b27459adbc..6224506c5044661f0053cb2991272d0d7d42ec79 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.54 -
 =====================================
+  Disable realtime support code by default.
   Make clvmd return 0 on success rather than 1.
   Add --pvmetadatacopies for pvcreate, vgcreate, vgextend, vgconvert.
   Add implict pvcreate support to vgcreate and vgextend.

diff --git a/configure b/configure
index 37d634f3326475c8091992762e149dc62ba52bdd..eedc60cd14a7a9a4134ee80044fcb66198d92c08 100755 (executable)
--- a/configure
+++ b/configure
@@ -1508,7 +1508,7 @@ Optional Features:
   --enable-lvm1_fallback  Use this to fall back and use LVM1 binaries if
                           device-mapper is missing from the kernel
   --disable-readline      Disable readline support
-  --disable-realtime      Disable realtime clock support
+  --enable-realtime       Enable realtime clock support
   --enable-cmirrord       Enable the cluster mirror log daemon
   --enable-debug          Enable debugging
   --enable-profiling      Gather gcov profiling data
@@ -2226,7 +2226,6 @@ case "$host_os" in
                ODIRECT=yes
                DM_IOCTLS=yes
                SELINUX=yes
-               REALTIME=yes
                CLUSTER=internal
                FSADM=yes
                ;;
@@ -2241,7 +2240,6 @@ case "$host_os" in
                ODIRECT=no
                DM_IOCTLS=no
                SELINUX=no
-               REALTIME=no
                CLUSTER=none
                FSADM=no
                ;;

diff --git a/configure.in b/configure.in
index b4e7f28b8878263ce99bb65cb722411558be5180..fb99c9f5d70d50003c2511fa68566fdb870eee29 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,6 @@ case "$host_os" in
                ODIRECT=yes
                DM_IOCTLS=yes
                SELINUX=yes
-               REALTIME=yes
                CLUSTER=internal
                FSADM=yes
                ;;
@@ -55,7 +54,6 @@ case "$host_os" in
                ODIRECT=no
                DM_IOCTLS=no
                SELINUX=no
-               REALTIME=no
                CLUSTER=none
                FSADM=no
                ;;
@@ -318,7 +316,7 @@ AC_MSG_RESULT($READLINE)
 ################################################################################
 dnl -- Disable realtime clock support
 AC_MSG_CHECKING(whether to enable realtime support)
-AC_ARG_ENABLE(realtime, [  --disable-realtime      Disable realtime clock support],
+AC_ARG_ENABLE(realtime, [  --enable-realtime       Enable realtime clock support],
 REALTIME=$enableval)
 AC_MSG_RESULT($REALTIME)
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2bd6fbad9b0ba1e753fa41d5db7b01e151b0ff61..991346431a14122be7731e4c93423e8720447bd9 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -82,7 +82,6 @@ SOURCES =\
        misc/lvm-globals.c \
        misc/lvm-string.c \
        misc/lvm-wrappers.c \
-       misc/timestamp.c \
        misc/util.c \
        mm/memlock.c \
        report/report.c \
@@ -90,6 +89,11 @@ SOURCES =\
        uuid/uuid.c \
        zero/zero.c
 
+ifeq ("@HAVE_REALTIME@", "yes")
+  SOURCES +=\
+       misc/timestamp.c
+endif
+
 ifeq ("@LVM1@", "internal")
   SOURCES +=\
        format1/disk-rep.c \