From b4bc14ba2f5db0c267ce2d03ca5c3f29380845a9 Mon Sep 17 00:00:00 2001
From: uid38180 <uid38180>
Date: Mon, 9 Sep 2002 20:53:08 +0000
Subject: [PATCH] unwind gettext usage; see tag COMMENT_LAST_WORKING_GETTEXT
 for the last working version of the gettext flow

---
 Makefile.am  | 6 ++----
 autogen.sh   | 2 +-
 configure.in | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f7af02fb..614c7d02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,11 +28,11 @@
 # distclean: remove everything except what goes in the distribution
 #
 
-SUBDIRS = intl m4  doc include man src test build flac.pbproj obj po
+SUBDIRS = doc include man src test build flac.pbproj obj
 
 DISTCLEANFILES = libtool-disable-static
 
-EXTRA_DIST = config.rpath mkinstalldirs  \
+EXTRA_DIST = \
 	COPYING.FDL \
 	COPYING.GPL \
 	COPYING.LGPL \
@@ -42,5 +42,3 @@ EXTRA_DIST = config.rpath mkinstalldirs  \
 	strip_fPIC.sh
 
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index 7c853402..39cabf4a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-gettextize --intl && aclocal && autoconf && autoheader && automake --foreign --include-deps --add-missing --copy
+aclocal && autoconf && autoheader && automake --foreign --include-deps --add-missing --copy
diff --git a/configure.in b/configure.in
index ac99d72e..38bb196a 100644
--- a/configure.in
+++ b/configure.in
@@ -117,7 +117,6 @@ AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
 SHARE_LIBS='$(top_builddir)/src/share/libutf8.a $(top_builddir)/src/share/libgetopt.a'
 
 dnl check for i18n(internationalization); these are from libiconv/gettext
-AM_GNU_GETTEXT
 AM_ICONV
 AM_LANGINFO_CODESET
 
@@ -229,7 +228,7 @@ fi
 CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS $OUR_CFLAGS_TAIL"
 CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS $OUR_CFLAGS_TAIL"
 
-AC_OUTPUT( po/Makefile.in m4/Makefile intl/Makefile \
+AC_OUTPUT( \
 	Makefile \
 	src/Makefile \
 	src/libFLAC/Makefile \