Updates to automate generation of GNU upload artifacts.

Fix a problem compiling on old, pre-ANSI systems.  getloadavg test is still
broken, but make builds.
Document a breakage on SunOS 4.x systems.

8 files changed, 68 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index c166053..56bdec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-04  Paul D. Smith  <psmith@gnu.org>
+
+	* README.template: Add a note about broken /bin/sh on SunOS
+	4.1.3_U1 & 4.1.4.  Fix up Savannah links.
+
+	* misc.c (message, error, fatal): Don't use "..." if we're using
+	varargs.  ansi2knr should handle this but it doesn't work: it
+	translates "..." to va_dcl etc. but _AFTER_ the preprocessor is
+	done.  On many systems (SunOS for example) va_dcl is a #define.
+	So, force the use of the non-"..." version on pre-ANSI compilers.
+
+	* maintMakefile (sign-dist): Create some rules to help automate
+	the new GNU ftp upload method.
+
 2004-02-24  Paul D. Smith  <psmith@gnu.org>
 
 	* config.h.W32.template: Add HAVE_STDARG_H
diff --git a/NEWS b/NEWS
index eb6ebdb..4034048 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  21 January 2004
+  04 March 2004
 
 Copyright (C) 2002,2003,2004  Free Software Foundation, Inc.
 See the end for copying conditions.
@@ -11,7 +11,7 @@ manual, which is contained in this distribution as the file doc/make.texi.
 Please send GNU make bug reports to <bug-make@gnu.org>.
 See the README file and the GNU make manual for details on reporting bugs.
 
-Version 3.81rc1
+Version 3.81beta1
 
 * GNU make is ported to OS/2.
   Port provided by Andreas Buening <andreas.buening@nexgo.de>.
@@ -34,7 +34,7 @@ Version 3.81rc1
 * Enhancements for POSIX compatibility:
    - Only touch targets (under -t) if they have at least one command.
 
-* Updated to autoconf 2.58, automake 1.8, and gettext 0.13.1.  Users
+* Updated to autoconf 2.59, automake 1.8.2, and gettext 0.14.1.  Users
   should not be impacted.
 
 
diff --git a/README.cvs b/README.cvs
index fc9cdd6..fd10934 100644
--- a/README.cvs
+++ b/README.cvs
@@ -23,10 +23,10 @@ There is no password; just hit the ENTER key if you are asked for one.
 Building From CVS
 -----------------
 
-To build GNU make from CVS, you will need Autoconf 2.57 (or better),
-Automake 1.7.3 (or better), and Gettext 0.11.5 (or better), and any
-tools that those utilities require (GNU m4, Perl, etc.).  You will also
-need a copy of wget.
+To build GNU make from CVS, you will need Autoconf, Automake, and
+Gettext, and any tools that those utilities require (GNU m4, Perl,
+etc.).  See the configure.in file to find the minimum versions of each
+of these tools.  You will also need a copy of wget.
 
 After checking out the code, you will need to perform these steps to get
 to the point where you can run "make".
diff --git a/README.template b/README.template
index 969f208..dcf5943 100644
--- a/README.template
+++ b/README.template
@@ -70,7 +70,7 @@ information on submitting useful and complete bug reports.
 You can also use the online bug tracking system in the Savannah GNU Make
 project to submit new problem reports or search for existing ones:
 
-  http://savannah.gnu.org/bugs/?group_id=71
+  http://savannah.gnu.org/bugs/?group=make
 
 If you need help using GNU make, try these forums:
 
@@ -79,11 +79,11 @@ If you need help using GNU make, try these forums:
   news:gnu.utils.help
   news:gnu.utils.bug
 
-  http://savannah.gnu.org/support/?group_id=71
+  http://savannah.gnu.org/support/?group=make
 
 You may also find interesting patches to GNU Make available here:
 
-  http://savannah.gnu.org/patch/?group_id=71
+  http://savannah.gnu.org/patch/?group=make
 
 Note these patches are provided by our users as a service and we make no
 statements regarding their correctness.  Please contact the authors
@@ -97,7 +97,7 @@ CVS Access
 The GNU make source repository is available via anonymous CVS from the
 GNU Subversions CVS server; look here for details:
 
-  http://savannah.gnu.org/cvs/?group_id=71
+  http://savannah.gnu.org/cvs/?group=make
 
 Please note: you won't be able to build GNU make from CVS without
 installing appropriate maintainer's tools, such as GNU m4, automake,
@@ -112,8 +112,14 @@ System-specific Notes
 ---------------------
 
 It has been reported that the XLC 1.2 compiler on AIX 3.2 is buggy such
