#
#
# patch "Makefile.am"
#  from [a32244599f7db2a319f556076bf43d70778c9c1a]
#    to [be842964e3ad2842ebb254db04521ce67332ba84]
# 
# patch "configure.ac"
#  from [bd5bb929657a753289589f9998a3949853d5ec9c]
#    to [911f2348435021422a8b75308e40562c71af3450]
# 
# patch "m4/portable-gettext.m4"
#  from [32eb907304023322cb0b6220967f25fb3663c97c]
#    to [0bb2d4eb912dea72fbdf507883a569b6a56cd946]
#
============================================================
--- Makefile.am	a32244599f7db2a319f556076bf43d70778c9c1a
+++ Makefile.am	be842964e3ad2842ebb254db04521ce67332ba84
@@ -409,10 +409,10 @@ LINGUA_RESULTS=$(addprefix po/,$(addsuff
 LINGUA_RESULTS=$(addprefix po/,$(addsuffix $(LINGUA_FORMAT),$(LINGUAS)))
 
 %.mo: %.po
-	msgfmt -o $@ $<
+	$(MSGFMT) -o $@ $<
 
 %.gmo: %.po
-	msgfmt -o $@ $<
+	$(MSGFMT) -o $@ $<
 
 install-data-local: $(LINGUA_RESULTS)
 	for lang in $(LINGUAS); do \
============================================================
--- configure.ac	bd5bb929657a753289589f9998a3949853d5ec9c
+++ configure.ac	911f2348435021422a8b75308e40562c71af3450
@@ -54,12 +54,12 @@ AX_CREATE_STDINT_H(mt-stdint.h)
 		 [AC_INCLUDES_DEFAULT()])
 AC_HEADER_STDBOOL
 AX_CREATE_STDINT_H(mt-stdint.h)
-AC_PROG_XGETTEXT_FLAG_OPTION
 # similarly, this calls ACX_PTHREAD, which expects C.
 BOOST_THREAD_STUBS
 
 AC_LANG([C++])
 PG_NLS
+AC_PROG_XGETTEXT_FLAG_OPTION
 # This header may not be visible to the C compiler.
 AC_CHECK_HEADERS([cxxabi.h],,, [AC_INCLUDES_DEFAULT()])
 
============================================================
--- m4/portable-gettext.m4	32eb907304023322cb0b6220967f25fb3663c97c
+++ m4/portable-gettext.m4	0bb2d4eb912dea72fbdf507883a569b6a56cd946
@@ -20,12 +20,13 @@ PG_GETTEXT
 
 PG_ICONV
 PG_GETTEXT
+PG_GETTEXT_PROGS
 
 AC_MSG_CHECKING(if NLS support should be built)
 if test "x$enable_nls" = "xyes"; then
    AC_MSG_RESULT(yes)
    AC_MSG_CHECKING(if NLS support can be built)
-   if test "x$ac_cv_func_gettext_exists" = "xyes" -a "x$ac_cv_func_dcgettext_exists" = "xyes" -a "x$ac_cv_func_iconv_exists" = "xyes"; then
+   if test "x$ac_cv_func_gettext_exists" = "xyes" -a "x$ac_cv_func_dcgettext_exists" = "xyes" -a "x$ac_cv_func_iconv_exists" = "xyes" -a "x$MSGFMT" != "x"; then
      AC_MSG_RESULT(yes)
      AC_DEFINE(ENABLE_NLS, 1,
        [Set to 1 if support for translated messages should be compiled in])
@@ -121,3 +122,22 @@ fi
   fi
 fi
 ])
+
+dnl @synopsis PG_GETTEXT_PROG
+dnl
+dnl @summary looks for various gettext related programs
+dnl
+dnl
+dnl @category InstalledPackages
+dnl @author Patrick Georgi <address@hidden>
+dnl @version 2007-03-16
+dnl @license MIT
+
+AC_DEFUN([PG_GETTEXT_PROGS],
+[
+if test "x$enable_nls" = "xyes"; then
+ AC_CHECK_TOOL(MSGFMT, msgfmt)
+ AC_CHECK_TOOL(MSGMERGE, msgmerge, :)
+ AC_CHECK_TOOL(XGETTEXT, xgettext, :)
+fi
+])