Skip to content

Autotools: Sync CS in php.m4 #15771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Autotools: Sync CS in php.m4 #15771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 30 additions & 37 deletions build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ AC_DEFUN([PHP_CANONICAL_HOST_TARGET],[
if test -z "$host_alias" && test -n "$host"; then
host_alias=$host
fi
if test -z "$host_alias"; then
AC_MSG_ERROR([host_alias is not set! Make sure to run config.guess])
fi
AS_VAR_IF([host_alias],,
[AC_MSG_ERROR([host_alias is not set! Make sure to run config.guess])])
])

dnl
Expand Down Expand Up @@ -638,12 +637,10 @@ dnl PHP_SET_LIBTOOL_VARIABLE(var)
dnl
dnl Set libtool variable.
dnl
AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE],[
if test -z "$LIBTOOL"; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
else
LIBTOOL="$LIBTOOL $1"
fi
AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE], [
AS_VAR_IF([LIBTOOL],,
[LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'],
[LIBTOOL="$LIBTOOL $1"])
])

dnl ----------------------------------------------------------------------------
Expand Down Expand Up @@ -757,13 +754,13 @@ AC_DEFUN([PHP_BUILD_THREAD_SAFE], [enable_zts=yes])
dnl
dnl PHP_REQUIRE_CXX
dnl
AC_DEFUN([PHP_REQUIRE_CXX],[
if test -z "$php_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
PHP_ADD_LIBRARY([stdc++])
php_cxx_done=yes
fi
AC_DEFUN([PHP_REQUIRE_CXX], [
AS_VAR_IF([php_cxx_done],, [
AC_PROG_CXX
AC_PROG_CXXCPP
PHP_ADD_LIBRARY([stdc++])
php_cxx_done=yes
])
])

dnl
Expand Down Expand Up @@ -837,11 +834,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[
install_modules="install-modules"
suffix=la

case $host_alias in
*aix*[)]
additional_flags="-Wl,-G"
;;
esac
AS_CASE([$host_alias], [*aix*], [additional_flags="-Wl,-G"])

if test "x$5" = "xyes"; then
PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/$1.$suffix"
Expand Down Expand Up @@ -1569,22 +1562,22 @@ dnl
dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME suffix can be: .so or
dnl .sl
dnl
AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES],[
AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
PHP_SUBST_OLD([SHLIB_SUFFIX_NAME])
PHP_SUBST_OLD([SHLIB_DL_SUFFIX_NAME])
SHLIB_SUFFIX_NAME=so
SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
case $host_alias in
*hpux*[)]
SHLIB_SUFFIX_NAME=sl
SHLIB_DL_SUFFIX_NAME=sl
;;
*darwin*[)]
SHLIB_SUFFIX_NAME=dylib
SHLIB_DL_SUFFIX_NAME=so
;;
esac
AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES], [
AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
AS_CASE([$host_alias],
[*hpux*], [
SHLIB_SUFFIX_NAME=sl
SHLIB_DL_SUFFIX_NAME=sl
],
[*darwin*], [
SHLIB_SUFFIX_NAME=dylib
SHLIB_DL_SUFFIX_NAME=so
], [
SHLIB_SUFFIX_NAME=so
SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
])
PHP_SUBST_OLD([SHLIB_SUFFIX_NAME])
PHP_SUBST_OLD([SHLIB_DL_SUFFIX_NAME])
])

dnl
Expand Down
Loading