#
#
# patch "configure.ac"
#  from [50f94831f25a02a628b181ed2c8cd99ba8a9313c]
#    to [a01238d9848798dee774832e876a266f05dba1a0]
# 
# patch "m4/portable-gettext.m4"
#  from [f8d7d4442b94568f4922764b17c1bbe4c46e4f20]
#    to [2a7ea2b55bfa9b2b94af9e0aa2b92c867e7fb7f2]
#
============================================================
--- configure.ac	50f94831f25a02a628b181ed2c8cd99ba8a9313c
+++ configure.ac	a01238d9848798dee774832e876a266f05dba1a0
@@ -82,9 +82,7 @@ AC_LANG([C++])
 ])
 
 AC_LANG([C++])
-PG_NLS_FRAMEWORK
-PG_ICONV
-PG_GETTEXT
+PG_NLS
 # This header may not be visible to the C compiler.
 AC_CHECK_HEADERS([cxxabi.h],,, [AC_INCLUDES_DEFAULT()])
 
============================================================
--- m4/portable-gettext.m4	f8d7d4442b94568f4922764b17c1bbe4c46e4f20
+++ m4/portable-gettext.m4	2a7ea2b55bfa9b2b94af9e0aa2b92c867e7fb7f2
@@ -10,16 +10,21 @@ dnl @license MIT
 dnl @version 2007-03-10
 dnl @license MIT
 
-AC_DEFUN([PG_NLS_FRAMEWORK],[
+AC_DEFUN([PG_NLS],[
    AC_ARG_ENABLE([nls],
      AS_HELP_STRING(
         [--disable-nls],
         [Disable support for translated messages]
      ), , enable_nls=yes)
 
-if test "x$enable_nls" = "xyes"; then
+PG_ICONV
+PG_GETTEXT
+
+if test "x$enable_nls" = "xyes" -a "x$ac_cv_func_gettext_exists" = "xyes" -a "x$ac_cv_func_dcgettext_exists" = "xyes" -a "x$ac_cv_func_iconv_exists" = "xyes"; then
    AC_DEFINE(ENABLE_NLS, 1,
      [Set to 1 if support for translated messages should be compiled in])
+else
+   enable_nls=no
 fi
 ])