summaryrefslogtreecommitdiff
path: root/config_host.mk.in
AgeCommit message (Collapse)AuthorFilesLines
2013-11-21--enable-ia2 no longer disables Java access bridgeMichael Stahl1-0/+0
Just install both; 448727e598ca0c35ee9cd6f2c25a847c8147943b already made IA2 an experimental feature with fallback to Java access bridge if experimental mode is disabled. Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990 (cherry picked from commit 31b91f6f8a7cacb062005d6ca2a7b5b2645a9799)
2013-11-20Separate Impress Remote from Android build.Andrzej J.R. Hunt1-0/+1
Previously the Impress Remote app could only be built within gbuild when building the entirety of LO for Android, it can now be enabled separately to be built within any LO build. (Note that the app could still be built separately without doing a full Android build of LO by using the android build tools and/or IDE.) Conflicts: config_host.mk.in Change-Id: I21d4389082a1492a3c9029d630f3fff97d9ba99a Reviewed-on: https://gerrit.libreoffice.org/6146 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-19fix Makefile.inBjoern Michaelsen1-1/+0
- unify ~all gbuild targets to one gbuild call - kill CHECK_PARALLELISM as we dont respect it consistently anyway - ${MODULE}.subsequentcheck needs no specialcasing now anymore too - should fix e.g. "make unitcheck slowcheck subsequentcheck" calls Change-Id: I4238d7de599cb9fbaf09f60539d6655b85b87c29 Reviewed-on: https://gerrit.libreoffice.org/6722 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-19Add --enable-ia2 configuration optionDavid Ostrovsky1-0/+1
Change-Id: I950c47bd95d5bb4aacf9e584c8e2eeef461af71f
2013-11-13configure: NSS_MAJOR etc. unused since cffad630Michael Stahl1-3/+0
Change-Id: I5182e538219e85e8c2b0ae615d02d9aaaff75ca5
2013-11-12integrate libeotDavid Tardon1-0/+4
Change-Id: I0f28ff1680026d883909cc12efabb54f705cecb4
2013-11-11bundle libebookDavid Tardon1-0/+3
Change-Id: I05d96875b9d1deb87dadd63f446080a6fe3494a9 Reviewed-on: https://gerrit.libreoffice.org/6630 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-11-07remove INPATH and PROEXTMichael Stahl1-3/+0
- WORKDIR path is just workdir - INSTDIR path is just instdir - WORKDIR_FOR_BUILD is workdir_for_build - INSTDIR_FOR_BUILD is instdir_for_build - replace other usage of INPATH by combination of OS and CPUNAME Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482 Reviewed-on: https://gerrit.libreoffice.org/6601 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-07fdo#42783: remove CPU variable from environmentMichael Stahl1-1/+0
Replace uses with CPUNAME instead, and get rid of the horrible postgresql patch that worked around environment leakage. Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
2013-11-07config_host.mk: remove unused use_shl_versionMichael Stahl1-1/+0
Change-Id: Ic829f1966cafa7c7680b95600ef071417ee9b9f7
2013-11-07configure: WORDS_BIGENDIAN is unusedMichael Stahl1-1/+0
Change-Id: I81b268d06c66860982b4d2443a1126e787f4190b
2013-11-07configure: no need to put OSVERSION in environmentMichael Stahl1-1/+0
... since it's only used inside configure. Change-Id: Iaf88239a5e8eb7215406b9948ca2599bd1468a8b
2013-11-02remove SOLARENV variableMichael Stahl1-1/+0
It is constant and can just be replaced by $(SRCDIR)/solenv. Use BUILD_TYPE where it was used to check if config_*.mk is sourced. Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
2013-11-02Kill servlet-api and tomcatDavid Ostrovsky1-2/+0
Change-Id: I630da3fa37144b2e5fb5117017f43841ba89c42a Reviewed-on: https://gerrit.libreoffice.org/6454 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31solver doesn't solve anything...Michael Stahl1-4/+0
... it is an abbreviation of "Solar Version". Since nobody can remember that: remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath and any mention thereof. Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad Reviewed-on: https://gerrit.libreoffice.org/6515 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31bundle libfreehandFridrich Štrba1-0/+3
Change-Id: I12de5e96754a8dba94dfdef3deb2aac18af28f22 Reviewed-on: https://gerrit.libreoffice.org/6510 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-10-30bundle libetonyekDavid Tardon1-0/+3
Change-Id: I4099ea49ebce7c28152a0895086be5b86b18e28b Reviewed-on: https://gerrit.libreoffice.org/6486 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-10-30configure: remove newly unused variable MERGE_MODULESMichael Stahl1-1/+0
Change-Id: Idb60c578f6dd3412a81b38aaf66d21674387a2e0
2013-10-19fdo#70496 revert to using libmysqlclientLionel Elie Mamane1-0/+3
Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b
2013-10-16remove glibc stub and tarball, it seems to be completely unusedBjoern Michaelsen1-2/+0
Change-Id: I1638d4cfc0e6025bd33ed6770ede8556304d6919 Reviewed-on: https://gerrit.libreoffice.org/6278 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16Get rid of PRODUCT, unused I hopeTor Lillqvist1-1/+0
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
2013-10-14fdo#61950 De-extensionize presentation minimizerDavid Ostrovsky1-1/+0
Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-07only build openGL canvas when libGL supports shaderChristian Lohmaier1-0/+1
and disable for Mac until code is adjusted to compile Change-Id: I48c69962ae5e59ae3bdd35d343deeeffdde6e903 Reviewed-on: https://gerrit.libreoffice.org/6160 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-10-06make system-bluez build not use -I$S/bluez_bluetooth/inc in sd...Rene Engelhard1-0/+1
Change-Id: Icdd90a7aadf7cfbc464e11a1e0386576cbc5c06c
2013-10-05URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist1-0/+1
Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
2013-10-01put result of make test-install into top-level test-install dirMichael Stahl1-1/+1
... and rename all DEVINSTALL variables to TESTINSTALL. Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist1-0/+2
Introduce SDKDIRNAME as a configury variable and use it instead of the gbuild gb_Package_SDKDIRNAME. Then we can easily construct the SDKDIRNAME_FOR_BUILD variant that is needed to find the specially named SDK in instdir on OS X when cross-compiling. Move the version number section in configure.ac earlier. Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-23Try to fix cross-compilationTor Lillqvist1-1/+7
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-19Allow enable / disable opencl at build time.Kohei Yoshida1-0/+1
Change-Id: I65e2a71aae8317930d1575e7d82c11c3fd2b74de
2013-09-19Remove opencl-sdk configure option, and build time opencl conditionals.Kohei Yoshida1-3/+0
We now load OpenCL library dynmically at run-time as needed. So there is no build time dependency on any OpenCL implementations. Change-Id: I214399060398a7c5e37b9a254147ccc2834e7866
2013-09-18Add the configure bits to support --disable-orcus.Kohei Yoshida1-0/+1
Change-Id: Ieeb1581187248875ca2e37278c62a382f6caa8e0
2013-09-17goodbye linkoo.. you have served wellMatúš Kukan1-1/+1
This commit: - removes linkoo and --disable-linkoo option - removes 'dev-update' make target - creates --disable-ooenv option - removes LD_LIBRARY_PATH and PATH settings in ooenv Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
2013-09-13configure: ensure that install_name_tool matches the toolchain...Michael Stahl1-1/+1
... used to build, since otherwise it'll break with "malformed object" errors. Alo replace now unused XCRUN variable. Change-Id: I58a20c34f903b7a7acb46597d94243389e6b3842
2013-09-11Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann1-0/+1
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
2013-09-09gbuild: fix Jar layers for WNTMichael Stahl1-0/+1
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
2013-09-09properly generate rc filesMatúš Kukan1-0/+1
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09replace variables in main.xcd already in gbuildMatúš Kukan1-0/+2
In main.xcd we have some variables which used to be defined mostly in instsetoo_native/util/openoffice.lst and replaced in installer. Process the file in custom target, so we can copy correct main.xcd directly with gbuild. Change-Id: Ie2b1b6da1adb161394f69c345bbe8671cfafb7c4
2013-09-09jvmfwk: install also into instdirMatúš Kukan1-0/+1
Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7
2013-08-29make the tinderbox information more reliable in the about dialog (fdo#58034)Petr Mladek1-1/+0
Pass the information via config_host/config_buildid.h. Then cui/source/dialogs/about.cxx will get rebuilt also in the incremental build. Change-Id: I058cbe162e7015cbea6c71253c20db097477708f
2013-08-28add --with-help=common parameter to the configure optionPetr Mladek1-0/+1
It allows to build only the common parts of the help, e.g. bundle the helpcontent-related icons. It is useful when the build content is built separately. For example, it is used to speed up the build of the main package in openSUSE Build Service.
2013-08-21avmedia: vlc - with the wrapper we no longer need cflags / libs.Michael Meeks1-2/+0
Change-Id: I824aa1e7908acefe898b7f24b323426f1cce250c
2013-08-21We don't seem to actually need glibc getoptTor Lillqvist1-1/+0
Change-Id: I1f221533f5ea684d113bdc45c04bf84405140f9f Reviewed-on: https://gerrit.libreoffice.org/5539 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist1-1/+1
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-18Further work on the "Mac-like app structure" optionTor Lillqvist1-0/+6
Lots of stuff still either ended up in the wrong place, or was looked up from the wrong place, or both. Fix most cases. Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
2013-08-18AC_DEFINE an ENABLE_MACOSX_MACLIKE_APP_STRUCTURETor Lillqvist1-0/+1
Change-Id: I6aab77fd253baf1fbbfa82d82bd4e83ddd9e3299
2013-08-10Start of enabling use of a more proper "Mac-like" install tree structureTor Lillqvist1-0/+3
First cut was at https://gerrit.libreoffice.org/#/c/2310/ but was abandoned by myself. Now getting back to the idea, but this time I will make it optional on OS X, and introduce it in smaller steps. Change-Id: Id88517fee8d49056b8bbecb0921206dc6b29580b
2013-08-09try to ensure not testing GCC version when using ClangLuboš Luňák1-0/+1
Clang reports itself as GCC 4.2.1 when asked the GCC way, which is about as good an answer as any, since there's no good mapping between them. So when testing GCC version, Clang would be usually considered too old, and therefore the proper way is to do a configure check if possible. GCC version should be only used for GCC-specific things such as avoiding a bug in a specific GCC version, and such testing should first check the compiler is not Clang. Rename GCCVER to GCC_VERSION and use it throughout the build system where needed. As it's empty for anything that's not GCC, this should lead to errors when used incorrectly. Change-Id: Iea96bbaf5d8ceabefa25be88576eeb4115384937
2013-08-05do not base feature checks on gcc versionLuboš Luňák1-0/+1
Clang reports itself to be gcc4.2, so there fail there, instead use configure checks. Change-Id: Idb44a5c875b24a15546a6495de02a1b4af898443
2013-07-26Move the (unimplemented) READONLY_INSTALLSET flag into config_features.hTor Lillqvist1-1/+0
Change-Id: Icce89cc2a3c8089aa248a176ab92b545c36b1091
2013-07-26initial configure pieces for VLC detection.Michael Meeks1-0/+3
Change-Id: I1001d7f87c3e3194c04ea9d1ef97a87898f891ea