* autogen.sh: Add a workaround to ensure that "depcomp" is

distributed.
* configure.in: Replace obsolete macros.  Use AC_MSG_NOTICE
where appropriate.
* acinclude.m4: Likewise.  Fix check whether S-Lang uses
terminfo.

ChangeLog

@@ -1,5 +1,12 @@
 2001-09-12  Pavel Roskin  <proski@gnu.org>
 
+	* autogen.sh: Add a workaround to ensure that "depcomp" is
+	distributed.
+	* configure.in: Replace obsolete macros.  Use AC_MSG_NOTICE
+	where appropriate.
+	* acinclude.m4: Likewise.  Fix check whether S-Lang uses
+	terminfo.
+
 	* configure.in: Use three-argument form of AC_INIT.  Use
 	AC_CONFIG_AUX_DIR.  Remove some unused or implied macros.
 	* Makefile.am (EXTRA_DIST): Remove "depcomp" - this workaround

acinclude.m4

@@ -181,7 +181,7 @@ av_struct_linger=no
 ],[
 av_struct_linger=no
 ])
-AC_MSG_RESULT($av_struct_linger)
+AC_MSG_RESULT([$av_struct_linger])
 ])
 
 
@@ -445,7 +445,7 @@ can be used together])
 dnl This configure.in code has been stolen from GNU fileutils-3.12.  Its
 dnl job is to detect a method to get file system information.
 
-    AC_CHECKING([how to get filesystem space usage])
+    AC_MSG_NOTICE([checking how to get filesystem space usage])
     space=no
 
     # Here we'll compromise a little (and perform only the link test)
@@ -626,7 +626,8 @@ int t() {
 ; return 0; }
 EOF
 ac_compile_warn='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 2>&1'
