06-makefile-maint.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * Makefile.maint: Update from Autoconf 2.54.
        * m4/strerror_r.m4 (AC_FUNC_STRERROR_R): Remove, shipped with 2.54.

Index: Makefile.maint
--- Makefile.maint Fri, 28 Sep 2001 09:33:42 +0200 akim
+++ Makefile.maint Sun, 13 Oct 2002 21:14:51 +0200 akim
@@ -251,19 +251,15 @@ my-distcheck: writable-files po-check
        echo "$(distdir).tar.gz is ready for distribution"; \
        echo "========================"

-# This must be the same name on both hosts.
-# Make it a symlink that points to the right place.
-real_dir = fetish-ftp
-
-url_dir_list = $(foreach x,$(hosts),ftp://$($(x)_host)/$($(x)_url_dir))
-
 tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/  -//')
 tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/  -//')
 bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/  -//')
 bz2-sha1 = $(shell sha1sum < $(my_distdir).tar.bz2|sed 's/  -//')
-tgz-size = $(shell du --human $(my_distdir).tar.gz|sed 's/\([Mk]\).*/ \1B/')
-bz2-size = $(shell du --human $(my_distdir).tar.bz2|sed 's/\([Mk]\).*/ \1B/')
-xd-size = $(shell du --human $(xd-delta)|sed 's/\([Mk]\).*/ \1B/')
+xdelta-md5 = $(shell md5sum < $(xd-delta)|sed 's/  -//')
+xdelta-sha1 = $(shell sha1sum < $(xd-delta)|sed 's/  -//')
+tgz-size = $(shell du --human $(my_distdir).tar.gz|sed 's/\([MkK]\).*/ \1B/')
+bz2-size = $(shell du --human $(my_distdir).tar.bz2|sed 's/\([MkK]\).*/ \1B/')
+xd-size = $(shell du --human $(xd-delta)|sed 's/\([MkK]\).*/ \1B/')

 rel-check:
        tarz=/tmp/rel-check-tarz-$$$$; \
@@ -277,12 +273,8 @@ rel-check:
 prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
 xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta

-GZIP = gzip
-BZIP2 = bzip2
-$(my_distdir).tar.bz2: $(my_distdir).tar.gz
-       $(GZIP) -dc $< > $(my_distdir).tar
-       rm -f $@
-       $(BZIP2) -9 $(my_distdir).tar
+news-r1 = /^[^ ].*$(THIS_VERSION_REGEXP)[]:]/
+news-r2 = /^[^ ].*$(PREV_VERSION_REGEXP)[]:]/

 rel-files = $(xd-delta) $(distdir).tar.bz2 $(distdir).tar.gz
 announcement: NEWS ChangeLog $(rel-files)
@@ -302,15 +294,17 @@ announcement: NEWS ChangeLog $(rel-files
            echo "  $$url/$(xd-delta)   ($(xd-size))"; \
          done; \
          echo; \
-         echo "Here are the MD5 and SHA1 signatures for the compressed tar 
files:"; \
+         echo "Here are the MD5 and SHA1 signatures:"; \
          echo; \
          echo "$(tgz-md5)  $(my_distdir).tar.gz"; \
          echo "$(bz2-md5)  $(my_distdir).tar.bz2"; \
+         echo "$(xdelta-md5)  $(xd-delta)"; \
          echo "$(tgz-sha1)  $(my_distdir).tar.gz"; \
          echo "$(bz2-sha1)  $(my_distdir).tar.bz2"; \
+         echo "$(xdelta-sha1)  $(xd-delta)"; \
          echo; \
          echo NEWS:; \
-         sed -n "/$(THIS_VERSION_REGEXP)[]:]/,/$(PREV_VERSION_REGEXP)[]:]/p" 
NEWS \
+         sed -n "$(news-r1),$(news-r2)p" NEWS \
            | grep -v '^\['; \
          echo; \
          echo ChangeLog entries:; \
@@ -321,12 +315,10 @@ announcement: NEWS ChangeLog $(rel-files
              -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
        )

-define emit-rsync-commands
+define emit-upload-commands
        echo =====================================
        echo =====================================
-       echo 'for host in $(a_host) $(b_host); do \'
-       echo '  rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.bz2 \'
-       echo '    $(my_distdir).tar.gz $$host:$(real_dir); done'
+       echo upload $(PACKAGE) $(PREV_VERSION) $(VERSION)
        echo '# send the /tmp/announcement e-mail'
        echo =====================================
        echo =====================================
@@ -343,4 +335,4 @@ alpha:
        chmod a-w $(rel-files)
        echo $(VERSION) > $(prev_version_file)
        $(CVS) ci -m. $(prev_version_file)
-       @$(emit-rsync-commands)
+       @$(emit-upload-commands)
Index: TODO
--- TODO Fri, 27 Sep 2002 20:10:16 +0200 akim
+++ TODO Sun, 13 Oct 2002 21:18:45 +0200 akim
@@ -2,62 +2,7 @@

 * Header guards

