[pkgsrc/trunk]: pkgsrc/devel/glib2 protect the --with-libiconv configure arg...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24548c751d20
branches:  trunk
changeset: 463181:24548c751d20
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Fri Oct 31 02:11:43 2003 +0000

description:
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.

diffstat:

 devel/glib2/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 711e4e42b637 -r 24548c751d20 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Fri Oct 31 02:09:19 2003 +0000
+++ b/devel/glib2/Makefile      Fri Oct 31 02:11:43 2003 +0000
@@ -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_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"