Merge branch 'stable-3.2'

Author: bonzini

lib-src/ChangeLog

@@ -1,3 +1,7 @@
+2011-09-09  Paolo Bonzini  <[email protected]>
+
+	* lib-src/socketx.h: Fix previous commit.
+
 2011-03-22  Paolo Bonzini  <[email protected]>
 
 	* lib-src/socketx.h: Define shutdown arguments for the sake of Windows.

lib-src/socketx.h

@@ -135,14 +135,14 @@ typedef int SOCKET;
 #endif
 #endif
 
+#endif /* !__MSVCRT__ */
+
 #ifndef SHUT_RDWR
 #define SHUT_RD		0
 #define SHUT_WR		1
 #define SHUT_RDWR	2
 #endif
 
-#endif /* !__MSVCRT__ */
-
 #include "getaddrinfo.h"
 
 #endif /* HAVE_SOCKETS */

libgst/Makefile.am

@@ -27,7 +27,7 @@ libgst_la_LIBADD=$(top_builddir)/lib-src/library.la $(SOCKET_LIBS) \
 libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la $(LIBSNPRINTFV)
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
-	-export-symbols-regex "^gst_.*"
+	-export-symbols-regex "^gst_.*" -bindir $(bindir)
 
 libgst_la_SOURCES = \
        gstpub.c    files.c       gst-parse.c    lex.c        \

makesetup.in

@@ -159,8 +159,8 @@ cd $DESTDIR/nonexistent
 # not distributed
 rm -f smalltalk/VFSAddOns.star
 
-# libtool stupidity
-ln -sf bin/libgst*.dll .
+# no need to manually load dependencies
+find . -name "*.la" | xargs sed -i "s/^dependency_libs=.*/dependency_libs=''/"
 
 # --------------------------------------------------------------------------
 # Shell functions to build installation sections

packages/glib/Makefile.am

@@ -8,7 +8,7 @@ ALL_LIBS = $(GLIB_LIBS) $(GTHREAD_LIBS)
 include_HEADERS = gst-gobject.h
 lib_LTLIBRARIES = libgst-gobject.la
 libgst_gobject_la_SOURCES = gst-gobject.c
-libgst_gobject_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libgst_gobject_la_LDFLAGS = -version-info 1:0:0 -no-undefined -bindir $(bindir)
 libgst_gobject_la_LIBADD = $(ALL_LIBS) ../../libgst/libgst.la
 
 moduleexec_LTLIBRARIES = gst-glib.la

packages/net/ChangeLog

@@ -1,3 +1,7 @@
+2011-09-09  Paolo Bonzini  <[email protected]>
+
+	* gnutls-wrapper.c: More Win32 fixes.  Reported by Gwenael Casaccio.
+
 2011-03-29  Paolo Bonzini  <[email protected]>
 
 	* MIME.st: Do not fail on empty fields like "Expires: \r\n".

packages/net/gnutls-wrapper.c

@@ -240,8 +240,7 @@ main (int argc, char **argv)
     gnutls_deinit (session);
 
  out:
-  shutdown (fd, SHUT_RDWR);	/* no more receptions */
-  close (fd);
+  shutdown (fd, SHUT_RDWR);	/* shutdown now, close on exit */
   gnutls_anon_free_client_credentials (anon_cred);
   gnutls_certificate_free_credentials (xcred);
   gnutls_global_deinit ();