[Libreoffice-commits] .: configure.in scp2/source set_soenv.in

[Michael Meeks]

 configure.in                         |   22 +++++++++-------------
 scp2/source/ooo/common_brand.scp     |    2 --
 scp2/source/ooo/file_library_ooo.scp |    2 --
 scp2/source/ooo/makefile.mk          |    4 ----
 set_soenv.in                         |    2 +-
 5 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit f1d31a33738ed6399e8c28ecc2245a990760ba17
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 21 16:50:57 2011 +0000

    use the unix quickstarter un-conditionally.

diff --git a/configure.in b/configure.in
index ca71f26..838ddf5 100755
--- a/configure.in
+++ b/configure.in
@@ -273,13 +273,6 @@ AC_ARG_ENABLE(systray,
         [Determines whether to build the systray quickstarter.]),
 ,enable_systray=yes)
 
-AC_ARG_ENABLE(unix-qstart,
-    AS_HELP_STRING([--disable-unix-qstart],
-        [On UNIX systems, we can enable a faster splash app that accelerates
-         startup, if we can link to the system libpng, use this if you are
-         a Linux Distro packager.]),
-,enable_unix_quickstarter=yes)
-
 AC_ARG_ENABLE(broffice,
     AS_HELP_STRING([--disable-broffice],
         [When disabled, broffice specific branding artwork for use in the pt_BR
@@ -6072,14 +6065,17 @@ AC_SUBST(ENABLE_SYSTRAY_GTK)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-ENABLE_UNIX_QUICKSTARTER=""
-if test "$test_unix_quickstarter" = "yes" -a "$enable_unix_quickstarter" = "yes"; then
-    ENABLE_UNIX_QUICKSTARTER="TRUE"
-    PKG_CHECK_MODULES( LIBPNG, libpng )
-fi
+AC_ARG_ENABLE(unix-qstart,
+    AS_HELP_STRING([--disable-unix-qstart],
+        [On UNIX systems, we can enable a faster splash app that accelerates
+         startup, if we can link to the system libpng, use this if you are
+         a Linux Distro packager.]),
+,enable_unix_quickstarter=yes)
+
+PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
 AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
-AC_SUBST(ENABLE_UNIX_QUICKSTARTER)
+AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
 
 ENABLE_BROFFICE=""
 AC_MSG_CHECKING([whether to enable BrOffice branding])
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 19d9f85..e70da01 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -514,14 +514,12 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
-#if defined ENABLE_UNIX_QUICKSTARTER
 File gid_File_Bin_QStart_Bin
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED, PATCH);
     Name = "oosplash.bin";
 End
-#endif
 
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2edf4e6..f42c27e 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1349,9 +1349,7 @@ File gid_File_Lib_Spell
 End
 
 STD_LIB_FILE( gid_File_Lib_Spl, spl)
-#if defined ENABLE_UNIX_QUICKSTARTER
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-#endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index eb4d92a..6423d38 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,10 +72,6 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
-.IF "$(ENABLE_UNIX_QUICKSTARTER)" != ""
-SCPDEFS+=-DENABLE_UNIX_QUICKSTARTER
-.ENDIF
-
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
diff --git a/set_soenv.in b/set_soenv.in
index 1e278c3..405fda6 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1630,7 +1630,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
 ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
 ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
-ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
+ToFile( "ENABLE_QUICKSTART_LIBPNG", "@ENABLE_QUICKSTART_LIBPNG@", "e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "WITH_THEMES",       "@WITH_THEMES@",      "e");
 ToFile( "WITH_HELPPACK_INTEGRATION",       "@WITH_HELPPACK_INTEGRATION@",      "e");