summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)Author
2013-11-07remove INPATH and PROEXTMichael Stahl
- 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-07OAuth2 application keys shouldn't be in the code.Cédric Bosdonnat
The GDrive OAuth2 key is now defined at configure time. If either the client secret or client id is missing, the Google Drive connectivity will be disabled at runtime. Tinderboxes can set up a GDrive key, but they need to make sure it's not persisting in the build log. Change-Id: I09bc748641ec14eae890f273f05bffe4ed421dbb
2013-11-07$CPU no longer exists, use $CPUNAME for libatomic-ops.Andrzej J.R. Hunt
Change-Id: Ic70214d5e875dc7672b5b9496f1d6a7d624d6ed6
2013-11-07Make libatomic_ops buildable and enable on non-X86.Andrzej J.R. Hunt
Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c Reviewed-on: https://gerrit.libreoffice.org/5812 Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org> Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org> Reviewed-on: https://gerrit.libreoffice.org/6600
2013-11-07fdo#42783: remove CPU variable from environmentMichael Stahl
Replace uses with CPUNAME instead, and get rid of the horrible postgresql patch that worked around environment leakage. Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
2013-11-07configure: add vars for Solaris/SPARC64 (already checked in vcl)Michael Stahl
Change-Id: Ic27986d8d45f61facedf2400b77334aaf1da7c1e
2013-11-07configure: stop adding dmake location to PATHMichael Stahl
Change-Id: I06c85f064a478ead6cecbe1c2d666ba3d947a177
2013-11-07configure: WORDS_BIGENDIAN is unusedMichael Stahl
Change-Id: I81b268d06c66860982b4d2443a1126e787f4190b
2013-11-07configure: no need to put OSVERSION in environmentMichael Stahl
... since it's only used inside configure. Change-Id: Iaf88239a5e8eb7215406b9948ca2599bd1468a8b
2013-11-06Revert "Make libatomic_ops buildable and enable on non-X86."Andrzej J.R. Hunt
(Pushed from wrong branch -- incomplete/broken.) This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6.
2013-11-06Make libatomic_ops buildable and enable on non-X86.Andrzej J.R. Hunt
Change-Id: I9423672b03caa4d500d44155bc47d4a8fa10c3cb Reviewed-on: https://gerrit.libreoffice.org/5812 Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org> Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
2013-11-05bump product version to 4.2.0.0.alpha1+Christian Lohmaier
Change-Id: If7cdbb110ffa9f34bde257ae4491533c838d20e9
2013-11-05add check for libodfgen versionDavid Tardon
Change-Id: I4d053c3234d93f141abbbab1412c591795c412e2
2013-11-05We don't build NSS for iOS and AndroidTor Lillqvist
Change-Id: Ice999350f91f6cde82d6a55e9ca470378d41c61f
2013-11-04configure: build oox with NSS backend by defaultMichael Stahl
Because NSS libraries are dynamic and OpenSSL static, using NSS saves 1.5 MB in the oox library [even though it's not as 1337 apparently]: -rwxrwxr-x. 1 ms ms 8889575 2. Nov 13:45 libooxlo.so.nss -rwxrwxr-x. 1 ms ms 7773576 2. Nov 13:45 libooxlo.so.nss.stripped -rwxrwxr-x. 1 ms ms 10340276 2. Nov 13:37 libooxlo.so.openssl -rwxrwxr-x. 1 ms ms 9042216 2. Nov 13:37 libooxlo.so.openssl.stripped Change-Id: I387496ae364acb1286d753d52f04924631136750
2013-11-03Recognize also NDK 9bTor Lillqvist
Change-Id: Ia9cecbe2cd6d9ee944abe5b8004aed27e191138c
2013-11-03update libmwaw to 0.2.0David Tardon
Change-Id: Ia66d7557e5056398e03ede9d54bf61317e84f2f3
2013-11-02remove SOLARENV variableMichael Stahl
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 Ostrovsky
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 Stahl
... 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 Štrba
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 Tardon
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 Stahl
Change-Id: Idb60c578f6dd3412a81b38aaf66d21674387a2e0
2013-10-30msc-externals: remove Package_msms, use MSM directly from MSVC dirMichael Stahl
Change-Id: I2e35810312ed140e393311569de7abd6f4676b63
2013-10-30configure: mozab-driver does not build with MSVC debug runtimesMichael Stahl
link.exe complains about different settings of _ITERATOR_DEBUG_LEVEL and RuntimeLibrary in MCatalog.o and other objects (LNK2038). Change-Id: I4a63231c93d34edd3c20b6987ee8c9ed3b072ed5
2013-10-25configure: remove --with-solver-and-workdir-rootMichael Stahl
This was just a crude hack, obsoleted by working out-of-tree builds. Change-Id: I2551df8dae9a7e05edc29de911ba9f9d70466148
2013-10-24cygwin: there is no sudo on WindowsThomas Arnhold
Change-Id: I8df4b379d98ba14a5cef93cefec9df16eefeb083
2013-10-24Disallow --without-system-cairo combined with (implicit) --enable-gtkStephan Bergmann
As the system gtk libraries may depend on later versions of libcairo.so.2 and its bring-along libpixman-1.so.0 with the same SONAMEs. So if it would ever happen at runtime that our bundled libcairo.so.2 and/or libpixman-1.so.0 get loaded before the system ones, the system gtk would probably not work correctly. Ultimately, the bundled cairo can probably go completely. This reverts 122a137672d761418a549568ad8cad623dd2b4b5 "extensions: crude hack for mysterious cairo link failure." As discussed at #libreoffice-dev: Oct 24 10:10:15 <mst__> sberg, caolan, dtardon any idea what the proper fix is for pluginapp.bin? 122a137672d761418a549568ad8cad623dd2b4b5 breaks on RHEL5 tinderbox... Oct 24 10:10:17 <IZBot> core - extensions: crude hack for mysterious cairo link failure - http://cgit.freedesktop.org/libreoffice/core/commit/?id=122a137672d761418a549568ad8cad623dd2b4b5 Oct 24 10:12:53 <dtardon> mst__, i'd try gb_Executable_use_external,pluginapp.bin,cairo Oct 24 10:13:58 <mst__> dtardon, i'm not sure if that is the intent - the -lcairo comes from the gtk external so we should use same cairo as gtk i.e. system one? but id on't understand why linker won't find the pixman library Oct 24 10:16:35 <sberg> mst__, I get no build failures in "make extensions.clean && make extensions" when I comment out that FIXME in extensions/Executable_pluginapp.bin.mk Oct 24 10:18:59 <mst__> sberg, it only started to fail for me when i removed libcairo.so from solver, probably you still have a stale one Oct 24 10:19:42 <sberg> mst__, in solver/*/lib/? no Oct 24 10:20:48 <sberg> mst__, but turns out I'm using --with-system-cairo (as required by --enable-gtk3), so ignore me Oct 24 10:22:53 <mst__> sberg, so if i rm solver/unxlngx6/lib/*cairo* solver/unxlngx6/lib/*pixman* it still fails for me, how could system-cairo work then? Oct 24 10:24:13 <sberg> mst__, in that /usr/lib64/libcairo.so has a DT_NEEDED on libpixman-1.so.0 (which "our" libcairo.so is missing, I'd assume) Oct 24 10:24:44 <sberg> mst__, erm Oct 24 10:41:18 <mst__> sberg, so if i filter out -lcairo in gb_LinkTarget__use_gtk then it magically works - are there any problems with that approach? Oct 24 10:47:19 <sberg> mst__, so the root of the problem is that there's two different libcairo involved? (just doing a local build --wihtout-system-cairo here, to see what's going on) Oct 24 10:47:55 <mst__> sberg, i don't think so since i get same problem after removing all cairo libs from solver Oct 24 11:12:11 <sberg> mst__, so the link line for pluginapp.bin contains -lcairo twice, apparently dragged in indirectly (via _use_externals gthread and gtk, likely), and does not contain "our" -L.../cairo/src/.libs (as it doesn't _use_externals cairo), but does contain -Lsolver/*/lib. Now, /usr/lib64/libcairo.so needs libpixman-1.so.0 and there happens to be one in solver/*/lib that lacks syms compared to /usr/lib64/libpixman-1.so.0 Oct 24 11:13:43 <sberg> mst__, so this was nicely hidden when all the external libs were delivered to solver/*/lib, but in the end I think the bug is to combine system gtk with non-system cairo and/or pixman Oct 24 11:14:49 <sberg> mst__, as long as our cairo and/or pixman have the same SONAMEs or exported symbol names as system ones, all hell can happen at runtime anyway Oct 24 11:15:32 <mst__> sberg, but... why then does it fail for me if i don't have the cairo/pixman libs in solver? Oct 24 11:15:57 <mst__> ahhh -Wl,-rpath-link,$S/instdir/unxlngx6/program <- taht must be why Oct 24 11:17:40 <mst__> is it normal that -Wl,--trace does not print out what libraries were found via -Wl,-rpath-link? it only appears to print explicit -lfoo Oct 24 11:18:27 <sberg> mst__, because of -Linstdir/*/program Oct 24 11:20:27 <mst__> sberg, so we need -Wl,-rpath-link,$S/instdir/unxlngx6/program obviously; Oct 24 11:22:08 <mst__> sberg, apparently everything builds successfully when filtering out -lcairo from GTK_LIBS, do you think that is the best workaround for this? Oct 24 11:22:14 <sberg> mst__, no, we need to change configure.ac to disallow --enable-gtk --without-system-{ciaro,pixman} Oct 24 11:22:39 <sberg> mst__, similarly to how we already disallow --enable-gtk3 --without-system-cairo Oct 24 11:24:48 <mst__> sberg, that would be sort of pointless, since linux is afaik the only platfrom where cairo is used at all - effectvely we could remove bundled caior then? Oct 24 11:27:04 <sberg> mst__, effectively yes, unless it would still be useful for some --disable-gtk scenario Oct 24 11:33:41 <mst__> caolan, cloph does RHEL5 have a sufficiently recent system cairo? Oct 24 11:34:43 <cloph> cairo 1.2.4 on the CentOS 5.9 (well, more like 5.10 now) system Oct 24 11:37:08 <jcorrius> my RHEL6 build uses internal cairo Oct 24 11:37:47 <caolan> rhel-5 cairo is 1.2.4 Oct 24 11:37:54 <mst__> caolan, the other option i can see is to do $(call gb_LinkTarget_add_libs,$(1),$(filter-out -lcairo,$(GTK_LIBS))) in gb_LinkTarget__use_gtk which works-for-me(TM) Oct 24 11:38:30 <sberg> jcorrius, not for very much longer ,) (it typically happens to work by luck to combine system GTK with bundled cairo) Oct 24 11:38:59 <mst__> thorsten, are you aware of any reason why we must bundle cairo on linux? Oct 24 11:40:05 <sberg> mst__, "<caolan> rhel-5 cairo is 1.2.4" and we only check for "cairo >= 1.0.2" in cofingure.ac, so all should be good Oct 24 11:40:35 <sberg> mst__, "works-for-me(TM)" just by luck Oct 24 11:41:33 <mst__> sberg, well perhaps guess the real problem is that pkg-config spits out a spurious -lcairo for gtk+-2.0 so... Oct 24 11:42:19 <mst__> ... but of course if a sufficiently good cairo is available everywhere we don't have reason to bundle it anyway Oct 24 11:45:45 <sberg> mst__, at least my /usr/lib64/libgtk-x11-2.0.so.0 does have a DT_NEEDED on libcairo.so.2, so even if pkg-config wouldn't spit it out we would still be in trouble at runtime Oct 24 11:47:05 <mst__> sberg, at runtime we have this problem for a lot more libraries than just cairo Oct 24 11:47:43 <sberg> mst__, but why refuse to fix the problem, at least for cairo, where there is apparently no good reason to bundle it anyway? Oct 24 11:48:36 <jcorrius> is cairo used on Windows for anything? Oct 24 11:48:42 <mst__> sberg, since there is no good reason to bundle it anyway i don't object to removing the bundled cairo Oct 24 11:49:38 <mst__> sberg, ... but i can still hold the opinion that gtk shouldn't put -lcairo in its pkgconfig :) Oct 24 11:53:12 <sberg> mst__, since "pkg-config --cflags gtk+-2.0" includes "-I/usr/include/cairo", one could argue that cairo is a "re-exported" part of that, so should also appear in pkg-config --libs output; one could likely argue either way Oct 24 11:55:27 <mst__> sberg, well but if you're calling functions from cairo then you're using cairo directly whereas if you just call gtk functions you have no need to link cario Oct 24 11:56:47 <sberg> mst__, sure, my argumentation depends on that "re-exports" argument (which might be thin); anyway, are you going to remove bundled cairo Oct 24 11:56:54 <sberg> ? Oct 24 11:57:34 <mst__> sberg, i'm going to force it to system in configure for now Oct 24 11:58:13 <sberg> mst__, I have a patch for exactly that already locally here, so could push that if you've not done that too already anyway Oct 24 11:59:00 <mst__> sberg, i havent' finished my freetype patch yet because people always distract me on irc so you can push Oct 24 11:59:01 <sberg> mst__, or, rather, my patch just errors out in the --enable-gtk --without-system-cairo combination, so if you have a better one, go ahead Change-Id: I071e759a55f46338b36c3cf8ac7cd5591bd9e376
2013-10-24epm: use executables from WORKDIR and clean up configureMichael Stahl
Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce
2013-10-24lcms2: use libraries from WORKDIRMichael Stahl
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
2013-10-24Enforce avoiding looking for non-existent system dicts on OS X and WindowsTor Lillqvist
It is totally pointless to look for "system" /usr/share/myspell, hyphen and mythes dictionaries on systems where they don't exist. Use only bundled dictionaries. (For OS X, we have code to use a system-specific spell checking API.) Change-Id: I13aed7225d003e608f61de95671feb2e50b26c25
2013-10-23icu: use libraries from WORKDIRMichael Stahl
Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db
2013-10-19fdo#70496 revert to using libmysqlclientLionel Elie Mamane
Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b
2013-10-19Require mdds 0.9.1 in configure script.Kohei Yoshida
Change-Id: Ib475ce5381c74218221ff86ff837705abd03b0ef
2013-10-18Initial experimental support for Visual Studio 2013Jesús Corrius
Change-Id: I4a1ad9da56f39a21d8a392fdb92704cc4311c84c
2013-10-18Check for minimum version of flex (2.5.35)Christian Lohmaier
since at least 5c2ba4aad61ce2c7c661202ae7ed26e1859c5216 flex 2.5.35 or newer is required, but linux baseline (CentOS 5.9) shippes with older one. Fail in configure/autogen instead of during make Signed-off-by: Stephan Bergmann <sbergman@redhat.com> ...and gracefully cope with Mac OS X flex --version returning "flex 2.5.35 Apple(flex-31)", so just look for the first run of d.d.d when determining the version number Change-Id: Ia5a324474aaa1a45910f50b4a78ab6ce6279575e
2013-10-17We don't use cppunit when cross-compilingTor Lillqvist
Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90
2013-10-17Bin --enable-desktop-gui-elementsTor Lillqvist
Nobody wants LO's own widgets in a touch / mobile app after all. Change-Id: I84f1e85cebce80b6ff4ec5e4e3254654b5f5e6ec
2013-10-17Normalize DISABLE_OPENSSL to USE TRUE/<nothing>Norbert Thiebaud
Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0 Reviewed-on: https://gerrit.libreoffice.org/5724 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-10-16remove glibc stub and tarball, it seems to be completely unusedBjoern Michaelsen
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-16Make libc++ optional for iOS and use the right library in the Xcode projectsTor Lillqvist
It seems that using libc++ when building with Xcode 4 (and iOS SDK 6) you get linking errors. Stick to libstdc++ for now then with that. Propagate the choice to the iOS Xcode projects through the lo.xcconfig file. Change-Id: Ic61dd2336066a77c4219c532106e3e50e85d0689
2013-10-16Get rid of PRODUCT, unused I hopeTor Lillqvist
Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
2013-10-16Generate the ios/lo.xcconfig at configure timeTor Lillqvist
Also, add INSTDIR and WORKDIR. Change-Id: I16266202c2e2d005533f7ffbcc2ae41f63833928
2013-10-15Make building installation sets depend on --with-package-format=...Stephan Bergmann
...instead of inconsitently having it depend on --enable-epm for some platforms and having it always enabled on Windows. Only Android and iOS are presumably still special and build any installation sets in their specific modules and outside instsetoo_native. One consequence is that for a non-Windows --enable-online-update --without-package-format build, instdir's version ini-file contains an UpdateURL that ends in just "?pkgfmt=" without an actual format identifier. However, checking whether the update feature would actually work is difficult for most such developer builds, anyway. Change-Id: If14fcf0b2e612499811e8a6e067a854bda612c42
2013-10-15Require at least iOS 6.1Tor Lillqvist
Change-Id: I6e75db10028143ef5926ceed8029e0404ab82d2b
2013-10-14fdo#61950 De-extensionize presentation minimizerDavid Ostrovsky
Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-12Add HAVE_FEATURE_X11Tor Lillqvist
Change-Id: I4ca7310c936ce123347be2e3243fddc738f85d6d
2013-10-11Small fix for cross-compilationTor Lillqvist
Change-Id: I5851af308193527a30eef1ded256f6b9ae69b260
2013-10-11Changes for iOS SDK 7.0Tor Lillqvist
When building for the iOS Simulator, the -mios-simulator-min-version switch should be used, not -mmacosx-version-min. Change-Id: Icaf184b99d6b6160786b7a9de2fe475251d244cf
2013-10-11Move C++ library check a bit earlier and use resultTor Lillqvist
Change-Id: I459308bbc0f957b11f3088e56cd21b4aeef9721a
generated by cgit (git 2.34.1) at 2025-02-04 12:10:32 +0000