Repair GnuTLS/win32
authorJean-Baptiste Kempf <jb@videolan.org>
Mon, 6 Oct 2008 08:45:46 +0000 (10:45 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 6 Oct 2008 08:45:46 +0000 (10:45 +0200)
extras/contrib/src/Patches/gnutls-win32.patch

index 18af991..2ef739b 100644 (file)
  #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@defexecdir = $(bindir)
--@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libgnutls-$(SOVERSION).def
-+@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA =
- # C++ library
- @ENABLE_CXX_TRUE@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
+