From d9f3b365a3b663d6e45ff734a86b313e2fbcbbf2 Mon Sep 17 00:00:00 2001 From: Irfan Adilovic Date: Sun, 17 Apr 2016 22:05:15 +0200 Subject: [PATCH] configure: ac_cv_ -> curl_cv_ for write-only vars These configure vars are modified in a curl-specific way but never evaluated or loaded from cache, even though they are designated as _cv_. We could either implement proper AC_CACHE_CHECKs for them, or remove them completely. Fixes #603 as ac_cv_func_gethostbyname is no longer clobbered, and AC_CHECK_FUNC(gethostbyname...) will no longer spuriously succeed after the first configure run with caching. `ac_cv_func_strcasecmp` is curious, see #770. `eval "ac_cv_func_$func=yes"` can still cause problems as it works in tandem with AC_CHECK_FUNCS and then potentially modifies its result. It would be best to rewrite this test to use a new CURL_CHECK_FUNCS macro, which works the same as AC_CHECK_FUNCS but relies on caching the values of curl_cv_func_* variables, without modifiying ac_cv_func_*. --- acinclude.m4 | 8 +- m4/curl-functions.m4 | 206 +++++++++++++++++++++---------------------- 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 3544e8592..68a3710cd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1158,7 +1158,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ # AC_DEFINE_UNQUOTED(HAVE_GETNAMEINFO, 1, [Define to 1 if you have the getnameinfo function.]) - ac_cv_func_getnameinfo="yes" + curl_cv_func_getnameinfo="yes" fi fi ]) @@ -1427,7 +1427,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ # AC_DEFINE_UNQUOTED(HAVE_RECV, 1, [Define to 1 if you have the recv function.]) - ac_cv_func_recv="yes" + curl_cv_func_recv="yes" fi else AC_MSG_ERROR([Unable to link function recv]) @@ -1594,7 +1594,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ # AC_DEFINE_UNQUOTED(HAVE_SEND, 1, [Define to 1 if you have the send function.]) - ac_cv_func_send="yes" + curl_cv_func_send="yes" fi else AC_MSG_ERROR([Unable to link function send]) @@ -2453,7 +2453,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ # AC_DEFINE_UNQUOTED(HAVE_SELECT, 1, [Define to 1 if you have the select function.]) - ac_cv_func_select="yes" + curl_cv_func_select="yes" fi fi ]) diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 3e6ac924d..ee7a2521c 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -639,10 +639,10 @@ AC_DEFUN([CURL_CHECK_FUNC_ALARM], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_ALARM, 1, [Define to 1 if you have the alarm function.]) - ac_cv_func_alarm="yes" + curl_cv_func_alarm="yes" else AC_MSG_RESULT([no]) - ac_cv_func_alarm="no" + curl_cv_func_alarm="no" fi ]) @@ -730,10 +730,10 @@ AC_DEFUN([CURL_CHECK_FUNC_BASENAME], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_BASENAME, 1, [Define to 1 if you have the basename function.]) - ac_cv_func_basename="yes" + curl_cv_func_basename="yes" else AC_MSG_RESULT([no]) - ac_cv_func_basename="no" + curl_cv_func_basename="no" fi ]) @@ -824,10 +824,10 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_CLOSESOCKET, 1, [Define to 1 if you have the closesocket function.]) - ac_cv_func_closesocket="yes" + curl_cv_func_closesocket="yes" else AC_MSG_RESULT([no]) - ac_cv_func_closesocket="no" + curl_cv_func_closesocket="no" fi ]) @@ -914,10 +914,10 @@ AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_CLOSESOCKET_CAMEL, 1, [Define to 1 if you have the CloseSocket camel case function.]) - ac_cv_func_closesocket_camel="yes" + curl_cv_func_closesocket_camel="yes" else AC_MSG_RESULT([no]) - ac_cv_func_closesocket_camel="no" + curl_cv_func_closesocket_camel="no" fi ]) @@ -1012,10 +1012,10 @@ AC_DEFUN([CURL_CHECK_FUNC_CONNECT], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_CONNECT, 1, [Define to 1 if you have the connect function.]) - ac_cv_func_connect="yes" + curl_cv_func_connect="yes" else AC_MSG_RESULT([no]) - ac_cv_func_connect="no" + curl_cv_func_connect="no" fi ]) @@ -1246,10 +1246,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FDOPEN], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_FDOPEN, 1, [Define to 1 if you have the fdopen function.]) - ac_cv_func_fdopen="yes" + curl_cv_func_fdopen="yes" else AC_MSG_RESULT([no]) - ac_cv_func_fdopen="no" + curl_cv_func_fdopen="no" fi ]) @@ -1368,10 +1368,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FGETXATTR], [ AC_DEFINE(HAVE_FGETXATTR_6, 1, [fgetxattr() takes 6 args]) fi # - ac_cv_func_fgetxattr="yes" + curl_cv_func_fgetxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_fgetxattr="no" + curl_cv_func_fgetxattr="no" fi ]) @@ -1490,10 +1490,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FLISTXATTR], [ AC_DEFINE(HAVE_FLISTXATTR_4, 1, [flistxattr() takes 4 args]) fi # - ac_cv_func_flistxattr="yes" + curl_cv_func_flistxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_flistxattr="no" + curl_cv_func_flistxattr="no" fi ]) @@ -1586,10 +1586,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FREEADDRINFO], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_FREEADDRINFO, 1, [Define to 1 if you have the freeaddrinfo function.]) - ac_cv_func_freeaddrinfo="yes" + curl_cv_func_freeaddrinfo="yes" else AC_MSG_RESULT([no]) - ac_cv_func_freeaddrinfo="no" + curl_cv_func_freeaddrinfo="no" fi ]) @@ -1670,10 +1670,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FREEIFADDRS], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_FREEIFADDRS, 1, [Define to 1 if you have the freeifaddrs function.]) - ac_cv_func_freeifaddrs="yes" + curl_cv_func_freeifaddrs="yes" else AC_MSG_RESULT([no]) - ac_cv_func_freeifaddrs="no" + curl_cv_func_freeifaddrs="no" fi ]) @@ -1792,10 +1792,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FREMOVEXATTR], [ AC_DEFINE(HAVE_FREMOVEXATTR_3, 1, [fremovexattr() takes 3 args]) fi # - ac_cv_func_fremovexattr="yes" + curl_cv_func_fremovexattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_fremovexattr="no" + curl_cv_func_fremovexattr="no" fi ]) @@ -1914,10 +1914,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FSETXATTR], [ AC_DEFINE(HAVE_FSETXATTR_6, 1, [fsetxattr() takes 6 args]) fi # - ac_cv_func_fsetxattr="yes" + curl_cv_func_fsetxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_fsetxattr="no" + curl_cv_func_fsetxattr="no" fi ]) @@ -1999,10 +1999,10 @@ AC_DEFUN([CURL_CHECK_FUNC_FTRUNCATE], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_FTRUNCATE, 1, [Define to 1 if you have the ftruncate function.]) - ac_cv_func_ftruncate="yes" + curl_cv_func_ftruncate="yes" else AC_MSG_RESULT([no]) - ac_cv_func_ftruncate="no" + curl_cv_func_ftruncate="no" fi ]) @@ -2151,8 +2151,8 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ curl_cv_func_getaddrinfo="yes" else AC_MSG_RESULT([no]) - ac_cv_func_getaddrinfo_threadsafe="no" curl_cv_func_getaddrinfo="no" + curl_cv_func_getaddrinfo_threadsafe="no" fi # if test "$curl_cv_func_getaddrinfo" = "yes"; then @@ -2263,9 +2263,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ if test "$tst_tsafe_getaddrinfo" = "yes"; then AC_DEFINE_UNQUOTED(HAVE_GETADDRINFO_THREADSAFE, 1, [Define to 1 if the getaddrinfo function is threadsafe.]) - ac_cv_func_getaddrinfo_threadsafe="yes" + curl_cv_func_getaddrinfo_threadsafe="yes" else - ac_cv_func_getaddrinfo_threadsafe="no" + curl_cv_func_getaddrinfo_threadsafe="no" fi fi ]) @@ -2357,10 +2357,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYADDR], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYADDR, 1, [Define to 1 if you have the gethostbyaddr function.]) - ac_cv_func_gethostbyaddr="yes" + curl_cv_func_gethostbyaddr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gethostbyaddr="no" + curl_cv_func_gethostbyaddr="no" fi ]) @@ -2450,10 +2450,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GAI_STRERROR], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GAI_STRERROR, 1, [Define to 1 if you have the gai_strerror function.]) - ac_cv_func_gai_strerror="yes" + curl_cv_func_gai_strerror="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gai_strerror="no" + curl_cv_func_gai_strerror="no" fi ]) @@ -2592,10 +2592,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYADDR_R], [ AC_DEFINE(HAVE_GETHOSTBYADDR_R_8, 1, [gethostbyaddr_r() takes 8 args]) fi # - ac_cv_func_gethostbyaddr_r="yes" + curl_cv_func_gethostbyaddr_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gethostbyaddr_r="no" + curl_cv_func_gethostbyaddr_r="no" fi ]) @@ -2686,10 +2686,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYNAME], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME, 1, [Define to 1 if you have the gethostbyname function.]) - ac_cv_func_gethostbyname="yes" + curl_cv_func_gethostbyname="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gethostbyname="no" + curl_cv_func_gethostbyname="no" fi ]) @@ -2828,10 +2828,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYNAME_R], [ AC_DEFINE(HAVE_GETHOSTBYNAME_R_6, 1, [gethostbyname_r() takes 6 args]) fi # - ac_cv_func_gethostbyname_r="yes" + curl_cv_func_gethostbyname_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gethostbyname_r="no" + curl_cv_func_gethostbyname_r="no" fi ]) @@ -2952,10 +2952,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETHOSTNAME], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GETHOSTNAME, 1, [Define to 1 if you have the gethostname function.]) - ac_cv_func_gethostname="yes" + curl_cv_func_gethostname="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gethostname="no" + curl_cv_func_gethostname="no" fi ]) @@ -3068,10 +3068,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETIFADDRS], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GETIFADDRS, 1, [Define to 1 if you have a working getifaddrs function.]) - ac_cv_func_getifaddrs="yes" + curl_cv_func_getifaddrs="yes" else AC_MSG_RESULT([no]) - ac_cv_func_getifaddrs="no" + curl_cv_func_getifaddrs="no" fi ]) @@ -3208,10 +3208,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETSERVBYPORT_R], [ AC_DEFINE(GETSERVBYPORT_R_BUFSIZE, 4096, [Specifies the size of the buffer to pass to getservbyport_r]) fi - ac_cv_func_getservbyport_r="yes" + curl_cv_func_getservbyport_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_getservbyport_r="no" + curl_cv_func_getservbyport_r="no" fi ]) @@ -3330,10 +3330,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GETXATTR], [ AC_DEFINE(HAVE_GETXATTR_6, 1, [getxattr() takes 6 args]) fi # - ac_cv_func_getxattr="yes" + curl_cv_func_getxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_getxattr="no" + curl_cv_func_getxattr="no" fi ]) @@ -3446,10 +3446,10 @@ AC_DEFUN([CURL_CHECK_FUNC_GMTIME_R], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_GMTIME_R, 1, [Define to 1 if you have a working gmtime_r function.]) - ac_cv_func_gmtime_r="yes" + curl_cv_func_gmtime_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_gmtime_r="no" + curl_cv_func_gmtime_r="no" fi ]) @@ -3570,10 +3570,10 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_NTOA_R], [ AC_DEFINE(HAVE_INET_NTOA_R_3, 1, [inet_ntoa_r() takes 3 args]) fi # - ac_cv_func_inet_ntoa_r="yes" + curl_cv_func_inet_ntoa_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_inet_ntoa_r="no" + curl_cv_func_inet_ntoa_r="no" fi ]) @@ -3729,10 +3729,10 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_INET_NTOP, 1, [Define to 1 if you have a IPv6 capable working inet_ntop function.]) - ac_cv_func_inet_ntop="yes" + curl_cv_func_inet_ntop="yes" else AC_MSG_RESULT([no]) - ac_cv_func_inet_ntop="no" + curl_cv_func_inet_ntop="no" fi ]) @@ -3881,10 +3881,10 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_INET_PTON, 1, [Define to 1 if you have a IPv6 capable working inet_pton function.]) - ac_cv_func_inet_pton="yes" + curl_cv_func_inet_pton="yes" else AC_MSG_RESULT([no]) - ac_cv_func_inet_pton="no" + curl_cv_func_inet_pton="no" fi ]) @@ -4491,10 +4491,10 @@ AC_DEFUN([CURL_CHECK_FUNC_LISTXATTR], [ AC_DEFINE(HAVE_LISTXATTR_4, 1, [listxattr() takes 4 args]) fi # - ac_cv_func_listxattr="yes" + curl_cv_func_listxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_listxattr="no" + curl_cv_func_listxattr="no" fi ]) @@ -4607,10 +4607,10 @@ AC_DEFUN([CURL_CHECK_FUNC_LOCALTIME_R], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_LOCALTIME_R, 1, [Define to 1 if you have a working localtime_r function.]) - ac_cv_func_localtime_r="yes" + curl_cv_func_localtime_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_localtime_r="no" + curl_cv_func_localtime_r="no" fi ]) @@ -4712,10 +4712,10 @@ AC_DEFUN([CURL_CHECK_FUNC_MEMRCHR], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_MEMRCHR, 1, [Define to 1 if you have the memrchr function or macro.]) - ac_cv_func_memrchr="yes" + curl_cv_func_memrchr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_memrchr="no" + curl_cv_func_memrchr="no" fi ]) @@ -4841,10 +4841,10 @@ AC_DEFUN([CURL_CHECK_FUNC_POLL], [ [Define to 1 if you have a working poll function.]) AC_DEFINE_UNQUOTED(HAVE_POLL_FINE, 1, [If you have a fine poll]) - ac_cv_func_poll="yes" + curl_cv_func_poll="yes" else AC_MSG_RESULT([no]) - ac_cv_func_poll="no" + curl_cv_func_poll="no" fi ]) @@ -4963,10 +4963,10 @@ AC_DEFUN([CURL_CHECK_FUNC_REMOVEXATTR], [ AC_DEFINE(HAVE_REMOVEXATTR_3, 1, [removexattr() takes 3 args]) fi # - ac_cv_func_removexattr="yes" + curl_cv_func_removexattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_removexattr="no" + curl_cv_func_removexattr="no" fi ]) @@ -5236,10 +5236,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SETXATTR], [ AC_DEFINE(HAVE_SETXATTR_6, 1, [setxattr() takes 6 args]) fi # - ac_cv_func_setxattr="yes" + curl_cv_func_setxattr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_setxattr="no" + curl_cv_func_setxattr="no" fi ]) @@ -5321,10 +5321,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SIGACTION], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SIGACTION, 1, [Define to 1 if you have the sigaction function.]) - ac_cv_func_sigaction="yes" + curl_cv_func_sigaction="yes" else AC_MSG_RESULT([no]) - ac_cv_func_sigaction="no" + curl_cv_func_sigaction="no" fi ]) @@ -5406,10 +5406,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SIGINTERRUPT], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SIGINTERRUPT, 1, [Define to 1 if you have the siginterrupt function.]) - ac_cv_func_siginterrupt="yes" + curl_cv_func_siginterrupt="yes" else AC_MSG_RESULT([no]) - ac_cv_func_siginterrupt="no" + curl_cv_func_siginterrupt="no" fi ]) @@ -5491,10 +5491,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SIGNAL], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SIGNAL, 1, [Define to 1 if you have the signal function.]) - ac_cv_func_signal="yes" + curl_cv_func_signal="yes" else AC_MSG_RESULT([no]) - ac_cv_func_signal="no" + curl_cv_func_signal="no" fi ]) @@ -5598,10 +5598,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SIGSETJMP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SIGSETJMP, 1, [Define to 1 if you have the sigsetjmp function or macro.]) - ac_cv_func_sigsetjmp="yes" + curl_cv_func_sigsetjmp="yes" else AC_MSG_RESULT([no]) - ac_cv_func_sigsetjmp="no" + curl_cv_func_sigsetjmp="no" fi ]) @@ -5696,10 +5696,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SOCKET], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SOCKET, 1, [Define to 1 if you have the socket function.]) - ac_cv_func_socket="yes" + curl_cv_func_socket="yes" else AC_MSG_RESULT([no]) - ac_cv_func_socket="no" + curl_cv_func_socket="no" fi ]) @@ -5785,10 +5785,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SOCKETPAIR], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the socketpair function.]) - ac_cv_func_socketpair="yes" + curl_cv_func_socketpair="yes" else AC_MSG_RESULT([no]) - ac_cv_func_socketpair="no" + curl_cv_func_socketpair="no" fi ]) @@ -5870,10 +5870,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRCASECMP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRCASECMP, 1, [Define to 1 if you have the strcasecmp function.]) - ac_cv_func_strcasecmp="yes" + curl_cv_func_strcasecmp="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strcasecmp="no" + curl_cv_func_strcasecmp="no" fi ]) @@ -5954,10 +5954,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRCMPI], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRCMPI, 1, [Define to 1 if you have the strcmpi function.]) - ac_cv_func_strcmpi="yes" + curl_cv_func_strcmpi="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strcmpi="no" + curl_cv_func_strcmpi="no" fi ]) @@ -6039,10 +6039,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRDUP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRDUP, 1, [Define to 1 if you have the strdup function.]) - ac_cv_func_strdup="yes" + curl_cv_func_strdup="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strdup="no" + curl_cv_func_strdup="no" fi ]) @@ -6298,10 +6298,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [ AC_DEFINE_UNQUOTED(STRERROR_R_TYPE_ARG3, $tst_posix_strerror_r_type_arg3, [Define to the type of arg 3 for strerror_r.]) fi - ac_cv_func_strerror_r="yes" + curl_cv_func_strerror_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strerror_r="no" + curl_cv_func_strerror_r="no" fi # if test "$tst_compi_strerror_r" = "yes" && @@ -6389,10 +6389,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRICMP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRICMP, 1, [Define to 1 if you have the stricmp function.]) - ac_cv_func_stricmp="yes" + curl_cv_func_stricmp="yes" else AC_MSG_RESULT([no]) - ac_cv_func_stricmp="no" + curl_cv_func_stricmp="no" fi ]) @@ -6473,10 +6473,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRNCASECMP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRNCASECMP, 1, [Define to 1 if you have the strncasecmp function.]) - ac_cv_func_strncasecmp="yes" + curl_cv_func_strncasecmp="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strncasecmp="no" + curl_cv_func_strncasecmp="no" fi ]) @@ -6558,10 +6558,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRNCMPI], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRNCMPI, 1, [Define to 1 if you have the strncmpi function.]) - ac_cv_func_strncmpi="yes" + curl_cv_func_strncmpi="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strncmpi="no" + curl_cv_func_strncmpi="no" fi ]) @@ -6643,10 +6643,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRNICMP], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRNICMP, 1, [Define to 1 if you have the strnicmp function.]) - ac_cv_func_strnicmp="yes" + curl_cv_func_strnicmp="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strnicmp="no" + curl_cv_func_strnicmp="no" fi ]) @@ -6728,10 +6728,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRSTR], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRSTR, 1, [Define to 1 if you have the strstr function.]) - ac_cv_func_strstr="yes" + curl_cv_func_strstr="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strstr="no" + curl_cv_func_strstr="no" fi ]) @@ -6813,10 +6813,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRTOK_R], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRTOK_R, 1, [Define to 1 if you have the strtok_r function.]) - ac_cv_func_strtok_r="yes" + curl_cv_func_strtok_r="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strtok_r="no" + curl_cv_func_strtok_r="no" fi ]) @@ -6898,10 +6898,10 @@ AC_DEFUN([CURL_CHECK_FUNC_STRTOLL], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_STRTOLL, 1, [Define to 1 if you have the strtoll function.]) - ac_cv_func_strtoll="yes" + curl_cv_func_strtoll="yes" else AC_MSG_RESULT([no]) - ac_cv_func_strtoll="no" + curl_cv_func_strtoll="no" fi ]) @@ -6983,9 +6983,9 @@ AC_DEFUN([CURL_CHECK_FUNC_WRITEV], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_WRITEV, 1, [Define to 1 if you have the writev function.]) - ac_cv_func_writev="yes" + curl_cv_func_writev="yes" else AC_MSG_RESULT([no]) - ac_cv_func_writev="no" + curl_cv_func_writev="no" fi ])