[pkgsrc/trunk]: pkgsrc/converters/libiconv If USE_GNU_ICONV is defined, don't...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b59af53add4
branches:  trunk
changeset: 474160:8b59af53add4
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Apr 26 00:28:39 2004 +0000

description:
If USE_GNU_ICONV is defined, don't use builtin libiconv if ICONV_TYPE is
native.

diffstat:

 converters/libiconv/builtin.mk |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (53 lines):

diff -r 0d8dc8e496c0 -r 8b59af53add4 converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk    Mon Apr 26 00:25:07 2004 +0000
+++ b/converters/libiconv/builtin.mk    Mon Apr 26 00:28:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:28 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/04/26 00:28:39 snj Exp $
 
 .if !defined(_LIBICONV_FOUND)
 _LIBICONV_FOUND!=                                                      \
@@ -30,9 +30,22 @@
 .    endif
 .  endfor
 
+.if !defined(ICONV_TYPE)
+ICONV_TYPE?=   gnu
+.  if !empty(USE_BUILTIN.iconv:M[yY][eE][sS]) && exists(${_ICONV_H})
+ICONV_TYPE!=   \
+       if ${GREP} -q "GNU LIBICONV Library" ${_ICONV_H}; then          \
+               ${ECHO} "gnu";                                          \
+       else                                                            \
+               ${ECHO} "native";                                       \
+       fi
+.  endif
+BUILDLINK_VARS+=       ICONV_TYPE
+.endif
+
 .  if defined(USE_GNU_ICONV)
 .    if !empty(IS_BUILTIN.iconv:M[nN][oO]) || \
-        (${PREFER.iconv} == "pkgsrc")
+        (${PREFER.iconv} == "pkgsrc") || ${ICONV_TYPE} == "native"
 USE_BUILTIN.iconv=     no
 .    endif
 .  endif
@@ -54,19 +67,6 @@
 
 BUILDLINK_LDADD.iconv?=        ${_LIBICONV}
 
-.if !defined(ICONV_TYPE)
-ICONV_TYPE?=   gnu
-.  if !empty(USE_BUILTIN.iconv:M[yY][eE][sS]) && exists(${_ICONV_H})
-ICONV_TYPE!=   \
-       if ${GREP} -q "GNU LIBICONV Library" ${_ICONV_H}; then          \
-               ${ECHO} "gnu";                                          \
-       else                                                            \
-               ${ECHO} "native";                                       \
-       fi
-.  endif
-BUILDLINK_VARS+=       ICONV_TYPE
-.endif
-
 .if defined(GNU_CONFIGURE)
 .  if !empty(USE_BUILTIN.iconv:M[nN][oO])
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}