Skip to content

Autotools: Sync CS in PHP_EVAL_LIBLINE #15737

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 4, 2024
Merged

Autotools: Sync CS in PHP_EVAL_LIBLINE #15737

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
34 changes: 16 additions & 18 deletions build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,25 +375,23 @@ AC_DEFUN([PHP_EVAL_LIBLINE],
[m4_warn([syntax], [Missing 2nd argument when skipping extension check])],
[_php_ext_shared_saved=$ext_shared; ext_shared=yes])])
for ac_i in $1; do
case $ac_i in
-pthread[)]
if test "$ext_shared" = "yes"; then
$2="[$]$2 -pthread"
else
PHP_RUN_ONCE(EXTRA_LDFLAGS, [$ac_i], [EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"])
PHP_RUN_ONCE(EXTRA_LDFLAGS_PROGRAM, [$ac_i],
AS_CASE([$ac_i],
[-pthread], [
AS_VAR_IF([ext_shared], [yes], [$2="$$2 -pthread"], [
PHP_RUN_ONCE([EXTRA_LDFLAGS], [$ac_i],
[EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"])
PHP_RUN_ONCE([EXTRA_LDFLAGS_PROGRAM], [$ac_i],
[EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $ac_i"])
fi
;;
-l*[)]
ac_ii=$(echo $ac_i|cut -c 3-)
PHP_ADD_LIBRARY($ac_ii,1,$2)
;;
-L*[)]
ac_ii=$(echo $ac_i|cut -c 3-)
PHP_ADD_LIBPATH($ac_ii,$2)
;;
esac
])
],
[-l*], [
ac_ii=$(echo $ac_i|cut -c 3-)
PHP_ADD_LIBRARY([$ac_ii], [yes], [$2])
],
[-L*], [
ac_ii=$(echo $ac_i|cut -c 3-)
PHP_ADD_LIBPATH([$ac_ii], [$2])
])
done
m4_ifnblank([$3], [m4_ifnblank([$2], [ext_shared=$_php_ext_shared_saved])])[]dnl
])
Expand Down