8000 Require bind_textdomain_codeset() not just gettext() to enable NLS su… · postgrespro/postgres_cluster@7e8374a · GitHub
[go: up one dir, main page]
Skip to content

Commit 7e8374a

Browse files
tglsfdctglsfdc
committed
Require bind_textdomain_codeset() not just gettext() to enable NLS support.
GNU gettext before 0.10.36 does not have that function, and is generally too incomplete to be usable.
1 parent e35ee67 commit 7e8374a

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

‎config/programs.m4‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/programs.m4,v 1.22 2008/02/17 16:36:42 petere Exp $
1+
# $PostgreSQL: pgsql/config/programs.m4,v 1.23 2008/05/27 22:18:04 tgl Exp $
22

33

44
# PGAC_PATH_YACC
@@ -187,10 +187,13 @@ AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
187187

188188
# PGAC_CHECK_GETTEXT
189189
# ------------------
190+
# We check for bind_textdomain_codeset() not just gettext(). GNU gettext
191+
# before 0.10.36 does not have that function, and is generally too incomplete
192+
# to be usable.
190193

191194
AC_DEFUN([PGAC_CHECK_GETTEXT],
192195
[
193-
AC_SEARCH_LIBS(gettext, intl, [],
196+
AC_SEARCH_LIBS(bind_textdomain_codeset, intl, [],
194197
[AC_MSG_ERROR([a gettext implementation is required for NLS])])
195198
AC_CHECK_HEADER([libintl.h], [],
196199
[AC_MSG_ERROR([header file <libintl.h> is required for NLS])])
@@ -199,7 +202,6 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
199202
AC_MSG_ERROR([msgfmt is required for NLS])
200203
fi
201204
AC_CHECK_PROGS(MSGMERGE, msgmerge)
202-
dnl FIXME: We should probably check for version >=0.10.36.
203205
AC_CHECK_PROGS(XGETTEXT, xgettext)
204206
])# PGAC_CHECK_GETTEXT
205207

‎configure‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24625,9 +24625,9 @@ _ACEOF
2462524625

2462624626
if test "$enable_nls" = yes ; then
2462724627

24628-
{ echo "$as_me:$LINENO: checking for library containing gettext" >&5
24629-
echo $ECHO_N "checking for library containing gettext... $ECHO_C" >&6; }
24630-
if test "${ac_cv_search_gettext+set}" = set; then
24628+
{ echo "$as_me:$LINENO: checking for library containing bind_textdomain_codeset" >&5
24629+
echo $ECHO_N "checking for library containing bind_textdomain_codeset... $ECHO_C" >&6; }
24630+
if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
2463124631
echo $ECHO_N "(cached) $ECHO_C" >&6
2463224632
else
2463324633
ac_func_search_save_LIBS=$LIBS
@@ -24644,11 +24644,11 @@ cat >>conftest.$ac_ext <<_ACEOF
2464424644
#ifdef __cplusplus
2464524645
extern "C"
2464624646
#endif
24647-
char gettext ();
24647+
char bind_textdomain_codeset ();
2464824648
int
2464924649
main ()
2465024650
{
24651-
return gettext ();
24651+
return bind_textdomain_codeset ();
2465224652
;
2465324653
return 0;
2465424654
}
@@ -24678,7 +24678,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2467824678
test ! -s conftest.err
2467924679
} && test -s conftest$ac_exeext &&
2468024680
$as_test_x conftest$ac_exeext; then
24681-
ac_cv_search_gettext=$ac_res
24681+
ac_cv_search_bind_textdomain_codeset=$ac_res
2468224682
else
2468324683
echo "$as_me: failed program was:" >&5
2468424684
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24688,21 +24688,21 @@ fi
2468824688

2468924689
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2469024690
conftest$ac_exeext
24691-
if test "${ac_cv_search_gettext+set}" = set; then
24691+
if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
2469224692
break
2469324693
fi
2469424694
done
24695-
if test "${ac_cv_search_gettext+set}" = set; then
24695+
if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then
2469624696
:
2469724697
else
24698-
ac_cv_search_gettext=no
24698+
ac_cv_search_bind_textdomain_codeset=no
2469924699
fi
2470024700
rm conftest.$ac_ext
2470124701
LIBS=$ac_func_search_save_LIBS
2470224702
fi
24703-
{ echo "$as_me:$LINENO: result: $ac_cv_search_gettext" >&5
24704-
echo "${ECHO_T}$ac_cv_search_gettext" >&6; }
24705-
ac_res=$ac_cv_search_gettext
24703+
{ echo "$as_me:$LINENO: result: $ac_cv_search_bind_textdomain_codeset" >&5
24704+
echo "${ECHO_T}$ac_cv_search_bind_textdomain_codeset" >&6; }
24705+
ac_res=$ac_cv_search_bind_textdomain_codeset
2470624706
if test "$ac_res" != no; then
2470724707
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
2470824708

0 commit comments

Comments
 (0)
0