From common/ChangeLog:

* aclocal.m4 Include ../../gettext.m4.
(CY_WITH_NLS, CY_GNU_GETTEXT, AM_PATH_PROG_WITH_TEST)
(AM_LC_MESSAGES): Remove.
* configure: Regenerate.

Regenerate all other configures.
This commit is contained in:
Mark Kettenis
2005-03-23 18:55:19 +00:00
parent d110d6a2e4
commit 2b193c4ab6
33 changed files with 372 additions and 519 deletions

View File

@@ -1,3 +1,7 @@
2005-03-23 Mark Kettenis <kettenis@gnu.org>
* configure: Regenerate.
2005-01-14 Andrew Cagney <cagney@gnu.org>
* configure.ac: Sinclude aclocal.m4 before common.m4. Add

30
sim/sh/configure vendored
View File

@@ -4827,7 +4827,8 @@ done
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_STPCPY 1
_ACEOF
@@ -4889,7 +4890,8 @@ fi
echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_LC_MESSAGES 1
_ACEOF
@@ -4911,10 +4913,6 @@ echo "${ECHO_T}$USE_NLS" >&6
USE_INCLUDED_LIBINTL=no
if test "$USE_NLS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define ENABLE_NLS 1
_ACEOF
echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
@@ -4932,7 +4930,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE
CATOBJEXT=
if test "${ac_cv_header_libintl_h+set}" = set; then
echo "$as_me:$LINENO: checking for libintl.h" >&5
@@ -5253,7 +5251,8 @@ fi
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_GETTEXT 1
_ACEOF
@@ -5529,8 +5528,10 @@ fi
if test "$CATOBJEXT" = "NONE"; then
nls_cv_use_gnu_gettext=yes
if test x"$CATOBJEXT" = x && test -d $srcdir/../intl; then
# Neither gettext nor catgets in included in the C library.
# Fall back on GNU gettext library (assuming it is present).
nls_cv_use_gnu_gettext=yes
fi
fi
@@ -5701,6 +5702,13 @@ echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
if test "x$CATOBJEXT" != "x"; then
cat >>confdefs.h <<\_ACEOF
#define ENABLE_NLS 1
_ACEOF
fi
if test "x$CATOBJEXT" != "x"; then
@@ -5902,7 +5910,7 @@ fi
l=
if test -d $srcdir/po; then
if test -f $srcdir/po/POTFILES.in; then
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then