diff options
| author | jlam <jlam@pkgsrc.org> | 2005-04-15 05:30:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-04-15 05:30:48 +0000 |
| commit | 1f5cfd341608c01faf9a7761f4158e94b73648fd (patch) | |
| tree | 16832333da0e34b82ac96a261007a8209c5404d7 /mk/tools/autoconf.mk | |
| parent | ffc3bea12a411aee96db471855bbefd4eae4a3d9 (diff) | |
| download | pkgsrc-1f5cfd341608c01faf9a7761f4158e94b73648fd.tar.gz | |
Avoid dependency loops by setting and checking TOOLS_IGNORE.* guards.
Diffstat (limited to 'mk/tools/autoconf.mk')
| -rw-r--r-- | mk/tools/autoconf.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk index f26f79f38d1..68699c02424 100644 --- a/mk/tools/autoconf.mk +++ b/mk/tools/autoconf.mk @@ -1,4 +1,4 @@ -# $NetBSD: autoconf.mk,v 1.1 2005/04/15 00:00:21 jlam Exp $ +# $NetBSD: autoconf.mk,v 1.2 2005/04/15 05:30:48 jlam Exp $ # # This Makefile fragment handles packages that use GNU autoconf. # @@ -50,7 +50,10 @@ _TOOLS_AUTOCONF.ifnames= ifnames ifnames-2.13 _TOOLS_AUTOCONF_LINKS= # empty -.if !empty(USE_TOOLS:Mautoconf) +.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf) +. if !empty(PKGPATH:Mdevel/autoconf) +MAKEFLAGS+= TOOLS_IGNORE.autoconf= +. else AUTOCONF_REQD?= 2.50 BUILD_DEPENDS+= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf @@ -88,9 +91,13 @@ TOOLS_REAL_CMD.ifnames= ${LOCALBASE}/bin/ifnames AUTOCONF= ${TOOLS_CMD.autoconf} AUTOHEADER= ${TOOLS_CMD.autoheader} AUTORECONF= ${TOOLS_CMD.autoreconf} +. endif .endif -.if !empty(USE_TOOLS:Mautoconf213) +.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:Mautoconf213) +. if !empty(PKGPATH:Mdevel/autoconf213) +MAKEFLAGS+= TOOLS_IGNORE.autoconf213= +. else AUTOCONF_REQD?= 2.13 BUILD_DEPENDS+= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213 @@ -125,8 +132,9 @@ AUTOCONF= ${TOOLS_CMD.autoconf} AUTOHEADER= ${TOOLS_CMD.autoheader} AUTORECONF= ${TOOLS_CMD.autoreconf} -. if defined(USE_LIBTOOL) +. if defined(USE_LIBTOOL) pre-configure: tools-libtool-m4-override +. endif . endif .endif |