Skip to content

Commit 04f9a52

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Remove PHP_DEBUG_MACRO
2 parents 35709b5 + 3bde483 commit 04f9a52

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

build/php.m4

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2117,37 +2117,6 @@ IFS="- /.
21172117
APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
21182118
])
21192119

2120-
dnl
2121-
dnl PHP_DEBUG_MACRO(filename)
2122-
dnl
2123-
AC_DEFUN([PHP_DEBUG_MACRO],[
2124-
DEBUG_LOG=$1
2125-
cat >$1 <<X
2126-
CONFIGURE: $CONFIGURE_COMMAND
2127-
CC: $CC
2128-
CFLAGS: $CFLAGS
2129-
CPPFLAGS: $CPPFLAGS
2130-
CXX: $CXX
2131-
CXXFLAGS: $CXXFLAGS
2132-
INCLUDES: $INCLUDES
2133-
LDFLAGS: $LDFLAGS
2134-
LIBS: $LIBS
2135-
DLIBS: $DLIBS
2136-
SAPI: $PHP_SAPI
2137-
PHP_RPATHS: $PHP_RPATHS
2138-
uname -a: `uname -a`
2139-
2140-
X
2141-
cat >conftest.$ac_ext <<X
2142-
main()
2143-
{
2144-
exit(0);
2145-
}
2146-
X
2147-
(eval echo \"$ac_link\"; eval $ac_link && ./conftest) >>$1 2>&1
2148-
rm -fr conftest*
2149-
])
2150-
21512120
dnl
21522121
dnl PHP_CONFIG_NICE(filename)
21532122
dnl

configure.ac

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,23 +1637,6 @@ if test -n "\$REDO_ALL"; then
16371637
cli_extensions="$EXT_CLI_STATIC"
16381638
sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c
16391639
1640-
if test -n "$DEBUG_LOG"; then
1641-
rm -f config.cache
1642-
cat <<X
1643-
+--------------------------------------------------------------------+
1644-
| *** ATTENTION *** |
1645-
| |
1646-
| Something is likely to be messed up here, because the configure |
1647-
| script was not able to detect a simple feature on your platform. |
1648-
| This is often caused by incorrect configuration parameters. Please |
1649-
| see the file debug.log for error messages. |
1650-
| |
1651-
| If you are unable to fix this, send the file debug.log to the |
1652-
| [email protected] mailing list and include appropriate |
1653-
| information about your setup. |
1654-
X
1655-
fi
1656-
16571640
if test "$PHP_SAPI" = "apache2handler"; then
16581641
if test "$APACHE_VERSION" -ge 2004001; then
16591642
if test -z "$APACHE_THREADED_MPM"; then

0 commit comments

Comments
 (0)