Changeset 1892 for pjproject/trunk/aconfigure.ac

Timestamp:

Mar 25, 2008 2:03:01 PM (17 years ago)

Author:

bennylp

Message:

Fixed autoconf configure warning when detecting mswsock.h on Mingw

File:

• pjproject/trunk/aconfigure.ac (modified) (1 diff)

pjproject/trunk/aconfigure.ac

@@ -162 +162 @@
 AC_CHECK_HEADER(time.h,[AC_DEFINE(PJ_HAS_TIME_H,1)])
 AC_CHECK_HEADER(unistd.h,[AC_DEFINE(PJ_HAS_UNISTD_H,1)])
-AC_CHECK_HEADER(mswsock.h,[AC_DEFINE(PJ_HAS_MSWSOCK_H,1)])
 AC_CHECK_HEADER(winsock.h,[AC_DEFINE(PJ_HAS_WINSOCK_H,1)])
 AC_CHECK_HEADER(winsock2.h,[AC_DEFINE(PJ_HAS_WINSOCK2_H,1)])
+AC_CHECK_HEADER(mswsock.h,[AC_DEFINE(PJ_HAS_MSWSOCK_H,1)],[],
+                 [#if PJ_HAS_WINSOCK2_H
+                  #     include <winsock2.h>
+                  #elif PJ_HAS_WINSOCK_H
+                  #     include <winsock.h>
+                  #endif
+                 ])
 AC_CHECK_HEADER(uuid/uuid.h,[ac_has_uuid_h=1])
-AC_CHECK_HEADERS(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)],[],
+AC_CHECK_HEADER(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)],[],
                  [#if PJ_HAS_SYS_SOCKET_H
                   #     include <sys/socket.h>