[debian-edu-commits] debian-edu/ 03/07: More build system fixes.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-server.

commit ff4cf219f8f3e963706fa50d718e2641e664ff48
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 7 14:38:36 2016 +0200

    More build system fixes.
---
 debian/patches/fix-buildsystem.patch | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-buildsystem.patch b/debian/patches/fix-buildsystem.patch
index 99bf5c4..8e9b932 100644
--- a/debian/patches/fix-buildsystem.patch
+++ b/debian/patches/fix-buildsystem.patch
@@ -1,4 +1,6 @@
-Subject: Remove -Werror and -pedantic from build options
+Description: Build system fixes
+ 1. Strip -Werror and -pedantic
+ 2. Fix gcrypt discovery
 Author: Dominik George <nik at naturalnet.de>
 --- a/configure.ac
 +++ b/configure.ac
@@ -11,6 +13,15 @@ Author: Dominik George <nik at naturalnet.de>
  AM_SILENT_RULES([yes])
  
  LT_PREREQ([2.2])
+@@ -873,7 +873,7 @@ then
+    libssh2 appears to be built against libgcrypt, but the libgcrypt headers
+    could not be found. SSH will be disabled.
+   --------------------------------------------])
+-                                           have_libssh2=no])])
++                                           have_libssh2=no])], [], [-lgcrypt])
+ 
+ fi
+ 
 --- a/src/common-ssh/Makefile.am
 +++ b/src/common-ssh/Makefile.am
 @@ -40,7 +40,7 @@ noinst_HEADERS =      \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-server.git