From 6d534153134d39cdcfc00afa2cc940a6337e9bfc Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 13 Sep 2002 06:55:24 +0000 Subject: [PATCH] * acinclude.m4: Replace undelfs_o with use_undelfs. * configure.in: Likewise. Don't substitute it. --- ChangeLog | 3 +++ acinclude.m4 | 2 +- configure.in | 6 +----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74371248d..26f639d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-09-13 Pavel Roskin + * acinclude.m4: Replace undelfs_o with use_undelfs. + * configure.in: Likewise. Don't substitute it. + * configure.in: Simplify processing of without-edit. Replace several variables with use_edit. * acinclude.m4: Remove AC_WITH_EDIT. diff --git a/acinclude.m4 b/acinclude.m4 index 2b9d3a04a..59f253684 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -660,7 +660,7 @@ AC_DEFUN([AC_EXT2_UNDEL], [ if test "$ext2fs_undel" = yes; then AC_MSG_NOTICE([using ext2fs file recovery code]) vfs_flags="${vfs_flags}, undelfs" - undelfs_o="undelfs.o" + use_undelfs=yes MCLIBS="$MCLIBS $EXT2FS_UNDEL_LIBS" else AC_MSG_NOTICE([not using ext2fs file recovery code]) diff --git a/configure.in b/configure.in index 121802db6..84e03fa11 100644 --- a/configure.in +++ b/configure.in @@ -508,8 +508,6 @@ else fi -undelfs_o="" - if test $use_vfs = yes; then AC_ARG_WITH(ext2undel, [ --with-ext2undel Compile with ext2 undelete code [[yes if found]]], @@ -525,8 +523,6 @@ if test $use_vfs = yes; then ]) fi -AC_SUBST(undelfs_o) - dnl Ncurses specific checks dnl @@ -655,7 +651,7 @@ fi AM_CONDITIONAL(USE_EDIT, [test -n "$use_edit"]) AM_CONDITIONAL(USE_VFS, [test "x$use_vfs" = xyes]) AM_CONDITIONAL(USE_VFS_NET, [test x"$use_net_code" = xtrue]) -AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$undelfs_o"]) +AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$use_undelfs"]) AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$use_smbfs"]) AM_CONDITIONAL(USE_MCFS, [test -n "$use_mcfs"]) AM_CONDITIONAL(INCLUDED_SLANG,