Sync with HEAD.

contrib/crossrpms/autotools/automake.add

@@ -4,10 +4,10 @@
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix@automake
-%define requirements		@rpmprefix@autoconf >= 2.60
+%define requirements		@rpmprefix@autoconf >= 2.61
 %else
 %define name			automake
-%define requirements		autoconf >= 2.60
+%define requirements		autoconf >= 2.61
 %endif
 
 Name:		%{name}
@@ -21,10 +21,6 @@ Summary:	Tool for automatically generating GNU style Makefile.in's
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:  %{requirements} perl
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-BuildRequires:  help2man
-%endif
 Requires:     	%{requirements}
 Requires(post):	/sbin/install-info
 Requires(preun):/sbin/install-info
@@ -62,9 +58,16 @@ chmod +x %{__perl_requires}
 
 %build
 PATH=%{_bindir}:$PATH
+case %_host in
+*-mingw32)
+# MinGW ships obsolete perl-5.6.1, which doesn't support threads
+  echo am_cv_prog_PERL_ithreads=no > config.cache
+  ;;
+esac
+
 # Don't use %%configure, it replaces config.sub/config.guess with the 
 # outdated versions bundled with rpm.
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
   --bindir=%{_bindir} --datadir=%{_datadir} \
   --docdir=%{_datadir}/automake-%{amvers}/doc
 make
@@ -73,18 +76,6 @@ make
 rm -rf "$RPM_BUILD_ROOT"
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
-for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
-  $RPM_BUILD_ROOT%{_bindir}/automake ; 
-do
-  perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \
-  help2man $i > `basename $i`.1
-  install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-done
-%endif
-
 %if "%{_prefix}" != "/usr"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
 echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist