diff options
| author | jlam <jlam> | 2005-05-20 03:08:45 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-20 03:08:45 +0000 |
| commit | 292ee28e2f2810a47752a05213ad65a5ef9074fa (patch) | |
| tree | 18bfb112b69794bc3174fbf9987992be3686486e /mk | |
| parent | 31e40cd6b3726b49aa0c5ce2f45541ec06bdf40e (diff) | |
| download | pkgsrc-292ee28e2f2810a47752a05213ad65a5ef9074fa.tar.gz | |
Only add the autoconf tool if the user also requested automake. This
avoids making autoconf required by every package in pkgsrc.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/automake.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk index d655fdfd8ee..f0e13a9be29 100644 --- a/mk/tools/automake.mk +++ b/mk/tools/automake.mk @@ -1,4 +1,4 @@ -# $NetBSD: automake.mk,v 1.9 2005/05/20 02:57:23 jlam Exp $ +# $NetBSD: automake.mk,v 1.10 2005/05/20 03:08:45 jlam Exp $ # # This Makefile fragment handles packages that use GNU automake. # @@ -129,7 +129,8 @@ AUTOMAKE= ${TOOLS_CMD.automake-1.4} .endif # Discover which version of autoconf should be used with automake. -.if !defined(_TOOLS_AM_AUTOCONF) +.if !empty(USE_TOOLS:Mautomake) || !empty(USE_TOOLS:Mautomake14) +. if !defined(_TOOLS_AM_AUTOCONF) _TOOLS_AM_AUTOCONF!= \ dep="autoconf>="${AUTOCONF_REQD:Q}; \ if ${PKG_ADMIN} pmatch "$$dep" autoconf-2.13; then \ @@ -137,9 +138,10 @@ _TOOLS_AM_AUTOCONF!= \ else \ ${ECHO} "autoconf"; \ fi -.endif +. endif MAKEVARS+= _TOOLS_AM_AUTOCONF USE_TOOLS+= ${_TOOLS_AM_AUTOCONF} +.endif # If the package wants to override the GNU auto* tools, then do it. AUTOMAKE_OVERRIDE?= yes |