make DLLs build properly

lib-src: 2009-08-05 Paolo Bonzini <bonzini@gnu.org> * lib-src/getaddrinfo.h: Include ws2tcpip.h. * lib-src/sha1.c: Move to packages/digest. * lib-src/sha1.h: Move to packages/digest. packages/digest: 2009-08-05 Paolo Bonzini <bonzini@gnu.org> * packages/digest/md5.c: Copy from lib-src. * packages/digest/md5.h: Copy from lib-src. * packages/digest/sha1.c: Move from lib-src. * packages/digest/sha1.h: Move from lib-src. packages/opengl: 2009-08-05 Paolo Bonzini <bonzini@gnu.org> * gstGlu.c: Disable gluUnProject4, also not in Win32.
lm · Aug 5, 2009 · 9c9d383 · 9c9d383
1 parent 01c9e4e
commit 9c9d383
Show file tree

Hide file tree

Showing 17 changed files with 668 additions and 21 deletions.
diff --git a/build-aux/gl.m4 b/build-aux/gl.m4
@@ -9,7 +9,7 @@ AC_CACHE_CHECK([how to link with OpenGL libraries], gst_cv_opengl_libs, [
   if test $ac_cv_header_OpenGL_gl_h = yes || \
      test $ac_cv_header_GL_gl_h = yes; then
     case $host in
-      *-*-mingw* | *-*-cygwin*) gst_cv_opengl_libs='-lglu' ;;
+      *-*-mingw* | *-*-cygwin*) gst_cv_opengl_libs='-lopengl32 -lglu32' ;;
       *-*-beos* | *-*-qnx*) gst_cv_opengl_libs='-lGL' ;;
       *-*-darwin*) gst_cv_opengl_libs='-Wl,-framework,OpenGL' ;;
       *) gst_cv_opengl_libs='-lGL -lGLU $(X_LIBS) $(X_PRE_LIBS) -lX11' ;;

diff --git a/build-aux/sockets.m4 b/build-aux/sockets.m4
@@ -5,32 +5,46 @@ AC_DEFUN([GST_SOCKETS], [
 AC_SEARCH_LIBS(listen, socket, [], [
     dnl Check for listen on MinGW. We need to include <winsock2.h>
     dnl to get the correct __stdcall name decoration
-    AC_MSG_CHECKING([For listen in -lws2_32])
-    OLD_LIBS="$LIBS"
-    LIBS="-lws2_32 $LIBS"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock2.h>]],[[listen(0,0);]])],
-                   [ac_cv_lib_ws2_32_listen=yes
-                    AC_MSG_RESULT(yes)],
-                   [LIBS="$OLD_LIBS"
-                    AC_MSG_RESULT(no)])])
+    AC_CACHE_CHECK([for listen in -lws2_32], [ac_cv_lib_ws2_32_listen], [
+      OLD_LIBS="$LIBS"
+      LIBS="-lws2_32 $LIBS"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock2.h>]],
+				      [[listen(0,0);]])],
+                     [ac_cv_lib_ws2_32_listen=yes],
+                     [ac_cv_lib_ws2_32_listen=no])
+      LIBS="$OLD_LIBS"])])
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
 gst_cv_sockets=yes
 AC_CHECK_FUNC(socket, , gst_cv_sockets=no)
 AC_CHECK_HEADERS(arpa/inet.h netdb.h netinet/in.h, , gst_cv_sockets=no)
+if test "$ac_cv_lib_ws2_32_listen" = "yes"; then
+    gst_cv_sockets=yes
+    AC_CHECK_HEADERS([ws2tcpip.h])
+    SOCKET_LIBS='-lws2_32'
+fi
+AC_SUBST(SOCKET_LIBS)
+
 AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo], [], [],
