From 809fae91cfcb78a163187444634a488f7335d270 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Sun, 20 Jun 2004 13:38:54 +0000
Subject: [PATCH] fsadm configurable (default disabled as untested) version
 update

---
 VERSION      |  2 +-
 WHATS_NEW    |  5 +++--
 configure    | 17 ++++++++++++++++-
 configure.in | 13 ++++++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index e11525be4..f2ad88206 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.00.16-cvs (2004-05-24)
+2.00.17-cvs (2004-06-20)
diff --git a/WHATS_NEW b/WHATS_NEW
index 0a5aa1283..b582f61bf 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
-Version 2.00.17 -
-=============================
+Version 2.00.17 - 20 June 2004
+==============================
+  configure --enable-fsadm to try out fsadm.  fsadm is not tested yet.
   Display all filtered devices, not just PVs, with pvs -a.
   Fix sync_dir() when no / in filename
   vgcfgbackup -f accepts template with %s for VG name.
diff --git a/configure b/configure
index 0a9780649..783dbddad 100755
--- a/configure
+++ b/configure
@@ -855,6 +855,7 @@ Optional Features:
   --disable-devmapper     Disable device-mapper interaction
   --disable-o_direct      Disable O_DIRECT
   --enable-cmdlib         Build shared command library
+  --enable-fsadm          Enable fsadm
   --enable-nls            Enable Native Language Support
 
 Optional Packages:
@@ -3899,7 +3900,7 @@ case "$host_os" in
 		SOFLAG="-shared"
 		DEVMAPPER=yes
 		ODIRECT=yes
-		FSADM=yes ;;
+		FSADM=no ;;
 	darwin*)
 		CFLAGS="-no-cpp-precomp -fno-common"
 		CLDFLAGS=
@@ -4122,6 +4123,14 @@ if test x$CMDLIB = xyes; then
 	CFLAGS="$CFLAGS -DCMDLIB"
 fi
 
+echo $ac_n "checking whether to enable fsadm""... $ac_c" 1>&6
+# Check whether --enable-fsadm or --disable-fsadm was given.
+if test "${enable_fsadm+set}" = set; then
+  enableval="$enable_fsadm"
+  FSADM=yes
+fi;
+echo "$ac_t""$FSADM" 1>&6
+
 if [ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ];
  then  exec_prefix="";
 fi;
@@ -6152,3 +6161,9 @@ if test x$ODIRECT != xyes; then
   echo Use of pvmove may cause machine to lock up under low memory conditions.
   echo
 fi
+
+if test x$FSADM == xyes; then
+  echo
+  echo Warning: fsadm support is untested.
+  echo
+fi
diff --git a/configure.in b/configure.in
index faaa631f3..c07b020a8 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ case "$host_os" in
 		SOFLAG="-shared"
 		DEVMAPPER=yes
 		ODIRECT=yes
-		FSADM=yes ;;
+		FSADM=no ;;
 	darwin*)
 		CFLAGS="-no-cpp-precomp -fno-common"
 		CLDFLAGS=
@@ -228,6 +228,11 @@ if test x$CMDLIB = xyes; then
 	CFLAGS="$CFLAGS -DCMDLIB"
 fi
 
+echo $ac_n "checking whether to enable fsadm""... $ac_c" 1>&6
+dnl Enable fsadm
+AC_ARG_ENABLE(fsadm, [  --enable-fsadm          Enable fsadm], FSADM=yes)
+echo "$ac_t""$FSADM" 1>&6
+
 dnl Mess with default exec_prefix
 if [[ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]];
  then  exec_prefix="";
@@ -404,3 +409,9 @@ if test x$ODIRECT != xyes; then
   echo Use of pvmove may cause machine to lock up under low memory conditions.
   echo
 fi
+
+if test x$FSADM == xyes; then
+  echo
+  echo Warning: fsadm support is untested.
+  echo
+fi