diff options
| author | jlam <jlam> | 2005-06-01 19:03:45 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-01 19:03:45 +0000 |
| commit | c2a3e1501c188df430da98606386bf5cad36eeb6 (patch) | |
| tree | 8c3631165e2b24f484dddf2d3c3deae26c1705c8 /converters | |
| parent | 0868b8c290e8309f0258b7dfbc76c8182466f700 (diff) | |
| download | pkgsrc-c2a3e1501c188df430da98606386bf5cad36eeb6.tar.gz | |
Don't include bsd.builtin.mk... just include the builtin.mk file for
the package that we're interested in (iconv). Also, fix the logic so
that we don't assume that built-in libiconv.so doesn't exist.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/php-iconv/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile index ce073de6239..3e40dbfb393 100644 --- a/converters/php-iconv/Makefile +++ b/converters/php-iconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:09 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 19:03:45 jlam Exp $ MODNAME= iconv CATEGORIES+= converters @@ -6,19 +6,20 @@ PKGREVISION= # empty COMMENT= PHP extension for character set conversion -# this is necessary so that PHP would find either the libc iconv +.include "../../converters/libiconv/buildlink3.mk" + +# This is necessary so that PHP would find either the libc iconv # or use the packaged iconv, as appropriate; using # --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists +# +CHECK_BUILTIN.iconv:= yes +.include "../../converters/libiconv/builtin.mk" +CHECK_BUILTIN.iconv:= no -.include "../../converters/libiconv/buildlink3.mk" -.include "../../mk/bsd.prefs.mk" -.include "../../mk/buildlink3/bsd.builtin.mk" - -.if !empty(USE_BUILTIN.iconv:M[nN][oO]) -# use libiconv +.if !empty(USE_BUILTIN.iconv:M[nN][oO]) || \ + !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS]) CONFIGURE_ARGS+= --with-iconv=shared,${BUILDLINK_PREFIX.iconv} .else -# use libc-provided iconv CONFIGURE_ARGS+= --with-iconv .endif |