From 0a0a6652eddd2420c12e2aa343cf8a60018e4383 Mon Sep 17 00:00:00 2001 From: kristerw Date: Sat, 21 May 2005 16:29:31 +0000 Subject: Include devel/hdf5/buildlink3.mk if octave is built with hdf5. --- math/octave-current/buildlink3.mk | 8 +++++++- math/octave/buildlink3.mk | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/math/octave-current/buildlink3.mk b/math/octave-current/buildlink3.mk index af0ded40754..61c0faa4857 100644 --- a/math/octave-current/buildlink3.mk +++ b/math/octave-current/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2005/01/29 22:33:47 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2005/05/21 16:29:31 kristerw Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -17,6 +17,12 @@ BUILDLINK_RECOMMENDED.octave-current+= octave-current>=2.1.59nb1 BUILDLINK_PKGSRCDIR.octave-current?= ../../math/octave-current .endif # OCTAVE_CURRENT_BUILDLINK3_MK +.include "../../mk/bsd.prefs.mk" + +.if !defined(PKG_OPTIONS.octave:) || !empty(PKG_OPTIONS.octave:Mhdf5) +.include "../../devel/hdf5/buildlink3.mk" +.endif + .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk index b128ee0e23d..a6efee0cbbe 100644 --- a/math/octave/buildlink3.mk +++ b/math/octave/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2005/04/01 10:25:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/05/21 16:29:31 kristerw Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OCTAVE_BUILDLINK3_MK:= ${OCTAVE_BUILDLINK3_MK}+ @@ -15,6 +15,12 @@ BUILDLINK_DEPENDS.octave+= octave>=2.1.69 BUILDLINK_PKGSRCDIR.octave?= ../../math/octave .endif # OCTAVE_BUILDLINK3_MK +.include "../../mk/bsd.prefs.mk" + +.if !defined(PKG_OPTIONS.octave:) || !empty(PKG_OPTIONS.octave:Mhdf5) +.include "../../devel/hdf5/buildlink3.mk" +.endif + .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -- cgit v1.2.3