diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-10-31 02:11:43 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-10-31 02:11:43 +0000 |
| commit | 1db6009463c266552e1fb81426f5ef1a472742b2 (patch) | |
| tree | 0f76b67d17856dcf950b695fd5d82cfb879bca6e | |
| parent | 88f53da752df4f172fd341e859d3b9118b0f1038 (diff) | |
| download | pkgsrc-1db6009463c266552e1fb81426f5ef1a472742b2.tar.gz | |
protect the --with-libiconv configure argument with a ICONV_IS_GNU check.
Thanks to Mark Davies and Jeremy Reed for pointing out the problems with the
previous commit.
| -rw-r--r-- | devel/glib2/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 2a23c9207dd..880a187b91b 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/10/30 10:27:52 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.32 2003/10/31 02:11:43 dmcmahill Exp $ DISTNAME= glib-2.2.3 PKGREVISION= 1 @@ -31,11 +31,15 @@ CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -CONFIGURE_ARGS+= --with-libiconv=yes + +.include "../../converters/libiconv/buildlink2.mk" + +.if defined(ICONV_IS_GNU) +CONFIGURE_ARGS+= --with-libiconv=gnu +.endif TEST_TARGET= check -.include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" |