[debian-edu-commits] debian-edu/ 18/18: 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 66cbd22b78133d9e651bf02729a764a21feeafce
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 7 19:41:09 2016 +0200

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

diff --git a/debian/patches/fix-buildsystem.patch b/debian/patches/fix-buildsystem.patch
index 8e9b932..3627b31 100644
--- a/debian/patches/fix-buildsystem.patch
+++ b/debian/patches/fix-buildsystem.patch
@@ -1,6 +1,8 @@
 Description: Build system fixes
  1. Strip -Werror and -pedantic
  2. Fix gcrypt discovery
+ 3. Explicitly discover dl
+ 4. Explicitly add some more libraries
 Author: Dominik George <nik at naturalnet.de>
 --- a/configure.ac
 +++ b/configure.ac
@@ -13,7 +15,36 @@ Author: Dominik George <nik at naturalnet.de>
  AM_SILENT_RULES([yes])
  
  LT_PREREQ([2.2])
-@@ -873,7 +873,7 @@ then
+@@ -66,6 +66,11 @@ AC_CHECK_LIB([pthread], [pthread_create]
+               AC_DEFINE([HAVE_LIBPTHREAD],,
+                         [Whether libpthread was found])])
+ 
++# dlopen
++LIBADD_DLOPEN=
++AC_SEARCH_LIBS([dlopen], [dl], [LIBADD_DLOPEN=$ac_cv_search_dlopen],
++               [AC_MSG_ERROR([libguac requires dlopen()])])
++
+ # OSSP UUID
+ AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
+              AC_CHECK_LIB([uuid], [uuid_make], [UUID_LIBS=-luuid],
+@@ -163,7 +168,7 @@ then
+     have_ssl=yes
+ 
+     AC_CHECK_HEADER(openssl/ssl.h,, [have_ssl=no])
+-    AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl"], [have_ssl=no])
++    AC_CHECK_LIB([ssl], [SSL_CTX_new], [SSL_LIBS="$SSL_LIBS -lssl -lcrypto"], [have_ssl=no])
+ 
+     if test "x${have_ssl}" = "xno"
+     then
+@@ -867,13 +872,14 @@ then
+     AC_CHECK_LIB([ssh2], [gcry_control],
+                          [AC_CHECK_HEADER(gcrypt.h,
+                                           [AC_DEFINE([LIBSSH2_USES_GCRYPT],,
+-                                                     [Whether libssh2 was built against libgcrypt])],
++                                                     [Whether libssh2 was built against libgcrypt])
++			                  SSH_LIBS="$SSH_LIBS -lgcrypt"],
+                                           [AC_MSG_WARN([
+   --------------------------------------------
     libssh2 appears to be built against libgcrypt, but the libgcrypt headers
     could not be found. SSH will be disabled.
    --------------------------------------------])

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