view src/libssh2-1-fixes.patch @ 4222:44b1a9b2193e

qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 02c08b655d54
children 7ba850535b45
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

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] include gpg-error with gcrypt for static linking
 (mxe-specific)


diff --git a/configure.ac b/configure.ac
index 563fb04..16caa88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")
-- 
2.1.0