summaryrefslogtreecommitdiffstats
path: root/src/libssh2-1-fixes.patch
blob: 7d169b5fee0844c30f8017863b402806538b7901 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From ab12cbdf40141b62d2c01943811a65a65cf5e657 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sun, 2 Sep 2012 00:55:28 +0200
Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
 (mxe-specific)


diff --git a/configure.ac b/configure.ac
index dfc6988..748dd21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ fi
 if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
   LIBS="$LIBS -lgcrypt"
+  LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
 fi
 
 AC_SUBST(LIBSREQUIRED)
-- 
1.8.0.3


From 246a5f965ad348a6de921689a031ffa481f733e7 Mon Sep 17 00:00:00 2001
From: MXE
Date: Sat, 23 Mar 2013 18:41:25 +1100
Subject: [PATCH 2/2] replace deprectaed AM_CONFIG_HEADER with
 AC_CONFIG_HEADERS


diff --git a/configure.ac b/configure.ac
index 748dd21..d190a2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src])
-AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h])
+AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h])
 AM_MAINTAINER_MODE
 
 dnl SED is needed by some of the tools
-- 
1.8.0.3