[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf

[Fridrich Strba]

 configure.in                           |   22 +++++++++++++++-------
 distro-configs/LibreOfficeLinux.conf   |    2 +-
 distro-configs/LibreOfficeOpenBSD.conf |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit e4bd1993189a5138e81c998b5a1c4e4777eaa4c9
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue May 17 15:23:40 2011 +0100

    fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497

diff --git a/configure.in b/configure.in
index 0705312..3257668 100755
--- a/configure.in
+++ b/configure.in
@@ -353,6 +353,13 @@ AC_ARG_ENABLE(kde4,
          both KDE3 and KDE4.]),
 ,)
 
+AC_ARG_ENABLE(unix-qstart-libpng,
+    AS_HELP_STRING([--disable-unix-qstart-libpng],
+        [On UNIX systems, we have a faster splash app, that can use libpng to
+	 render its splash, if we can safely link to the system libpng then
+	 enabling this is a good idea (ie. for Linux Distro packaging).]),
+,enable_unix_libpng=yes)
+
 AC_ARG_ENABLE(binfilter,
     AS_HELP_STRING([--enable-binfilter],
         [Enable legacy binary file formats filters build.]),
@@ -6136,16 +6143,17 @@ AC_SUBST(ENABLE_SYSTRAY_GTK)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-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_MSG_CHECKING([whether to enable libpng linking in quickstarter])
+if test "x$enable_unix_libpng" = "xyes"; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+   ENABLE_QUICKSTART_LIBPNG=""
+fi
 AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
 
 ENABLE_BROFFICE=""
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 3505963..2110064 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -43,7 +43,7 @@
 --enable-cairo
 --enable-binfilter
 --disable-xrender-link
---disable-unix-qstart
+--disable-unix-qstart-libpng
 --disable-randr-link
 --disable-kde4
 --disable-dbus
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 340805a..db5f33e 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -8,7 +8,7 @@
 --disable-odk
 --disable-opengl
 --disable-randr-link
---disable-unix-qstart
+--disable-unix-qstart-libpng
 --disable-xrender-link
 --enable-binfilter
 --enable-cairo