summaryrefslogtreecommitdiff
path: root/sim/ppc
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@gnu.org>2005-03-23 18:55:19 +0000
committerMark Kettenis <kettenis@gnu.org>2005-03-23 18:55:19 +0000
commit2b193c4ab6472ae6f704c99a1503fe787cbeb7db (patch)
tree93878d5aee0798b629b9c6da8aad69051ae7b4e7 /sim/ppc
parentd110d6a2e4bbef0a8b0fb00f4f41137341e23492 (diff)
downloadbinutils-gdb-2b193c4ab6472ae6f704c99a1503fe787cbeb7db.tar.gz
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.
Diffstat (limited to 'sim/ppc')
-rw-r--r--sim/ppc/ChangeLog4
-rwxr-xr-xsim/ppc/configure30
2 files changed, 23 insertions, 11 deletions
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index ebde414b991..7b259e6d3ee 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23 Mark Kettenis <kettenis@gnu.org>
+
+ * configure: Regenerate.
+
2005-01-11 Andrew Cagney <cagney@localhost.localdomain>
* configure.ac: Delete AC_CONFIG_AUX_DIR.
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 4b17699d6d0..4cb1eb3c926 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -4582,7 +4582,8 @@ done
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_STPCPY 1
_ACEOF
@@ -4644,7 +4645,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
@@ -4666,10 +4668,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
@@ -4687,7 +4685,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
@@ -5008,7 +5006,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
@@ -5284,8 +5283,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
@@ -5456,6 +5457,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
@@ -5657,7 +5665,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