From 517a8bc2fa91dcd5e0db659fe76ba74d955ec588 Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI Date: Tue, 30 Nov 2010 13:45:42 +0100 Subject: Adds OxygenOffice extras as configurable optional Introduces: --enable-extra-gallery - for additional galleries --enable-extra-template - for additional templates --enable-extra-sample - for additional samples --enable-extra-font - for additional fonts configure options. --- set_soenv.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index dbaada48110f..0a70afbabe3a 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1950,6 +1950,10 @@ ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" ); ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" ); ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" ); ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" ); +ToFile( "WITH_EXTRA_GALLERY", "@WITH_EXTRA_GALLERY@", "e" ); +ToFile( "WITH_EXTRA_TEMPLATE", "@WITH_EXTRA_TEMPLATE@", "e" ); +ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" ); +ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" ); ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" ); ToFile( "DB_VERSION", "@DB_VERSION@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); -- cgit From 0ba6499e6d78650eef3871cbfca4327c472536cd Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 1 Dec 2010 23:26:31 +0100 Subject: merge a modified version of patches/dev300/system-db-check.diff try to find all the supported db headers and libs in all the "standard" directories --- set_soenv.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 0a70afbabe3a..17019a6b230f 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1956,6 +1956,8 @@ ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" ); ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" ); ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" ); ToFile( "DB_VERSION", "@DB_VERSION@", "e" ); +ToFile( "DB_LIB", "@DB_LIB@", "e" ); +ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); -- cgit From 51f3f391a455180a50723e052c20304e535d2963 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 9 Dec 2010 13:17:41 +0100 Subject: v3 of the configure.in/scp2 patch to allow selecting themes DOH, here comes v3, I left a debug output in configure.in in v2, otherwise no change. Sorry Sebastian >From 6c379488250f5a3349dfc2d805f70a0f084fe07d Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 9 Dec 2010 12:23:55 +0100 Subject: [PATCHv3] Introduce an --enable-theme="theme1 theme2..." option By default, we include all defaults as before, but if given, we can limit the number of included themes with e.g. --enable-theme="oxygen tango". This is passed through set_soenv and sets the environment variable ENABLE_THEMES="...." which can be used by the packimages makefile in the postprocess repository. It also adds defines in the form of THEME_OXYGEN that are being used in the scp2 module to decide if we should install the theme file or not. Signed-off-by: Sebastian Spaeth --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 17019a6b230f..5cfb9d2ae5e7 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1688,6 +1688,7 @@ 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( "ENABLE_THEMES", "@ENABLE_THEMES@","e"); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); -- cgit From 0820769fc1f577a118001cf8fd1cfd1aa45986e1 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 9 Dec 2010 15:57:22 +0000 Subject: rename to with_themes, and test scp2 a little Conflicts: scp2/source/ooo/module_hidden_ooo.scp --- set_soenv.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 5cfb9d2ae5e7..b6cce642a85e 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1688,8 +1688,8 @@ 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( "ENABLE_THEMES", "@ENABLE_THEMES@","e"); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); +ToFile( "WITH_THEMES", "@WITH_THEMES@", "e"); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" ); -- cgit From 73e4a11ef048a04a28e9062e43f95b336709f2ab Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 13 Dec 2010 20:38:28 +0100 Subject: Propagate the WITH_EXTENSION_INTEGRATION variable to build environment --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index b6cce642a85e..ef3df95d1729 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1690,6 +1690,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" ); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "WITH_THEMES", "@WITH_THEMES@", "e"); +ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e"); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" ); -- cgit From 0cf73310435cf6882074dd6fc809fcaa364c5804 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Mon, 13 Dec 2010 20:23:02 +0100 Subject: AC_SUBST gperf (fdo#32195) --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index ef3df95d1729..9c3f2718f2b4 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1904,6 +1904,7 @@ if ( '@ENABLE_RPATH@' eq "no" ) { ToFile( "EPM", "@EPM@", "e" ); ToFile( "EPM_FLAGS", $EPM_FLAGS, "e" ); ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" ); +ToFile( "GPERF", "@GPERF@", "e" ); ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" ); ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); -- cgit From a528189281771522b0dbebe19c6a499a66026fa7 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Fri, 17 Dec 2010 20:04:07 +0100 Subject: actually add WITH_HELPPACK_INTEGRATION to set_soenv.in --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 9c3f2718f2b4..6e51c4fe5965 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1690,6 +1690,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" ); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "WITH_THEMES", "@WITH_THEMES@", "e"); +ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e"); ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e"); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); -- cgit