Restore usual meaning for AUTOMAKE_OVERRIDE so that it works even if

USE_BUILDLINK2 is defined.  AUTOMAKE_OVERRIDE == "yes" is the default, and
means that pkgsrc will try to avoid executing the GNU autotools during the
build process.  Setting AUTOMAKE_OVERRIDE to "no" will avoid these extra
steps by pkgsrc, so that the GNU autotools will be automatically invoked
if they are found (though they may not necessarily invoke the correct ones
and the effects may be surprising...do this only if you know what you are
doing).

2 files changed, 15 insertions, 9 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a6aba317f5b..b7a5c4eb7dd 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1089 2002/11/24 20:13:16 jschauma Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1090 2002/11/26 08:59:04 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1879,6 +1879,8 @@ do-pkgconfig-override:
 .  endfor
 .endif
 
+.if empty(USE_BUILDLINK2:M[nN][oO])
+#
 # By default, prevent invocation of GNU "auto*" driven by the generated
 # Makefiles during the build process by touching various auto{conf,make}
 # source files to make them up-to-date.  Packages that require regenerating
@@ -1910,7 +1912,7 @@ do-pkgconfig-override:
 #		sysutils/fileutils, www/curl, x11/lesstif, x11/kdelibs2
 #
 AUTOMAKE_OVERRIDE?=	YES
-.if defined(AUTOMAKE_OVERRIDE) && (${AUTOMAKE_OVERRIDE} == "YES")
+.  if (${AUTOMAKE_OVERRIDE} == "YES")
 AUTOMAKE_PATTERNS+=     aclocal.m4 
 AUTOMAKE_PATTERNS+=     configure.in
 AUTOMAKE_PATTERNS+=     Makefile.in
@@ -1920,13 +1922,13 @@ AUTOMAKE_PATTERNS+=     ${CONFIGURE_SCRIPT:T}
 
 _CONFIGURE_PREREQ+=	automake-pre-override
 automake-pre-override:
-.  if defined(HAS_CONFIGURE)
+.    if defined(HAS_CONFIGURE)
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	(for _PATTERN in ${AUTOMAKE_PATTERNS}; do			\
 	   ${FIND} ${WRKSRC} -type f -name "$$_PATTERN" -print;		\
 	 done; echo ${NULL_COOKIE} ) |					\
 	${XARGS} ${TOUCH} ${TOUCH_FLAGS}
-.  endif
+.    endif
 
 AUTOMAKE_POST_PATTERNS+=     config.status
 AUTOMAKE_POST_PATTERNS+=     Makefile
@@ -1935,14 +1937,15 @@ AUTOMAKE_POST_PATTERNS+=     config.h
 
 _CONFIGURE_POSTREQ+=	automake-post-override
 automake-post-override:
-.  if defined(HAS_CONFIGURE)
+.    if defined(HAS_CONFIGURE)
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	(for _PATTERN in ${AUTOMAKE_POST_PATTERNS}; do			\
 	   ${FIND} ${WRKSRC} -type f -name "$$_PATTERN" -print;		\
 	 done; echo ${NULL_COOKIE} ) |					\
 	${XARGS} ${TOUCH} ${TOUCH_FLAGS}
-.  endif
-.endif	# AUTOMAKE_OVERRIDE
+.    endif
+.  endif	# AUTOMAKE_OVERRIDE
+.endif		# USE_BUILDLINK != "no"
 
 .if !target(do-configure)
 do-configure: ${_CONFIGURE_PREREQ}
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 9c4c89a0ba4..5859311f5db 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.55 2002/11/25 19:32:47 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.56 2002/11/26 08:59:06 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -858,7 +858,7 @@ buildlink-check:
 # status for each of the GNU auto* tools, which should cause GNU configure
 # scripts to think that they can't be found.
 #
-AUTOMAKE_OVERRIDE?=	NO
+AUTOMAKE_OVERRIDE?=	yes
 _GNU_MISSING=		${.CURDIR}/../../mk/gnu-config/missing
 _HIDE_PROGS.autoconf=	bin/autoconf	bin/autoconf-2.13		\
 			bin/autoheader	bin/autoheader-2.13		\
@@ -876,7 +876,10 @@ _HIDE_PROGS.automake=	bin/aclocal	bin/aclocal-1.4			\
 					bin/automake-1.6		\
 					bin/automake-1.7
 
+.if empty(AUTOMAKE_OVERRIDE:M[nN][oO])
 do-buildlink: hide-autotools
+.endif
+
 hide-autotools:	# empty
 
 .for _autotool_ in autoconf automake