From 3315f35e31096fcf9d9935ed47c834ac1b83166a Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Wed, 29 Oct 2003 06:55:41 +0000
Subject: [PATCH] * configure.in: Move ext2fs undelete support ... *
 acinclude.m4 (MC_WITH_VFS): ... here. * extraconf.h: Remove VFS logic, it's
 enforced in configure now.

---
 ChangeLog    |  4 ++++
 acinclude.m4 | 16 ++++++++++++++++
 configure.in | 16 ----------------
 extraconf.h  |  5 -----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f9fa7e99..94b8118dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-10-29  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Move ext2fs undelete support ...
+	* acinclude.m4 (MC_WITH_VFS): ... here.
+	* extraconf.h: Remove VFS logic, it's enforced in configure now.
+
 	* acinclude.m4 (MC_WITH_VFS): Use AC_SEARCH_LIBS when possible.
 	Allow disabling network code by --disable-netcode.
 
diff --git a/acinclude.m4 b/acinclude.m4
index d57e227f5..276601b89 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -215,6 +215,22 @@ AC_DEFUN([MC_WITH_VFS],[
   )
   fi
 
+  dnl
+  dnl Ext2fs undelete support
+  dnl
+  AC_ARG_WITH(ext2undel,
+    [  --with-ext2undel         Compile with ext2 undelete code [[yes if found]]],
+    [if test x$withval != xno; then
+      if test x$withval != xyes; then
+	LDFLAGS="$LDFLAGS -L$withval/lib"
+	CPPFLAGS="$CPPFLAGS -I$withval/include"
+      fi
+      AC_EXT2_UNDEL
+    fi],[
+    dnl Default: detect
+    AC_CHECK_LIB(ext2fs, ext2fs_close, [AC_EXT2_UNDEL], , [-lcom_err])
+  ])
+
   AC_DEFINE(USE_VFS, 1, [Define to enable VFS support])
   if $use_net_code; then
      AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS])
diff --git a/configure.in b/configure.in
index 48c53bdf0..b768ec339 100644
--- a/configure.in
+++ b/configure.in
@@ -519,22 +519,6 @@ else
 fi
 
 
-if test $use_vfs = yes; then
-    AC_ARG_WITH(ext2undel,
-        [  --with-ext2undel         Compile with ext2 undelete code [[yes if found]]],
-	[if test x$withval != xno; then
-		if test x$withval != xyes; then
-			LDFLAGS="$LDFLAGS -L$withval/lib"
-			CPPFLAGS="$CPPFLAGS -I$withval/include"
-		fi
-		AC_EXT2_UNDEL
-	fi],[
-	dnl Default: detect
-	AC_CHECK_LIB(ext2fs, ext2fs_close, [AC_EXT2_UNDEL], , [-lcom_err])
-    ])
-fi
-
-
 dnl Check if the OS is supported by the console saver.
 cons_saver=""
 case $host_os in
diff --git a/extraconf.h b/extraconf.h
index c10ea20e2..c4bd67713 100644
--- a/extraconf.h
+++ b/extraconf.h
@@ -17,11 +17,6 @@ the need to embed this logic into configure.in.
 # endif
 #endif
 
-#ifndef USE_VFS
-#    undef USE_NETCODE
-#    undef USE_EXT2FSLIB
-#endif
-
 #if defined (__QNX__) && !defined(__QNXNTO__) && !defined (HAVE_INFOMOUNT_LIST)
 #    define HAVE_INFOMOUNT_QNX
 #endif