* Makefile.am: Add m4 to SUBDIRS. Set ACLOCAL_AMFLAGS so that

m4 directory is used by aclocal.
* m4/Makefile.am: New file.
* configure.in: Substitute m4/Makefile.
* autogen.sh: Don't copy any macro files, use m4 directory.

ChangeLog

@@ -1,5 +1,11 @@
 2002-08-17  Pavel Roskin  <proski@gnu.org>
 
+	* Makefile.am: Add m4 to SUBDIRS.  Set ACLOCAL_AMFLAGS so that
+	m4 directory is used by aclocal.
+	* m4/Makefile.am: New file.
+	* configure.in: Substitute m4/Makefile.
+	* autogen.sh: Don't copy any macro files, use m4 directory.
+
 	* syntax/Makefile.am: Add js.syntax.
 
 	* configure.in: Add support for glib 2.x.  Right now, it has to

Makefile.am

@@ -2,12 +2,14 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs slang edit src lib doc syntax pc
+SUBDIRS = intl po m4 vfs slang edit src lib doc syntax pc
 
 EXTRA_DIST =	FAQ INSTALL.FAST MAINTAINERS \
 		README.PC README.QNX extraconf.h
 
 noinst_DATA = mc.spec
 
+ACLOCAL_AMFLAGS = -I m4
+
 dist-hook:
 	cp mc.spec $(distdir)

autogen.sh

@@ -37,31 +37,14 @@ if test $gettext_ver -ge 01100; then
   fi
   $AUTOPOINT || exit 1
 else
-  $GETTEXTIZE --copy --force >tmpout || exit 1
+  $GETTEXTIZE --copy --force || exit 1
   if test -e po/ChangeLog~; then
     rm -f po/ChangeLog
     mv po/ChangeLog~ po/ChangeLog
   fi
 fi
 
-rm -f aclocal.m4
-if test -f `aclocal --print-ac-dir`/gettext.m4; then
-  : # gettext macro files are available to aclocal.
-else
-  # gettext macro files are not available.
-  # Find them and copy to a local directory.
-  # Ugly way to parse the instructions gettexize gives us.
-  m4files="`cat tmpout | sed -n -e '/^Please/,/^from/s/^  *//p'`"
-  fromdir=`cat tmpout | sed -n -e '/^Please/,/^from/s/^from the \([^ ]*\) .*$/\1/p'`
-  rm -rf gettext.m4
-  mkdir gettext.m4
-  for i in $m4files; do
-    cp -f $fromdir/$i gettext.m4
-  done
-  ACLOCAL_INCLUDES="-I gettext.m4"
-fi
-
-rm -f tmpout
+ACLOCAL_INCLUDES="-I m4"
 
 # Some old version of GNU build tools fail to set error codes.
 # Check that they generate some of the files they should.

configure.in

@@ -680,6 +680,7 @@ slang/Makefile
 edit/Makefile 
 syntax/Makefile
 pc/Makefile
+m4/Makefile
 
 lib/mc.ext
 lib/mc.sh
@@ -702,7 +703,8 @@ doc/it/mc.1 doc/it/Makefile
 doc/pl/mc.1 doc/pl/Makefile
 doc/ru/mc.1 doc/ru/Makefile
 
-intl/Makefile po/Makefile.in
+intl/Makefile
+po/Makefile.in
 ])
 
 AC_OUTPUT

m4/Makefile.am

@@ -0,0 +1,22 @@
+m4files = \
+	codeset.m4 \
+	gettext.m4 \
+	glib.m4 \
+	glibc21.m4 \
+	iconv.m4 \
+	intdiv0.m4 \
+	inttypes-pri.m4 \
+	inttypes.m4 \
+	inttypes_h.m4 \
+	isc-posix.m4 \
+	lcmessage.m4 \
+	lib-ld.m4 \
+	lib-link.m4 \
+	lib-prefix.m4 \
+	pkg.m4 \
+	progtest.m4 \
+	stdint_h.m4 \
+	uintmax_t.m4 \
+	ulonglong.m4
+
+EXTRA_DIST = README $(m4files)