[Libreoffice-commits] .: configure.in set_soenv.in

[Michael Meeks]

 configure.in |   29 +++++++++++++++++++++++++++--
 set_soenv.in |    4 ++++
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit b7fa30f3656ebe1d51189cdbd03d2d2788f6bfd7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Oct 12 16:26:05 2010 +0100

    Enable unx quickstart, and broffice flags

diff --git a/configure.in b/configure.in
index 17a2e14..9cd1a15 100644
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,16 @@ AC_ARG_ENABLE(gtk,
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
+AC_ARG_ENABLE(unix-qstart,
+[  --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,
+[  --enable-broffice       When enabled, this will include broffice branded
+                          artwork into packages, that will only be seen in the
+                          pt_BR locale.
+],,)
 AC_ARG_ENABLE(cairo,
 [  --enable-cairo          Determines whether to use Cairo library on
                           platforms where Cairo is available.
@@ -1076,6 +1086,7 @@ case "$build_os" in
 		test_cups=yes
 		test_randr=yes
 		test_freetype=yes
+		test_unix_quickstarter=yes
 		_os=Linux
 		;;
 	gnu)
@@ -6008,9 +6019,7 @@ if test  "$test_gtk" = "yes"; then
       else
           AC_MSG_RESULT([no])
       fi
-
    fi
-
 fi
 AC_SUBST(ENABLE_GIO)
 AC_SUBST(ENABLE_DBUS)
@@ -6018,6 +6027,22 @@ 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_SUBST(LIBPNG_LIBS)
+AC_SUBST(LIBPNG_CFLAGS)
+AC_SUBST(ENABLE_UNIX_QUICKSTARTER)
+
+ENABLE_BROFFICE=""
+AC_MSG_CHECKING([whether to enable BrOffice branding])
+if test "$enable_broffice" = "yes"; then
+    ENABLE_BROFFICE="TRUE"
+fi
+AC_SUBST(ENABLE_BROFFICE)
+
 dnl ===================================================================
 dnl Check whether the Cairo libraries are available.
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 2e42f66..b2d6b09 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1624,12 +1624,14 @@ ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
+ToFile( "ENABLE_BROFFICE",   "@ENABLE_BROFFICE@",  "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
+ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
@@ -1869,6 +1871,8 @@ ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
 ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
 ToFile( "XRANDR_LIBS",       "@XRANDR_LIBS@",      "e" );
 ToFile( "XRANDR_DLOPEN",     "@XRANDR_DLOPEN@",    "e" );
+ToFile( "LIBPNG_CFLAGS",     "@LIBPNG_CFLAGS@",    "e" );
+ToFile( "LIBPNG_LIBS",       "@LIBPNG_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
 ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );
 ToFile( "LIBWPD_LIBS",       "@LIBWPD_LIBS@",      "e" );