[Libreoffice-commits] .: 2 commits - configure.in desktop/unx

[Tomáš Chvátal]

 configure.in               |    2 +-
 desktop/unx/source/start.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2264f482e57e989e649934d3980368f2b135d496
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Nov 15 12:34:12 2011 +0100

    Use proper switch for on/of qstart-libpng.

diff --git a/configure.in b/configure.in
index 34400e7..6ae1fbb 100644
--- a/configure.in
+++ b/configure.in
@@ -7013,7 +7013,7 @@ AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
 
 AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test "x$enable_unix_libpng" = "xyes"; then
+if test "x$unix_qstart_libpng" != "xno"; then
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])
commit 4fe54ea11ed82dd662d0132585c199ec9f3a6c95
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Nov 15 12:33:49 2011 +0100

    Instead of returning out of function just skip its calling.

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 940a997..6152e4c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -697,9 +697,6 @@ static void extend_library_path (const char *new_element)
 static void
 exec_javaldx (Args *args)
 {
-#ifndef SOLAR_JAVA
-    return;
-#endif
     char newpath[4096];
     sal_uInt32 nArgs;
     rtl_uString *pApp;
@@ -858,8 +855,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
             exec_pagein (args);
 
         /* javaldx */
+#ifdef SOLAR_JAVA
         if (!args->bInhibitJavaLdx)
             exec_javaldx (args);
+#endif
 
         do
         {