Remove mk/autoconf.mk and mk/automake.mk and replace their usage with

USE_TOOLS and any of "autoconf", "autoconf213", "automake" or
"automake14".  Also, we don't need to call the auto* tools via
${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care
to symlink the correct tool to the correct name, so we can just use
aclocal, autoconf, etc.

3 files changed, 15 insertions, 16 deletions

diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 5f97f2cbce4..5b66bd3f661 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
@@ -16,13 +16,12 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gwydiondylan.org/
 COMMENT=		Functional language
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		automake14 gmake
 USE_LIBTOOL=		yes
 MAKEFILE=		GNUmakefile
 BUILD_TARGET=		default
 
 GNU_CONFIGURE=		yes
-AUTOMAKE_REQD=		1.4
 AUTOCONF_REQD=		2.50
 
 DYLAN_VERSION=		2.3.11
@@ -51,14 +50,13 @@ post-patch:
 	done
 
 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL}
+	cd ${WRKSRC} && aclocal
 	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --force --copy
-	cd ${WRKSRC} && ${AUTOHEADER}
-	cd ${WRKSRC} && ${AUTOCONF}
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && autoconf
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/php/ext.mk b/lang/php/ext.mk
index 0de65db4874..66374b8392e 100644
--- a/lang/php/ext.mk
+++ b/lang/php/ext.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ext.mk,v 1.5 2004/12/12 09:13:56 jdolecek Exp $
+# $NetBSD: ext.mk,v 1.6 2005/06/01 20:08:00 jlam Exp $
 #
 # PHP extension package framework, for both PECL and bundled PHP extensions.
 #
@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--with-php-config=${PHP_CONFIG}
 
 USE_CONFIG_WRAPPER=	YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		automake
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
@@ -56,9 +57,11 @@ phpize-module:
 	@cookie=${WRKDIR}/.phpize_module_done;				\
 	if [ ! -f $${cookie} ]; then					\
 		cd ${WRKSRC} && 					\
-		${SETENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER}	\
-			ACLOCAL=${ACLOCAL}				\
-			LIBTOOLIZE=${LOCALBASE}/bin/libtoolize		\
+		${SETENV}						\
+			AUTOCONF=${TOOLS_DIR:Q}/bin/autoconf		\
+			AUTOHEADER=${TOOLS_DIR:Q}/bin/autoheader	\
+			ACLOCAL=${TOOLS_DIR:Q}/bin/aclocal		\
+			LIBTOOLIZE=${LOCALBASE:Q}/bin/libtoolize	\
 			${PHPIZE} &&					\
 		${TOUCH} ${TOUCH_FLAGS} $${cookie};			\
 	fi
@@ -79,7 +82,6 @@ do-patch:
 	done
 .endif
 
-.include "../../mk/automake.mk"
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
 
 .endif	# PHPEXT_MK
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 21977cd33d4..ef5a738b258 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=	Squeak-3.6-3
@@ -14,8 +14,9 @@ COMMENT=	Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_TOOLS+=	automake14
 
-AUTOCONF_REQD>=	2.57
+AUTOCONF_REQD=	2.57
 AUTOMAKE_REQD=	1.4.6
 
 BUILD_DIRS=		${WRKDIR}/build
@@ -50,8 +51,6 @@ post-install:
 CONFIGURE_ARGS+=	--enable-mpg-mmx
 .endif
 
-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
 .include "../../audio/nas/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"