diff options
| author | jlam <jlam> | 2001-10-16 06:23:08 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-10-16 06:23:08 +0000 |
| commit | c91c9e41b962fe22fbbba187136eddf6ebfc843b (patch) | |
| tree | 500d56b84e4cb1e9fdb5e5187f0c6d4a31fc59dd /textproc/php4-sablot/patches/patch-aa | |
| parent | 1d431bfb18620a1d7db84a13d3cc80af869c1d7f (diff) | |
| download | pkgsrc-c91c9e41b962fe22fbbba187136eddf6ebfc843b.tar.gz | |
Update php4-sablot to the version from the php-4.0.6 distribution. There
is no list of changes from version 4.0.5. Also move from the www category.
Diffstat (limited to 'textproc/php4-sablot/patches/patch-aa')
| -rw-r--r-- | textproc/php4-sablot/patches/patch-aa | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/textproc/php4-sablot/patches/patch-aa b/textproc/php4-sablot/patches/patch-aa new file mode 100644 index 00000000000..2e52d082701 --- /dev/null +++ b/textproc/php4-sablot/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:23:08 jlam Exp $ + +--- config.m4.orig Fri Jun 1 02:42:55 2001 ++++ config.m4 +@@ -36,7 +36,8 @@ + for i in $PHP_EXPAT_DIR $SABLOT_DIR; do + if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(m, /usr/lib, SABLOT_SHARED_LIBADD) + PHP_ADD_INCLUDE($i/include) + AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ])) + testval=yes +@@ -51,14 +52,12 @@ + found_iconv=no + AC_CHECK_LIB(c, iconv_open, found_iconv=yes) + if test "$found_iconv" = "no"; then +- if test "$PHP_ICONV" = "no"; then +- for i in /usr /usr/local; do ++ for i in $PHP_ICONV /usr /usr/local; do + if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then +- PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib) ++ PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD) + found_iconv=yes + fi + done +- fi + fi + + if test "$found_iconv" = "no"; then |