Make PHP compile out-of-the-box with uClibc

diff --git a/acinclude.m4 b/acinclude.m4
index 50e5e5e7460d11ebb31dc08afeb6d727b2f4ed1e..47f2c242b45febc46935d03492fcb3c87ccde1d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1680,6 +1680,13 @@ AC_DEFUN([PHP_CHECK_FUNC_LIB],[
     AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
   ])
 
+  if test "$found" = "yes"; then
+    ac_libs=$LIBS
+    LIBS="$LIBS -l$2"
+    AC_TRY_RUN([main() { return (0); }],[found=yes],[found=no],[found=no])
+    LIBS=$ac_libs
+  fi
+
   if test "$found" = "yes"; then
     PHP_ADD_LIBRARY($2)
     PHP_DEF_HAVE($1)

diff --git a/configure.in b/configure.in
index f6c507ed333806606206b36d6d40a6857fa813f2..343484779cb6edb68efd213ac264984b04b51545 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -279,7 +279,7 @@ PHP_CHECK_FUNC(gethostname, nsl)
 PHP_CHECK_FUNC(gethostbyaddr, nsl)
 PHP_CHECK_FUNC(yp_get_default_domain, nsl)
 
-AC_CHECK_LIB(dl, dlopen, [PHP_ADD_LIBRARY(dl)])
+PHP_CHECK_FUNC(dlopen, dl)
 AC_CHECK_LIB(m, sin)
 
 dnl Check for resolver routines.
@@ -802,6 +802,7 @@ dnl -------------------------------------------------------------------------
 
 PHP_CONFIGURE_PART(Configuring Zend)
 LIBZEND_BASIC_CHECKS
+LIBZEND_DLSYM_CHECK
 LIBZEND_OTHER_CHECKS
 
 TSRM_LIB='TSRM/libtsrm.la'

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index af1c5798e74c8c66ff2f4f4475cc9fe0fe376564..69758bbe8226ca414123a046b546b54db274ba60 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -189,7 +189,7 @@ dnl AC_CHECK_LIB(pam, pam_start, [
 dnl   EXTRA_LIBS="$EXTRA_LIBS -lpam"
 dnl   AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) 
 
-AC_CHECK_FUNCS(getcwd getwd)
+AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot)
 
 AC_CRYPT_CAP
 AC_FLUSH_IO

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 92d4d8214ad0c4e31ab0b968b1686dba8995f26c..62b4b0c606228e1cdb02d9d5c90bb64e98960396 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -321,6 +321,7 @@ PHP_FUNCTION(tanh)
 
 PHP_FUNCTION(asinh)
 {
+#ifdef HAVE_ASINH
        zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
@@ -329,6 +330,7 @@ PHP_FUNCTION(asinh)
        convert_to_double_ex(num);
        Z_DVAL_P(return_value) = asinh(Z_DVAL_PP(num));
        Z_TYPE_P(return_value) = IS_DOUBLE;
+#endif
 }
 
 /* }}} */
@@ -337,6 +339,7 @@ PHP_FUNCTION(asinh)
 
 PHP_FUNCTION(acosh)
 {
+#ifdef HAVE_ACOSH
        zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
@@ -345,6 +348,7 @@ PHP_FUNCTION(acosh)
        convert_to_double_ex(num);
        Z_DVAL_P(return_value) = acosh(Z_DVAL_PP(num));
        Z_TYPE_P(return_value) = IS_DOUBLE;
+#endif
 }
 
 /* }}} */
@@ -353,6 +357,7 @@ PHP_FUNCTION(acosh)
 
 PHP_FUNCTION(atanh)
 {
+#ifdef HAVE_ATANH
        zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
@@ -361,6 +366,7 @@ PHP_FUNCTION(atanh)
        convert_to_double_ex(num);
        Z_DVAL_P(return_value) = atanh(Z_DVAL_PP(num));
        Z_TYPE_P(return_value) = IS_DOUBLE;
+#endif
 }
 
 /* }}} */
@@ -504,6 +510,7 @@ PHP_FUNCTION(expm1)
 
 PHP_FUNCTION(log1p)
 {
+#ifdef HAVE_LOG1P
        zval **num;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
@@ -512,6 +519,7 @@ PHP_FUNCTION(log1p)
        convert_to_double_ex(num);
        Z_DVAL_P(return_value) = log1p(Z_DVAL_PP(num));
        Z_TYPE_P(return_value) = IS_DOUBLE;
+#endif
 }
 
 /* }}} */
@@ -577,6 +585,7 @@ PHP_FUNCTION(sqrt)
 
 PHP_FUNCTION(hypot)
 {
+#ifdef HAVE_HYPOT
        zval **num1, **num2;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &num1, &num2) == FAILURE) {
@@ -586,6 +595,7 @@ PHP_FUNCTION(hypot)
        convert_to_double_ex(num2);
        Z_DVAL_P(return_value) = hypot(Z_DVAL_PP(num1), Z_DVAL_PP(num2));
        Z_TYPE_P(return_value) = IS_DOUBLE;
+#endif
 }
 
 /* }}} */