Skip to content

Fix AS_VAR_* checks #14868

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
Jul 8, 2024
Merged

Fix AS_VAR_* checks #14868

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ T_ME=`$php_shtool echo -n -e %b`
PHP_INIT_BUILD_SYSTEM

dnl We want this one before the checks, so the checks can modify CFLAGS.
AS_VAR_SET_IF([CFLAGS],, [auto_cflags=1])
AS_VAR_IF([CFLAGS],, [auto_cflags=1])

abs_srcdir=`(cd $srcdir; pwd)`
abs_builddir=`pwd`
Expand Down
2 changes: 1 addition & 1 deletion sapi/apache2handler/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ if test "$PHP_APXS2" != "no"; then
esac

APACHE_THREADED_MPM=$($APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes')
AS_VAR_SET_IF([APACHE_THREADED_MPM], [PHP_BUILD_THREAD_SAFE])
AS_VAR_IF([APACHE_THREADED_MPM],,, [PHP_BUILD_THREAD_SAFE])
fi
4 changes: 2 additions & 2 deletions scripts/phpize.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ AC_DEFUN([PHP_ALWAYS_SHARED],[
test "[$]$1" = "no" && $1=yes
])dnl

AS_VAR_SET_IF([CFLAGS],, [auto_cflags=1])
AS_VAR_IF([CFLAGS],, [auto_cflags=1])

abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd`
Expand Down Expand Up @@ -62,7 +62,7 @@ INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`

AS_VAR_SET_IF([prefix],,
AS_VAR_IF([prefix],,
[AC_MSG_ERROR([Cannot find php-config. Please use --with-php-config=PATH])])

php_shtool=$srcdir/build/shtool
Expand Down
Loading