[Libreoffice-commits] .: desktop/Executable_oosplash.mk

Peter Foley pefoley2 at kemper.freedesktop.org
Sun Sep 18 13:53:36 PDT 2011


 desktop/Executable_oosplash.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 38fd95ced1c68a4f4d8dbcee86bb808f8e918171
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Sep 18 11:27:45 2011 -0400

    fix link failure on linux if not using libXinerama

diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 3cf7bae..63623cf 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -53,12 +53,17 @@ $(eval $(call gb_Executable_add_defs,oosplash,\
 ))
 
 $(eval $(call gb_Executable_add_libs,oosplash,\
-    -lX11 \
     -lXinerama \
 ))
 
 endif
 
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Executable_add_libs,oosplash,\
+    -lX11 \
+))
+endif
+
 ifeq ($(ENABLE_QUICKSTART_LIBPNG),TRUE)
 
 $(eval $(call gb_Executable_add_defs,oosplash,\


More information about the Libreoffice-commits mailing list