Build the net library if we have winsock2.

Original commit message from CVS:
* configure.ac:
* libs/gst/Makefile.am:
Build the net library if we have winsock2.
This commit is contained in:
Michael Smith 2008-07-29 00:45:29 +00:00
parent 4f90d4dfe4
commit e240fcbcaa
3 changed files with 11 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2008-07-28 Michael Smith <msmith@songbirdnest.com>
* configure.ac:
* libs/gst/Makefile.am:
Build the net library if we have winsock2.
2008-07-26 Stefan Kost <ensonic@users.sf.net>
patch by: Luc Pionchon <luc.pionchon@nokia.com>

View file

@ -324,6 +324,7 @@ AC_CHECK_HEADERS([valgrind/valgrind.h], HAVE_VALGRIND_H=yes)
dnl used in gst/gstpoll.c
AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
if test "x$HAVE_WINSOCK2_H" = "xyes"; then
WIN32_LIBS="-lws2_32"
AC_SUBST(WIN32_LIBS)

View file

@ -10,9 +10,13 @@ else
if HAVE_SYS_SOCKET_H
SUBDIRS_NET = net
else
if HAVE_WINSOCK2_H
SUBDIRS_NET = net
else
SUBDIRS_NET =
endif
endif
endif
SUBDIRS_ALWAYS = base controller dataprotocol