From 0f93ec20cdedff43cead98b8754f16454a8ef203 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 24 Jul 1998 06:39:59 +0000 Subject: [PATCH] Thu Jul 23 22:44:16 1998 Tom Tromey * Makefile.in (aclocal.m4): Depend on all source files. Include gnome-vfs.m4 and gnome-undelfs.m4. (GNOME_M4_FILES): New macro. * autogen.sh: Include gnome-vfs.m4 and gnome-undelfs.m4 in aclocal.m4. * configure.in: Use GNOME_VFS_CHECKS and GNOME_UNDELFS_CHECKS macros instead of in-line checks. Create vfs/Makefile from vfs/Make-mc.in. --- Makefile.in | 5 +++-- autogen.sh | 2 +- configure.in | 55 ++++++++++++++------------------------------------- src/ChangeLog | 11 +++++++++++ 4 files changed, 30 insertions(+), 43 deletions(-) diff --git a/Makefile.in b/Makefile.in index 476e0fe2e..9def82b53 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,8 +34,9 @@ static: configure: configure.in aclocal.m4 chmod 755 configure -aclocal.m4: mc-aclocal.m4 - cd $(srcdir); cat macros/gnome.m4 mc-aclocal.m4 gettext.m4 > aclocal.m4 +GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 +aclocal.m4: mc-aclocal.m4 $(GNOME_M4_FILES) gettext.m4 + cd $(srcdir); cat $(GNOME_M4_FILES) mc-aclocal.m4 gettext.m4 > aclocal.m4 config.h.in: configure.in acconfig.h cd $(srcdir); autoheader diff --git a/autogen.sh b/autogen.sh index b2177508c..c7914c221 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ test -z "$srcdir" && srcdir=. ( cd $srcdir -cat macros/gnome.m4 mc-aclocal.m4 gettext.m4 > aclocal.m4 +cat macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 mc-aclocal.m4 gettext.m4 > aclocal.m4 autoheader autoconf ) diff --git a/configure.in b/configure.in index 452df7e71..1f6228546 100644 --- a/configure.in +++ b/configure.in @@ -408,22 +408,10 @@ AC_CHECK_LIB(seq, get_process_stats, [ LIBS="$LIBS -lseq" AC_DEFINE(HAVE_GET_PROCESS_STATS)]) -NETFILES="" -vfs_flags="tarfs" -use_net_code=false +GNOME_VFS_CHECKS +NETFILES= if test $have_socket = yes; then - AC_STRUCT_LINGER - AC_CHECK_FUNCS(pmap_set, , [ - AC_CHECK_LIB(rpc, pmap_set, [ - LIBS="-lrpc $LIBS" - AC_DEFINE(HAVE_PMAP_SET) - ])]) - AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport) -dnl add for source routing support setsockopt - AC_CHECK_HEADERS(rpc/pmap_clnt.h) - vfs_flags="$vfs_flags, mcfs, ftpfs" - NETFILES="\$(NETFILES)" - use_net_code=true + NETFILES="\$(NETFILES)" fi AC_SUBST(NETFILES) @@ -1091,12 +1079,6 @@ AC_DEFUN(AC_WITH_VFS, [ LIBVFS="libvfs-mc.a" LVFS="-lvfs-mc" fastdepvfs=fastdepvfs - if test $have_socket = yes; then - mcserv="mcserv" - if $termnet; then - TERMNET="-ltermnet" - fi - fi CPPFLAGS="$CPPFLAGS -I\$(vfsdir)" AC_MSG_RESULT(Using the VFS switch code) vfs_type="Midnight Commander Virtual File System" @@ -1106,7 +1088,6 @@ AC_SUBST(TERMNET) LIBVFS="" LVFS="" fastdepvfs="" -mcserv="" vfs_type="normal" AC_ARG_WITH(vfs, [--with-vfs Compile with the VFS code], @@ -1115,6 +1096,8 @@ AC_ARG_WITH(vfs, AC_WITH_VFS else vfs_flags="" + TERMNET="" + mcserv="" fi, dnl Default: provide the VFS code AC_WITH_VFS @@ -1122,7 +1105,6 @@ AC_ARG_WITH(vfs, AC_SUBST(LIBVFS) AC_SUBST(LVFS) AC_SUBST(fastdepvfs) -AC_SUBST(mcserv) AC_DEFUN(AC_WITH_EDIT, [ AC_DEFINE(USE_INTERNAL_EDIT) @@ -1161,22 +1143,15 @@ AC_ARG_WITH(netrc, undelfs_o="" AC_DEFUN(AC_EXT2_UNDEL, [ - AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h) - if test x$ac_cv_header_ext2fs_ext2fs_h = xyes - then - if test x$ac_cv_header_linux_ext2_fs_h = xyes - then - AC_DEFINE(USE_EXT2FSLIB) - AC_MSG_RESULT(With ext2fs file recovery code) - vfs_flags="${vfs_flags} undelfs" - undelfs_o="undelfs.o" - LIBS="$LIBS -lext2fs -lcom_err" - else - AC_MSG_WARN(No ext2fs file recovery code: linux/ext2_fs.h is missing) - fi - else - AC_MSG_WARN(No ext2fs file recovery code: ext2fs/ext2fs.h is missing) - fi + GNOME_UNDELFS_CHECKS + if test "$ext2fs_undel" = yes; then + AC_MSG_RESULT(With ext2fs file recovery code) + vfs_flags="${vfs_flags} undelfs" + undelfs_o="undelfs.o" + LIBS="$LIBS $EXT2FS_UNDEL_LIBS" + else + AC_MSG_WARN(No ext2fs file recovery code) + fi ]) AC_ARG_WITH(ext2undel, @@ -1438,7 +1413,7 @@ AC_OUTPUT([ Make.common Makefile doc/Makefile -vfs/Makefile +vfs/Makefile:vfs/Make-mc.in lib/Makefile tk/Makefile gnome/Makefile diff --git a/src/ChangeLog b/src/ChangeLog index 58a5585c7..90a016df6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +Thu Jul 23 22:44:16 1998 Tom Tromey + + * Makefile.in (aclocal.m4): Depend on all source files. Include + gnome-vfs.m4 and gnome-undelfs.m4. + (GNOME_M4_FILES): New macro. + * autogen.sh: Include gnome-vfs.m4 and gnome-undelfs.m4 in + aclocal.m4. + * configure.in: Use GNOME_VFS_CHECKS and GNOME_UNDELFS_CHECKS + macros instead of in-line checks. Create vfs/Makefile from + vfs/Make-mc.in. + Thu Jul 23 19:49:12 1998 Pavel Roskin * hotlist.c: corrected layout of the warning which appears