From e240fcbcaa3bba79055fa1fd98b8a14299da59e7 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 29 Jul 2008 00:45:29 +0000 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ configure.ac | 1 + libs/gst/Makefile.am | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index c7aecaf7f5..2172145eb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-28 Michael Smith + + * configure.ac: + * libs/gst/Makefile.am: + Build the net library if we have winsock2. + 2008-07-26 Stefan Kost patch by: Luc Pionchon diff --git a/configure.ac b/configure.ac index 338446474c..d4e1b345fb 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/libs/gst/Makefile.am b/libs/gst/Makefile.am index 5839e5a788..e6647f5ec8 100644 --- a/libs/gst/Makefile.am +++ b/libs/gst/Makefile.am @@ -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