view src/libssh2-1-fixes.patch @ 3721:933b99febcf1

Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -0400
parents 64912b529fc3
children 02c08b655d54
line wrap: on
line source

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

-- 
1.7.10.4


From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 2 Sep 2012 00:55:28 +0200
Subject: [PATCH 2/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.7.10.4