diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-21 19:09:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-21 19:09:37 +0000 |
| commit | 679d9be8a58a711f9e05073e52a1456ff4d0a664 (patch) | |
| tree | cfd34cd5a30984483244534f86aa981e6bc42d64 /acinclude.m4 | |
| parent | ea3db7ce061d19e11914f3d86720c613630d48ce (diff) | |
Move iconv tests before gettext checks. (#81999)
Mon May 20 18:02:46 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Move iconv tests before gettext
checks. (#81999)
* m4macros/glib-gettext.m4 acinclude.m4: If we can't
link to gettext, try adding in -liconv. (#80076,
Boyd Lynn Gerber)
* m4macros/glib-gettext.m4 acinclude.m4: Suppress
warnings about xgettext not being GNU gettext when
libintl wasn't found at all.
(#79016, Andrew P. Lentvorski, Jr.)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e4b70de97..54f0f75ed 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -85,29 +85,38 @@ AC_DEFUN(AM_GLIB_WITH_NLS, nls_cv_header_intl= nls_cv_header_libgt= CATOBJEXT=NONE + XGETTEXT=: AC_CHECK_HEADER(libintl.h, [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")], gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)]) - if test "$gt_cv_func_dgettext_libc" != "yes"; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + if test "$gt_cv_func_dgettext_libc" != "yes" ; then AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for dgettext in libintl], - gt_cv_func_dgettext_libintl, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes, - gt_cv_func_dgettext_libintl=no)], - gt_cv_func_dgettext_libintl=no)]) - fi + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)]) + + if test "$gt_cv_func_dgettext_libc" != "yes" ; then + AC_MSG_NOTICE([Seeing if -liconv is needed to use gettext]) + AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv) + fi + fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - LIBS="$LIBS -lintl"; + LIBS="$LIBS -lintl $libintl_extra_libs"; fi if test "$gt_cv_func_dgettext_libc" = "yes" \ || test "$gt_cv_func_dgettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then @@ -128,7 +137,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS, # Added by Martin Baulig 12/15/98 for libc5 systems if test "$gt_cv_func_dgettext_libc" != "yes" \ && test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS=-lintl + INTLLIBS="-lintl $libintl_extra_libs" LIBS=`echo $LIBS | sed -e 's/-lintl//'` fi ]) @@ -141,7 +150,8 @@ AC_DEFUN(AM_GLIB_WITH_NLS, fi if test "$nls_cv_use_gnu_gettext" != "yes"; then - AC_DEFINE(ENABLE_NLS) + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) else dnl Unset this variable since we use the non-zero value as a flag. CATOBJEXT= @@ -241,9 +251,6 @@ strdup __argz_count __argz_stringify __argz_next]) dnl cannot handle comments. sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/po/po2tbl.sed.in > po/po2tbl.sed dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but ($top_srcdir). |