updated to 2.50

Changed files:
    autoconf-fhs.patch -> 1.3
    autoconf-mawk.patch -> 1.3

diff --git a/autoconf-fhs.patch b/autoconf-fhs.patch
index d7f7111c83983fefc48798ee61a133914f2f8a87..30ec35933b4c24a18a63c4b0d3177d9c141bc3d6 100644 (file)
--- a/autoconf-fhs.patch
+++ b/autoconf-fhs.patch
@@ -1,19 +1,23 @@
-diff -Nru autoconf-2.13/acgeneral.m4 autoconf-2.13.new/acgeneral.m4
---- autoconf-2.13/acgeneral.m4 Wed Aug 16 19:24:11 2000
-+++ autoconf-2.13.new/acgeneral.m4     Wed Aug 16 19:25:11 2000
-@@ -198,12 +198,12 @@
- datadir='${prefix}/share'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir='/var/lib'
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+infodir='${prefix}/share/info'
-+mandir='${prefix}/share/man'
+--- autoconf-2.50/acgeneral.m4.fhs     Tue May 22 15:42:14 2001
++++ autoconf-2.50/acgeneral.m4 Tue May 22 15:42:34 2001
+@@ -829,16 +829,16 @@
+ # Use braces instead of parens because sh, perl, etc. also accept them.
+ AC_SUBST([bindir],         ['${exec_prefix}/bin'])dnl
+ AC_SUBST([sbindir],        ['${exec_prefix}/sbin'])dnl
+-AC_SUBST([libexecdir],     ['${exec_prefix}/libexec'])dnl
++AC_SUBST([libexecdir],     ['${exec_prefix}/lib'])dnl
+ AC_SUBST([datadir],        ['${prefix}/share'])dnl
+ AC_SUBST([sysconfdir],     ['${prefix}/etc'])dnl
+ AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
+-AC_SUBST([localstatedir],  ['${prefix}/var'])dnl
++AC_SUBST([localstatedir],  ['/var/lib'])dnl
+ AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
+ AC_SUBST([includedir],     ['${prefix}/include'])dnl
+ AC_SUBST([oldincludedir],  ['/usr/include'])dnl
+-AC_SUBST([infodir],        ['${prefix}/info'])dnl
+-AC_SUBST([mandir],         ['${prefix}/man'])dnl
++AC_SUBST([infodir],        ['${prefix}/share/info'])dnl
++AC_SUBST([mandir],         ['${prefix}/share/man'])dnl
  
- # Initialize some other variables.
- subdirs=
+ # Identity of this package.
+ AC_SUBST([PACKAGE_NAME],

diff --git a/autoconf-mawk.patch b/autoconf-mawk.patch
index 963fc96a9185e9523a96b7ac53c955e911daa2f5..e693511f763edb74c86d9a57b49cec4606c4a23b 100644 (file)
--- a/autoconf-mawk.patch
+++ b/autoconf-mawk.patch
@@ -1,44 +1,41 @@
-diff -Naur autoconf-2.13/acspecific.m4 autoconf-2.13-p/acspecific.m4
---- autoconf-2.13/acspecific.m4        Tue Jan  5 14:27:52 1999
-+++ autoconf-2.13-p/acspecific.m4      Mon Jul  3 01:00:39 2000
-@@ -479,9 +479,9 @@
- AC_DEFUN(AC_PROG_RANLIB,
- [AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)])
- 
--dnl Check for mawk first since it's generally faster.
-+dnl Check for awk first since it's generally the one we would like to use :)
- AC_DEFUN(AC_PROG_AWK,
--[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
-+[AC_CHECK_PROGS(AWK, awk mawk gawk nawk, )])
- 
- AC_DEFUN(AC_PROG_YACC,
- [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])
-diff -Naur autoconf-2.13/autoconf.texi autoconf-2.13-p/autoconf.texi
---- autoconf-2.13/autoconf.texi        Mon Jul  3 00:57:52 2000
-+++ autoconf-2.13-p/autoconf.texi      Mon Jul  3 01:03:19 2000
-@@ -1537,10 +1537,10 @@
+--- autoconf-2.50/doc/autoconf.texi.mawk       Tue May 22 15:33:52 2001
++++ autoconf-2.50/doc/autoconf.texi    Tue May 22 15:36:55 2001
+@@ -2833,10 +2833,10 @@
  @defmac AC_PROG_AWK
  @maindex PROG_AWK
  @ovindex AWK
 -Check for @code{mawk}, @code{gawk}, @code{nawk}, and @code{awk}, in that
 +Check for @code{awk}, @code{mawk}, @code{gawk}, and @code{nawk}, in that
- order, and set output variable @code{AWK} to the first one that it
--finds.  It tries @code{mawk} first because that is reported to be the
+ order, and set output variable @code{AWK} to the first one that is found.
+-It tries @code{mawk} first because that is reported to be the
 -fastest implementation.
-+finds.  It tries @code{awk} first because that is reported to be the
++It tries @code{awk} first because that is reported to be the
 +implementation that our system usually runs.
  @end defmac
  
- @defmac AC_PROG_CC
-diff -Naur autoconf-2.13/configure autoconf-2.13-p/configure
---- autoconf-2.13/configure    Tue Jan  5 14:28:57 1999
-+++ autoconf-2.13-p/configure  Mon Jul  3 00:59:42 2000
-@@ -583,7 +583,7 @@
- done
- test -n "$M4" || M4="m4"
  
+--- autoconf-2.50/acspecific.m4.mawk   Tue May 22 15:33:36 2001
++++ autoconf-2.50/acspecific.m4        Tue May 22 15:35:43 2001
+@@ -113,9 +113,9 @@
+ [AC_CHECK_TOOL(RANLIB, ranlib, :)])
+ 
+ 
+-# Check for mawk first since it's generally faster.
++# Check for awk first since it's generally the one we would like to use :)
+ AC_DEFUN([AC_PROG_AWK],
+-[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
++[AC_CHECK_PROGS(AWK, awk mawk gawk nawk, )])
+ 
+ 
+ # AC_PROG_YACC
+--- autoconf-2.50/configure.mawk       Tue May 22 15:34:06 2001
++++ autoconf-2.50/configure    Tue May 22 15:34:47 2001
+@@ -1267,7 +1267,7 @@
+ # a AC-SUBST inside AC-PROG-GNU-M4.  Grmph!
+ 
+ # `autoconf' and `ifnames' use AWK.
 -for ac_prog in mawk gawk nawk awk
-+for ac_prog in awk
++for ac_prog in awk mawk gawk nawk
  do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2