Rearrange placement inside file of CURL_DEFINE_UNQUOTED, CURL_CONFIGURE_LONG
and CURL_CONFIGURE_CURL_SOCKLEN_T to ease future maintainance.
This commit is contained in:
Yang Tse
parent
e323abe5d9
commit
256489639c
324
acinclude.m4
324
acinclude.m4
@ -2269,6 +2269,168 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_DEFINE_UNQUOTED (VARIABLE, [VALUE])
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Like AC_DEFINE_UNQUOTED this macro will define a C preprocessor
|
||||||
|
dnl symbol that can be further used in custom template configuration
|
||||||
|
dnl files. This macro, unlike AC_DEFINE_UNQUOTED, does not use a third
|
||||||
|
dnl argument for the description. Symbol definitions done with this
|
||||||
|
dnl macro are intended to be exclusively used in handcrafted *.h.in
|
||||||
|
dnl template files. Contrary to what AC_DEFINE_UNQUOTED does, this one
|
||||||
|
dnl prevents autoheader generation and insertion of symbol template
|
||||||
|
dnl stub and definition into the first configuration header file. Do
|
||||||
|
dnl not use this macro as a replacement for AC_DEFINE_UNQUOTED, each
|
||||||
|
dnl one serves different functional needs.
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_DEFINE_UNQUOTED], [
|
||||||
|
cat >>confdefs.h <<_EOF
|
||||||
|
[@%:@define] $1 ifelse($#, 2, [$2], 1)
|
||||||
|
_EOF
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CONFIGURE_LONG
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Find out the size of long as reported by sizeof() and define
|
||||||
|
dnl CURL_SIZEOF_LONG as appropriate to be used in template file
|
||||||
|
dnl include/curl/curlbuild.h.in to properly configure the library.
|
||||||
|
dnl The size of long is a build time characteristic and as such
|
||||||
|
dnl must be recorded in curlbuild.h
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CONFIGURE_LONG], [
|
||||||
|
if test -z "$ac_cv_sizeof_long" ||
|
||||||
|
test "$ac_cv_sizeof_long" -eq "0"; then
|
||||||
|
AC_MSG_ERROR([cannot find out size of long.])
|
||||||
|
fi
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_SIZEOF_LONG], [$ac_cv_sizeof_long])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl CURL_CONFIGURE_CURL_SOCKLEN_T
|
||||||
|
dnl -------------------------------------------------
|
||||||
|
dnl Find out suitable curl_socklen_t data type definition and size, making
|
||||||
|
dnl appropriate definitions for template file include/curl/curlbuild.h.in
|
||||||
|
dnl to properly configure and use the library.
|
||||||
|
dnl
|
||||||
|
dnl The need for the curl_socklen_t definition arises mainly to properly
|
||||||
|
dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t
|
||||||
|
dnl data type which is 32 or 64-Bit wide depending on the data model being
|
||||||
|
dnl used, and that on the other hand is only actually used when interfacing
|
||||||
|
dnl the X/Open sockets provided in the xnet library.
|
||||||
|
|
||||||
|
AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [
|
||||||
|
AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl
|
||||||
|
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl
|
||||||
|
AC_REQUIRE([CURL_PREPROCESS_CALLCONV])dnl
|
||||||
|
#
|
||||||
|
AC_MSG_CHECKING([for curl_socklen_t data type])
|
||||||
|
curl_typeof_curl_socklen_t="unknown"
|
||||||
|
for arg1 in int SOCKET; do
|
||||||
|
for arg2 in 'struct sockaddr' void; do
|
||||||
|
for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
|
||||||
|
if test "$curl_typeof_curl_socklen_t" = "unknown"; then
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([[
|
||||||
|
$curl_includes_ws2tcpip
|
||||||
|
$curl_includes_sys_socket
|
||||||
|
$curl_preprocess_callconv
|
||||||
|
extern int FUNCALLCONV getpeername($arg1, $arg2 *, $t *);
|
||||||
|
]],[[
|
||||||
|
$t *lenptr = 0;
|
||||||
|
if(0 != getpeername(0, 0, lenptr))
|
||||||
|
return 1;
|
||||||
|
]])
|
||||||
|
],[
|
||||||
|
curl_typeof_curl_socklen_t="$t"
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
for t in socklen_t int; do
|
||||||
|
if test "$curl_typeof_curl_socklen_t" = "void"; then
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([[
|
||||||
|
$curl_includes_sys_socket
|
||||||
|
typedef $t curl_socklen_t;
|
||||||
|
]],[[
|
||||||
|
curl_socklen_t dummy;
|
||||||
|
]])
|
||||||
|
],[
|
||||||
|
curl_typeof_curl_socklen_t="$t"
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
AC_MSG_RESULT([$curl_typeof_curl_socklen_t])
|
||||||
|
if test "$curl_typeof_curl_socklen_t" = "void" ||
|
||||||
|
test "$curl_typeof_curl_socklen_t" = "unknown"; then
|
||||||
|
AC_MSG_ERROR([cannot find data type for curl_socklen_t.])
|
||||||
|
fi
|
||||||
|
#
|
||||||
|
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
|
||||||
|
tst_pull_header_checks='none ws2tcpip'
|
||||||
|
tst_size_checks='4'
|
||||||
|
else
|
||||||
|
tst_pull_header_checks='none systypes syssocket'
|
||||||
|
tst_size_checks='4 8 2'
|
||||||
|
fi
|
||||||
|
for tst_size in $tst_size_checks; do
|
||||||
|
for tst_pull_headers in $tst_pull_header_checks; do
|
||||||
|
if test "$curl_sizeof_curl_socklen_t" = "unknown"; then
|
||||||
|
case $tst_pull_headers in
|
||||||
|
ws2tcpip)
|
||||||
|
tmp_includes="$curl_includes_ws2tcpip"
|
||||||
|
;;
|
||||||
|
systypes)
|
||||||
|
tmp_includes="$curl_includes_sys_types"
|
||||||
|
;;
|
||||||
|
syssocket)
|
||||||
|
tmp_includes="$curl_includes_sys_socket"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
tmp_includes=""
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_COMPILE_IFELSE([
|
||||||
|
AC_LANG_PROGRAM([[
|
||||||
|
$tmp_includes
|
||||||
|
typedef $curl_typeof_curl_socklen_t curl_socklen_t;
|
||||||
|
typedef char dummy_arr[sizeof(curl_socklen_t) == $tst_size ? 1 : -1];
|
||||||
|
]],[[
|
||||||
|
curl_socklen_t dummy;
|
||||||
|
]])
|
||||||
|
],[
|
||||||
|
curl_sizeof_curl_socklen_t="$tst_size"
|
||||||
|
curl_pull_headers_socklen_t="$tst_pull_headers"
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
AC_MSG_RESULT([$curl_sizeof_curl_socklen_t])
|
||||||
|
if test "$curl_sizeof_curl_socklen_t" = "unknown"; then
|
||||||
|
AC_MSG_ERROR([cannot find out size of curl_socklen_t.])
|
||||||
|
fi
|
||||||
|
#
|
||||||
|
case $curl_pull_headers_socklen_t in
|
||||||
|
ws2tcpip)
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_PULL_WS2TCPIP_H])
|
||||||
|
;;
|
||||||
|
systypes)
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])
|
||||||
|
;;
|
||||||
|
syssocket)
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_SOCKET_H])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_TYPEOF_CURL_SOCKLEN_T], [$curl_typeof_curl_socklen_t])
|
||||||
|
CURL_DEFINE_UNQUOTED([CURL_SIZEOF_CURL_SOCKLEN_T], [$curl_sizeof_curl_socklen_t])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CHECK_FUNC_SELECT
|
dnl CURL_CHECK_FUNC_SELECT
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl Test if the socket select() function is available,
|
dnl Test if the socket select() function is available,
|
||||||
@ -2692,43 +2854,6 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_DEFINE_UNQUOTED (VARIABLE, [VALUE])
|
|
||||||
dnl -------------------------------------------------
|
|
||||||
dnl Like AC_DEFINE_UNQUOTED this macro will define a C preprocessor
|
|
||||||
dnl symbol that can be further used in custom template configuration
|
|
||||||
dnl files. This macro, unlike AC_DEFINE_UNQUOTED, does not use a third
|
|
||||||
dnl argument for the description. Symbol definitions done with this
|
|
||||||
dnl macro are intended to be exclusively used in handcrafted *.h.in
|
|
||||||
dnl template files. Contrary to what AC_DEFINE_UNQUOTED does, this one
|
|
||||||
dnl prevents autoheader generation and insertion of symbol template
|
|
||||||
dnl stub and definition into the first configuration header file. Do
|
|
||||||
dnl not use this macro as a replacement for AC_DEFINE_UNQUOTED, each
|
|
||||||
dnl one serves different functional needs.
|
|
||||||
|
|
||||||
AC_DEFUN([CURL_DEFINE_UNQUOTED], [
|
|
||||||
cat >>confdefs.h <<_EOF
|
|
||||||
[@%:@define] $1 ifelse($#, 2, [$2], 1)
|
|
||||||
_EOF
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CONFIGURE_LONG
|
|
||||||
dnl -------------------------------------------------
|
|
||||||
dnl Find out the size of long as reported by sizeof() and define
|
|
||||||
dnl CURL_SIZEOF_LONG as appropriate to be used in template file
|
|
||||||
dnl include/curl/curlbuild.h.in to properly configure the library.
|
|
||||||
dnl The size of long is a build time characteristic and as such
|
|
||||||
dnl must be recorded in curlbuild.h
|
|
||||||
|
|
||||||
AC_DEFUN([CURL_CONFIGURE_LONG], [
|
|
||||||
if test -z "$ac_cv_sizeof_long" ||
|
|
||||||
test "$ac_cv_sizeof_long" -eq "0"; then
|
|
||||||
AC_MSG_ERROR([cannot find out size of long.])
|
|
||||||
fi
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_SIZEOF_LONG], [$ac_cv_sizeof_long])
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
dnl DO_CURL_OFF_T_CHECK (TYPE, SIZE)
|
dnl DO_CURL_OFF_T_CHECK (TYPE, SIZE)
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl Internal macro for CURL_CONFIGURE_CURL_OFF_T
|
dnl Internal macro for CURL_CONFIGURE_CURL_OFF_T
|
||||||
@ -3029,131 +3154,6 @@ AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [
|
|||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CONFIGURE_CURL_SOCKLEN_T
|
|
||||||
dnl -------------------------------------------------
|
|
||||||
dnl Find out suitable curl_socklen_t data type definition and size, making
|
|
||||||
dnl appropriate definitions for template file include/curl/curlbuild.h.in
|
|
||||||
dnl to properly configure and use the library.
|
|
||||||
dnl
|
|
||||||
dnl The need for the curl_socklen_t definition arises mainly to properly
|
|
||||||
dnl interface HP-UX systems which on one hand have a typedef'ed socklen_t
|
|
||||||
dnl data type which is 32 or 64-Bit wide depending on the data model being
|
|
||||||
dnl used, and that on the other hand is only actually used when interfacing
|
|
||||||
dnl the X/Open sockets provided in the xnet library.
|
|
||||||
|
|
||||||
AC_DEFUN([CURL_CONFIGURE_CURL_SOCKLEN_T], [
|
|
||||||
AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl
|
|
||||||
AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl
|
|
||||||
AC_REQUIRE([CURL_PREPROCESS_CALLCONV])dnl
|
|
||||||
#
|
|
||||||
AC_MSG_CHECKING([for curl_socklen_t data type])
|
|
||||||
curl_typeof_curl_socklen_t="unknown"
|
|
||||||
for arg1 in int SOCKET; do
|
|
||||||
for arg2 in 'struct sockaddr' void; do
|
|
||||||
for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
|
|
||||||
if test "$curl_typeof_curl_socklen_t" = "unknown"; then
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
AC_LANG_PROGRAM([[
|
|
||||||
$curl_includes_ws2tcpip
|
|
||||||
$curl_includes_sys_socket
|
|
||||||
$curl_preprocess_callconv
|
|
||||||
extern int FUNCALLCONV getpeername($arg1, $arg2 *, $t *);
|
|
||||||
]],[[
|
|
||||||
$t *lenptr = 0;
|
|
||||||
if(0 != getpeername(0, 0, lenptr))
|
|
||||||
return 1;
|
|
||||||
]])
|
|
||||||
],[
|
|
||||||
curl_typeof_curl_socklen_t="$t"
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
done
|
|
||||||
for t in socklen_t int; do
|
|
||||||
if test "$curl_typeof_curl_socklen_t" = "void"; then
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
AC_LANG_PROGRAM([[
|
|
||||||
$curl_includes_sys_socket
|
|
||||||
typedef $t curl_socklen_t;
|
|
||||||
]],[[
|
|
||||||
curl_socklen_t dummy;
|
|
||||||
]])
|
|
||||||
],[
|
|
||||||
curl_typeof_curl_socklen_t="$t"
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
AC_MSG_RESULT([$curl_typeof_curl_socklen_t])
|
|
||||||
if test "$curl_typeof_curl_socklen_t" = "void" ||
|
|
||||||
test "$curl_typeof_curl_socklen_t" = "unknown"; then
|
|
||||||
AC_MSG_ERROR([cannot find data type for curl_socklen_t.])
|
|
||||||
fi
|
|
||||||
#
|
|
||||||
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
|
|
||||||
tst_pull_header_checks='none ws2tcpip'
|
|
||||||
tst_size_checks='4'
|
|
||||||
else
|
|
||||||
tst_pull_header_checks='none systypes syssocket'
|
|
||||||
tst_size_checks='4 8 2'
|
|
||||||
fi
|
|
||||||
for tst_size in $tst_size_checks; do
|
|
||||||
for tst_pull_headers in $tst_pull_header_checks; do
|
|
||||||
if test "$curl_sizeof_curl_socklen_t" = "unknown"; then
|
|
||||||
case $tst_pull_headers in
|
|
||||||
ws2tcpip)
|
|
||||||
tmp_includes="$curl_includes_ws2tcpip"
|
|
||||||
;;
|
|
||||||
systypes)
|
|
||||||
tmp_includes="$curl_includes_sys_types"
|
|
||||||
;;
|
|
||||||
syssocket)
|
|
||||||
tmp_includes="$curl_includes_sys_socket"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
tmp_includes=""
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_COMPILE_IFELSE([
|
|
||||||
AC_LANG_PROGRAM([[
|
|
||||||
$tmp_includes
|
|
||||||
typedef $curl_typeof_curl_socklen_t curl_socklen_t;
|
|
||||||
typedef char dummy_arr[sizeof(curl_socklen_t) == $tst_size ? 1 : -1];
|
|
||||||
]],[[
|
|
||||||
curl_socklen_t dummy;
|
|
||||||
]])
|
|
||||||
],[
|
|
||||||
curl_sizeof_curl_socklen_t="$tst_size"
|
|
||||||
curl_pull_headers_socklen_t="$tst_pull_headers"
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
AC_MSG_RESULT([$curl_sizeof_curl_socklen_t])
|
|
||||||
if test "$curl_sizeof_curl_socklen_t" = "unknown"; then
|
|
||||||
AC_MSG_ERROR([cannot find out size of curl_socklen_t.])
|
|
||||||
fi
|
|
||||||
#
|
|
||||||
case $curl_pull_headers_socklen_t in
|
|
||||||
ws2tcpip)
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_PULL_WS2TCPIP_H])
|
|
||||||
;;
|
|
||||||
systypes)
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])
|
|
||||||
;;
|
|
||||||
syssocket)
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_TYPES_H])
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_PULL_SYS_SOCKET_H])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_TYPEOF_CURL_SOCKLEN_T], [$curl_typeof_curl_socklen_t])
|
|
||||||
CURL_DEFINE_UNQUOTED([CURL_SIZEOF_CURL_SOCKLEN_T], [$curl_sizeof_curl_socklen_t])
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
dnl CURL_CHECK_WIN32_LARGEFILE
|
dnl CURL_CHECK_WIN32_LARGEFILE
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl Check if curl's WIN32 large file will be used
|
dnl Check if curl's WIN32 large file will be used
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user