[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - configure.ac

Aron Budea aron.budea at collabora.com
Mon Aug 14 13:03:33 UTC 2017


 configure.ac |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1586ee5bef3821f301ce2c9348745fc8f7e34f6a
Author: Aron Budea <aron.budea at collabora.com>
Date:   Sat Aug 12 07:07:02 2017 +0200

    Add dlopen check again to fix build
    
    That unneeded dlopen check isn't unneeded.
    Regression from 4be7a6cb166161a5c981f706b460a191984a4c80
    
    Change-Id: I8fc451d16c3fa95696995d884743af675d42804d
    Reviewed-on: https://gerrit.libreoffice.org/41077
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 7455705517033acc24e91df0d5cf9a825f0562a0)
    Reviewed-on: https://gerrit.libreoffice.org/41078
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/configure.ac b/configure.ac
index ddd46b8e..a76ba0e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,6 +252,12 @@ AS_IF([test `uname -s` = Linux],
       [AS_IF([test -n "$with_cppunit_libs"],
              [LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
 
+AS_IF([test `uname -s` != Darwin],
+      [AC_SEARCH_LIBS([dlopen],
+                      [dl dld],
+                      [],
+                      [AC_MSG_ERROR([dlopen not found])])])
+
 AC_SEARCH_LIBS([png_create_write_struct],
                [png],
                [],


More information about the Libreoffice-commits mailing list