[vlc-commits] commit: Contribs: fix libupnp linking with pthread for Win32 ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 24 18:14:10 2010 +0200| [b6160774e6982f1a34ae8c94bd88355a1f90035e] | committer: Jean-Baptiste Kempf 

Contribs: fix libupnp linking with pthread for Win32

Ref #4108

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6160774e6982f1a34ae8c94bd88355a1f90035e
---

 extras/contrib/src/Patches/libupnp-configure.patch |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Patches/libupnp-configure.patch b/extras/contrib/src/Patches/libupnp-configure.patch
index 0431468..1dd5d66 100644
--- a/extras/contrib/src/Patches/libupnp-configure.patch
+++ b/extras/contrib/src/Patches/libupnp-configure.patch
@@ -48,7 +48,7 @@
 +#	[],
 +#	[AC_MSG_ERROR([POSIX threads are required to build this program])])
  #
-+PTHREAD_LIBS=" -lpthreadGC2"
++PTHREAD_LIBS=" -lpthreadGC2 -lws2_32"
 +PTHREAD_CFLAGS=" -DPTW32_STATIC_LIB -DUPNP_STATIC_LIB"
  # Update environment variables for pthreads
  #
@@ -109,3 +109,13 @@
  
  
  AC_CONFIG_FILES([
+--- libupnp/libupnp.pc.in	2008-02-10 02:55:39.000000000 +0100
++++ libupnp.new/libupnp.pc.in	2010-08-24 18:08:41.000000000 +0200
+@@ -6,6 +6,6 @@
+ Name: libupnp
+ Description: Linux SDK for UPnP Devices
+ Version: @VERSION@
+-Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
++Libs: -L${libdir} -lupnp -lthreadutil -lixml @PTHREAD_LIBS@ 
+ Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
+