-if { if eval $ac_compile_warn; then :; else echo arning; fi; } | grep arning 1>&AC_FD_CC 2>&AC_FD_CC; then
+if { if eval $ac_compile_warn; then :; else echo arning; fi; } |
+	grep arning 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
   ifelse([$4], , :, [rm -rf conftest*
   $4])
 ifelse([$3], , , [else
@@ -639,12 +640,12 @@ rm -f conftest*]
 
 AC_DEFUN([AC_USE_TERMINFO], [
 	AC_DEFINE(SLANG_TERMINFO, 1, [Define to use S-Lang with terminfo])
-	AC_MSG_RESULT([Using SLang screen manager/terminfo])
+	AC_MSG_NOTICE([using SLang screen manager/terminfo])
 	slang_term=" with terminfo"
 ])
 
 AC_DEFUN([AC_USE_TERMCAP], [
-	AC_MSG_RESULT([Using SLang screen manager/termcap])
+	AC_MSG_NOTICE([using S-Lang screen manager/termcap])
 	AC_DEFINE(USE_TERMCAP, 1, [[Define to use termcap library]])
 	dnl Check with $LIBS at the end so that it works with ELF libs.
 	AC_CHECK_LIB(termcap, tgoto, LIBS="$LIBS -ltermcap", , $LIBS)
@@ -661,22 +662,19 @@ AC_DEFUN([AC_WITH_SLANG], [
 		      [Define to use S-Lang library installed on the system])
 	    MCLIBS="-lslang $MCLIBS"
 	    screen_manager="SLang (system-installed library)"
-	    AC_MSG_RESULT([Using system installed SLang library])
+	    AC_MSG_NOTICE([using system installed S-Lang library])
 	    rm -f slang/slang.h
 	    ac_save_LIBS="$LIBS"
 	    LIBS="$LIBS -lslang"
-	    AC_TRY_RUN(
+	    AC_TRY_LINK(
 	    [ 
-	    #ifdef SLANG_H_INSIDE_SLANG_DIR
+	    #ifdef HAVE_SLANG_SLANG_H
 	    #include <slang/slang.h>
 	    #else
 	    #include <slang.h>
-	    #endif
-	    int main(void){
-		SLtt_get_terminfo();
-		SLtt_tgetflag("");
-		return 0;
-	    } ], 
+	    #endif], [
+	    SLtt_get_terminfo();
+	    SLtt_tgetflag("");], 
 	    [LIBS="$ac_save_LIBS"; AC_USE_TERMINFO], 
 	    [LIBS="$ac_save_LIBS"; AC_USE_TERMCAP])
 	else
@@ -716,18 +714,18 @@ AC_DEFUN([AC_WITH_EDIT], [
 	MCEDIT="mcedit"
 	LEDIT="-ledit"
 	EDIT_msg="yes"
-	AC_MSG_RESULT([will call internal editor])
+	AC_MSG_NOTICE([using internal editor])
 ])
 
 AC_DEFUN([AC_EXT2_UNDEL], [
   MC_UNDELFS_CHECKS
   if test "$ext2fs_undel" = yes; then
-     AC_MSG_RESULT([With ext2fs file recovery code])
+     AC_MSG_NOTICE([using 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])
+     AC_MSG_NOTICE([not using ext2fs file recovery code])
   fi
 ])
 
@@ -739,7 +737,7 @@ AC_DEFUN([AC_NCURSES], [
     then
         if test -f $1/$2
 	then
-	    AC_MSG_RESULT([Found ncurses on $1/$2])
+	    AC_MSG_NOTICE([found ncurses header $1/$2])
  	    MCLIBS="$MCLIBS $3"
 	    CPPFLAGS="$CPPFLAGS $4"
 	    search_ncurses=false

autogen.sh

@@ -50,6 +50,9 @@ $ACLOCAL -I gettext.m4 $ACLOCAL_FLAGS || \
   exit 1
 $AUTOHEADER || exit 1
 $AUTOCONF || exit 1
+
+# Workaround for Automake 1.5 to ensure that depcomp is distributed.
+$AUTOMAKE -a src/Makefile || exit 1
 $AUTOMAKE -a || exit 1
 
 cd vfs/samba || exit 1

configure.in

@@ -273,7 +273,7 @@ AC_SUBST(NETFILES)
 vfs_type="normal"
 if test $use_vfs = yes
 then
-	AC_MSG_RESULT([Using the VFS switch code])
+	AC_MSG_NOTICE([enabling VFS code])
 	vfs_type="Midnight Commander Virtual File System"
 fi
 
@@ -345,7 +345,7 @@ if $HAVE_nroff; then
     fi
     ])
     MANDOC=$ac_cv_mandoc
-    AC_MSG_RESULT($MANDOC)
+    AC_MSG_RESULT([$MANDOC])
 else
     MANDOC=-man
 fi
@@ -372,7 +372,7 @@ if $HAVE_nroff; then
     fi
     ])
     if test "x$ac_cv_nroff_tascii" = x; then
-	AC_MSG_RESULT(no)
+	AC_MSG_RESULT([no])
     else
 	AC_MSG_RESULT([yes,$ac_cv_nroff_tascii])
     fi
@@ -498,7 +498,7 @@ AC_ARG_WITH(mad,
 	mem_debug="Janne's MAD library"
 	AC_DEFINE(HAVE_MAD, 1,
 		  [Define to use Memory Allocation Debugger (MAD)])
-	AC_MSG_RESULT([compiling with memory leak detector])
+	AC_MSG_NOTICE([compiling with memory leak detector])
 fi])
 
 dnl
@@ -508,7 +508,7 @@ AC_ARG_WITH(efence,
 [--with-efence              Developers only: activates Electric Fence],
 	[if test x$withval = xyes; then
 	LIBS="$LIBS -lefence"
-	AC_MSG_RESULT([compiling with Electric fence])
+	AC_MSG_NOTICE([compiling with Electric fence])
 	mem_debug="Electric Fence"
 fi])
 
@@ -521,7 +521,7 @@ AC_ARG_WITH(mmap,
 	[--with-mmap                To force using the mmap call (AIX)],
 	[if test x$withval = xyes; then
 	AC_DEFINE(HAVE_MMAP)
-        AC_MSG_RESULT([forcing MMAP support])
+        AC_MSG_NOTICE([forcing MMAP support])
 fi])
 
 slang_check_lib=true
@@ -581,7 +581,7 @@ MCEDIT=""
 LEDIT=""
 EDIT_msg=""
 AC_ARG_WITH(edit,
-        [--with-edit                Define INTERNAL_EDIT],
+        [--with-edit                Enable internal editpr],
 	[if test x$withval = xyes
 	then
 		AC_WITH_EDIT
@@ -600,7 +600,7 @@ AC_ARG_WITH(netrc,
 	if test x$withval = xyes; then
 		AC_DEFINE(USE_NETRC, 1,
 			  [Define to use .netrc for FTP connections])
-		AC_MSG_RESULT([ftpfs will have .netrc parsing code])
+		AC_MSG_NOTICE([ftpfs will use .netrc])
 	fi
 ])
 
@@ -627,7 +627,7 @@ AC_SUBST(undelfs_o)
 	
 if $search_ncurses
 then
-    AC_CHECKING([location of ncurses.h file])
+    AC_MSG_NOTICE([checking location of ncurses.h file])
 
     AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
     AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
@@ -656,7 +656,7 @@ cat > conftest.$ac_ext <<EOF
 #undef VERSION
 VERSION:NCURSES_VERSION
 EOF
-        if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
+        if (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
   egrep "VERSION:" >conftest.out 2>&1; then
             ncurses_version=`cat conftest.out|sed -e 's/^[[^"]]*"//' -e 's/".*//'`
 	fi
@@ -809,7 +809,7 @@ AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
 
 AH_BOTTOM([#include <extraconf.h>])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile 
 mc.spec
 doc/Makefile 
@@ -841,7 +841,12 @@ vfs/extfs/uzoo
 doc/mc.1 doc/mcedit.1 doc/mcserv.8
 
 intl/Makefile po/Makefile.in
-],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])
+
+AC_CONFIG_COMMANDS(potfiles,
+    [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+
+AC_OUTPUT
 
 case $screen_manager in
 SLang*)