parent
408b4f822a
commit
b33d80879a
@ -1,51 +1,25 @@
|
||||
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
|
||||
From a1d0ed70e2c94d89d0b598eacca6ac79b8cd5508 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 2 Sep 2012 00:55:28 +0200
|
||||
Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
|
||||
Subject: [PATCH] include gpg-error with gcrypt for static linking
|
||||
(mxe-specific)
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index dfc6988..748dd21 100644
|
||||
index 563fb04..16caa88 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>])
|
||||
@@ -124,6 +124,7 @@ if test "$ac_cv_libgcrypt" = "yes"; then
|
||||
AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
|
||||
LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
|
||||
LIBS="$LIBS -lgcrypt"
|
||||
+ LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
|
||||
found_crypto=libgcrypt
|
||||
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
|
||||
AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")
|
||||
--
|
||||
1.8.0.3
|
||||
2.1.0
|
||||
|
||||
|
Loading…
Reference in new issue