1 diff -urN php-4.2.1RC2.org/configure.in php-4.2.1RC2/configure.in
2 --- php-4.2.1RC2.org/configure.in Sat May 11 20:49:22 2002
3 +++ php-4.2.1RC2/configure.in Sat May 11 21:05:41 2002
6 if test "$php_no_nsl_checks" != "yes"; then
8 +AC_CHECK_FUNC(gethostname,[true], [
9 AC_CHECK_LIB(nsl, gethostname, [
11 AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
14 AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], [])
20 diff -urN php-4.2.1RC2.org/ext/gmp/config.m4 php-4.2.1RC2/ext/gmp/config.m4
21 --- php-4.2.1RC2.org/ext/gmp/config.m4 Sat May 11 20:49:22 2002
22 +++ php-4.2.1RC2/ext/gmp/config.m4 Sat May 11 21:05:41 2002
25 PHP_EXTENSION(gmp, $ext_shared)
26 AC_DEFINE(HAVE_GMP, 1, [ ])
27 - PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib)
28 + PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
30 +PHP_SUBST(GMP_SHARED_LIBADD)
31 diff -urN php-4.2.1RC2.org/ext/xslt/config.m4 php-4.2.1RC2/ext/xslt/config.m4
32 --- php-4.2.1RC2.org/ext/xslt/config.m4 Sat May 11 20:49:24 2002
33 +++ php-4.2.1RC2/ext/xslt/config.m4 Sat May 11 21:09:39 2002
36 AC_CHECK_LIB(js, JS_GetRuntime, found_js=yes)
37 if test "$found_js" = "yes"; then
39 + PHP_ADD_LIBRARY(js,, XSLT_SHARED_LIBADD)
43 diff -urN php-4.2.1RC2.org/ext/yp/Makefile.in php-4.2.1RC2/ext/yp/Makefile.in
44 --- php-4.2.1RC2.org/ext/yp/Makefile.in Sat May 11 20:49:24 2002
45 +++ php-4.2.1RC2/ext/yp/Makefile.in Sat May 11 21:05:41 2002
47 LTLIBRARY_NAME = libyp.la
48 LTLIBRARY_SOURCES = yp.c
49 LTLIBRARY_SHARED_NAME = yp.la
50 +LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
52 include $(top_srcdir)/build/dynlib.mk
53 diff -urN php-4.2.1RC2.org/ext/yp/config.m4 php-4.2.1RC2/ext/yp/config.m4
54 --- php-4.2.1RC2.org/ext/yp/config.m4 Sat May 11 20:49:24 2002
55 +++ php-4.2.1RC2/ext/yp/config.m4 Sat May 11 21:05:41 2002
57 [ --enable-yp Include YP support.])
59 if test "$PHP_YP" != "no"; then
60 - AC_DEFINE(HAVE_YP,1,[ ])
61 + PHP_SUBST(NSL_SHARED_LIBADD)
62 + AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
63 + AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
64 PHP_EXTENSION(yp, $ext_shared)
68 AC_DEFINE(SOLARIS_YP,1,[ ]) ;;