diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2019-05-30 23:32:09 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2019-06-01 19:19:25 +0300 |
commit | 2db0eabd118370fd2937bd9021ade9b0e40473fa (patch) | |
tree | 480e21fbc818471dea52e642e1c8611b5c347e66 /configure.ac | |
parent | 2a59d367d6ff2be09d5cc952f3ece82517062702 (diff) | |
download | libmicrohttpd-2db0eabd118370fd2937bd9021ade9b0e40473fa.tar.gz libmicrohttpd-2db0eabd118370fd2937bd9021ade9b0e40473fa.zip |
configure: fixed detection of 'getsockname' on some systems (W32 x32),
do not use 'getsockname()' if it is not detected by configure.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 203b9d30..bcb4e45d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -789,12 +789,25 @@ AC_CHECK_MEMBERS([struct sockaddr_in.sin_len, struct sockaddr_in6.sin6_len, | |||
789 | #endif | 789 | #endif |
790 | ]) | 790 | ]) |
791 | 791 | ||
792 | AC_CHECK_DECLS([getsockname], | 792 | MHD_CHECK_FUNC([getsockname], |
793 | [[ | ||
794 | #ifdef HAVE_SYS_TYPES_H | ||
795 | #include <sys/types.h> | ||
796 | #endif | ||
797 | #ifdef HAVE_SYS_SOCKET_H | ||
798 | #include <sys/socket.h> | ||
799 | #endif | ||
800 | #ifdef HAVE_WINSOCK2_H | ||
801 | #include <winsock2.h> | ||
802 | #endif | ||
803 | ]], | ||
793 | [ | 804 | [ |
794 | AC_CHECK_FUNCS([getsockname], | 805 | struct sockaddr_storage ss; |
795 | [ | 806 | (void)getsockname(socket(0,0,0),(struct sockaddr *)&ss,(void*)0); |
796 | AC_CACHE_CHECK([[whether getsockname() is usable]], [[mhc_cv_getsockname_usable]], | 807 | ], |
797 | [ | 808 | [ |
809 | AC_CACHE_CHECK([[whether getsockname() is usable]], [[mhc_cv_getsockname_usable]], | ||
810 | [ | ||
798 | AC_RUN_IFELSE( | 811 | AC_RUN_IFELSE( |
799 | [ | 812 | [ |
800 | AC_LANG_SOURCE( | 813 | AC_LANG_SOURCE( |
@@ -888,22 +901,9 @@ int main(void) | |||
888 | ) | 901 | ) |
889 | ] | 902 | ] |
890 | ) | 903 | ) |
891 | AS_VAR_IF([[mhc_cv_getsockname_usable]], [["no"]], [:], | 904 | AS_VAR_IF([[mhc_cv_getsockname_usable]], [["no"]], [:], |
892 | [AC_DEFINE([[MHD_USE_GETSOCKNAME]], [[1]], [Define if you have usable `getsockname' function.])]) | 905 | [AC_DEFINE([[MHD_USE_GETSOCKNAME]], [[1]], [Define if you have usable `getsockname' function.])]) |
893 | ] | 906 | ] |
894 | ) | ||
895 | ], [], | ||
896 | [[ | ||
897 | #ifdef HAVE_SYS_TYPES_H | ||
898 | #include <sys/types.h> | ||
899 | #endif | ||
900 | #ifdef HAVE_SYS_SOCKET_H | ||
901 | #include <sys/socket.h> | ||
902 | #endif | ||
903 | #ifdef HAVE_WINSOCK2_H | ||
904 | #include <winsock2.h> | ||
905 | #endif | ||
906 | ]] | ||
907 | ) | 907 | ) |
908 | 908 | ||
909 | # Check for inter-thread signaling type | 909 | # Check for inter-thread signaling type |