forget about m4/Makefile.*

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/Makefile.am b/Makefile.am
index 9978ecd..3c64513 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ if BUILD_NNTP
 NNTP_SUBDIR = nntp
 endif
 
-SUBDIRS = tools intl m4 po \
+SUBDIRS = tools intl po \
          lib-lua lib-mime lib-lib lib-mx lib-sys lib-ui \
          pop imap $(NNTP_SUBDIR)
 

diff --git a/autogen.sh b/autogen.sh
index dfe1b36..bf2a8a7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,16 +1,14 @@
 #!/bin/sh --
 
-if aclocal -I m4 && autoheader && (cd m4 && make -f Makefile.am.in ) \
-  && automake --include-deps && autoconf
+if aclocal -I m4 && autoheader && automake --include-deps && autoconf
 then
   echo
-  echo "The configure script for Mutt-ng was successfully prepared."
+  echo "The configure script for madmutt was successfully prepared."
   echo "Continue with \"./configure [your options]\"."
   echo
 else
   echo
   echo "Some part of the preparation process failed."
-  echo "Please refer to doc/devel-notes.txt for details."
   echo
   exit 1
 fi

diff --git a/configure.ac b/configure.ac
index f050da7..beac5e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -549,7 +549,6 @@ AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_OUTPUT(Makefile
           intl/Makefile
-          m4/Makefile
           po/Makefile.in
           apidoc/Makefile apidoc/doxygen.cfg
           lib-lib/Makefile

diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644 (file)
index 7b0514c..0000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-
-##m4-files-begin
-EXTRA_DIST = Makefile.am.in \
-curslib.m4 \
-funcdecl.m4 \
-libesmtp.m4
-##m4-files-end
-
-Makefile.am: Makefile.am.in
-       rm -f $@ $@t
-       sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t
-       ( (echo EXTRA_DIST = Makefile.am.in | tr '\012' @); \
-         (echo *.m4|tr ' ' @) ) \
-         |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
-         >> $@t
-       sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t
-       chmod a-w $@t
-       mv $@t $@

diff --git a/m4/Makefile.am.in b/m4/Makefile.am.in
deleted file mode 100644 (file)
index 790b158..0000000
--- a/m4/Makefile.am.in
+++ /dev/null
@@ -1,15 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-
-##m4-files-begin
-##m4-files-end
-
-Makefile.am: Makefile.am.in
-       rm -f $@ $@t
-       sed -n '1,/^##m4-files-begin/p' Makefile.am.in > $@t
-       ( (echo EXTRA_DIST = Makefile.am.in | tr '\012' @); \
-         (echo *.m4|tr ' ' @) ) \
-         |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
-         >> $@t
-       sed -n '/^##m4-files-end/,$$p' Makefile.am.in >> $@t
-       chmod a-w $@t
-       mv $@t $@