CVS: a2ps ChangeLog,1.4.2.6,1.4.2.7 Makefile.am,1.2,1.2.2.1 README-cvs,1.1.2.1,1.1.2.2 bootstrap,1.1.2.3,1.1.2.4 configure.in,1.2.2.2,1.2.2.3

[Akim Demaille <address@hidden>]

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

Modified Files:
      Tag: a2ps-4-1x
        ChangeLog Makefile.am README-cvs bootstrap configure.in 
Log Message:
* 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: ChangeLog
===================================================================
RCS file: /cvsroot/a2ps/a2ps/ChangeLog,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** ChangeLog   18 Apr 2002 15:57:53 -0000      1.4.2.6
--- ChangeLog   19 Jul 2002 11:31:23 -0000      1.4.2.7
***************
*** 1,2 ****
--- 1,12 ----
+ 2002-07-19  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.
+ 
  2002-04-18  Akim Demaille  <address@hidden>
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/a2ps/a2ps/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Makefile.am 22 Mar 2002 13:34:45 -0000      1.2
--- Makefile.am 19 Jul 2002 11:31:23 -0000      1.2.2.1
***************
*** 1,4 ****
  ## Top level Makefile for a2ps.
! ## Copyright (c) 1995-2000 Akim Demaille, Miguel Santana
  ##
  ## This program is free software; you can redistribute it and/or modify
--- 1,4 ----
  ## Top level Makefile for a2ps.
! ## Copyright (C) 1995-2000 Akim Demaille, Miguel Santana
  ##
  ## This program is free software; you can redistribute it and/or modify
***************
*** 17,21 ****
  
  ## Process this file with automake to produce Makefile.in
! AUTOMAKE_OPTIONS = check-news 1.6 dist-bzip2 readme-alpha
  
  ## Make sure to drop doc at the end: it causes may problems, so
--- 17,21 ----
  
  ## Process this file with automake to produce Makefile.in
! AUTOMAKE_OPTIONS = check-news 1.6.2 dist-bzip2 readme-alpha
  
  ## Make sure to drop doc at the end: it causes may problems, so

Index: README-cvs
===================================================================
RCS file: /cvsroot/a2ps/a2ps/README-cvs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** README-cvs  18 Apr 2002 15:57:54 -0000      1.1.2.1
--- README-cvs  19 Jul 2002 11:31:23 -0000      1.1.2.2
***************
*** 4,12 ****
  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
  
  Only building the initial full source tree will be a bit painful,
--- 4,11 ----
  tools we depend upon:
  
! - 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,

Index: bootstrap
===================================================================
RCS file: /cvsroot/a2ps/a2ps/bootstrap,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** bootstrap   18 Apr 2002 17:15:12 -0000      1.1.2.3
--- bootstrap   19 Jul 2002 11:31:23 -0000      1.1.2.4
***************
*** 1,4 ****
  #! /bin/sh
! 
  contrib_scripts="card fixps pdiff psmandup psset"
  
--- 1,4 ----
  #! /bin/sh
! set -e
  contrib_scripts="card fixps pdiff psmandup psset"
  
***************
*** 6,10 ****
  
  # These are created by the Makefile, which is missing for the time
! # being.
  for i in $contrib_scripts
  do
--- 6,10 ----
  
  # These are created by the Makefile, which is missing for the time
! # being.  They are needed by configure.
  for i in $contrib_scripts
  do
***************
*** 15,35 ****
  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
  
  (
    cd contrib
    for i in $contrib_scripts
    do
!     rm contrib/$i.in
    done
    make
  )
--- 15,30 ----
  autoreconf --force --install --verbose
  
  # Configure and make the missing guys.
  ./configure
  
+ # 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 -f $i $i.in
    done
    make
  )
+ make

Index: configure.in
===================================================================
RCS file: /cvsroot/a2ps/a2ps/configure.in,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** configure.in        18 Apr 2002 15:57:54 -0000      1.2.2.2
--- configure.in        19 Jul 2002 11:31:23 -0000      1.2.2.3
***************
*** 1,3 ****
! AC_PREREQ(2.53)
  AC_COPYRIGHT([Copyright (c) 1995-2000 Akim Demaille, Miguel Santana])
  
--- 1,3 ----
! AC_PREREQ(2.53b)
  AC_COPYRIGHT([Copyright (c) 1995-2000 Akim Demaille, Miguel Santana])
  
***************
*** 7,16 ****
  
  AC_INIT(GNU a2ps, 4.13c, address@hidden)
- 
  AC_CONFIG_AUX_DIR(auxdir)
- AM_CONFIG_HEADER(config.h)
  
  # Initialize automake
  AM_INIT_AUTOMAKE
  # Specify the liba2ps version number
  LIBVERSION=1:0:0
--- 7,17 ----
  
  AC_INIT(GNU a2ps, 4.13c, address@hidden)
  AC_CONFIG_AUX_DIR(auxdir)
  
  # Initialize automake
  AM_INIT_AUTOMAKE
+ 
+ AC_CONFIG_HEADERS(config.h)
+ 
  # Specify the liba2ps version number
  LIBVERSION=1:0:0
***************
*** 156,160 ****
  
  # Internationalization.
! AM_GNU_GETTEXT
  
  # Save the cache
--- 157,162 ----
  
  # Internationalization.
! AM_GNU_GETTEXT_VERSION([0.11.3])
! AM_GNU_GETTEXT(, need-ngettext)
  
  # Save the cache