Skip to content

Commit 29e94f8

Browse files
authored
Autotools: Remove obsole Autoconf macros (php#18914)
These Autoconf macros have been marked as obsolete in PHP-8.4 and now also removed: - PHP_AP_EXTRACT_VERSION - PHP_BUILD_THREAD_SAFE - PHP_DEF_HAVE - PHP_OUTPUT - PHP_TEST_BUILD
1 parent d8c4890 commit 29e94f8

File tree

2 files changed

+7
-72
lines changed

2 files changed

+7
-72
lines changed

UPGRADING.INTERNALS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,18 @@ PHP 8.5 INTERNALS UPGRADE NOTES
5555
without duplicate build rules. It is up to the SAPI maintainers to ensure
5656
that appropriate build rules are created.
5757

58-
- Linux build system changes
58+
- Unix build system changes
5959
. libdir is properly set when --libdir (ex: /usr/lib64) and --with-libdir (ex lib64)
6060
configure options are used to ${libdir}/php (ex: /usr/lib64/php)
6161
. PHP_ODBC_CFLAGS, PHP_ODBC_LFLAGS, PHP_ODBC_LIBS, PHP_ODBC_TYPE preprocessor
6262
macros defined by ext/odbc are now defined in php_config.h instead of the
6363
build-defs.h header.
64+
. Autoconf macro PHP_AP_EXTRACT_VERSION has been removed.
65+
. Autoconf macro PHP_BUILD_THREAD_SAFE has been removed (set enable_zts
66+
manually).
67+
. Autoconf macro PHP_DEF_HAVE has been removed (use AC_DEFINE).
68+
. Autoconf macro PHP_OUTPUT has been removed (use AC_CONFIG_FILES).
69+
. Autoconf macro PHP_TEST_BUILD has been removed (use AC_* macros).
6470

6571
========================
6672
3. Module changes

build/php.m4

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,6 @@ dnl ----------------------------------------------------------------------------
2626
dnl Build system helper macros.
2727
dnl ----------------------------------------------------------------------------
2828

29-
dnl
30-
dnl PHP_DEF_HAVE(what)
31-
dnl
32-
dnl Generates 'AC_DEFINE(HAVE_WHAT, 1, [ ])'.
33-
dnl
34-
AC_DEFUN([PHP_DEF_HAVE], [m4_warn([obsolete],
35-
[The macro 'PHP_DEF_HAVE' is obsolete. Use AC_DEFINE.])
36-
AC_DEFINE([HAVE_]translit($1,a-z_.-,A-Z___), 1, [ ])])
37-
3829
dnl
3930
dnl PHP_RUN_ONCE(namespace, variable, code)
4031
dnl
@@ -89,17 +80,6 @@ AC_DEFUN([PHP_SUBST_OLD],[
8980
PHP_SUBST([$1])
9081
])
9182

92-
dnl
93-
dnl PHP_OUTPUT(file)
94-
dnl
95-
dnl Adds "file" to the list of files generated by AC_OUTPUT. This macro can be
96-
dnl used several times. This macro is obsolete as of PHP 8.4 in favor of the
97-
dnl default AC_CONFIG_FILES.
98-
dnl
99-
AC_DEFUN([PHP_OUTPUT],
100-
[m4_warn([obsolete], [The macro 'PHP_OUTPUT' is obsolete. Use AC_CONFIG_FILES.])
101-
AC_CONFIG_FILES([$1])])
102-
10383
dnl ----------------------------------------------------------------------------
10484
dnl Build system base macros.
10585
dnl ----------------------------------------------------------------------------
@@ -743,13 +723,6 @@ dnl ----------------------------------------------------------------------------
743723
dnl Build macros
744724
dnl ----------------------------------------------------------------------------
745725

746-
dnl
747-
dnl PHP_BUILD_THREAD_SAFE
748-
dnl
749-
AC_DEFUN([PHP_BUILD_THREAD_SAFE], [m4_warn([obsolete],
750-
[The macro 'PHP_BUILD_THREAD_SAFE' is obsolete. Set 'enable_zts' manually.])
751-
enable_zts=yes])
752-
753726
dnl
754727
dnl PHP_REQUIRE_CXX
755728
dnl
@@ -1518,31 +1491,6 @@ AC_DEFUN([PHP_CHECK_FUNC],[
15181491
esac
15191492
])
15201493

1521-
dnl
1522-
dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, extra-source]])
1523-
dnl
1524-
dnl This macro checks whether build works and given function exists.
1525-
dnl
1526-
AC_DEFUN([PHP_TEST_BUILD], [m4_warn([obsolete],
1527-
[The macro 'PHP_TEST_BUILD' is obsolete. Use AC_* macros.])
1528-
old_LIBS=$LIBS
1529-
LIBS="$4 $LIBS"
1530-
AC_LINK_IFELSE([AC_LANG_SOURCE([
1531-
$5
1532-
char $1(void);
1533-
int main(void) {
1534-
$1();
1535-
return 0;
1536-
}
1537-
])],[
1538-
LIBS=$old_LIBS
1539-
$2
1540-
],[
1541-
LIBS=$old_LIBS
1542-
$3
1543-
])
1544-
])
1545-
15461494
dnl ----------------------------------------------------------------------------
15471495
dnl Platform characteristics checks.
15481496
dnl ----------------------------------------------------------------------------
@@ -2039,25 +1987,6 @@ AC_DEFUN([PHP_INSTALL_HEADERS],
20391987
])
20401988
])
20411989

2042-
dnl
2043-
dnl PHP_AP_EXTRACT_VERSION(/path/httpd)
2044-
dnl
2045-
dnl This macro is used to get a comparable version for Apache.
2046-
dnl
2047-
AC_DEFUN([PHP_AP_EXTRACT_VERSION], [m4_warn([obsolete],
2048-
[The macro 'PHP_AP_EXTRACT_VERSION' is obsolete. Use 'apxs -q HTTPD_VERSION'])
2049-
AS_IF([test -x "$1"], [
2050-
ac_output=$($1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//')
2051-
ac_IFS=$IFS
2052-
IFS="- /.
2053-
"
2054-
set $ac_output
2055-
IFS=$ac_IFS
2056-
2057-
APACHE_VERSION=$(expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6)
2058-
])
2059-
])
2060-
20611990
dnl
20621991
dnl PHP_CONFIG_NICE(filename)
20631992
dnl

0 commit comments

Comments
 (0)