diff options
| -rw-r--r-- | config/programs.m4 | 8 | ||||
| -rwxr-xr-x | configure | 30 |
2 files changed, 20 insertions, 18 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 diff --git a/configure b/configure index 7a4b8eab9e1..8a39bc184d3 100755 --- a/configure +++ b/configure @@ -22072,13 +22072,13 @@ _ACEOF if test "$enable_nls" = yes ; then - echo "$as_me:$LINENO: checking for library containing gettext" >&5 -echo $ECHO_N "checking for library containing gettext... $ECHO_C" >&6 -if test "${ac_cv_search_gettext+set}" = set; then + echo "$as_me:$LINENO: checking for library containing bind_textdomain_codeset" >&5 +echo $ECHO_N "checking for library containing bind_textdomain_codeset... $ECHO_C" >&6 +if test "${ac_cv_search_bind_textdomain_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_gettext=no +ac_cv_search_bind_textdomain_codeset=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22092,11 +22092,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettext (); +char bind_textdomain_codeset (); int main () { -gettext (); +bind_textdomain_codeset (); ; return 0; } @@ -22123,7 +22123,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_gettext="none required" + ac_cv_search_bind_textdomain_codeset="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -22131,7 +22131,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_gettext" = no; then +if test "$ac_cv_search_bind_textdomain_codeset" = no; then for ac_lib in intl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -22147,11 +22147,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettext (); +char bind_textdomain_codeset (); int main () { -gettext (); +bind_textdomain_codeset (); ; return 0; } @@ -22178,7 +22178,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_gettext="-l$ac_lib" + ac_cv_search_bind_textdomain_codeset="-l$ac_lib" break else echo "$as_me: failed program was:" >&5 @@ -22191,10 +22191,10 @@ rm -f conftest.err conftest.$ac_objext \ fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_gettext" >&5 -echo "${ECHO_T}$ac_cv_search_gettext" >&6 -if test "$ac_cv_search_gettext" != no; then - test "$ac_cv_search_gettext" = "none required" || LIBS="$ac_cv_search_gettext $LIBS" +echo "$as_me:$LINENO: result: $ac_cv_search_bind_textdomain_codeset" >&5 +echo "${ECHO_T}$ac_cv_search_bind_textdomain_codeset" >&6 +if test "$ac_cv_search_bind_textdomain_codeset" != no; then + test "$ac_cv_search_bind_textdomain_codeset" = "none required" || LIBS="$ac_cv_search_bind_textdomain_codeset $LIBS" else { { echo "$as_me:$LINENO: error: a gettext implementation is required for NLS" >&5 |