Mercurial > mxe-octave

annotate src/libssh2-1-fixes.patch @ 2535:4a6fc9512b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package ssh2
author Mark Brand <mabrand@mabrand.nl>
date Sat, 19 May 2012 09:57:21 +0200
parents
children f79b2ad2be45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2535
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of MXE.
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See index.html for further information.
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 From 6b8a3edae23dc93cc02e6c9572d0796e338ddc4f Mon Sep 17 00:00:00 2001
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 From: Mark Brand <mabrand@mabrand.nl>
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 Date: Sat, 19 May 2012 10:40:36 +0200
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Subject: [PATCH] libgcrypt does not provide pkg-config support
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Commits 04692445d4a32430610ccf8c256e18245cbb3e06
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 and e887a8bd0f043fd49e9119756858e75e82dee504 add
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 'libgcrypt' to Requires.private of libssh2.pc
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 file, but libgcrypt does not provide a .pc file, so
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 this does not work.
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 ---
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 configure.ac | 1 -
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 1 file changed, 1 deletion(-)
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 diff --git a/configure.ac b/configure.ac
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 index aa9d397..0d35a27 100644
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 --- a/configure.ac
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +++ b/configure.ac
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 @@ -102,7 +102,6 @@ fi
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 # Look for libgcrypt
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 - LIBSREQUIRED=libgcrypt
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 fi
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 AC_SUBST(LIBSREQUIRED)
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 --
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 1.7.9.2
4a6fc9512b17 update package ssh2
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32