romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-27 01:47:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

configure: compile-time SIZEOF checks

Browse source 
... instead of exeucting code to get the size. Removes the use of
LD_LIBRARY_PATH for this.

Fixes #2586
Closes #2589
Reported-by: Bernhard Walle
This commit is contained in:
Daniel Stenberg 2018-05-21 19:54:16 +02:00
parent 302d537423
commit 6876ccf90b
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -2348,7 +2348,7 @@ if test -z "$ssl_backends" -o "x$OPT_CYASSL" != xno; then
check_for_ca_bundle=1 check_for_ca_bundle=1
dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined! dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
AC_CHECK_SIZEOF(long long) AX_COMPILE_CHECK_SIZEOF(long long)
dnl Versions since at least 2.6.0 may have options.h dnl Versions since at least 2.6.0 may have options.h
AC_CHECK_HEADERS(cyassl/options.h) AC_CHECK_HEADERS(cyassl/options.h)
@ -3449,16 +3449,16 @@ AC_HEADER_TIME
CURL_CHECK_STRUCT_TIMEVAL CURL_CHECK_STRUCT_TIMEVAL
CURL_VERIFY_RUNTIMELIBS CURL_VERIFY_RUNTIMELIBS
AC_CHECK_SIZEOF(size_t) AX_COMPILE_CHECK_SIZEOF(size_t)
AC_CHECK_SIZEOF(long) AX_COMPILE_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(int) AX_COMPILE_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(short) AX_COMPILE_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(time_t) AX_COMPILE_CHECK_SIZEOF(time_t)
AC_CHECK_SIZEOF(off_t) AX_COMPILE_CHECK_SIZEOF(off_t)
o=$CPPFLAGS o=$CPPFLAGS
CPPFLAGS="-I$srcdir/include $CPPFLAGS" CPPFLAGS="-I$srcdir/include $CPPFLAGS"
AC_CHECK_SIZEOF(curl_off_t, unused , [ AX_COMPILE_CHECK_SIZEOF(curl_off_t, [
#include <curl/system.h> #include <curl/system.h>
]) ])
CPPFLAGS=$o CPPFLAGS=$o