[PATCH] NLS back to working order.

[Kaveh R. Ghazi]

 > From: Philipp Thomas <pthomas@suse.de>
 > 
 > I've finally checked in the patches to bring the tree back to working order
 > for enabled NLS support. Bootstrap with --with-included-gettext succeeded.

Great!  I have some comments.


I still think you should make --with-included-gettext the default on
all systems for reasons I've already explained here:

http://gcc.gnu.org/ml/gcc/2000-06/msg00114.html

Do you have any opinion on this?



 > Index: gcc/configure.in
 > +AC_C_INLINE
 > +

I'm pretty sure AM_GNU_GETTEXT calls AC_REQUIRE on AC_C_INLINE so the
above is not necessary (but it doesn't hurt.)



 > Index: gcc/ch/Makefile.in
 > -LIBS = $(LIBIBERTY) $(CLIB)
 > -LIBDEPS = $(LIBIBERTY)
 > +LIBS = $(LIBIBERTY) $(CLIB) $(INTLLIBS)
 > +LIBDEPS = $(INTLLIBS) $(LIBIBERTY)

 > Index: gcc/f/Makefile.in
 > -LIBS = $(LIBIBERTY) $(CLIB)
 > -LIBDEPS = $(LIBIBERTY)
 > +LIBS = $(LIBIBERTY) $(CLIB) $(INTLLIBS)
 > +LIBDEPS = $(INTLLIBS) $(LIBIBERTY)

 > Index: gcc/java/Makefile.in
 > -LIBS = $(LIBIBERTY) $(CLIB)
 > -LIBDEPS = $(LIBIBERTY) ../errors.o
 > +LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB)
 > +LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o

You weren't consistent in keeping the order of LIBS.  The order should
be "$(INTLLIBS) $(LIBIBERTY) $(CLIB)" for all cases.


 > RCS file: /cvs/gcc/egcs/gcc/intl/dcgettext.c,v
 > -# else
 > +# elif !defined (HAVE_DECL_GETCWD)

I think you are using HAVE_DECL_GETCWD wrong.  Its a 3-state macro,
undefined, 0 or 1.  You want to check:
"defined(HAVE_DECL_GETCWD) && !HAVE_DECL_GETCWD"
(See the HAVE_DECL_* comments in system.h/libiberty.h for more details.)


 > Index: gcc/intl/l10nflist.c
 > ===================================================================
 > RCS file: /cvs/gcc/egcs/gcc/intl/l10nflist.c,v
 > retrieving revision 1.2
 > diff -u -p -r1.2 l10nflist.c
 > --- l10nflist.c	1999/09/04 15:08:49	1.2
 > +++ l10nflist.c	2000/06/06 06:41:15
 > @@ -20,11 +20,11 @@
 >  # include <config.h>
 >  #endif
 >  
 > +#ifndef _GNU_SOURCE
 > +# define _GNU_SOURCE	1
 > +#endif
 >  
 >  #if defined HAVE_STRING_H || defined _LIBC
 > -# ifndef _GNU_SOURCE
 > -#  define _GNU_SOURCE	1
 > -# endif
 >  # include <string.h>
 >  #else
 >  # include <strings.h>

Just out of curiosity, why was the above necessary?

		Thanks,
		--Kaveh
--
Kaveh R. Ghazi			Engagement Manager / Project Services
ghazi@caip.rutgers.edu		Qwest Internet Solutions