Use bind_textdomain_codeset if available, getting rid of annoying
warnings form msgmft.

* configure.in: Test for bind_textdomain_codeset.
* Makefile.in: ONly strip Content-Type: header from .po files if
  bind_textdomain_codeset is not available.
* subversion/libsvn_subr/cmdline.c (svn_cmdline_init): Use
  bind_textdomain_codeset if available.

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 10070)
+++ Makefile.in	(arbetskopia)
@@ -522,12 +522,21 @@
 .dvi.pdf:
 	$(DVIPDF) $< $@
 
-.po.spo:
-	sed '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' $< > $@
+# Strip the Content-Type: header from the po file if we don't have a
+# gettext that supports bind_textdomain_codeset, so it doesn't try
+# to convert our UTF-8 .po files to the locale encoding.
+@IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET@.po.spo:
+@IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET@	sed '/^"Content-Type: text\/plain; charset=UTF-8\\n"$$/d' $< > $@
 
-.spo.mo:
-	$(MSGFMT) -o $@ $<
+@IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET@.spo.mo:
+@IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET@	$(MSGFMT) -o $@ $<
 
+# For systems with bind_textdomain_codeset, just leave the Content-Type:
+# header alone.
+@IF_HAVE_BIND_TEXTDOMAIN_CODESET@.po.mo:
+@IF_HAVE_BIND_TEXTDOMAIN_CODESET@	$(MSGFMT) -o $@ $<
+
+
 install-docs: install-man @INSTALL_INFO@
 
 manroot = $(mandir)/man
Index: configure.in
===================================================================
--- configure.in	(revision 10070)
+++ configure.in	(arbetskopia)
@@ -305,6 +305,17 @@
 #endif
 )
 
+dnl Used to simulate makefile conditionals.
+IF_HAVE_BIND_TEXTDOMAIN_CODESET=\#
+IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET=\#
+if test $USE_NLS = "yes"; then
+   AC_CHECK_FUNCS(bind_textdomain_codeset,
+                  [ IF_HAVE_BIND_TEXTDOMAIN_CODESET="" ],
+                  [ IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET="" ])
+fi
+AC_SUBST(IF_HAVE_BIND_TEXTDOMAIN_CODESET)
+AC_SUBST(IF_NOT_HAVE_BIND_TEXTDOMAIN_CODESET)
+
 INSTALL_STATIC_RULES="install-bin install-docs"
 INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
Index: subversion/libsvn_subr/cmdline.c
===================================================================
--- subversion/libsvn_subr/cmdline.c	(revision 10070)
+++ subversion/libsvn_subr/cmdline.c	(arbetskopia)
@@ -165,7 +165,10 @@
   }
 #else
   bindtextdomain(PACKAGE_NAME, SVN_LOCALE_DIR);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+  bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
 #endif
+#endif
   textdomain(PACKAGE_NAME);
 #endif