[debian-edu-commits] debian-edu/pkg-team/ 133/159: hopefully fix underlinking of internal libs

[Dominik George]

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

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

commit 1375fb533e9c2b93018c6e91cd901ba8af42145e
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Sep 1 19:40:04 2015 +0200

    hopefully fix underlinking of internal libs
---
 patches/make-fixes.diff | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/patches/make-fixes.diff b/patches/make-fixes.diff
index 4975168..e75a2e7 100644
--- a/patches/make-fixes.diff
+++ b/patches/make-fixes.diff
@@ -9,6 +9,38 @@
    xrdpapi \
 +  xorgxrdp \
    $(XRDPVRDIR)
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -40,7 +40,12 @@ libcommon_la_SOURCES = \
+   thread_calls.c \
+   trans.c
+ 
++if NEED_LIBDL
++EXTRA_LIBDL = -ldl
++endif
++
+ libcommon_la_LIBADD = \
++  $(EXTRA_LIBDL) \
+   -lcrypto \
+   -lssl \
+   -lpthread
+--- a/configure.ac
++++ b/configure.ac
+@@ -210,6 +210,14 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
+   [AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
+   [#include <X11/Xlib.h>])
+ 
++# checking if we need libdl
++save_LIBS=$LIBS
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
++AM_CONDITIONAL(NEED_LIBDL, [test x"$LIBS" != x"$save_LIBS"])
++LIBS=$save_LIBS
++
+ libdir="${libdir}/xrdp";
+ if test "x${prefix}" = "xNONE" ; then
+ sysconfdir="/etc";
 --- a/xrdpapi/Makefile.am
 +++ b/xrdpapi/Makefile.am
 @@ -9,6 +9,7 @@ AM_CFLAGS = \
@@ -19,3 +51,9 @@
    $(EXTRA_INCLUDES)
  
  lib_LTLIBRARIES = \
+@@ -21,4 +22,5 @@ libxrdpapi_la_LDFLAGS = \
+   $(EXTRA_FLAGS)
+ 
+ libxrdpapi_la_LIBADD = \
++  $(top_builddir)/common/libcommon.la \
+   $(EXTRA_LIBS)

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