You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2017/08/13 18:26:41 UTC
[3/9] incubator-guacamole-server git commit: GUACAMOLE-325:
Explicitly check for libdl,
using it if provided and warning if both libdl and dlopen() are absent.
GUACAMOLE-325: Explicitly check for libdl, using it if provided and warning if both libdl and dlopen() are absent.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/7b8d250b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/7b8d250b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/7b8d250b
Branch: refs/heads/master
Commit: 7b8d250bd5366872707b2936a1513ac2bdec6808
Parents: 9dcddd1
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jun 10 14:39:03 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Jul 5 20:55:02 2017 -0700
----------------------------------------------------------------------
configure.ac | 9 ++++++++-
src/libguac/Makefile.am | 3 +--
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/7b8d250b/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 62c5335..49ac65f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,13 @@ AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIBS=-lpthread
AC_DEFINE([HAVE_LIBPTHREAD],,
[Whether libpthread was found])])
+# Include libdl for dlopen() if necessary
+AC_CHECK_LIB([dl], [dlopen],
+ [DL_LIBS=-ldl],
+ [AC_CHECK_DECL([dlopen],,
+ AC_MSG_ERROR("libdl is required on systems which do not otherwise provide dlopen()"),
+ [#include <dlfcn.h>])])
+
# OSSP UUID
AC_CHECK_LIB([ossp-uuid], [uuid_make], [UUID_LIBS=-lossp-uuid],
AC_CHECK_LIB([uuid], [uuid_make], [UUID_LIBS=-luuid],
@@ -85,7 +92,7 @@ AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
# WinSock
AC_CHECK_LIB([wsock32], [main])
-AC_SUBST(LIBADD_DLOPEN)
+AC_SUBST(DL_LIBS)
AC_SUBST(MATH_LIBS)
AC_SUBST(PNG_LIBS)
AC_SUBST(JPEG_LIBS)
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/7b8d250b/src/libguac/Makefile.am
----------------------------------------------------------------------
diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am
index 35e8e6e..567f0fa 100644
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@ -114,6 +114,7 @@ libguac_la_CFLAGS = \
libguac_la_LDFLAGS = \
-version-info 14:0:2 \
@CAIRO_LIBS@ \
+ @DL_LIBS@ \
@JPEG_LIBS@ \
@PNG_LIBS@ \
@PTHREAD_LIBS@ \
@@ -122,5 +123,3 @@ libguac_la_LDFLAGS = \
@VORBIS_LIBS@ \
@WEBP_LIBS@
-libguac_la_LIBADD = \
- @LIBADD_DLOPEN@