* 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
is not needed if AC_CONFIG_AUX_DIR is used.
* vfs/Make-mc.in: Adjust mkinstalldirs location.
* autogen.sh: Create "config" and remove "autom4te.cache".

.cvsignore

@@ -1,9 +1,11 @@
 *.cache
+*.tar.gz
 ABOUT-NLS
 Make.common
 Makefile
 Makefile.in
 aclocal.m4
+config
 config.guess
 config.h
 config.h.in

ChangeLog

@@ -1,3 +1,12 @@
+2001-09-12  Pavel Roskin  <proski@gnu.org>
+
+	* 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
+	is not needed if AC_CONFIG_AUX_DIR is used.
+	* vfs/Make-mc.in: Adjust mkinstalldirs location.
+	* autogen.sh: Create "config" and remove "autom4te.cache".
+
 2001-09-11  Pavel Roskin  <proski@gnu.org>
 
 	* syntax/Syntax: New file, extracted from edit/syntax.c.

Makefile.am

@@ -6,7 +6,7 @@ SUBDIRS = intl po vfs slang edit src lib doc syntax pc
 
 EXTRA_DIST =	FAQ INSTALL.FAST MAINTAINERS \
 		README.PC README.QNX README.smbfs \
-		extraconf.h depcomp
+		extraconf.h
 
 noinst_DATA = mc.spec
 

autogen.sh

@@ -14,6 +14,9 @@ test -z "$srcdir" && srcdir=.
 (
 cd $srcdir
 
+# This cache is not reliable yet.
+rm -rf autom4te.cache
+
 # Ensure that gettext is reasonably new.
 gettext_ver=`$GETTEXTIZE --version | sed -n '1s/^.* //p'`
 
@@ -38,6 +41,10 @@ for i in $m4files; do
   cp -f $fromdir/$i gettext.m4
 done
 
+if test ! -d config; then
+  mkdir config || exit 1
+fi
+
 $ACLOCAL -I gettext.m4 $ACLOCAL_FLAGS || \
   $ACLOCAL $ACLOCAL_FLAGS || \
   exit 1

configure.in

@@ -1,19 +1,18 @@
 dnl
 dnl Configure.in file for the Midnight Commander
 dnl
-AC_INIT(src/main.c)
-AC_PREREQ(2.52)
-AC_CANONICAL_HOST
 
+AC_INIT(GNU Midnight Commander, 4.5.99a, mc-devel@gnome.org)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(mc, 4.5.99a)
+
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_RANLIB
 AC_PROG_LN_S
-AC_PROG_AWK
+AC_CANONICAL_HOST
 
 AC_AIX
 AC_MINIX

vfs/Make-mc.in

@@ -9,7 +9,7 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 top_builddir = ..
 
 # Installation target directories & other installation stuff