diff options
| author | jlam <jlam> | 2005-06-01 19:13:24 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-01 19:13:24 +0000 |
| commit | e41b1a8fd34ebd59c91671da66ad94b795b0d1d8 (patch) | |
| tree | 56d630987fef3f2db8dbcb0f7669cef852a482e6 /textproc/php4-xslt | |
| parent | 100b3dc730e0fd7dd242c11527c5171502a8f2a8 (diff) | |
| download | pkgsrc-e41b1a8fd34ebd59c91671da66ad94b795b0d1d8.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 'textproc/php4-xslt')
| -rw-r--r-- | textproc/php4-xslt/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile index cf052dc48ac..e2b6003aae0 100644 --- a/textproc/php4-xslt/Makefile +++ b/textproc/php4-xslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:41 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 19:13:24 jlam Exp $ MODNAME= xslt CATEGORIES+= textproc @@ -10,19 +10,21 @@ CONFIGURE_ARGS+= --enable-${MODNAME} CONFIGURE_ARGS+= --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron} CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} +.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 - -.include "../../mk/bsd.prefs.mk" -.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} +# +CHECK_BUILTIN.iconv:= yes +.include "../../converters/libiconv/builtin.mk" +CHECK_BUILTIN.iconv:= no + +.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 -CONFIGURE_ARGS+= --with-iconv-dir +CONFIGURE_ARGS+= --with-iconv .endif PLIST_SRC+= ${.CURDIR}/PLIST.extras |