more autofools syncing

diff --git a/Makefile.am b/Makefile.am
index 03bdbcae30adc51026024cab1837817ce2beb768..5daa71a3b26a9ec86749ab30a237b7d2211be404 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = m4 doc src po 
+SUBDIRS = doc src po 
 
 EXTRA_DIST= config.rpath ABOUT-NLS 
 

diff --git a/Makefile.in b/Makefile.in
index 66775a49221a3e0da713573faf75095b78e8eb02..218f63a8210bcd3b93cf2352a75f0c7640166a41 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-SUBDIRS = m4 doc src po 
+SUBDIRS = doc src po 
 
 EXTRA_DIST = config.rpath ABOUT-NLS 
 
@@ -119,10 +119,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        uninstall-info-recursive all-recursive install-data-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ././stamp-h.in ./stamp-h.in ABOUT-NLS AUTHORS \
-       COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
-       aclocal.m4 config.guess config.h.in config.sub configure \
-       configure.in depcomp install-sh ltmain.sh missing mkinstalldirs
+DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+       INSTALL Makefile.am Makefile.in NEWS aclocal.m4 config.guess \
+       config.h.in config.sub configure configure.in depcomp \
+       install-sh ltmain.sh missing mkinstalldirs
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -150,7 +150,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/progtest.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4
+$(ACLOCAL_M4):  configure.in 
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
        @if test ! -f $@; then \
@@ -282,7 +282,7 @@ GZIP_ENV = --best
 distdir: $(DISTFILES)
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
-       $(mkinstalldirs) $(distdir)/./. $(distdir)/po
+       $(mkinstalldirs) $(distdir)/po
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

diff --git a/configure b/configure
index b0818aac5442faeae7d984117d6977ed60fb1415..1b7986c849c2612edba94ff6396a858d52c436ae 100755 (executable)
--- a/configure
+++ b/configure
@@ -10366,7 +10366,7 @@ rm -f conftest*
 fi
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile po/Makefile.in po/Makefile.in m4/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile po/Makefile.in po/Makefile.in"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -10861,7 +10861,6 @@ do
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

diff --git a/configure.in b/configure.in
index 1169fb24ceeb2ad1fec72d1b9b0b258f9e9f3cd3..4c950f593d460888f7d4ea1c84f0e5c4eeffff76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,4 +41,4 @@ AC_CHECK_FUNCS(strdup strerror strtoul)
 dnl Checks for Large File System
 AC_SYS_LARGEFILE
 
-AC_OUTPUT(Makefile doc/Makefile src/Makefile po/Makefile.in po/Makefile.in m4/Makefile )
+AC_OUTPUT(Makefile doc/Makefile src/Makefile po/Makefile.in po/Makefile.in )