diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 21:15:47 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-28 21:15:47 +0100 |
| commit | 9ba0654ad7d59abefabeb7337026c5df2c97e6eb (patch) | |
| tree | cab479d09bf760d81859abc63ee1e4cbd437b03a | |
| parent | 49e31265edac2c67fb5b155f63ec5752af19eac1 (diff) | |
| parent | 36fef6dcd9d9e95127726fcfb231303ca59749b9 (diff) | |
| download | php-git-9ba0654ad7d59abefabeb7337026c5df2c97e6eb.tar.gz | |
Merge php-src into phpdbg
Conflicts:
config.m4
| -rw-r--r-- | config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -22,8 +22,8 @@ if test "$BUILD_PHPDBG" == "" && test "$PHP_PHPDBG" != "no"; then fi if test "$PHP_PHPDBG_WEBHELPER" != "no"; then - if ! test -d ext/phpdbg_webhelper; then - ln -s ../sapi/phpdbg ext/phpdbg_webhelper + if ! test -d $abs_srcdir/ext/phpdbg_webhelper; then + ln -s ../sapi/phpdbg $abs_srcdir/ext/phpdbg_webhelper fi if test "$PHP_JSON" != "no"; then PHP_NEW_EXTENSION(phpdbg_webhelper, phpdbg_rinit_hook.c phpdbg_webdata_transfer.c, $ext_shared) |