[Bug-gnubg] [patch] gnubg-0.14.1: fix compile error if CODESET is not available

[Adrian Bunk]

I got the following compile error when trying to compile gnubg-0.14.1 on 
NetBSD/sparc-1.5:

<--  snip  -->

...
gcc -DHAVE_CONFIG_H -I. -I. -I. -I./lib  -I/usr/local/include/libxml2 
-I./intl -DLOCALEDIR=\"/usr/local/share/locale\" -I/usr/local/include/freetype2 
-I/usr/local/include  -I/usr/local/include/python2.3 
-I/usr/local/include/glib-2.0 
-I/usr/local/lib/glib-2.0/include   -I/usr/local/include/gtk-2.0 
-I/usr/local/lib/gtk-2.0/include -I/usr/local/include/atk-1.0 
-I/usr/local/include/pango-1.0 
-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/X11R6/include 
-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include   
-I/usr/local/include  
-I/usr/X11R6/include/artsc -I/usr/local/include    -I/usr/local/include  -O2 
-mcpu=v8 -c
 `test -f 'gnubg.c' || echo './'`gnubg.c
In file included from /usr/include/termios.h:301,
                 from /usr/local/include/python2.3/pyport.h:369,
                 from /usr/local/include/python2.3/Python.h:48,
                 from gnubgmodule.h:33,
                 from gnubg.c:114:
/usr/include/sys/ttydefaults.h:61: warning: `CTRL' redefined
/usr/local/include/readline/chardefs.h:64: warning: this is the location 
of the previous definition
gnubg.c: In function `real_main':
gnubg.c:7476: `CODESET' undeclared (first use in this function)
gnubg.c:7476: (Each undeclared identifier is reported only once
gnubg.c:7476: for each function it appears in.)
gnubg.c: In function `Convert':
gnubg.c:8759: warning: passing arg 3 of `libiconv' from incompatible 
pointer type
gnubg.c:8759: warning: passing arg 5 of `libiconv' from incompatible 
pointer type
make[2]: *** [gnubg.o] Error 1
make[2]: Leaving directory `/aux/adrian/build/gnubg-0.14.1'

<--  snip  -->


The fis is simple:


--- gnubg.c.old 2004-01-22 02:03:18.000000000 +0100
+++ gnubg.c     2004-01-22 02:05:33.000000000 +0100
@@ -7471,7 +7471,7 @@
     textdomain (PACKAGE);
     bind_textdomain_codeset( PACKAGE, GNUBG_CHARSET );
                             
-#if HAVE_NL_LANGINFO
+#if HAVE_LANGINFO_CODESET
  {
    char *cs = nl_langinfo( CODESET );
    char *cset;



cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed