[pkgsrc/trunk]: pkgsrc/mk/tools Based on the value of ${AUTOCONF_REQD}, choos...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58875da2fc62
branches:  trunk
changeset: 494172:58875da2fc62
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 20 02:40:23 2005 +0000

description:
Based on the value of ${AUTOCONF_REQD}, choose the right autoconf tool
to use.  This fixes packages that want automake-1.4, but autoconf-2.50.

diffstat:

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

diffs (44 lines):

diff -r 3e649d4b36c6 -r 58875da2fc62 mk/tools/automake.mk
--- a/mk/tools/automake.mk      Fri May 20 02:07:30 2005 +0000
+++ b/mk/tools/automake.mk      Fri May 20 02:40:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.7 2005/05/11 20:21:32 jlam Exp $
+# $NetBSD: automake.mk,v 1.8 2005/05/20 02:40:23 jlam Exp $
 #
 # This Makefile fragment handles packages that use GNU automake.
 #
@@ -74,7 +74,6 @@
 .  else
 AUTOMAKE_REQD?=                1.9
 AUTOCONF_REQD?=                2.58
-USE_TOOLS+=            autoconf
 
 TOOLS_DEPMETHOD.automake?=     BUILD_DEPENDS
 TOOLS_DEPENDS.automake?=       automake>=${AUTOMAKE_REQD}:../../devel/automake
@@ -103,7 +102,6 @@
 .  else
 AUTOMAKE_REQD?=                1.4
 AUTOCONF_REQD?=                2.13
-USE_TOOLS+=            autoconf213
 
 TOOLS_DEPMETHOD.automake14?=   BUILD_DEPENDS
 TOOLS_DEPENDS.automake14?=     automake14>=${AUTOMAKE_REQD}:../../devel/automake14
@@ -130,6 +128,18 @@
 .  endif
 .endif
 
+# Discover which version of autoconf should be used with automake.
+.if !defined(_TOOLS_AM_AUTOCONF)
+_TOOLS_AM_AUTOCONF!=   \
+       if ${PKG_ADMIN} pmatch autoconf>=${AUTOCONF_REQD} autoconf-2.13; then \
+               ${ECHO} "autoconf213";                                  \
+       else                                                            \
+               ${ECHO} "autoconf";                                     \
+       fi
+.endif
+MAKEVARS+=     _TOOLS_AM_AUTOCONF
+USE_TOOLS+=    ${_TOOLS_AM_AUTOCONF}
+
 # If the package wants to override the GNU auto* tools, then do it.
 AUTOMAKE_OVERRIDE?=    yes
 .if !empty(AUTOMAKE_OVERRIDE:M[yY][eE][sS])