diff options
| -rw-r--r-- | config.tests/unix/dlopen/dlopen.cpp (renamed from config.tests/unix/libdl/libdl.cpp) | 0 | ||||
| -rw-r--r-- | config.tests/unix/dlopen/dlopen.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/libdl/libdl.pro | 5 | ||||
| -rwxr-xr-x | configure | 8 |
4 files changed, 10 insertions, 5 deletions
diff --git a/config.tests/unix/libdl/libdl.cpp b/config.tests/unix/dlopen/dlopen.cpp index 28a82330f2..28a82330f2 100644 --- a/config.tests/unix/libdl/libdl.cpp +++ b/config.tests/unix/dlopen/dlopen.cpp diff --git a/config.tests/unix/dlopen/dlopen.pro b/config.tests/unix/dlopen/dlopen.pro new file mode 100644 index 0000000000..1d34314332 --- /dev/null +++ b/config.tests/unix/dlopen/dlopen.pro @@ -0,0 +1,2 @@ +SOURCES = $$PWD/dlopen.cpp +CONFIG -= qt dylib diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro index 8ed5231a8f..4016395d35 100644 --- a/config.tests/unix/libdl/libdl.pro +++ b/config.tests/unix/libdl/libdl.pro @@ -1,3 +1,2 @@ -SOURCES = libdl.cpp -CONFIG -= qt dylib -!qnx: LIBS += -ldl +include(../dlopen/dlopen.pro) +LIBS += -ldl @@ -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 |