configure.in | 2 +- desktop/Module_desktop.mk | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-)
New commits: commit 95a9b3088fa02007f31e4280f0438dec1aeadf13 Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com> Date: Mon Sep 3 16:29:09 2012 +0200 configure: always avoid building ns plugin extension with --enable-headless Doing the same trick as osx and android. Change-Id: Ib2efa8166eca0017c86947acdedf20f3826dddaf diff --git a/configure.in b/configure.in index da4e35c..f7d8f35 100644 --- a/configure.in +++ b/configure.in @@ -8329,7 +8329,7 @@ dnl Check for nsplugin dnl =================================================================== AC_MSG_CHECKING([whether to build nsplugin extension]) ENABLE_NSPLUGIN=NO -if test $_os = Darwin -o $_os = iOS -o $_os = Android; then +if test $_os = Darwin -o $_os = iOS -o $_os = Android -o "$enable_headless" = "yes"; then enable_gtk=no fi if test "$enable_nsplugin" != "no"; then commit 64a530cfa8e9be44965c9d708dfb642c2df2a59d Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com> Date: Mon Sep 3 15:07:06 2012 +0200 desktop: i swear we don't need oosplash with --enable-headless Change-Id: I7d03590fc2a0942757b7214c15be78e8bc626e9c diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index cb067b3..f043a61 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -116,11 +116,6 @@ else ifeq ($(OS),IOS) else ifeq ($(GUIBASE),headless) -$(eval $(call gb_Module_add_targets,desktop,\ - Executable_oosplash \ - Library_spl_unx \ -)) - else $(eval $(call gb_Module_add_targets,desktop,\ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits