Gettext 0.11.3

[Akim Demaille]

This should make `bootstrap' more robust.   Sorry for the delays, I
was waiting for Gettext :(  Applied to both branches.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/file.m4: Pass -f to rm.
        * configure.in: Require Gettext 0.11.3 and Autoconf 2.53b.
        Run AM_INIT_AUTOMAKE before AC_CONFIG_HEADERS.
        * Makefile.am (AUTOMAKE_OPTIONS): Require 1.6.2.
        * bootstrap: Fix `contrib' setup.
        * m4/gettext-version.m4: New, to work around a Gettext 0.11.3 bug.
        * m4/c-bs-a.m4: Remove, now in Autoconf.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/a2ps/a2ps/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- Makefile.am 22 Mar 2002 13:34:45 -0000 1.2
+++ Makefile.am 19 Jul 2002 11:29:03 -0000
@@ -1,5 +1,5 @@
 ## Top level Makefile for a2ps.
-## Copyright (c) 1995-2000 Akim Demaille, Miguel Santana
+## Copyright (C) 1995-2000 Akim Demaille, Miguel Santana
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = check-news 1.6 dist-bzip2 readme-alpha
+AUTOMAKE_OPTIONS = check-news 1.6.2 dist-bzip2 readme-alpha
 
 ## Make sure to drop doc at the end: it causes may problems, so
 ## let's do the maximum before it
Index: README-cvs
===================================================================
RCS file: /cvsroot/a2ps/a2ps/README-cvs,v
retrieving revision 1.1.2.1
diff -u -u -r1.1.2.1 README-cvs
--- README-cvs 18 Apr 2002 15:57:54 -0000 1.1.2.1
+++ README-cvs 19 Jul 2002 11:29:03 -0000
@@ -3,11 +3,10 @@
 maintenance, merges etc.), therefore you will have to the maintainer
 tools we depend upon:
 
-- Automake 1.6 or 1.6.1
-- Autoconf 2.53 or better
-  (actually, CVS Autoconf provides a better autoreconf...
-   http://www.lrde.epita.fr/~akim/download/autoconf-2.53a.tar.gz)
-- Gettext 0.10.1
+- Automake 1.6.2
+- Autoconf 2.53b
+  (ftp://sources.redhat.com/pub/automake/autoconf-2.53b.tar.gz)
+- Gettext 0.11.3
 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.
Index: bootstrap
===================================================================
RCS file: /cvsroot/a2ps/a2ps/bootstrap,v
retrieving revision 1.1.2.3
diff -u -u -r1.1.2.3 bootstrap
--- bootstrap 18 Apr 2002 17:15:12 -0000 1.1.2.3
+++ bootstrap 19 Jul 2002 11:29:03 -0000
@@ -1,11 +1,11 @@
 #! /bin/sh
-
+set -e
 contrib_scripts="card fixps pdiff psmandup psset"
 
 echo "Bootstrapping a2ps..."
 
 # These are created by the Makefile, which is missing for the time
-# being.
+# being.  They are needed by configure.
 for i in $contrib_scripts
 do
   touch contrib/$i.in
@@ -14,22 +14,17 @@
 # Autoconf, Automake, Gettext.
 autoreconf --force --install --verbose
 
-# Because of Gettext
-mv m4/Makefile.am~ m4/Makefile.am
-mv Makefile.am~ Makefile.am
-mv configure.in~ configure.in
-touch m4/Makefile.am Makefile.am configure.in
-autoreconf --verbose
-
 # Configure and make the missing guys.
 ./configure
-make
 
+# Configure was using card.in etc.  But they were probably fake ones.
+# Remove them, and let make do the rest.
 (
   cd contrib
   for i in $contrib_scripts
   do
-    rm contrib/$i.in
+    rm -f $i $i.in
   done
   make
 )
+make
Index: configure.in
===================================================================
RCS file: /cvsroot/a2ps/a2ps/configure.in,v
retrieving revision 1.2.2.2
diff -u -u -r1.2.2.2 configure.in
--- configure.in 18 Apr 2002 15:57:54 -0000 1.2.2.2
+++ configure.in 19 Jul 2002 11:29:22 -0000
@@ -1,4 +1,4 @@
-AC_PREREQ(2.53)
+AC_PREREQ(2.53b)
 AC_COPYRIGHT([Copyright (c) 1995-2000 Akim Demaille, Miguel Santana])
 
 ## ---------------- ##
@@ -6,12 +6,13 @@
 ## ---------------- ##
 
 AC_INIT(GNU a2ps, 4.13c, address@hidden)
-
 AC_CONFIG_AUX_DIR(auxdir)
-AM_CONFIG_HEADER(config.h)
 
 # Initialize automake
 AM_INIT_AUTOMAKE
+
+AC_CONFIG_HEADERS(config.h)
+
 # Specify the liba2ps version number
 LIBVERSION=1:0:0
 AC_SUBST(LIBVERSION)
@@ -155,7 +156,8 @@
 AC_CHECK_DECLS([fputs, strlen])
 
 # Internationalization.
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.11.3])
+AM_GNU_GETTEXT(, need-ngettext)
 
 # Save the cache
 AC_CACHE_SAVE
Index: lib/liba2ps.h
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/liba2ps.h,v
retrieving revision 1.1.1.1.2.1
diff -u -u -r1.1.1.1.2.1 liba2ps.h
--- lib/liba2ps.h 25 Mar 2002 17:09:15 -0000 1.1.1.1.2.1
+++ lib/liba2ps.h 19 Jul 2002 11:29:22 -0000
@@ -4,7 +4,7 @@
  * shared header with the whole package
  * Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
  * Copyright (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
- * $Id: liba2ps.h,v 1.1.1.1.2.1 2002/03/25 17:09:15 akim Exp $
+ * $Id: liba2ps.h.in,v 1.1.1.1 2002/03/04 18:46:25 akim Exp $
  */
 
 /*
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/a2ps/a2ps/m4/Makefile.am,v
retrieving revision 1.1.1.1.2.1
diff -u -u -r1.1.1.1.2.1 Makefile.am
--- m4/Makefile.am 25 Mar 2002 17:09:15 -0000 1.1.1.1.2.1
+++ m4/Makefile.am 19 Jul 2002 11:29:22 -0000
@@ -3,7 +3,6 @@
 EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 
lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4  \
 a2_psutils.m4 \
 atexit.m4 \
-c-bs-a.m4 \
 file.m4 \
 fp_echo.m4 \
 fullpath.m4 \
@@ -25,4 +24,5 @@
 uintmax_t.m4 \
 ulonglong.m4 \
 winsz.m4 \
-xstrtoumax.m4
+xstrtoumax.m4 \
+gettext-version.m4
Index: m4/c-bs-a.m4
===================================================================
RCS file: m4/c-bs-a.m4
diff -N m4/c-bs-a.m4
--- m4/c-bs-a.m4 4 Mar 2002 18:46:25 -0000 1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-#serial 1
-
-dnl From Paul Eggert.
-
-AC_DEFUN(AC_C_BACKSLASH_A,
-[
-  AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
-   [AC_TRY_COMPILE([],
-     [
-#if '\a' == 'a'
-      syntax error;
-#endif
-      char buf['\a' == 'a' ? -1 : 1];
-      buf[0] = '\a';
-      return buf[0] != "\a"[0];
-     ],
-     ac_cv_c_backslash_a=yes,
-     ac_cv_c_backslash_a=no)])
-  if test $ac_cv_c_backslash_a = yes; then
-    AC_DEFINE(HAVE_C_BACKSLASH_A, 1,
-      [Define if backslash-a works in C strings.])
-  fi
-])
-
-AC_DEFUN(jm_PREREQ_QUOTEARG,
-[
-  AC_CHECK_FUNCS(isascii mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
-  AC_HEADER_STDC
-  AC_C_BACKSLASH_A
-  AM_C_PROTOTYPES
-])
Index: m4/file.m4
===================================================================
RCS file: /cvsroot/a2ps/a2ps/m4/file.m4,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 file.m4
--- m4/file.m4 4 Mar 2002 18:46:25 -0000 1.1.1.1
+++ m4/file.m4 19 Jul 2002 11:29:22 -0000
@@ -1,15 +1,31 @@
-## --------------------------------------------------------- ##
-## Find where is `file' and what is the option for it to     ##
-## follow the links. If no way, use a plain `file'           ##
-##                           address@hidden            ##
-## --------------------------------------------------------- ##
+# -*- Autoconf -*-
+# Find where is `file' and what is the option for it to follow the
+# links. If no way, use a plain `file'.
+#
+# Copyright (C) 1995-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 General Public License as published by
+# the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
+#
+# You should have received a copy of the GNU 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
 
-# serial 4
+# Written by Akim Demaille <address@hidden>
+# serial 5
 
 dnl This is a test to know what is the correct way to get
 dnl file following the links
 dnl I hope it is robust, but I'm a novice :) Akim Demaille
-AC_DEFUN(ad_PROG_FILE_LINK,
+AC_DEFUN([ad_PROG_FILE_LINK],
   [AC_PATH_PROG(file_prog, file)dnl
    AC_MSG_CHECKING(for the option for file to follow the links)
    AC_CACHE_VAL(ac_cv_prog_file_link_option,[
@@ -23,7 +39,7 @@
          *) ac_cv_prog_file_link_option=$file_opt ; break    ;;
        esac
      done
-     rm conftestfile conftestfile1
+     rm -f conftestfile conftestfile1
      if test "X$ac_cv_prog_file_link_option" = X; then
         ac_cv_prog_file_link_option="no";
      fi])dnl