aboutsummaryrefslogtreecommitdiff
path: root/config/programs.m4
diff options
context:
space:
mode:
Diffstat (limited to 'config/programs.m4')
-rw-r--r--config/programs.m48
1 files changed, 5 insertions, 3 deletions
diff --git a/config/programs.m4 b/config/programs.m4
index fb9793fac1a..57ed795d893 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/programs.m4,v 1.20 2006/05/23 19:28:45 momjian Exp $
+# $PostgreSQL: pgsql/config/programs.m4,v 1.20.2.1 2008/05/27 22:18:18 tgl Exp $
# PGAC_PATH_FLEX
@@ -147,10 +147,13 @@ AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
# PGAC_CHECK_GETTEXT
# ------------------
+# We check for bind_textdomain_codeset() not just gettext(). GNU gettext
+# before 0.10.36 does not have that function, and is generally too incomplete
+# to be usable.
AC_DEFUN([PGAC_CHECK_GETTEXT],
[
- AC_SEARCH_LIBS(gettext, intl, [],
+ AC_SEARCH_LIBS(bind_textdomain_codeset, intl, [],
[AC_MSG_ERROR([a gettext implementation is required for NLS])])
AC_CHECK_HEADER([libintl.h], [],
[AC_MSG_ERROR([header file <libintl.h> is required for NLS])])
@@ -159,7 +162,6 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
AC_MSG_ERROR([msgfmt is required for NLS])
fi
AC_CHECK_PROGS(MSGMERGE, msgmerge)
-dnl FIXME: We should probably check for version >=0.10.36.
AC_CHECK_PROGS(XGETTEXT, xgettext)
# Note: share/locale is always the default, independent of $datadir