[pkgsrc/trunk]: pkgsrc/mk/tools Only add the autoconf tool if the user also r...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bcc64e76745
branches:  trunk
changeset: 494175:1bcc64e76745
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 20 03:08:45 2005 +0000

description:
Only add the autoconf tool if the user also requested automake.  This
avoids making autoconf required by every package in pkgsrc.

diffstat:

 mk/tools/automake.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 68ed53e1a34c -r 1bcc64e76745 mk/tools/automake.mk
--- a/mk/tools/automake.mk      Fri May 20 03:00:16 2005 +0000
+++ b/mk/tools/automake.mk      Fri May 20 03:08:45 2005 +0000
@@ -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 @@
 .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 @@
        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