diff --git a/autoconf/autoconf.spec b/autoconf/autoconf.spec index 6aeed43f6d..c220533060 100644 --- a/autoconf/autoconf.spec +++ b/autoconf/autoconf.spec @@ -22,9 +22,15 @@ ## SUCH DAMAGE. ## +# version numbers %define V_latest 2.54 %define V_old 2.13 +# package options +%ifndef with_acx_pthread +%define with_acx_pthread no +%endif + # package information Name: autoconf Summary: GNU Source Autoconfiguration @@ -40,6 +46,7 @@ Release: 20021020 # list of sources Source1: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_old}.tar.gz +Source2: http://www.gnu.org/software/ac-archive/Installed_Packages/acx_pthread.m4 Patch0: autoconf-%{V_old}.patch # build information @@ -57,11 +64,21 @@ AutoReqProv: no is mostly needed by people producing packages that run on a wide variety of platforms--particularly UNIX-a-likes. + Options: + --define 'with_acx_pthread %{with_acx_pthread}' + %prep %setup0 -q -c -n autoconf-%{V_latest} %setup1 -q -T -D -a 1 cd autoconf-%{V_old} %{l_patch} -p0 <%{SOURCE autoconf-%{V_old}.patch} + ( cd ../autoconf-%{V_latest}/lib/autoconf +%if "%{with_acx_pthread}" == "yes" + cp -rp %{SOURCE acx_pthread.m4} . + cat autoconf.m4 | %{l_sed} -e '69a\ +m4_include([autoconf/acx_pthread.m4])' >autoconf.m4 +%endif + ) %build ( cd autoconf-%{V_old} @@ -95,6 +112,9 @@ AutoReqProv: no %{l_make} %{l_mflags} install \ prefix=$RPM_BUILD_ROOT%{l_prefix} ) +%if "%{with_acx_pthread}" == "yes" + cp -rp %{SOURCE acx_pthread.m4} $RPM_BUILD_ROOT%{l_prefix}/share/autoconf/autoconf +%endif rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}