* configure.in: Move ext2fs undelete support ...

* acinclude.m4 (MC_WITH_VFS): ... here.
* extraconf.h: Remove VFS logic, it's enforced in configure now.
This commit is contained in:
Pavel Roskin 2003-10-29 06:55:41 +00:00
parent fc7dc2ba67
commit 3315f35e31
4 changed files with 20 additions and 21 deletions

View File

@ -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.

View File

@ -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])

View File

@ -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

View File

@ -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