Skip to content

Update autoconf script #8514

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

Closed
wants to merge 2 commits into from
Closed

Update autoconf script #8514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84389bd
Use new updated macros
Girgias May 8, 2022
ce418fc
Fix autoconf warnings
Girgias May 8, 2022
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
31 changes: 16 additions & 15 deletions build/libtool.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,10 +675,13 @@ s390*-*linux*|sparc*-*linux*)
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_SAVE
AC_LANG_C
AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_RESTORE])
[AC_LANG_PUSH([C])
AC_LINK_IFELSE(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AC_LINK_IFELSE(
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])

In one line it is simpler to compare it with possible upstream version.

[AC_LANG_PROGRAM([[]], [[]])],
[lt_cv_cc_needs_belf=yes],
[lt_cv_cc_needs_belf=no]
)
AC_LANG_POP([C])])
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
Expand Down Expand Up @@ -1197,7 +1200,7 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
if test "$hard_links" = no; then
AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
Expand Down Expand Up @@ -1935,15 +1938,15 @@ AC_ARG_WITH([tags],

if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
AC_MSG_WARN([output file \`$ofile' does not exist])
AC_MSG_WARN([output file '$ofile' does not exist])
fi

if test -z "$LTCC"; then
eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
if test -z "$LTCC"; then
AC_MSG_WARN([output file \`$ofile' does not look like a libtool script])
AC_MSG_WARN([output file '$ofile' does not look like a libtool script])
else
AC_MSG_WARN([using \`LTCC=$LTCC', extracted from \`$ofile'])
AC_MSG_WARN([using 'LTCC=$LTCC', extracted from '$ofile'])
fi
fi
if test -z "$LTCFLAGS"; then
Expand All @@ -1966,7 +1969,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then

if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
then
AC_MSG_ERROR([tag name \"$tagname\" already exists])
AC_MSG_ERROR([tag name "$tagname" already exists])
fi

# Update the list of available tags.
Expand Down Expand Up @@ -2738,8 +2741,7 @@ fi
AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
AC_DEFUN([_LT_AC_LANG_C_CONFIG],
[lt_save_CC="$CC"
AC_LANG_SAVE
AC_LANG_C
AC_LANG_PUSH([C])

# Source file extension for C test sources.
ac_ext=c
Expand Down Expand Up @@ -2807,7 +2809,7 @@ AC_MSG_RESULT([$enable_static])

AC_LIBTOOL_CONFIG($1)

AC_LANG_RESTORE
AC_LANG_POP([C])
CC="$lt_save_CC"
])# AC_LIBTOOL_LANG_C_CONFIG

Expand All @@ -2819,8 +2821,7 @@ CC="$lt_save_CC"
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
[AC_LANG_PUSH([C++])
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([_LT_AC_PROG_CXXCPP])

Expand Down Expand Up @@ -3806,7 +3807,7 @@ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)

AC_LIBTOOL_CONFIG($1)

AC_LANG_RESTORE
AC_LANG_POP([C++])
CC=$lt_save_CC
LDCXX=$LD
LD=$lt_save_LD
Expand Down
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 @@ -16,7 +16,7 @@ m4_include([TSRM/tsrm.m4])
dnl Basic autoconf initialization, generation of config.nice.
dnl ----------------------------------------------------------------------------

AC_PREREQ([2.68])
AC_PREREQ([2.69])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AC_PREREQ([2.69])
AC_PREREQ([2.68])

I'd leave this for now as it is.

AC_INIT([PHP],[8.2.0-dev],[https://bugs.php.net],[php],[https://www.php.net])
AC_CONFIG_SRCDIR([main/php_version.h])
AC_CONFIG_AUX_DIR([build])
Expand Down