-	       [#include <netdb.h>])
+	       [#ifdef HAVE_NETDB_H
+		#include <netdb.h>
+		#endif
+		#ifdef HAVE_WS2TCPIP_H
+		#include <ws2tcpip.h>
+		#endif])
 AC_CHECK_MEMBER([struct addrinfo.ai_family],
 		[AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1,
 			   [Define if your system's netdb.h has struct addrinfo])], [],
-	        [#include <netdb.h>])
+	        [#ifdef HAVE_NETDB_H
+		 #include <netdb.h>
+		 #endif
+		 #ifdef HAVE_WS2TCPIP_H
+		 #include <ws2tcpip.h>
+		 #endif])
 
 dnl This is wrong for Windows, but anyway Windows does not have sa_len
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include <sys/socket.h>])
 
-if test "$ac_cv_lib_ws2_32_listen" = "yes"; then
-    gst_cv_sockets=yes
-fi
 if test $gst_cv_sockets = yes; then
   GST_SOCKET_FAMILIES
   AC_CHECK_FUNCS(getipnodebyaddr)

diff --git a/configure.ac b/configure.ac
@@ -441,6 +441,12 @@ GST_PACKAGE_ENABLE([LibSDL], [sdl/libsdl],
     *-framework,Cocoa* | *"-framework Cocoa"*) gst_cv_sdl_uses_cocoa=yes ;;
     *) gst_cv_sdl_uses_cocoa=no ;;
   esac
+
+  # We do SDLmain's job on our own, and mingw32 is linked automatically
+  # into the DLL.  If we do not do this, libtool refuses to create a DLL
+  # for the SDL module.
+  SDL_LIBS=`echo " $SDL_LIBS " | sed 's/ -lSDLmain / /; s/ -lmingw32 / /' `
+  
   AM_CONDITIONAL([HAVE_COCOA], [test $gst_cv_sdl_uses_cocoa = yes])],
   [gst_cv_sdl],
   [Makefile], [sdl.la])

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* lib-src/getaddrinfo.h: Include ws2tcpip.h.
+	* lib-src/sha1.c: Move to packages/digest.
+	* lib-src/sha1.h: Move to packages/digest.
+
 2009-08-05  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lib-src/poll.c: Merge with gnulib.

diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
@@ -5,11 +5,11 @@ library_la_DEPENDENCIES =  @LTLIBOBJS@ @LTALLOCA@
 
 # These are to be included *always*, the rest are driven by configure.in
 library_la_SOURCES = \
-       qsort.c getopt.c getopt1.c md5.c sha1.c avltrees.c rbtrees.c lock.c \
+       qsort.c getopt.c getopt1.c md5.c avltrees.c rbtrees.c lock.c \
        strspell.c signalx.c ltdl.c regex.c socketx.c pointer-set.c
 
 noinst_HEADERS = \
-       obstack.h poll_.h getopt.h md5.h sha1.h ansidecl.h strspell.h lock.h \
+       obstack.h poll_.h getopt.h md5.h ansidecl.h strspell.h lock.h \
        mathl.h trigl.h avltrees.h rbtrees.h trigl.c sincosl.c getaddrinfo.h \
        signalx.h socketx.h ltdl.h regex.h pointer-set.h
 

diff --git a/lib-src/getaddrinfo.h b/lib-src/getaddrinfo.h
@@ -28,6 +28,8 @@
 /* Get all getaddrinfo related declarations, if available.  */
 #if !(defined WIN32 || defined _WIN32) || defined __CYGWIN__
 # include <sys/socket.h>
+#else
+# include <ws2tcpip.h>
 #endif
 #ifdef HAVE_NETDB_H
 # include <netdb.h>

diff --git a/libgst/Makefile.am b/libgst/Makefile.am
@@ -19,7 +19,7 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
 
 # definitions for libgst.la
 
-libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
+libgst_la_LIBADD=$(top_builddir)/lib-src/library.la $(SOCKET_LIBS) \
 	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBGMP) \
 	$(LIBTHREAD)
 

diff --git a/packages/digest/ChangeLog b/packages/digest/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* packages/digest/md5.c: Copy from lib-src.
+	* packages/digest/md5.h: Copy from lib-src.
+	* packages/digest/sha1.c: Move from lib-src.
+	* packages/digest/sha1.h: Move from lib-src.
+
 2008-05-15  Paolo Bonzini  <bonzini@gnu.org>
 
 	* packages/digest/md5.st: Pass data to C functions as #cObject.

diff --git a/packages/digest/Makefile.am b/packages/digest/Makefile.am
@@ -2,8 +2,8 @@ gst_module_ldflags = -rpath $(moduledir) -release $(VERSION) -module \
         -no-undefined -export-symbols-regex gst_initModule
 
 module_LTLIBRARIES = digest.la
-digest_la_SOURCES = digest.c
-digest_la_LIBADD = ../../lib-src/library.la
+noinst_HEADERS = md5.h sha1.h
+digest_la_SOURCES = digest.c md5.c sha1.c
 digest_la_LDFLAGS = $(gst_module_ldflags)
 
 AM_CPPFLAGS = -I$(top_srcdir)/libgst -I$(top_srcdir)/lib-src