Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apr/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile	30 Mar 2004 19:20:16 -0000	1.38
+++ Makefile	4 Apr 2004 20:19:28 -0000
@@ -29,11 +29,12 @@
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_ICONV=	yes
-USE_AUTOCONF_VER=	257
+USE_AUTOCONF_VER=	259
 USE_PERL5=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL_VER=	15
 LIBTOOLFILES=		# none
+USE_AUTOMAKE_VER=	15
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -117,14 +118,15 @@
 	${LN} -s apr-util-APU_0_9_BRANCH apr-util-${PORTVERSION}
 
 pre-configure:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf
+	${DO_NADA}
+
+run-autotools:
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${ACLOCAL_DIR}/libtool${USE_LIBTOOL_VER}.m4 ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${ACLOCAL_DIR}/libtool${USE_LIBTOOL_VER}.m4 ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
-
-run-autotools:
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
 	cd ${WRKDIR}/apr-util-${PORTVERSION}; \