Check that realpath is available. Bug: #9469

# TSRM still uses it without checking. I can't fix that.

diff --git a/configure.in b/configure.in
index 05ffbea3474c2b45f762e9a4f87febfd8c45f7b1..d1c1587cce6aa14028d25d868d7abc9a99179fa8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -395,6 +395,7 @@ mkstemp \
 mmap \
 nl_langinfo \
 putenv \
+realpath \
 random \
 rand_r \
 regcomp \

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a8a630f9721cb1d85a9c907eb9430cb5d3f55f91..efbbbf860ea4245e9b987309b9a8358190177508 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -628,7 +628,7 @@ function_entry basic_functions[] = {
 
        PHP_FE(socket_get_status,                                                                                               NULL)
 
-#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS)
+#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
        PHP_FE(realpath,                                                                                                                NULL)
 #else
        PHP_FALIAS(realpath,                    warn_not_available,                                             NULL)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index df03be59e98995bc276b706d3f2e56946c0b4f92..e4b91526baddea7ed8b2747f50848691dfa2dfe8 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -2270,7 +2270,7 @@ PHP_FUNCTION(fgetcsv)
 /* }}} */
 
 
-#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS)
+#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
 /* {{{ proto string realpath(string path)
    Return the resolved path */
 PHP_FUNCTION(realpath)

diff --git a/ext/standard/file.h b/ext/standard/file.h
index e3cdc4aad94b019ff6ffee39a90a24a85a9971b5..853cf1342faf2a93300d640ea7318dacfacab2cd 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -66,7 +66,9 @@ PHP_FUNCTION(flock);
 PHP_FUNCTION(fd_set);
 PHP_FUNCTION(fd_isset);
 PHP_FUNCTION(select);
+#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS)
 PHP_FUNCTION(realpath);
+#endif
 PHP_NAMED_FUNCTION(php_if_ftruncate);
 PHP_NAMED_FUNCTION(php_if_fstat);