Peter M. Groen / libmodbus

Commit 8f252294785b997e3f22ead41cc7fd3b828d0f0a

Authored by StalderT
Committed by Stéphane Raimbault
1 parent 3a6476e3

Update configure.ac 

https://github.com/stephane/libmodbus/issues/248
Inline Side-by-side
Showing 1 changed file with 11 additions and 5 deletions
configure.ac
  View file @8f25229
@@ -57,6 +57,7 @@ AC_CANONICAL_HOST @@ -57,6 +57,7 @@ AC_CANONICAL_HOST
57 57
58 # OS check 58 # OS check
59 os_win32="false" 59 os_win32="false"
  60 +os_cygwin="false"
60 os_qnx="false" 61 os_qnx="false"
61 case "${host_os}" in 62 case "${host_os}" in
62 *mingw32*) 63 *mingw32*)
@@ -65,6 +66,9 @@ case "${host_os}" in @@ -65,6 +66,9 @@ case "${host_os}" in
65 *nto-qnx*) 66 *nto-qnx*)
66 os_qnx="true" 67 os_qnx="true"
67 ;; 68 ;;
  69 + *cygwin*)
  70 + os_cygwin="true"
  71 + ;;
68 esac 72 esac
69 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "true") 73 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "true")
70 AM_CONDITIONAL(OS_QNX, test "$os_qnx" = "true") 74 AM_CONDITIONAL(OS_QNX, test "$os_qnx" = "true")
@@ -120,11 +124,13 @@ AC_TYPE_UINT16_T @@ -120,11 +124,13 @@ AC_TYPE_UINT16_T
120 AC_TYPE_UINT32_T 124 AC_TYPE_UINT32_T
121 AC_TYPE_UINT8_T 125 AC_TYPE_UINT8_T
122 126
123 -# Required for getaddrinfo (TCP PI - IPv6)  
124 -AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)  
125 -if test "x$HAVE_WINSOCK2_H" = "xyes"; then  
126 - LIBS="$LIBS -lws2_32"  
127 - AC_SUBST(LIBS) 127 +if test "$os_cygwin" = "false"; then
  128 + # Required for getaddrinfo (TCP IP - IPv6)
  129 + AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
  130 + if test "x$HAVE_WINSOCK2_H" = "xyes"; then
  131 + LIBS="$LIBS -lws2_32"
  132 + AC_SUBST(LIBS)
  133 + fi
128 fi 134 fi
129 135
130 # Check for RS485 support (Linux kernel version 2.6.28+) 136 # Check for RS485 support (Linux kernel version 2.6.28+)