CVS: a2ps/lib gettext.h,NONE,1.1.2.1 Makefile.am,1.1.1.1,1.1.1.1.2.1 liba2ps.h,1.1.1.1,1.1.1.1.2.1 system.h,1.1.1.1,1.1.1.1.2.1

[Akim Demaille <address@hidden>]

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

Modified Files:
      Tag: a2ps-4-1x
        Makefile.am liba2ps.h system.h 
Added Files:
      Tag: a2ps-4-1x
        gettext.h 
Log Message:
Gettext 0.11.1.
* lib/Makefile.am (noinst_HEADERS): Add gettext.h.
* lib/system.h: Use lib/gettext.h.
* src/Makefile.am, contrib/sample/Makefile.am: @LIBINTL@ instead
of @address@hidden


--- NEW FILE ---
/* Convenience header for conditional use of GNU <libintl.h>.
   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published
   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.

   You should have received a copy of the GNU Library General Public
   License along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   USA.  */

#ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1

/* NLS can be disabled through the configure --disable-nls option.  */
#if ENABLE_NLS

/* Get declarations of GNU message catalog functions.  */
# include <libintl.h>

#else

/* Disabled NLS.
   The casts to 'const char *' serve the purpose of producing warnings
   for invalid uses of the value returned from these functions.
   On pre-ANSI systems without 'const', the config.h file is supposed to
   contain "#define const".  */
# define gettext(Msgid) ((const char *) (Msgid))
# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
# define ngettext(Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dngettext(Domainname, Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define textdomain(Domainname) ((const char *) (Domainname))
# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))

#endif

/* A pseudo function call that serves as a marker for the automated
   extraction of messages, but does not call gettext().  The run-time
   translation is done at a different place in the code.
   The argument, String, should be a literal string.  Concatenated strings
   and other string expressions won't work.
   The macro's expansion is not parenthesized, so that it is suitable as
   initializer for static 'char[]' or 'const char[]' variables.  */
#define gettext_noop(String) String

#endif /* _LIBGETTEXT_H */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/Makefile.am,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
*** Makefile.am 4 Mar 2002 18:46:24 -0000       1.1.1.1
--- Makefile.am 25 Mar 2002 17:09:15 -0000      1.1.1.1.2.1
***************
*** 77,81 ****
  
  noinst_HEADERS = $(liba2psheaders) $(libitheaders) $(mylibitheaders)   \
! $(libitpureheaders)
  
  
--- 77,81 ----
  
  noinst_HEADERS = $(liba2psheaders) $(libitheaders) $(mylibitheaders)   \
! $(libitpureheaders) gettext.h
  
  

Index: liba2ps.h
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/liba2ps.h,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

Index: system.h
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/system.h,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
*** system.h    4 Mar 2002 18:46:25 -0000       1.1.1.1
--- system.h    25 Mar 2002 17:09:15 -0000      1.1.1.1.2.1
***************
*** 421,440 ****
  `---------------------------*/
  
! #if HAVE_LOCALE_H
  # include <locale.h>
  #endif
! #if !HAVE_SETLOCALE
! # define setlocale(Category, Locale) /* empty */
  #endif
  
! #if ENABLE_NLS
! # include <libintl.h>
! # define _(Text) gettext (Text)
! #else
! # define bindtextdomain(Domain, Directory) /* empty */
! # define textdomain(Domain) /* empty */
! # define _(Text) Text
! #endif
! #define N_(Text) Text
  
  
--- 421,434 ----
  `---------------------------*/
  
! #ifdef HAVE_LOCALE_H
  # include <locale.h>
  #endif
! #ifndef HAVE_SETLOCALE
! # define setlocale(Category, Locale)
  #endif
  
! #include "gettext.h"
! #define _(Msgid)  gettext (Msgid)
! #define N_(Msgid) (Msgid)