diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rwxr-xr-x | bfd/configure | 12 | ||||
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rwxr-xr-x | gdb/configure | 12 | ||||
| -rw-r--r-- | gettext.m4 | 4 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rwxr-xr-x | opcodes/configure | 12 |
8 files changed, 40 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 7bad48da97d..b6b22646650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-31 Andrew Cagney <cagney@gnu.org> + + * gettext.m4: Only set ENABLE_NLS when gettext is present. + 2005-01-29 Hans-Peter Nilsson <hp@axis.com> * configure.in (noconfigdirs) <crisv32-*-*>: Match like cris-*-*. diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f8b51e1306e..b0f0666a6ed 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-01-31 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate to track ../gettext.m4. + 2005-01-31 Mark Mitchell <mark@codesourcery.com> * elf32-arm.c (elf32_arm_symbian_special_sections): Do not set diff --git a/bfd/configure b/bfd/configure index b9612487087..3d34ebaef07 100755 --- a/bfd/configure +++ b/bfd/configure @@ -7241,11 +7241,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 @@ -8035,6 +8030,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 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a700249abc9..acd5de0614c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2005-01-31 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate to track ../gettext.m4. + 2005-01-29 Baurzhan Ismagulov <ibr@radix50.net> * MAINTAINERS: Add myself to "Write After Approval". diff --git a/gdb/configure b/gdb/configure index 975c526b269..9eb8f97c0c4 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4847,11 +4847,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 @@ -5641,6 +5636,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 diff --git a/gettext.m4 b/gettext.m4 index f3deafa61dc..2c54fb8c140 100644 --- a/gettext.m4 +++ b/gettext.m4 @@ -24,7 +24,6 @@ AC_DEFUN([CY_WITH_NLS], dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - 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], @@ -156,6 +155,9 @@ AC_DEFUN([CY_WITH_NLS], AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) + if test "x$CATOBJEXT" != "x"; then + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested]) + fi ]) AC_DEFUN([CY_GNU_GETTEXT], diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e805bfdce91..3cd146727d5 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2005-01-31 Andrew Cagney <cagney@gnu.org> + + * configure: Regenerate to track ../gettext.m4. + 2005-01-31 Jan Beulich <jbeulich@novell.com> * ia64-gen.c (NELEMS): Define. diff --git a/opcodes/configure b/opcodes/configure index 6f1847f93a0..75d946d410d 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -7216,11 +7216,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 @@ -8010,6 +8005,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 |