[Libreoffice-commits] core.git: configure.ac vcl/unx

[Michael Stahl]

 configure.ac                         |    1 +
 vcl/unx/generic/app/randrwrapper.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e5a0cd29c2b98b8e8262a0727795dd8b5b22649
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 1 17:05:03 2016 +0100

    fix the --disable-randr-link build
    
    This was borked since gbuildification of vcl in 2011 and the dlopen
    code didn't even compile since commit
    b5f1139427b40ca727a03e2e41aa5625cfb08bb8
    
    Change-Id: Ieff22ed144d9d89e53dd956ce0dfea5e4d07ea13

diff --git a/configure.ac b/configure.ac
index fed2b42..c90b56a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9226,6 +9226,7 @@ AC_MSG_CHECKING([whether to enable RandR support])
 if test "$USING_X11" = TRUE -a "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \); then
     if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
         XRANDR_DLOPEN="TRUE"
+        ENABLE_RANDR="TRUE"
         AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
     else
         AC_MSG_RESULT([yes])
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index 570cfcc..d97f86f 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -138,7 +138,7 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) :
         // obviously they expected libXext to be linked in global symbolspace (that is
         // linked by the application), which is not the case with us (because we want
         // to be able to run in headless mode even without an installed X11 library)
-        m_pRandRLib = osl_loadModule( "libXrandr.so.2", SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW );
+        m_pRandRLib = osl_loadModuleAscii("libXrandr.so.2", SAL_LOADMODULE_DEFAULT | SAL_LOADMODULE_NOW);
         initFromModule();
     }
     if( m_bValid )