Need to check for __inet_aton on Solaris.

diff --git a/configure.in b/configure.in
index 575fcd6233045fd426d5197dcf6a324f77119018..068a23fe6146e495654dad3e29cc3b66022fd9a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -193,7 +193,10 @@ AC_CHECK_LIB(m, sin)
 
 AC_CHECK_LIB(bind, inet_aton, [
   AC_ADD_LIBRARY(bind)
-  AC_DEFINE(HAVE_LIBBIND) ], []) 
+  AC_DEFINE(HAVE_LIBBIND) ], [
+   AC_CHECK_LIB(bind, __inet_aton, [
+    AC_ADD_LIBRARY(bind)
+    AC_DEFINE(HAVE_LIBBIND) ], []) ]) 
 
 AC_CHECK_LIB(resolv, inet_aton)
 

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 2d0bd9107bbd74c9526a308bde139ba6d46ef7c6..310a996b6dc291bf2aba0ba007fae811b9d72e3e 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -22,7 +22,7 @@
        TODO:
        - Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time
        - Make new modifier, similar to /e, that passes matches to
-      a user-defined function
+         a user-defined function
 */
 
 #include "php.h"