31 files changed, 36 insertions, 25 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 3a5209dc3..a652a0234 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/misc/Makefile.common
 
+SUBDIRS = gettext
+
 if INSTALL_M4
 m4datadir = $(ACLOCAL_DIR)
 else
@@ -8,27 +10,20 @@ endif
 
 m4data_DATA = xine.m4
 
-EXTRA_DIST = glibc2.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 \
+EXTRA_DIST = \
 	aa.m4 \
 	arts.m4 \
 	attributes.m4 \
-	codeset.m4 \
 	directx.m4 \
 	dl.m4 \
 	dvdnav.m4 \
-	gettext.m4 \
-	glibc21.m4 \
-	iconv.m4 \
 	irixal.m4 \
-	isc-posix.m4 \
-	lcmessage.m4 \
 	libFLAC.m4 \
 	libfame.m4 \
 	libtool15.m4 \
 	opengl.m4 \
 	optimizations.m4 \
 	pkg.m4 \
-	progtest.m4 \
 	xine.m4 \
 	_xine.m4 \
 	xv.m4 \
diff --git a/m4/gettext/Makefile.am b/m4/gettext/Makefile.am
new file mode 100644
index 000000000..1ea9db48c
--- /dev/null
+++ b/m4/gettext/Makefile.am
@@ -0,0 +1,32 @@
+include $(top_srcdir)/misc/Makefile.common
+
+EXTRA_DIST = \
+	codeset.m4
+	gettext.m4
+	glibc2.m4
+	glibc21.m4
+	iconv.m4
+	intdiv0.m4
+	intmax.m4
+	inttypes-pri.m4
+	inttypes.m4
+	inttypes_h.m4
+	isc-posix.m4
+	lcmessage.m4
+	lib-ld.m4
+	lib-link.m4
+	lib-prefix.m4
+	longdouble.m4
+	longlong.m4
+	nls.m4
+	po.m4
+	printf-posix.m4
+	progtest.m4
+	signed.m4
+	size_max.m4
+	stdint_h.m4
+	uintmax_t.m4
+	ulonglong.m4
+	wchar_t.m4
+	wint_t.m4
+	xsize.m4
diff --git a/m4/codeset.m4 b/m4/gettext/codeset.m4
index a6e67ec49..a6e67ec49 100644
--- a/m4/codeset.m4
+++ b/m4/gettext/codeset.m4
diff --git a/m4/gettext.m4 b/m4/gettext/gettext.m4
index 624a80785..624a80785 100644
--- a/m4/gettext.m4
+++ b/m4/gettext/gettext.m4
diff --git a/m4/glibc2.m4 b/m4/gettext/glibc2.m4
index e8f5bfe6e..e8f5bfe6e 100644
--- a/m4/glibc2.m4
+++ b/m4/gettext/glibc2.m4
diff --git a/m4/glibc21.m4 b/m4/gettext/glibc21.m4
index d95fd9861..d95fd9861 100644
--- a/m4/glibc21.m4
+++ b/m4/gettext/glibc21.m4
diff --git a/m4/iconv.m4 b/m4/gettext/iconv.m4
index 5ed7c43ae..654c41589 100644
--- a/m4/iconv.m4
+++ b/m4/gettext/iconv.m4
@@ -15,22 +15,6 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
-
-  dnl
-  dnl xine: added the prefix /usr/local on FreeBSD if none specified
-  dnl
-  if test -z "$INCICONV"; then
-    case "$host" in
-      *-*-freebsd*)
-        dir=/usr/local
-        if test -d $dir/include; then INCICONV="$INCICONV -I$dir/include"; fi
-        if test -d $dir/lib; then
-          LIBICONV="$LIBICONV -L$dir/lib"
-          LTLIBICONV="$LTLIBICONV -L$dir/lib"
-        fi
-        ;;
-    esac
-  fi
 ])
 
 AC_DEFUN([AM_ICONV_LINK],
diff --git a/m4/intdiv0.m4 b/m4/gettext/intdiv0.m4
index b8d78176a..b8d78176a 100644
--- a/m4/intdiv0.m4
+++ b/m4/gettext/intdiv0.m4
diff --git a/m4/intmax.m4 b/m4/gettext/intmax.m4
index d99c999fd..d99c999fd 100644
--- a/m4/intmax.m4
+++ b/m4/gettext/intmax.m4
diff --git a/m4/inttypes-pri.m4 b/m4/gettext/inttypes-pri.m4
index 4d56a9ad3..4d56a9ad3 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/gettext/inttypes-pri.m4
diff --git a/m4/inttypes.m4 b/m4/gettext/inttypes.m4
index 779bcea05..779bcea05 100644
--- a/m4/inttypes.m4
+++ b/m4/gettext/inttypes.m4
diff --git a/m4/inttypes_h.m4 b/m4/gettext/inttypes_h.m4
index a5d075d96..a5d075d96 100644
--- a/m4/inttypes_h.m4
+++ b/m4/gettext/inttypes_h.m4
diff --git a/m4/isc-posix.m4 b/m4/gettext/isc-posix.m4
index 74dc8f26d..74dc8f26d 100644
--- a/m4/isc-posix.m4
+++ b/m4/gettext/isc-posix.m4
diff --git a/m4/lcmessage.m4 b/m4/gettext/lcmessage.m4
index 19aa77e4f..19aa77e4f 100644
--- a/m4/lcmessage.m4
+++ b/m4/gettext/lcmessage.m4
diff --git a/m4/lib-ld.m4 b/m4/gettext/lib-ld.m4
index 96c4e2c33..96c4e2c33 100644
--- a/m4/lib-ld.m4
+++ b/m4/gettext/lib-ld.m4
diff --git a/m4/lib-link.m4 b/m4/gettext/lib-link.m4
index ea0b0c4ea..ea0b0c4ea 100644
--- a/m4/lib-link.m4
+++ b/m4/gettext/lib-link.m4
diff --git a/m4/lib-prefix.m4 b/m4/gettext/lib-prefix.m4
index e0736ce1c..0d895ca63 100644
--- a/m4/lib-prefix.m4
+++ b/m4/gettext/lib-prefix.m4
@@ -9,7 +9,7 @@ dnl From Bruno Haible.
 dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
 dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
 dnl require excessive bracketing.
-ifdef([AS_HELP_STRING],
+ifdef([AC_HELP_STRING],
 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
 [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 
diff --git a/m4/longdouble.m4 b/m4/gettext/longdouble.m4
index 40cd7ce02..40cd7ce02 100644
--- a/m4/longdouble.m4
+++ b/m4/gettext/longdouble.m4
diff --git a/m4/longlong.m4 b/m4/gettext/longlong.m4
index 7b399e012..7b399e012 100644
--- a/m4/longlong.m4
+++ b/m4/gettext/longlong.m4
diff --git a/m4/nls.m4 b/m4/gettext/nls.m4
index 2082c3b24..2082c3b24 100644
--- a/m4/nls.m4
+++ b/m4/gettext/nls.m4
diff --git a/m4/po.m4 b/m4/gettext/po.m4
index f2795eea0..f2795eea0 100644
--- a/m4/po.m4
+++ b/m4/gettext/po.m4
diff --git a/m4/printf-posix.m4 b/m4/gettext/printf-posix.m4
index af10170af..af10170af 100644
--- a/m4/printf-posix.m4
+++ b/m4/gettext/printf-posix.m4
diff --git a/m4/progtest.m4 b/m4/gettext/progtest.m4
index a56365cd3..a56365cd3 100644
--- a/m4/progtest.m4
+++ b/m4/gettext/progtest.m4
diff --git a/m4/signed.m4 b/m4/gettext/signed.m4
index 048f59369..048f59369 100644
--- a/m4/signed.m4
+++ b/m4/gettext/signed.m4
diff --git a/m4/size_max.m4 b/m4/gettext/size_max.m4
index 4fe81c7b0..4fe81c7b0 100644
--- a/m4/size_max.m4
+++ b/m4/gettext/size_max.m4
diff --git a/m4/stdint_h.m4 b/m4/gettext/stdint_h.m4
index 3355f35aa..3355f35aa 100644
--- a/m4/stdint_h.m4
+++ b/m4/gettext/stdint_h.m4
diff --git a/m4/uintmax_t.m4 b/m4/gettext/uintmax_t.m4
index bf83ed746..bf83ed746 100644
--- a/m4/uintmax_t.m4
+++ b/m4/gettext/uintmax_t.m4
diff --git a/m4/ulonglong.m4 b/m4/gettext/ulonglong.m4
index dee10ccc3..dee10ccc3 100644
--- a/m4/ulonglong.m4
+++ b/m4/gettext/ulonglong.m4
diff --git a/m4/wchar_t.m4 b/m4/gettext/wchar_t.m4
index cde2129a9..cde2129a9 100644
--- a/m4/wchar_t.m4
+++ b/m4/gettext/wchar_t.m4
diff --git a/m4/wint_t.m4 b/m4/gettext/wint_t.m4
index b8fff9c86..b8fff9c86 100644
--- a/m4/wint_t.m4
+++ b/m4/gettext/wint_t.m4
diff --git a/m4/xsize.m4 b/m4/gettext/xsize.m4
index 85bb721e4..85bb721e4 100644
--- a/m4/xsize.m4
+++ b/m4/gettext/xsize.m4