CVS: a2ps/lib encoding.c,1.1.1.1,1.1.1.1.2.1 gettext.h,1.1.2.1,1.1.2.2

[Akim Demaille <address@hidden>]

Update of /cvsroot/a2ps/a2ps/lib
In directory subversions:/tmp/cvs-serv26484/lib

Modified Files:
      Tag: a2ps-4-1x
        encoding.c gettext.h 
Log Message:
Gettext 0.11.5.
* configure.in (AM_GNU_GETTEXT_VERSION): New macro, replacing
GETTEXT_VERSION var.
Bump version to 0.11.5.
(AM_GNU_GETTEXT): Use external gettext.
(AC_OUTPUT): Remove intl/Makefile.
(AC_CHECK_FUNCS): Add setlocale.
* Makefile.am (AUTOMAKE_OPTIONS): 1.6.3.
(SUBDIRS): Remove intl.


Index: encoding.c
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/encoding.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** encoding.c  4 Mar 2002 18:46:25 -0000       1.1.1.1
--- encoding.c  2 Sep 2002 12:36:00 -0000       1.1.1.1.2.1
***************
*** 5,9 ****
   * Copyright (c) 1988-1993 Miguel Santana
   * Copyright (c) 1995-1999 Akim Demaille, Miguel Santana
-  * $Id$
   */
  
--- 5,8 ----

Index: gettext.h
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/gettext.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** gettext.h   25 Mar 2002 17:09:15 -0000      1.1.2.1
--- gettext.h   2 Sep 2002 12:36:00 -0000       1.1.2.2
***************
*** 28,31 ****
--- 28,41 ----
  #else
  
+ /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+    chokes if dcgettext is defined as a macro.  So include it now, to make
+    later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+    as well because people using "gettext.h" will not include <libintl.h>,
+    and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+    is OK.  */
+ #if defined(__sun)
+ # include <locale.h>
+ #endif
+ 
  /* Disabled NLS.
     The casts to 'const char *' serve the purpose of producing warnings