diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2004-07-12 04:32:21 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2004-07-12 04:32:21 +0000 |
| commit | 5b5b44c0f0952e9c0f1d11c688b525ce15f4583d (patch) | |
| tree | a8ede9dc5e81bb24409998602d18cb26469c7845 /textproc/php4-xslt | |
| parent | 1505b0e0ad05a908a2956cb82579423cfe766d41 (diff) | |
| download | pkgsrc-5b5b44c0f0952e9c0f1d11c688b525ce15f4583d.tar.gz | |
the trick with setting PHP_ICONV in environment doesn't work with
more recent PHP anymore, so use USE_BUILDIN.iconv test to select
the appropriate iconv parameter value
fixes compilation on NetBSD 1.6.x and other systems without builtin
iconv, and thus PR pkg/26212 and PR pkg/26213
package behaviour unchanged, so no PKGREVISION bump done
Diffstat (limited to 'textproc/php4-xslt')
| -rw-r--r-- | textproc/php4-xslt/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index b121640e309..35c155ee6ae 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/07/06 19:52:01 jdolecek Exp $ +# $NetBSD: Makefile,v 1.12 2004/07/12 04:32:21 jdolecek Exp $ MODNAME= xslt CATEGORIES+= textproc @@ -14,9 +14,18 @@ CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron} CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} # this is necessary so that PHP would find either the libc iconv -# or use the packaged iconv, as appropriate; see also converters/php4-iconv +# or use the packaged iconv, as appropriate; using +# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists + +.include "../../converters/libiconv/buildlink3.mk" +.include "../../mk/buildlink3/bsd.builtin.mk" + +.if !empty(USE_BUILTIN.iconv:M[nN][oO]) +# use libiconv +CONFIGURE_ARGS+= --with-iconv-dir=${BUILDLINK_PREFIX.iconv:Q} +.else CONFIGURE_ARGS+= --with-iconv-dir -CONFIGURE_ENV+= PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q} +.endif PLIST_SRC+= ${.CURDIR}/PLIST.extras DOCDIR= ${PREFIX}/share/doc/${PKGBASE} |