[vlc-devel] commit: Repair GnuTLS/win32 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Mon Oct  6 10:45:46 2008 +0200| [969ebf913a96b0703980e78134db642443f42ead] | committer: Jean-Baptiste Kempf 

Repair GnuTLS/win32
(cherry picked from commit 5a75b21fac588d9e833ea17fde89443448f4ab16)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/contrib/src/Patches/gnutls-win32.patch |   53 +------------------------
 1 files changed, 1 insertions(+), 52 deletions(-)

diff --git a/extras/contrib/src/Patches/gnutls-win32.patch b/extras/contrib/src/Patches/gnutls-win32.patch
index 18af991..2ef739b 100644
--- a/extras/contrib/src/Patches/gnutls-win32.patch
+++ b/extras/contrib/src/Patches/gnutls-win32.patch
@@ -17,55 +17,4 @@
  #ifdef _LIBC
  libc_hidden_def (gai_strerror)
  #endif
---- gnutls-2.2.5/configure.in	2008-05-19 21:45:47.000000000 +0200
-+++ gnutls/configure.in	2008-05-22 08:19:02.000000000 +0200
-@@ -200,8 +200,6 @@
- 	fi
- fi
- 
--# Needs to be called outside of 'if' clause.
--AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
- AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION],
-                [test "$_gcc_gnu89_inline" = "yes"])
- 
-@@ -715,6 +713,10 @@
- AC_SUBST(LIBGNUTLS_LIBS)
- AC_SUBST(LIBGNUTLS_CFLAGS)
- 
-+
-+# Needs to be called outside of 'if' clause.
-+AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes")
-+
- LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
- LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}"
- AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
---- gnutls-2.2.5/lib/Makefile.in	2008-05-19 21:48:35.000000000 +0200
-+++ gnutls/lib/Makefile.in	2008-05-22 08:30:01.000000000 +0200
-@@ -643,7 +643,6 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = x509 $(am__append_1)
-@@ -712,7 +711,7 @@
- libgnutls_la_LIBADD = ../lgl/liblgnu.la x509/libgnutls_x509.la \
- 	@LTLIBZ@ $(LIBGCRYPT_LIBS) @LTLIBINTL@ $(am__append_6)
- @HAVE_LD_OUTPUT_DEF_TRUE at defexecdir = $(bindir)
-- at HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(SOVERSION).def
-+ at HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA =
- 
- # C++ library
- @ENABLE_CXX_TRUE at CPP_OBJECTS = gnutlsxx.cpp
---- gnutls-2.2.5/lib/Makefile.am	2008-05-19 21:45:13.000000000 +0200
-+++ gnutls/lib/Makefile.am	2008-05-22 08:44:16.000000000 +0200
-@@ -123,7 +123,7 @@
- if HAVE_LD_OUTPUT_DEF
- libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(SOVERSION).def
- defexecdir = $(bindir)
--defexec_DATA = libgnutls-$(SOVERSION).def
-+defexec_DATA = 
- DISTCLEANFILES += $(defexec_DATA)
- endif
- 
+