This file is part of MXE. See index.html for further information. From 331c9b1a946f83deae950e0722b37688600e8073 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 Apr 2012 13:58:42 +0200 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. diff --git a/configure.ac b/configure.ac index 064905e..d727500 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) +AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Wno-override]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([config.h]) -- 1.8.1.4 From 41e7bdf61b95973ebf021184ea3952d1a9349d4c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 6 Jun 2012 09:57:24 +0200 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac index d727500..0f4cd70 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,7 @@ gl_EARLY AM_PROG_AS dnl AM_PROG_AR AC_PROG_CXX +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # For includes/gnutls/gnutls.h.in. AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) -- 1.8.1.4 From 42dd30f85578ddf957b1bfd2b0cf0752dd4ca8e7 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 4 Feb 2013 16:11:12 +0100 Subject: [PATCH 3/5] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in index 13f2d3b..926c30c 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system URL: http://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ +Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ -lcrypt32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- 1.8.1.4 From 7acc157b266701671f5a047e227ea4f91290d698 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Feb 2013 08:43:43 +0100 Subject: [PATCH 4/5] relax automake version check diff --git a/configure.ac b/configure.ac index 0f4cd70..a8c7a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Wno-override]) +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([config.h]) -- 1.8.1.4 From 06f1cb7ad830199bcab7da030827dba09fce9325 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 1 Jun 2013 18:06:37 +0200 Subject: [PATCH 5/5] mingw compatibility fix Follow-up to f1cd31cfb0d80d8681d107591c87725445768529 taken from https://gitorious.org/gnutls/gnutls/merge_requests/3 diff --git a/src/cli.c b/src/cli.c index a7da6a4..3ff7417 100644 --- a/src/cli.c +++ b/src/cli.c @@ -853,7 +853,9 @@ main (int argc, char **argv) int user_term = 0, retval = 0; socket_st hd; ssize_t bytes; +#ifndef _WIN32 struct sigaction new_action, old_action; +#endif set_program_name (argv[0]); cmd_parser (argc, argv); -- 1.8.1.4