Skip to content

Commit a86163a

Browse files
authored
Autotools: Refactor getaddrinfo check (#14783)
- AS_VAR_IF and AS_CASE used - CS synced - Over-quoted arguments reduced - Cache variable ac_cv_func_getaddrinfo renamed to php_cv_func_getaddrinfo
1 parent a6b336a commit a86163a

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

configure.ac

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,10 @@ AC_CHECK_FUNCS([nanosleep],,
646646

647647
dnl Check for getaddrinfo, should be a better way, but... Also check for working
648648
dnl getaddrinfo.
649-
AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,
650-
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
651-
[[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[
649+
AC_CACHE_CHECK([for getaddrinfo], [php_cv_func_getaddrinfo],
650+
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
651+
[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);])],
652+
[AC_RUN_IFELSE([AC_LANG_SOURCE([
652653
#include <netdb.h>
653654
#include <sys/types.h>
654655
#include <string.h>
@@ -686,21 +687,16 @@ int main(void) {
686687
freeaddrinfo(ai);
687688
return 0;
688689
}
689-
]])],[ac_cv_func_getaddrinfo=yes], [ac_cv_func_getaddrinfo=no], [
690-
dnl Cross compilation.
691-
case $host_alias in
692-
*linux*|*midipix)
693-
ac_cv_func_getaddrinfo=yes
694-
;;
695-
*)
696-
ac_cv_func_getaddrinfo=no
697-
;;
698-
esac
699690
])],
700-
[ac_cv_func_getaddrinfo=no])])
701-
if test "$ac_cv_func_getaddrinfo" = yes; then
702-
AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
703-
fi
691+
[php_cv_func_getaddrinfo=yes],
692+
[php_cv_func_getaddrinfo=no],
693+
[AS_CASE([$host_alias],
694+
[*linux*|*midipix], [php_cv_func_getaddrinfo=yes],
695+
[php_cv_func_getaddrinfo=no])])],
696+
[php_cv_func_getaddrinfo=no])])
697+
AS_VAR_IF([php_cv_func_getaddrinfo], [yes],
698+
[AC_DEFINE([HAVE_GETADDRINFO], [1],
699+
[Define to 1 if you have the 'getaddrinfo' function.])])
704700

705701
dnl on FreeBSD, copy_file_range() works only with the undocumented flag 0x01000000;
706702
dnl until the problem is fixed properly, copy_file_range() is used only on Linux

0 commit comments

Comments
 (0)