From bc4ca3c77b7c2f21de6a19d43ad52ca1bdd9a505 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 12 May 2007 14:34:13 +0200
Subject: [PATCH] more autofuck simplifications

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 configure.ac   |  4 +---
 m4/Makefile.am | 28 +---------------------------
 m4/gperf.m4    | 10 ----------
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 m4/gperf.m4

diff --git a/configure.ac b/configure.ac
index a74f7ce..1424eb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_GPERF
+AC_PATH_PROG(GPERF, gperf, AC_MSG_ERROR([Could not find gperf]))
 AC_CHECK_TOOL(AR, ar, ar)
 
 AC_SYS_LARGEFILE
@@ -50,9 +51,6 @@ AH_TEMPLATE([SIG_ATOMIC_VOLATILE_T],
             [Some systems declare sig_atomic_t as volatile, some others -- no.
              This define will have value `sig_atomic_t' or
              `volatile sig_atomic_t' accordingly.])
-AH_TEMPLATE([ICONV_NONTRANS],
-            [Define as 1 if iconv() only converts exactly and we should treat
-             all return values other than (size_t)(-1) as equivalent.])
 
 dnl ---------------- sendmail ----------------
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index ef5d521..7b0514c 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,35 +2,9 @@
 
 ##m4-files-begin
 EXTRA_DIST = Makefile.am.in \
-codeset.m4 \
 curslib.m4 \
 funcdecl.m4 \
-gettext.m4 \
-gperf.m4 \
-iconv.m4 \
-intmax.m4 \
-inttypes_h.m4 \
-inttypes-h.m4 \
-inttypes-pri.m4 \
-lcmessage.m4 \
-libesmtp.m4 \
-lib-ld.m4 \
-lib-link.m4 \
-lib-prefix.m4 \
-lock.m4 \
-longdouble.m4 \
-longlong.m4 \
-nls.m4 \
-po.m4 \
-progtest.m4 \
-size_max.m4 \
-stdint_h.m4 \
-uintmax_t.m4 \
-ulonglong.m4 \
-visibility.m4 \
-wchar_t.m4 \
-wint_t.m4 \
-xsize.m4
+libesmtp.m4
 ##m4-files-end
 
 Makefile.am: Makefile.am.in
diff --git a/m4/gperf.m4 b/m4/gperf.m4
deleted file mode 100644
index 708d78b..0000000
--- a/m4/gperf.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-dnl
-dnl AC_PROG_GPERF
-dnl
-
-AC_DEFUN([AC_PROG_GPERF],[
-        AC_PATH_PROG(GPERF, gperf, no)
-        if test "$GPERF" = no; then
-                AC_MSG_ERROR(Could not find gperf)
-        fi
-])
-- 
2.20.1