-En rentrant chez moi, je relance un `make' sur un projet que j'ai avancé
-ailleurs durant la semaine.  Le système que j'utilise ici est un peu plus
-à jour que l'autre, et le Bison est probablement plus récent itou.  Ici,
-c'est la version 1.33.  J'obtiens, en montrant un peu plus que nécessaire:
-
----------------------------------------------------------------------->
-cd ~/fpub/pyrexpp/Pyrexpp/
-LANGUAGE= /usr/bin/make MAKEFLAGS='-k -j2'
-/usr/bin/make -C .. install
-make[1]: Entre dans le répertoire `/bpi/titan/home/pinard/fpub/pyrexpp'
-install -g bpi -m 2775 -d Prépare-titan
-chmod g+sw Prépare-titan
-touch Prépare-titan/.estampille
-/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o 
Prépare-titan/ctools.o ctools.c
-bison -d -o Prépare-titan/c-parser.c c-parser.y
-/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o 
Prépare-titan/c-parser.o Prépare-titan/c-parser.c
-flex -t c-scanner.l | grep -v '^#line' > Prépare-titan/c-scanner.c
-/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o 
Prépare-titan/c-scanner.o Prépare-titan/c-scanner.c
-In file included from Prépare-titan/c-scanner.c:547:
-Prépare-titan/c-parser.h:1: warning: garbage at end of `#ifndef' argument
-Prépare-titan/c-parser.h:2: warning: missing white space after `#define 
BISON_PR'
-/usr/bin/gcc -o Prépare-titan/ctools.so Prépare-titan/ctools.o 
Prépare-titan/c-scanner.o -shared -lm
-python setup.py --quiet build
-install -g bpi -m 664 Prépare-titan/ctools.so 
/bpi/titan/local/lib/python2.2/site-packages/Pyrexpp
-python setup.py --quiet install
-make[1]: Quitte le répertoire `/bpi/titan/home/pinard/fpub/pyrexpp'
-[...]
-----------------------------------------------------------------------<
-
-Diagnostics que je n'avais sûrement pas, plus tôt en journée, sur l'autre
-système.  En allant voir, je trouve:
-
----------------------------------------------------------------------->
-#ifndef BISON_PRÉPARE_TITAN_C_PARSER_H
-# define BISON_PRÉPARE_TITAN_C_PARSER_H
-
-# ifndef YYSTYPE
-#  define YYSTYPE int
-# endif
-# define       IDENTIFIER      257
-[...]
-
-extern YYSTYPE yylval;
-
-#endif /* not BISON_PRÉPARE_TITAN_C_PARSER_H */
-----------------------------------------------------------------------<
-
-Le pré-processeur de C n'est pas à l'aise avec les caractères accentués
-dans les identificateurs.
-
-Bon, de mon expérience, il n'a jamais été nécessaire de protéger un fichier
-`.h' de Bison ou Yacc contre de multiples inclusions, mais si ça été
-fait, je présume qu'il y avait un problème réel et convaincant à régler,
-et qu'il ne s'agit pas d'une simple fantaisie: je ne mettrai donc pas
-ça en doute.  Mais le choix du nom de l'identificateur laisse à désirer,
-tu en conviendras :-).  Et faut-il vraiment y inclure le répertoire?
+From Franc,ois: should we keep the directory part in the CPP guard?


 * URGENT: Documenting C++ output
Index: m4/Makefile.am
--- m4/Makefile.am Fri, 27 Sep 2002 20:10:16 +0200 akim
+++ m4/Makefile.am Sun, 13 Oct 2002 21:22:03 +0200 akim
@@ -2,5 +2,5 @@
 EXTRA_DIST = \
   dmalloc.m4 error.m4 \
   m4.m4 mbrtowc.m4 memcmp.m4 mkstemp.m4 \
-  prereq.m4 strerror_r.m4 timevar.m4 warning.m4 \
+  prereq.m4 timevar.m4 warning.m4 \
   gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4
Index: m4/timevar.m4
--- m4/timevar.m4 Sun, 13 Oct 2002 10:01:29 +0200 akim
+++ m4/timevar.m4 Sun, 13 Oct 2002 21:22:17 +0200 akim
@@ -1,5 +1,5 @@
-# -*-Autoconf-*-
-# Checks required to run `timevar', a nonportable memory/time tracker.
+# -*- Autoconf -*-
+# Checks required to run `timevar', a time tracker.
 #
 # Copyright (C) 2002 Free Software Foundation, Inc.
 #
Index: m4/strerror_r.m4
--- m4/strerror_r.m4 Fri, 02 Nov 2001 19:28:01 +0100 akim
+++ m4/strerror_r.m4 Sun, 13 Oct 2002 21:24:19 +0200 akim
@@ -1,59 +0,0 @@
-#serial 1003
-# Experimental replacement for the function in the latest CVS autoconf.
-# Use with the error.c file in ../lib.
-
-# Copyright 2001 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, 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.  */
-
-undefine([AC_FUNC_STRERROR_R])
-
-# AC_FUNC_STRERROR_R
-# ------------------
-AC_DEFUN([AC_FUNC_STRERROR_R],
-[AC_CHECK_DECLS([strerror_r])
-AC_CHECK_FUNCS([strerror_r])
-AC_CACHE_CHECK([whether strerror_r returns char *],
-               ac_cv_func_strerror_r_char_p,
-   [
-    ac_cv_func_strerror_r_char_p=no
-    if test $ac_cv_have_decl_strerror_r = yes; then
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-       [[
-         char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         char *p = strerror_r (0, buf, sizeof buf);
-       ]])],
-                       ac_cv_func_strerror_r_char_p=yes)
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-       extern char *strerror_r ();],
-       [[char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         exit (!isalpha (x));]])],
-                    ac_cv_func_strerror_r_char_p=yes, , :)
-    fi
-  ])
-if test $ac_cv_func_strerror_r_char_p = yes; then
-  AC_DEFINE([STRERROR_R_CHAR_P], 1,
-           [Define to 1 if strerror_r returns char *.])
-fi
-])# AC_FUNC_STRERROR_R