summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOleksandr Tymoshenko <gonzo@bluezbox.com>2016-05-16 23:24:36 -0700
committerRalf Nolden <nolden@kde.org>2016-05-19 10:15:42 +0000
commite9628fbd391972d4ffe5882d283d512df7fa705c (patch)
tree33e05104805bb15612e4591bdcdf6a6e9eef2099 /configure
parentdd8745e1d4beedfb8ef2e42fc10050287d3975f3 (diff)
Fix dynamic librariy support detection for platforms without libdl
Some platforms (e.g. FreeBSD) do not have libdl, but dlopen and related functions are part of libc. So first check for dlopen in libc, and only if that fails, look for it in libdl. Task-number: QTBUG-52951 Change-Id: I65a8ed18fce157da32f4e1ffeba30d7513385a8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure b/configure
index 7c65fbd8b5..109c0bbbac 100755
--- a/configure
+++ b/configure
@@ -4743,9 +4743,13 @@ if [ "$CFG_LIBPNG" = "auto" ]; then
fi
# detect dl
-if ! compileTest unix/libdl "libdl"; then
- QMakeVar add DEFINES QT_NO_DYNAMIC_LIBRARY
+if compileTest unix/dlopen "dlopen"; then
QMAKE_CONFIG="$QMAKE_CONFIG no-libdl"
+else
+ if ! compileTest unix/libdl "libdl"; then
+ QMAKE_CONFIG="$QMAKE_CONFIG no-libdl"
+ QMakeVar add DEFINES QT_NO_DYNAMIC_LIBRARY
+ fi
fi
if [ "$CFG_EGLFS" = "yes" ]; then