I have made the following changes intended for : nemo:devel:mw / autoconf213
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/177 Thank You, Dmitry Rozhkov [This message was auto-generated] --- Request # 177: Messages from BOSS: State: review at 2013-04-12T06:57:47 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rozhkov:branches:nemo:devel:apps / autoconf213 -> nemo:devel:mw / autoconf213 changes files: -------------- ++++++ new changes file: --- autoconf213.changes +++ autoconf213.changes @@ -0,0 +1,15 @@ +* Thu Jul 19 2012 Stephan Kulow <[email protected]> - 2.13 +- buildrequire makeinfo + +* Tue Dec 20 2011 Stepjan Kulow <[email protected]> - 2.13 +- remove call to suse_update_config (very old work around) + +* Sat Sep 17 2011 Jan Engelhardt <[email protected]> - 2.13 +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +* Fri Dec 18 2009 Jan Engelhardt <[email protected]> - 2.13 +- enable parallel building + +* Fri Aug 22 2008 Wolfgang Rosenauer <[email protected]> - 2.13 +- initial autoconf 2.13 package based on Fedora's package new: ---- autoconf-2.12-race.patch autoconf-2.13-autoscan.patch autoconf-2.13-c++exit.patch autoconf-2.13-exit.patch autoconf-2.13-headers.patch autoconf-2.13-make-defs-62361.patch autoconf-2.13-mawk.patch autoconf-2.13-noinfo.patch autoconf-2.13-notmp.patch autoconf-2.13-versioning.patch autoconf-2.13-wait3test.patch autoconf-2.13.tar.bz2 autoconf213-destdir.patch autoconf213.changes autoconf213.spec spec files: ----------- ++++++ new spec file: --- autoconf213.spec +++ autoconf213.spec @@ -0,0 +1,94 @@ +# +# spec file for package autoconf213 +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: autoconf213 +Url: http://www.gnu.org/software/autoconf +Requires: gawk +Requires: m4 >= 1.1 +Requires: mktemp +Requires: perl +Version: 2.13 +Release: 18.3 +Summary: A GNU Tool for Automatically Configuring Source Code +License: GPL-2.0+ +Group: Development/Tools/Building +BuildArch: noarch +Source: autoconf-%{version}.tar.bz2 +Patch0: autoconf-2.12-race.patch +Patch1: autoconf-2.13-mawk.patch +Patch2: autoconf-2.13-notmp.patch +Patch3: autoconf-2.13-c++exit.patch +Patch4: autoconf-2.13-headers.patch +Patch5: autoconf-2.13-autoscan.patch +Patch6: autoconf-2.13-exit.patch +Patch7: autoconf-2.13-wait3test.patch +Patch8: autoconf-2.13-make-defs-62361.patch +Patch9: autoconf-2.13-versioning.patch +Patch10: autoconf213-destdir.patch +Patch11: autoconf-2.13-noinfo.patch + +%description +GNU Autoconf is a tool for configuring source code and makefiles. Using +autoconf, programmers can create portable and configurable packages, +because the person building the package is allowed to specify various +configuration options. + +You should install autoconf if you are developing software and would +like to create shell scripts to configure your source code packages. + +Note that the autoconf package is not required for the end user who may +be configuring software with an autoconf-generated script; autoconf is +only required for the generation of the scripts, not their use. + +%prep +%setup -n autoconf-%{version} -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 + +%build +./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ + --program-suffix=-2.13 +make %{?_smp_mflags} + +%install +%makeinstall +# We don't want to include the standards.info stuff in the package, +# because it comes from binutils... +rm -rf ${RPM_BUILD_ROOT}%{_infodir} + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/autoconf2.13.info.gz + +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/autoconf2.13.info.gz + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING NEWS README TODO +%{_prefix}/bin/* +%{_prefix}/share/autoconf-2.13 other changes: -------------- ++++++ autoconf-2.12-race.patch (new) --- autoconf-2.12-race.patch +++ autoconf-2.12-race.patch @@ -0,0 +1,49 @@ +--- autoconf-2.12/autoconf.sh.race Thu Aug 27 19:01:23 1998 ++++ autoconf-2.12/autoconf.sh Thu Aug 27 19:05:04 1998 +@@ -45,7 +45,7 @@ + esac + + : ${TMPDIR=/tmp} +-tmpout=${TMPDIR}/acout.$$ ++tmpout=`/bin/mktemp ${TMPDIR}/acout.XXXXXX` + localdir= + show_version=no + +@@ -97,10 +97,10 @@ + + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 + +-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. ++tmpin=`/bin/mktemp ${TMPDIR}/acin.XXXXXX` ++# Always set this, to avoid bogus errors from some rm's. + if test z$infile = z-; then + infile=$tmpin +- cat > $infile + elif test ! -r "$infile"; then + echo "autoconf: ${infile}: No such file or directory" >&2 + exit 1 +--- autoconf-2.12/autoheader.sh.race Thu Aug 27 19:05:19 1998 ++++ autoconf-2.12/autoheader.sh Thu Aug 27 19:08:18 1998 +@@ -194,9 +194,9 @@ + # Some fgrep's have limits on the number of lines that can be in the + # pattern on the command line, so use a temporary file containing the + # pattern. +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ ++ (fgrep_tmp=`/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 +- cat > $fgrep_tmp <<EOF ++ cat >> $fgrep_tmp <<EOF + $syms + EOF + fgrep -f $fgrep_tmp +--- autoconf-2.12/autoupdate.sh.race Thu Aug 27 19:09:12 1998 ++++ autoconf-2.12/autoupdate.sh Thu Aug 27 19:10:05 1998 +@@ -26,7 +26,7 @@ + Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] + [--version] [template-file]" + +-sedtmp=/tmp/acups.$$ ++sedtmp=`/bin/mktemp /tmp/acups.XXXXXX` + # For debugging. + #sedtmp=/tmp/acups + show_version=no ++++++ autoconf-2.13-autoscan.patch (new) --- autoconf-2.13-autoscan.patch +++ autoconf-2.13-autoscan.patch @@ -0,0 +1,53 @@ +--- autoconf-2.13/autoscan.pl~ Tue Jul 10 19:00:10 2001 ++++ autoconf-2.13/autoscan.pl Tue Jul 10 19:00:10 2001 +@@ -123,14 +123,33 @@ + # Called by &find on each file. + sub wanted + { +- if (/^.*\.[chlymC]$/ || /^.*\.cc$/) { +- $name =~ s?^\./??; push(@cfiles, $name); +- } +- elsif (/^[Mm]akefile$/ || /^[Mm]akefile\.in$/ || /^GNUmakefile$/) { +- $name =~ s?^\./??; push(@makefiles, $name); +- } +- elsif (/^.*\.sh$/) { +- $name =~ s?^\./??; push(@shfiles, $name); ++ # Wanted only if there is no corresponding FILE.in. ++ return ++ if -f "$_.in"; ++ ++ # Strip a useless leading `./'. ++ $name =~ s,^\./,,; ++ ++ if (/^.*\.[chlymC](\.in)?$/) ++ { ++ push (@cfiles, $name); ++ $programs{cc}++; ++ } ++ elsif (/^.*\.(cc|cpp|cxx|CC|C|hh|hpp|hxx|HH|H|yy|ypp|ll|lpp)(\.in)?$/) ++ { ++ push (@cfiles, $name); ++ $programs{CC}++; ++ } ++ elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile$/) ++ { ++ # Wanted only if there is no corresponding Makefile.in. ++ # Using Find, $_ contains the current filename with the current ++ # directory of the walk through. ++ push (@makefiles, $name); ++ } ++ elsif (/^.*\.sh(\.in)?$/) ++ { ++ push (@shfiles, $name); + } + } + +@@ -244,7 +263,7 @@ + $libraries{$1}++; + } + # Tokens in the code. +- while (s/\W([a-zA-Z_]\w*)\W/ /) { ++ while (s/\W([a-zA-Z_][\w\+\.-]*)\W/ /) { + $programs{$1}++; + } + } ++++++ autoconf-2.13-c++exit.patch (new) --- autoconf-2.13-c++exit.patch +++ autoconf-2.13-c++exit.patch @@ -0,0 +1,57 @@ +--- autoconf-2.13/acgeneral.m4~ Tue Jun 26 17:00:28 2001 ++++ autoconf-2.13/acgeneral.m4 Tue Jun 26 17:00:28 2001 +@@ -1817,10 +1817,6 @@ + [cat > conftest.$ac_ext <<EOF + [#]line __oline__ "configure" + #include "confdefs.h" +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" void exit(int); +-#endif +-])dnl + [$1] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +--- autoconf-2.13/acspecific.m4~ Tue Jun 26 17:04:34 2001 ++++ autoconf-2.13/acspecific.m4 Tue Jun 26 17:04:34 2001 +@@ -152,8 +152,41 @@ + CXXFLAGS= + fi + fi ++ ++AC_PROG_CXX_EXIT_DECLARATION + ]) + ++ ++# AC_PROG_CXX_EXIT_DECLARATION ++# ----------------------------- ++# Find a valid prototype for exit and declare it in confdefs.h. ++AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, ++[for ac_declaration in \ ++ ''\ ++ '#include <stdlib.h>' \ ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ ++ 'extern "C" void std::exit (int); using std::exit;' \ ++ 'extern "C" void exit (int) throw ();' \ ++ 'extern "C" void exit (int);' \ ++ 'void exit (int);' ++do ++ AC_TRY_COMPILE([#include <stdlib.h> ++$ac_declaration], ++ [exit (42);], ++ [], ++ [continue]) ++ AC_TRY_COMPILE([$ac_declaration], ++ [exit (42);], ++ [break]) ++done ++if test -n "$ac_declaration"; then ++ echo '#ifdef __cplusplus' >>confdefs.h ++ echo $ac_declaration >>confdefs.h ++ echo '#endif' >>confdefs.h ++fi ++])# AC_PROG_CXX_EXIT_DECLARATION ++ ++ + dnl Determine a Fortran 77 compiler to use. If `F77' is not already set + dnl in the environment, check for `g77', `f77' and `f2c', in that order. + dnl Set the output variable `F77' to the name of the compiler found. ++++++ autoconf-2.13-exit.patch (new) --- autoconf-2.13-exit.patch +++ autoconf-2.13-exit.patch @@ -0,0 +1,18 @@ +--- autoconf-2.13/acgeneral.m4.orig Thu Jul 26 15:13:37 2001 ++++ autoconf-2.13/acgeneral.m4 Thu Jul 26 15:14:00 2001 +@@ -1988,12 +1988,12 @@ + AC_MSG_CHECKING(size of $1) + AC_CACHE_VAL(AC_CV_NAME, + [AC_TRY_RUN([#include <stdio.h> +-main() ++int main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); ++ if (!f) return(1); + fprintf(f, "%d\n", sizeof($1)); +- exit(0); ++ return(0); + }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl + AC_MSG_RESULT($AC_CV_NAME) + AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) ++++++ autoconf-2.13-headers.patch (new) --- autoconf-2.13-headers.patch +++ autoconf-2.13-headers.patch @@ -0,0 +1,39 @@ +--- autoconf-2.13/acspecific.m4.orig Fri Jun 29 16:26:39 2001 ++++ autoconf-2.13/acspecific.m4 Fri Jun 29 16:26:39 2001 +@@ -1010,7 +1043,7 @@ + ]) + + AC_DEFUN(AC_FUNC_MMAP, +-[AC_CHECK_HEADERS(unistd.h) ++[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) + AC_CHECK_FUNCS(getpagesize) + AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, + [AC_TRY_RUN([ +@@ -1039,11 +1072,24 @@ + #include <fcntl.h> + #include <sys/mman.h> + ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++ ++#if HAVE_STDLIB_H ++# include <stdlib.h> ++#endif ++ ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++ ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ + /* This mess was copied from the GNU getpagesize.h. */ + #ifndef HAVE_GETPAGESIZE +-# ifdef HAVE_UNISTD_H +-# include <unistd.h> +-# endif + + /* Assume that all systems that can run configure have sys/param.h. */ + # ifndef HAVE_SYS_PARAM_H ++++++ autoconf-2.13-make-defs-62361.patch (new) --- autoconf-2.13-make-defs-62361.patch +++ autoconf-2.13-make-defs-62361.patch @@ -0,0 +1,54 @@ +diff -u autoconf-2.13/acgeneral.m4~ autoconf-2.13/acgeneral.m4 +--- autoconf-2.13/acgeneral.m4~ Wed May 15 14:47:12 2002 ++++ autoconf-2.13/acgeneral.m4 Wed May 15 14:47:12 2002 +@@ -2156,20 +2156,38 @@ + dnl AC_OUTPUT_MAKE_DEFS() + define(AC_OUTPUT_MAKE_DEFS, + [# Transform confdefs.h into DEFS. +-dnl Using a here document instead of a string reduces the quoting nightmare. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-cat > conftest.defs <<\EOF +-changequote(<<, >>)dnl +-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +-s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g +-s%\[%\\&%g +-s%\]%\\&%g +-s%\$%$$%g +-changequote([, ])dnl +-EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +-rm -f conftest.defs ++# ++# If the first sed substitution is executed (which looks for macros that ++# take arguments), then we branch to the quote section. Otherwise, ++# look for a macro that doesn't take arguments. ++cat >confdef2opt.sed <<\_ACEOF ++changequote(<<, >>)dnl ++t clear ++: clear ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g ++t quote ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g ++t quote ++d ++: quote ++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g ++s,\[,\\&,g ++s,\],\\&,g ++s,\$,$$,g ++p ++changequote([, ])dnl ++_ACEOF ++# We use echo to avoid assuming a particular line-breaking character. ++# The extra dot is to prevent the shell from consuming trailing ++# line-breaks from the sub-command output. A line-break within ++# single-quotes doesn't work because, if this script is created in a ++# platform that uses two characters for line-breaks (e.g., DOS), tr ++# would break. ++ac_LF_and_DOT=`echo; echo .` ++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` ++rm -f confdef2opt.sed + ]) + + dnl Do the variable substitutions to create the Makefiles or whatever. ++++++ autoconf-2.13-mawk.patch (new) --- autoconf-2.13-mawk.patch +++ autoconf-2.13-mawk.patch @@ -0,0 +1,41 @@ +--- autoconf-2.13/configure.mawk Tue Jan 5 08:28:57 1999 ++++ autoconf-2.13/configure Sun Mar 21 16:58:01 1999 +@@ -583,7 +583,7 @@ + done + test -n "$M4" || M4="m4" + +-for ac_prog in mawk gawk nawk awk ++for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +--- autoconf-2.13/acspecific.m4.mawk Tue Jan 5 08:27:52 1999 ++++ autoconf-2.13/acspecific.m4 Sun Mar 21 16:58:56 1999 +@@ -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 Don't check for mawk first even if it's generally faster. + AC_DEFUN(AC_PROG_AWK, +-[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )]) ++[AC_CHECK_PROGS(AWK, gawk mawk nawk awk, )]) + + AC_DEFUN(AC_PROG_YACC, + [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)]) +--- autoconf-2.13/autoconf.texi.mawk Tue Jan 5 08:28:37 1999 ++++ autoconf-2.13/autoconf.texi Sun Mar 21 16:59:42 1999 +@@ -1535,10 +1535,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{gawk}, @code{mawk}, @code{nawk}, and @code{awk}, 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 +-fastest implementation. ++finds. It tries @code{gawk} first because that is reported to be the ++best implementation. + @end defmac + + @defmac AC_PROG_CC ++++++ autoconf-2.13-noinfo.patch (new) --- autoconf-2.13-noinfo.patch +++ autoconf-2.13-noinfo.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile.in b/Makefile.in +index a6c94d4..2c9309e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -82,7 +82,7 @@ editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e \ + -e 's,@''SHELL''@,$(SHELL),g' + editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g' + +-all: ${SCRIPTS} ${M4FROZEN} info ++all: ${SCRIPTS} ${M4FROZEN} + + .SUFFIXES: + .SUFFIXES: .sh .pl .m4 .m4f +@@ -110,14 +110,14 @@ info: autoconf.info @standards_info@ INSTALL + + # Use --no-split to avoid creating filenames > 14 chars. + autoconf.info: autoconf.texi install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ ++ #$(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ + + INSTALL: install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ ++ #$(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ + --no-headers --no-validate + + standards.info: standards.texi make-stds.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@ ++ #$(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@ + + dvi: autoconf.dvi @standards_dvi@ + ++++++ autoconf-2.13-notmp.patch (new) --- autoconf-2.13-notmp.patch +++ autoconf-2.13-notmp.patch @@ -0,0 +1,129 @@ +--- autoconf-2.13/autoconf.sh~ Fri Mar 26 20:50:48 1999 ++++ autoconf-2.13/autoconf.sh Fri Mar 26 20:58:22 1999 +@@ -52,13 +52,13 @@ + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; + --localdir=* | --l*=* ) + localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -l | --localdir | --l*) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + localdir="${1}" + shift ;; + --macrodir=* | --m*=* ) +@@ -66,7 +66,7 @@ + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --v* ) +@@ -76,7 +76,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; + * ) + break ;; + esac +@@ -86,13 +86,14 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $tmpout + exit 0 + fi + + case $# in + 0) infile=configure.in ;; + 1) infile="$1" ;; +- *) echo "$usage" >&2; exit 1 ;; ++ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; + esac + + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 +@@ -103,6 +104,7 @@ + infile=$tmpin + elif test ! -r "$infile"; then + echo "autoconf: ${infile}: No such file or directory" >&2 ++ rm -f $tmpin $tmpout + exit 1 + fi + +@@ -111,6 +113,8 @@ + else + use_localdir= + fi ++# Make sure we don't leave those around - they are annoying ++trap 'rm -f $tmpin $tmpout' 0 + + # Use the frozen version of Autoconf if available. + r= f= +@@ -118,7 +122,7 @@ + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; + *traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; ++*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; + esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || +@@ -154,6 +158,6 @@ + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + ' >&4 + +-rm -f $tmpout ++rm -f $tmpout $tmpin + + exit $status +--- autoconf-2.13/autoupdate.sh~ Fri Mar 26 20:50:48 1999 ++++ autoconf-2.13/autoupdate.sh Fri Mar 26 21:02:18 1999 +@@ -35,13 +35,13 @@ + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; + --macrodir=* | --m*=* ) + AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --versio | --versi | --vers) +@@ -51,7 +51,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; + * ) + break ;; + esac +@@ -61,6 +61,7 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $sedtmp + exit 0 + fi + +@@ -68,6 +69,7 @@ + + tmpout=acupo.$$ + trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 ++trap 'rm -f $sedtmp' 0 + case $# in + 0) infile=configure.in; out="> $tmpout" + # Make sure $infile can be read, and $tmpout has the same permissions. ++++++ autoconf-2.13-versioning.patch (new) --- autoconf-2.13-versioning.patch +++ autoconf-2.13-versioning.patch @@ -0,0 +1,12 @@ +diff -u autoconf-2.13/Makefile.in~ autoconf-2.13/Makefile.in +--- autoconf-2.13/Makefile.in~ Wed May 15 15:36:06 2002 ++++ autoconf-2.13/Makefile.in Wed May 15 15:36:06 2002 +@@ -49,7 +49,7 @@ + + # Directory in which to install library files. + datadir = @datadir@ +-acdatadir = $(datadir)/autoconf ++acdatadir = $(datadir)/autoconf-2.13 + + # Directory in which to install documentation info files. + infodir = @infodir@ ++++++ autoconf-2.13-wait3test.patch (new) --- autoconf-2.13-wait3test.patch +++ autoconf-2.13-wait3test.patch @@ -0,0 +1,11 @@ +--- autoconf-2.13/acspecific.m4.sopwith Mon Feb 25 18:05:39 2002 ++++ autoconf-2.13/acspecific.m4 Mon Feb 25 18:18:35 2002 +@@ -1419,6 +1419,8 @@ + r.ru_majflt = r.ru_minflt = 0; + switch (fork()) { + case 0: /* Child. */ ++ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ ++ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } + sleep(1); /* Give up the CPU. */ + _exit(0); + case -1: _exit(0); /* What can we do? */ ++++++ autoconf-2.13.tar.bz2 (new) ++++++ autoconf213-destdir.patch (new) --- autoconf213-destdir.patch +++ autoconf213-destdir.patch @@ -0,0 +1,46 @@ +--- autoconf-2.13/Makefile.in.rh1 2007-02-14 16:22:52.000000000 +0100 ++++ autoconf-2.13/Makefile.in 2007-02-14 16:23:26.000000000 +0100 +@@ -137,23 +137,23 @@ + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) + + install: all $(M4FILES) acconfig.h installdirs install-info + for p in $(ASCRIPTS); do \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + for i in $(M4FROZEN); do \ +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + for i in $(M4FILES) acconfig.h; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + -if test -f autoscan; then \ +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ + for i in acfunctions acheaders acidentifiers acprograms \ + acmakevars; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done; \ + else :; fi + +@@ -161,11 +161,11 @@ + install-info: info installdirs + if test -f autoconf.info; then \ + for i in *.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/*.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi +
