Re: [Monotone-devel] FreeBSD port patches

[Zack Weinberg]

On 9/23/06, Lapo Luchini <address@hidden> wrote:

>    if (!init)
>      {
>        setlocale(LC_ALL, "");
> +#ifdef ENABLE_NLS
>        bindtextdomain(PACKAGE, LOCALEDIR);
>        textdomain(PACKAGE);
> +#endif
>        init = 1;
>      }

It would be better to put something like

#ifndef ENABLE_NLS
inline char * textdomain(char *) { return 0; }
inline char * bindtextdomain(char *, char *) { return 0; }
#endif

just above localize_monotone(); #ifdefs in the middle of a function
are to be avoided.

> -       $(CXXLINK) $(mtn_LDFLAGS) $(mtn_OBJECTS) $(mtn_LDADD) $(LIBS)
> +       $(CXXLINK) $(mtn_LDFLAGS) $(mtn_OBJECTS) $(mtn_LDADD) $(LIBS)  
> $(LIBINTL) $(LIBICONV)

As Nathaniel said, you need to modify Makefile.am not Makefile.in (the
latter is a generated file) ... however, this should not be necessary
at all, as we already have $(LIBICONV) and $(LIBINTL) in the various
prog_LDADD variables.  If that's not working, please let us know.

zw