summaryrefslogtreecommitdiff
path: root/aconfigure.ac
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2008-03-25 14:03:01 +0000
committerBenny Prijono <bennylp@teluu.com>2008-03-25 14:03:01 +0000
commit74cc8df71fea7eaa32600d726c948830649b077d (patch)
tree82d903f2a6e78b9655435e22eb039ff0eb80591f /aconfigure.ac
parent9ff2e6dd2ada9385e96611b91f4f828bb59d3f02 (diff)
Fixed autoconf configure warning when detecting mswsock.h on Mingw
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1892 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
-rw-r--r--aconfigure.ac10
1 files changed, 8 insertions, 2 deletions
diff --git a/aconfigure.ac b/aconfigure.ac
index ed81cc83..e55ae1fe 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -161,11 +161,17 @@ AC_CHECK_HEADER(sys/timeb.h,[AC_DEFINE(PJ_HAS_SYS_TIMEB_H,1)])
AC_CHECK_HEADER(sys/types.h,[AC_DEFINE(PJ_HAS_SYS_TYPES_H,1)])
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>
#endif