archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Sync LIBS and LDFLAGS handling (#14956)

Browse source 
- ZEND_EXTRA_LIBS holds all possible libraries appended during the
  checks related to Zend.m4, moved after the ZEND_INIT check to make it
  more clear, redundant double quotes removed;
- EXTRA_LIBS has already been populated above in the configure.ac
- redundant 'unset LIBS' removed
This commit is contained in:
Peter Kokot 2024-07-15 12:16:53 +02:00 • committed by GitHub
parent 6980eba863
commit 694e04499a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -1312,6 +1312,9 @@ fi
ZEND_INIT ZEND_INIT
ZEND_EXTRA_LIBS=$LIBS
unset LIBS
PHP_ADD_INCLUDE([$abs_srcdir], [1]) PHP_ADD_INCLUDE([$abs_srcdir], [1])
PHP_ADD_INCLUDE([$abs_srcdir/main], [1]) PHP_ADD_INCLUDE([$abs_srcdir/main], [1])
PHP_ADD_INCLUDE([$abs_builddir], [1]) PHP_ADD_INCLUDE([$abs_builddir], [1])
@ -1321,13 +1324,9 @@ PHP_ADD_INCLUDE([$abs_builddir/Zend])
PHP_ADD_INCLUDE([$abs_srcdir/Zend]) PHP_ADD_INCLUDE([$abs_srcdir/Zend])
PHP_ADD_INCLUDE([$abs_srcdir/TSRM]) PHP_ADD_INCLUDE([$abs_srcdir/TSRM])
ZEND_EXTRA_LIBS="$LIBS"
unset LIBS
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $LDFLAGS"
EXTRA_LIBS="$EXTRA_LIBS $LIBS" unset LDFLAGS
unset LIBS LDFLAGS
AC_ARG_PROGRAM AC_ARG_PROGRAM