-that if you compile make with `cc -O' on AIX 3.2, it will not work correctly.
-It is said that using `cc' without `-O' does work.
+that if you compile make with `cc -O' on AIX 3.2, it will not work
+correctly.  It is said that using `cc' without `-O' does work.
+
+The standard /bin/sh on SunOS 4.1.3_U1 and 4.1.4 is broken and cannot be
+used to configure GNU make.  Please install a different shell such as
+bash or pdksh in order to run "configure".  See this message for more
+information:
+  http://mail.gnu.org/archive/html/bug-autoconf/2003-10/msg00190.html
 
 One area that is often a problem in configuration and porting is the code
 to check the system's current load average.  To make it easier to test and
diff --git a/configure.in b/configure.in
index ebf65dc..3828be7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNU make],[3.81rc1],[bug-make@gnu.org])
+AC_INIT([GNU make],[3.81beta1],[bug-make@gnu.org])
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.59)
 AC_REVISION([[$Id$]])
 
 # Autoconf setup
@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR(vpath.c)
 AC_CONFIG_HEADERS(config.h)
 
 # Automake setup
-AM_INIT_AUTOMAKE([1.7.6])
+AM_INIT_AUTOMAKE([1.8.2])
 
 # Checks for programs.
 AC_PROG_CC
@@ -33,7 +33,7 @@ AM_C_PROTOTYPES
 
 # Enable gettext, in "external" mode.
 
-AM_GNU_GETTEXT_VERSION(0.12.1)
+AM_GNU_GETTEXT_VERSION(0.14.1)
 AM_GNU_GETTEXT([external])
 
 # This test must come as early as possible after the compiler configuration
diff --git a/maintMakefile b/maintMakefile
index 31e24ae..24dd90c 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -240,3 +240,29 @@ po-check:
 	  diff -u $@-1 $@-2 || exit 1; \
 	  rm -f $@-1 $@-2; \
 	fi
+
+## ------------------------- ##
+## GNU FTP upload artifacts. ##
+## ------------------------- ##
+
+# This target creates the upload artifacts.
+
+GPG = gpg
+
+DIST_ARCHIVES_SIG = $(addsuffix .sig,$(DIST_ARCHIVES))
+DIST_ARCHIVES_DIRECTIVE = $(addsuffix .directive.asc,$(DIST_ARCHIVES))
+
+sign-dist: $(DIST_ARCHIVES_SIG) $(DIST_ARCHIVES_DIRECTIVE)
+
+$(DIST_ARCHIVES_DIRECTIVE): directive.asc
+	cp $< $@
+
+%.sig : %
+	@echo "Signing file '$<':"
+	$(GPG) -o $@ -b $<
+
+directive.asc:
+	@echo "Creating directive file '$@':"
+	@echo 'directory: make' > .directive
+	$(GPG) -o $@ --clearsign .directive
+	@rm -f .directive
diff --git a/make.h b/make.h
index 786fc6c..453e9f5 100644
--- a/make.h
+++ b/make.h
@@ -387,7 +387,7 @@ struct floc
 #define STRING_SIZE_TUPLE(_s) (_s), (sizeof (_s)-1)
 
 
-/* We have to have both stdarg.h or varargs.h AND v*printf or doprnt to use
+/* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use
    variadic versions of these functions.  */
 
 #if HAVE_STDARG_H || HAVE_VARARGS_H
@@ -396,7 +396,7 @@ struct floc
 # endif
 #endif
 
-#if __STDC__ && USE_VARIADIC
+#if __STDC__ && USE_VARIADIC && HAVE_STDARG_H
 extern void message (int prefix, const char *fmt, ...)
                      __attribute__ ((__format__ (__printf__, 2, 3)));
 extern void error (const struct floc *flocp, const char *fmt, ...)
diff --git a/misc.c b/misc.c
index 0832042..07a9c47 100644
--- a/misc.c
+++ b/misc.c
@@ -205,7 +205,7 @@ concat (const char *s1, const char *s2, const char *s3)
 /* Print a message on stdout.  */
 
 void
-#if USE_VARIADIC
+#if __STDC__ && USE_VARIADIC && HAVE_STDARG_H
 message (int prefix, const char *fmt, ...)
 #else
 message (prefix, fmt, va_alist)
@@ -241,7 +241,7 @@ message (prefix, fmt, va_alist)
 /* Print an error message.  */
 
 void
-#if USE_VARIADIC
+#if __STDC__ && USE_VARIADIC && HAVE_STDARG_H
 error (const struct floc *flocp, const char *fmt, ...)
 #else
 error (flocp, fmt, va_alist)
@@ -274,7 +274,7 @@ error (flocp, fmt, va_alist)
 /* Print an error message and exit.  */
 
 void
-#if USE_VARIADIC
+#if __STDC__ && USE_VARIADIC && HAVE_STDARG_H
 fatal (const struct floc *flocp, const char *fmt, ...)
 #else
 fatal (flocp, fmt, va_alist)