From: Chris Allegretta Date: Tue, 18 Dec 2001 14:59:20 +0000 (+0000) Subject: m4/gettext.m4: - Back down to 1.1.3 version X-Git-Tag: v1.1.5~34 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=cf6807100b7f45b200903203a015a8a1b388f585;p=nano.git m4/gettext.m4: - Back down to 1.1.3 version git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@936 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 6af73d3c..fb0e35be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ CVS code - update_line() - back out check for (realdata[i] < 32) as it will screw high ascii characters. +- m4/gettext.m4: + - Back down to 1.1.3 version. nano-1.1.4 - 12/11/2001 - General diff --git a/m4/gettext.m4 b/m4/gettext.m4 index b6d037ff..890dd49a 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -21,9 +21,21 @@ AC_DEFUN(NANO_AM_WITH_NLS, USE_INCLUDED_LIBINTL=no + AC_ARG_WITH(locale-dir, + [ --with-locale-dir=DIR specify locale directory], + LOCALE_DIR=$withval) + test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale' + AC_SUBST(LOCALE_DIR) + + AC_ARG_WITH(gnu-locale-dir, + [ --with-gnu-locale-dir=DIR specify GNU locale directory], + GNU_LOCALE_DIR=$withval) + test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale' + AC_SUBST(GNU_LOCALE_DIR) + dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -48,18 +60,13 @@ AC_DEFUN(NANO_AM_WITH_NLS, if test "$gt_cv_func_gettext_libc" != "yes"; then AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libintl" = yes; then - LIBS="$LIBS -lintl" + [AC_CHECK_LIB(intl, gettext)]) fi if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) + || test "$ac_cv_lib_intl_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT, 1, + [Define to 1 if you have gettext and don't want to use GNU gettext.]) NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then