AC_DEFUN([CURL_CHECK_DEF], [
AC_REQUIRE([CURL_CPP_P])dnl
OLDCPPFLAGS=$CPPFLAGS
- # CPPPFLAGS comes from CURL_CPP_P
- CPPFLAGS="$CPPPFLAGS"
+ # CPPPFLAG comes from CURL_CPP_P
+ CPPFLAGS="$CPPFLAGS $CPPPFLAG"
AS_VAR_PUSHDEF([ac_HaveDef], [curl_cv_have_def_$1])dnl
AS_VAR_PUSHDEF([ac_Def], [curl_cv_def_$1])dnl
if test -z "$SED"; then
dnl Check for compilable and valid windows.h header
AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
- AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [
+ AC_CACHE_CHECK([for windows.h], [curl_cv_header_windows_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_windows_h="yes"
+ curl_cv_header_windows_h="yes"
],[
- ac_cv_header_windows_h="no"
+ curl_cv_header_windows_h="no"
])
])
- case "$ac_cv_header_windows_h" in
+ case "$curl_cv_header_windows_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
[Define to 1 if you have the windows.h header file.])
AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([whether build target is a native Windows one], [ac_cv_native_windows], [
- if test "$ac_cv_header_windows_h" = "no"; then
- ac_cv_native_windows="no"
+ AC_CACHE_CHECK([whether build target is a native Windows one], [curl_cv_native_windows], [
+ if test "$curl_cv_header_windows_h" = "no"; then
+ curl_cv_native_windows="no"
else
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#endif
]])
],[
- ac_cv_native_windows="yes"
+ curl_cv_native_windows="yes"
],[
- ac_cv_native_windows="no"
+ curl_cv_native_windows="no"
])
fi
])
- AM_CONDITIONAL(DOING_NATIVE_WINDOWS, test "x$ac_cv_native_windows" = xyes)
+ AM_CONDITIONAL(DOING_NATIVE_WINDOWS, test "x$curl_cv_native_windows" = xyes)
])
AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([for winsock.h], [ac_cv_header_winsock_h], [
+ AC_CACHE_CHECK([for winsock.h], [curl_cv_header_winsock_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_winsock_h="yes"
+ curl_cv_header_winsock_h="yes"
],[
- ac_cv_header_winsock_h="no"
+ curl_cv_header_winsock_h="no"
])
])
- case "$ac_cv_header_winsock_h" in
+ case "$curl_cv_header_winsock_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1,
[Define to 1 if you have the winsock.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([for winsock2.h], [ac_cv_header_winsock2_h], [
+ AC_CACHE_CHECK([for winsock2.h], [curl_cv_header_winsock2_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_winsock2_h="yes"
+ curl_cv_header_winsock2_h="yes"
],[
- ac_cv_header_winsock2_h="no"
+ curl_cv_header_winsock2_h="no"
])
])
- case "$ac_cv_header_winsock2_h" in
+ case "$curl_cv_header_winsock2_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WINSOCK2_H, 1,
[Define to 1 if you have the winsock2.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_WS2TCPIP], [
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
- AC_CACHE_CHECK([for ws2tcpip.h], [ac_cv_header_ws2tcpip_h], [
+ AC_CACHE_CHECK([for ws2tcpip.h], [curl_cv_header_ws2tcpip_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_ws2tcpip_h="yes"
+ curl_cv_header_ws2tcpip_h="yes"
],[
- ac_cv_header_ws2tcpip_h="no"
+ curl_cv_header_ws2tcpip_h="no"
])
])
- case "$ac_cv_header_ws2tcpip_h" in
+ case "$curl_cv_header_ws2tcpip_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WS2TCPIP_H, 1,
[Define to 1 if you have the ws2tcpip.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_WINLDAP], [
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([for winldap.h], [ac_cv_header_winldap_h], [
+ AC_CACHE_CHECK([for winldap.h], [curl_cv_header_winldap_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_winldap_h="yes"
+ curl_cv_header_winldap_h="yes"
],[
- ac_cv_header_winldap_h="no"
+ curl_cv_header_winldap_h="no"
])
])
- case "$ac_cv_header_winldap_h" in
+ case "$curl_cv_header_winldap_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WINLDAP_H, 1,
[Define to 1 if you have the winldap.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_WINBER], [
AC_REQUIRE([CURL_CHECK_HEADER_WINLDAP])dnl
- AC_CACHE_CHECK([for winber.h], [ac_cv_header_winber_h], [
+ AC_CACHE_CHECK([for winber.h], [curl_cv_header_winber_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
#endif
]])
],[
- ac_cv_header_winber_h="yes"
+ curl_cv_header_winber_h="yes"
],[
- ac_cv_header_winber_h="no"
+ curl_cv_header_winber_h="no"
])
])
- case "$ac_cv_header_winber_h" in
+ case "$curl_cv_header_winber_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_WINBER_H, 1,
[Define to 1 if you have the winber.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_LBER], [
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
- AC_CACHE_CHECK([for lber.h], [ac_cv_header_lber_h], [
+ AC_CACHE_CHECK([for lber.h], [curl_cv_header_lber_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
ber_free(bep, 1);
]])
],[
- ac_cv_header_lber_h="yes"
+ curl_cv_header_lber_h="yes"
],[
- ac_cv_header_lber_h="no"
+ curl_cv_header_lber_h="no"
])
])
- if test "$ac_cv_header_lber_h" = "yes"; then
+ if test "$curl_cv_header_lber_h" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_LBER_H, 1,
[Define to 1 if you have the lber.h header file.])
#
AC_DEFUN([CURL_CHECK_HEADER_LDAP], [
AC_REQUIRE([CURL_CHECK_HEADER_LBER])dnl
- AC_CACHE_CHECK([for ldap.h], [ac_cv_header_ldap_h], [
+ AC_CACHE_CHECK([for ldap.h], [curl_cv_header_ldap_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
int res = ldap_unbind(ldp);
]])
],[
- ac_cv_header_ldap_h="yes"
+ curl_cv_header_ldap_h="yes"
],[
- ac_cv_header_ldap_h="no"
+ curl_cv_header_ldap_h="no"
])
])
- case "$ac_cv_header_ldap_h" in
+ case "$curl_cv_header_ldap_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_LDAP_H, 1,
[Define to 1 if you have the ldap.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_LDAP_SSL], [
AC_REQUIRE([CURL_CHECK_HEADER_LDAP])dnl
- AC_CACHE_CHECK([for ldap_ssl.h], [ac_cv_header_ldap_ssl_h], [
+ AC_CACHE_CHECK([for ldap_ssl.h], [curl_cv_header_ldap_ssl_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
LDAP *ldp = ldapssl_init("dummy", LDAPS_PORT, 1);
]])
],[
- ac_cv_header_ldap_ssl_h="yes"
+ curl_cv_header_ldap_ssl_h="yes"
],[
- ac_cv_header_ldap_ssl_h="no"
+ curl_cv_header_ldap_ssl_h="no"
])
])
- case "$ac_cv_header_ldap_ssl_h" in
+ case "$curl_cv_header_ldap_ssl_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_LDAP_SSL_H, 1,
[Define to 1 if you have the ldap_ssl.h header file.])
AC_DEFUN([CURL_CHECK_HEADER_LDAPSSL], [
AC_REQUIRE([CURL_CHECK_HEADER_LDAP])dnl
- AC_CACHE_CHECK([for ldapssl.h], [ac_cv_header_ldapssl_h], [
+ AC_CACHE_CHECK([for ldapssl.h], [curl_cv_header_ldapssl_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
LDAP *ldp = ldap_ssl_init("dummy", LDAPS_PORT, cert_label);
]])
],[
- ac_cv_header_ldapssl_h="yes"
+ curl_cv_header_ldapssl_h="yes"
],[
- ac_cv_header_ldapssl_h="no"
+ curl_cv_header_ldapssl_h="no"
])
])
- case "$ac_cv_header_ldapssl_h" in
+ case "$curl_cv_header_ldapssl_h" in
yes)
AC_DEFINE_UNQUOTED(HAVE_LDAPSSL_H, 1,
[Define to 1 if you have the ldapssl.h header file.])
dnl and check if it is needed even with stdlib.h
AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [
- AC_CACHE_CHECK([for malloc.h], [ac_cv_header_malloc_h], [
+ AC_CACHE_CHECK([for malloc.h], [curl_cv_header_malloc_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#include <malloc.h>
free(q);
]])
],[
- ac_cv_header_malloc_h="yes"
+ curl_cv_header_malloc_h="yes"
],[
- ac_cv_header_malloc_h="no"
+ curl_cv_header_malloc_h="no"
])
])
- if test "$ac_cv_header_malloc_h" = "yes"; then
+ if test "$curl_cv_header_malloc_h" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_MALLOC_H, 1,
[Define to 1 if you have the malloc.h header file.])
#
dnl memory related functions.
AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [
- AC_CACHE_CHECK([for memory.h], [ac_cv_header_memory_h], [
+ AC_CACHE_CHECK([for memory.h], [curl_cv_header_memory_h], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#include <memory.h>
free(q);
]])
],[
- ac_cv_header_memory_h="yes"
+ curl_cv_header_memory_h="yes"
],[
- ac_cv_header_memory_h="no"
+ curl_cv_header_memory_h="no"
])
])
- if test "$ac_cv_header_memory_h" = "yes"; then
+ if test "$curl_cv_header_memory_h" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_MEMORY_H, 1,
[Define to 1 if you have the memory.h header file.])
#
#
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
])
netdb.h netinet/in.h arpa/inet.h)
#
AC_CACHE_CHECK([for working NI_WITHSCOPEID],
- [ac_cv_working_ni_withscopeid], [
+ [curl_cv_working_ni_withscopeid], [
AC_RUN_IFELSE([
AC_LANG_PROGRAM([[
#ifdef HAVE_STDLIB_H
]]) # AC-LANG-PROGRAM
],[
# Exit code == 0. Program worked.
- ac_cv_working_ni_withscopeid="yes"
+ curl_cv_working_ni_withscopeid="yes"
],[
# Exit code != 0. Program failed.
- ac_cv_working_ni_withscopeid="no"
+ curl_cv_working_ni_withscopeid="no"
],[
# Program is not run when cross-compiling. So we assume
# NI_WITHSCOPEID will work if we are able to compile it.
unsigned int dummy= NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
]])
],[
- ac_cv_working_ni_withscopeid="yes"
+ curl_cv_working_ni_withscopeid="yes"
],[
- ac_cv_working_ni_withscopeid="no"
+ curl_cv_working_ni_withscopeid="no"
]) # AC-COMPILE-IFELSE
]) # AC-RUN-IFELSE
]) # AC-CACHE-CHECK
- case "$ac_cv_working_ni_withscopeid" in
+ case "$curl_cv_working_ni_withscopeid" in
yes)
AC_DEFINE(HAVE_NI_WITHSCOPEID, 1,
[Define to 1 if NI_WITHSCOPEID exists and works.])
#
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])
#
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])
AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [
AC_CHECK_HEADERS(sys/types.h sys/socket.h)
- AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
+ AC_CACHE_CHECK([for MSG_NOSIGNAL], [curl_cv_msg_nosignal], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
int flag=MSG_NOSIGNAL;
]])
],[
- ac_cv_msg_nosignal="yes"
+ curl_cv_msg_nosignal="yes"
],[
- ac_cv_msg_nosignal="no"
+ curl_cv_msg_nosignal="no"
])
])
- case "$ac_cv_msg_nosignal" in
+ case "$curl_cv_msg_nosignal" in
yes)
AC_DEFINE_UNQUOTED(HAVE_MSG_NOSIGNAL, 1,
[Define to 1 if you have the MSG_NOSIGNAL flag.])
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl
AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl
AC_CHECK_HEADERS(sys/types.h sys/time.h time.h sys/socket.h)
- AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [
+ AC_CACHE_CHECK([for struct timeval], [curl_cv_struct_timeval], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
#undef inline
ts.tv_usec = 0;
]])
],[
- ac_cv_struct_timeval="yes"
+ curl_cv_struct_timeval="yes"
],[
- ac_cv_struct_timeval="no"
+ curl_cv_struct_timeval="no"
])
])
- case "$ac_cv_struct_timeval" in
+ case "$curl_cv_struct_timeval" in
yes)
AC_DEFINE_UNQUOTED(HAVE_STRUCT_TIMEVAL, 1,
[Define to 1 if you have the timeval struct.])
]])
],[
AC_MSG_RESULT([no])
- ac_cv_sig_atomic_t_volatile="no"
+ curl_cv_sig_atomic_t_volatile="no"
],[
AC_MSG_RESULT([yes])
- ac_cv_sig_atomic_t_volatile="yes"
+ curl_cv_sig_atomic_t_volatile="yes"
])
#
- if test "$ac_cv_sig_atomic_t_volatile" = "yes"; then
+ if test "$curl_cv_sig_atomic_t_volatile" = "yes"; then
AC_DEFINE(HAVE_SIG_ATOMIC_T_VOLATILE, 1,
[Define to 1 if sig_atomic_t is already defined as volatile.])
fi
]])
],[
AC_MSG_RESULT([yes])
- ac_cv_func_clock_gettime="yes"
+ curl_func_clock_gettime="yes"
],[
AC_MSG_RESULT([no])
- ac_cv_func_clock_gettime="no"
+ curl_func_clock_gettime="no"
])
fi
dnl Definition of HAVE_CLOCK_GETTIME_MONOTONIC is intentionally postponed
AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
AC_REQUIRE([CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC])dnl
#
- if test "$ac_cv_func_clock_gettime" = "yes"; then
+ if test "$curl_func_clock_gettime" = "yes"; then
#
AC_MSG_CHECKING([for clock_gettime in libraries])
#
X-unknown)
AC_MSG_RESULT([cannot find clock_gettime])
AC_MSG_WARN([HAVE_CLOCK_GETTIME_MONOTONIC will not be defined])
- ac_cv_func_clock_gettime="no"
+ curl_func_clock_gettime="no"
;;
X-)
AC_MSG_RESULT([no additional lib required])
- ac_cv_func_clock_gettime="yes"
+ curl_func_clock_gettime="yes"
;;
*)
if test -z "$curl_cv_save_LIBS"; then
LIBS="$curl_cv_gclk_LIBS $curl_cv_save_LIBS"
fi
AC_MSG_RESULT([$curl_cv_gclk_LIBS])
- ac_cv_func_clock_gettime="yes"
+ curl_func_clock_gettime="yes"
;;
esac
#
dnl only do runtime verification when not cross-compiling
if test "x$cross_compiling" != "xyes" &&
- test "$ac_cv_func_clock_gettime" = "yes"; then
+ test "$curl_func_clock_gettime" = "yes"; then
AC_MSG_CHECKING([if monotonic clock_gettime works])
AC_RUN_IFELSE([
AC_LANG_PROGRAM([[
],[
AC_MSG_RESULT([no])
AC_MSG_WARN([HAVE_CLOCK_GETTIME_MONOTONIC will not be defined])
- ac_cv_func_clock_gettime="no"
+ curl_func_clock_gettime="no"
LIBS="$curl_cv_save_LIBS"
])
fi
#
- case "$ac_cv_func_clock_gettime" in
+ case "$curl_func_clock_gettime" in
yes)
AC_DEFINE_UNQUOTED(HAVE_CLOCK_GETTIME_MONOTONIC, 1,
[Define to 1 if you have the clock_gettime function and monotonic timer.])
AC_MSG_CHECKING([size of curl_socklen_t])
curl_sizeof_curl_socklen_t="unknown"
curl_pull_headers_socklen_t="unknown"
- if test "$ac_cv_header_ws2tcpip_h" = "yes"; then
+ if test "$curl_cv_header_ws2tcpip_h" = "yes"; then
tst_pull_header_checks='none ws2tcpip'
tst_size_checks='4'
else
#
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
])
dnl /etc/ssl/certs/ca-certificates.crt Debian systems
dnl /etc/pki/tls/certs/ca-bundle.crt Redhat and Mandriva
dnl /usr/share/ssl/certs/ca-bundle.crt old(er) Redhat
-dnl /usr/local/share/certs/ca-root.crt FreeBSD
-dnl /etc/ssl/cert.pem OpenBSD
+dnl /usr/local/share/certs/ca-root-nss.crt FreeBSD
+dnl /etc/ssl/cert.pem OpenBSD, FreeBSD (symlink)
dnl /etc/ssl/certs/ (ca path) SUSE
AC_DEFUN([CURL_CHECK_CA_BUNDLE], [
for a in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \
/usr/share/ssl/certs/ca-bundle.crt \
- /usr/local/share/certs/ca-root.crt \
+ /usr/local/share/certs/ca-root-nss.crt \
/etc/ssl/cert.pem \
"$cac"; do
if test -f "$a"; then
AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl
AC_MSG_CHECKING([whether build target supports WIN32 file API])
curl_win32_file_api="no"
- if test "$ac_cv_header_windows_h" = "yes"; then
+ if test "$curl_cv_header_windows_h" = "yes"; then
if test x"$enable_largefile" != "xno"; then
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
if test "x$cpp_p" = "xno"; then
AC_MSG_WARN([failed to figure out cpp -P alternative])
# without -P
- CPPPFLAGS=$OLDCPPFLAGS
+ CPPPFLAG=""
else
# with -P
- CPPPFLAGS=$CPPFLAGS
+ CPPPFLAG="-P"
fi
dnl restore CPPFLAGS
CPPFLAGS=$OLDCPPFLAGS
+ else
+ # without -P
+ CPPPFLAG=""
fi
])
projects / platform / upstream / curl.git / blobdiff