summaryrefslogtreecommitdiffstats
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* configure: remove --with-solver-and-workdir-rootMichael Stahl2013-10-251-34/+3
| | | | | | This was just a crude hack, obsoleted by working out-of-tree builds. Change-Id: I2551df8dae9a7e05edc29de911ba9f9d70466148
* cygwin: there is no sudo on WindowsThomas Arnhold2013-10-241-1/+1
| | | | Change-Id: I8df4b379d98ba14a5cef93cefec9df16eefeb083
* Disallow --without-system-cairo combined with (implicit) --enable-gtkStephan Bergmann2013-10-241-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* epm: use executables from WORKDIR and clean up configureMichael Stahl2013-10-241-3/+3
| | | | Change-Id: I69e75dbbaa16b6dc407a69ba8137c09888db50ce
* lcms2: use libraries from WORKDIRMichael Stahl2013-10-241-1/+4
| | | | Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
* Enforce avoiding looking for non-existent system dicts on OS X and WindowsTor Lillqvist2013-10-241-0/+8
| | | | | | | | | | 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
* icu: use libraries from WORKDIRMichael Stahl2013-10-231-1/+1
| | | | Change-Id: I7d996cc9412eadf89c8d04ee29abe1fa6f7d53db
* fdo#70496 revert to using libmysqlclientLionel Elie Mamane2013-10-191-4/+39
| | | | Change-Id: I5b98b5e7840e4f1c6005aee0c1f43ef814ecf77b
* Require mdds 0.9.1 in configure script.Kohei Yoshida2013-10-191-1/+1
| | | | Change-Id: Ib475ce5381c74218221ff86ff837705abd03b0ef
* Initial experimental support for Visual Studio 2013Jesús Corrius2013-10-181-9/+23
| | | | Change-Id: I4a1ad9da56f39a21d8a392fdb92704cc4311c84c
* Check for minimum version of flex (2.5.35)Christian Lohmaier2013-10-181-0/+6
| | | | | | | | | | | | | 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
* We don't use cppunit when cross-compilingTor Lillqvist2013-10-171-1/+3
| | | | Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90
* Bin --enable-desktop-gui-elementsTor Lillqvist2013-10-171-9/+0
| | | | | | Nobody wants LO's own widgets in a touch / mobile app after all. Change-Id: I84f1e85cebce80b6ff4ec5e4e3254654b5f5e6ec
* Normalize DISABLE_OPENSSL to USE TRUE/<nothing>Norbert Thiebaud2013-10-171-2/+2
| | | | | | | 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>
* remove glibc stub and tarball, it seems to be completely unusedBjoern Michaelsen2013-10-161-17/+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>
* Make libc++ optional for iOS and use the right library in the Xcode projectsTor Lillqvist2013-10-161-2/+23
| | | | | | | | | | 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
* Get rid of PRODUCT, unused I hopeTor Lillqvist2013-10-161-4/+0
| | | | Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5
* Generate the ios/lo.xcconfig at configure timeTor Lillqvist2013-10-161-2/+4
| | | | | | Also, add INSTDIR and WORKDIR. Change-Id: I16266202c2e2d005533f7ffbcc2ae41f63833928
* Make building installation sets depend on --with-package-format=...Stephan Bergmann2013-10-151-46/+17
| | | | | | | | | | | | | | | ...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
* Require at least iOS 6.1Tor Lillqvist2013-10-151-2/+2
| | | | Change-Id: I6e75db10028143ef5926ceed8029e0404ab82d2b
* fdo#61950 De-extensionize presentation minimizerDavid Ostrovsky2013-10-141-18/+1
| | | | | Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
* Add HAVE_FEATURE_X11Tor Lillqvist2013-10-121-0/+1
| | | | Change-Id: I4ca7310c936ce123347be2e3243fddc738f85d6d
* Small fix for cross-compilationTor Lillqvist2013-10-111-5/+9
| | | | Change-Id: I5851af308193527a30eef1ded256f6b9ae69b260
* Changes for iOS SDK 7.0Tor Lillqvist2013-10-111-17/+32
| | | | | | | When building for the iOS Simulator, the -mios-simulator-min-version switch should be used, not -mmacosx-version-min. Change-Id: Icaf184b99d6b6160786b7a9de2fe475251d244cf
* Move C++ library check a bit earlier and use resultTor Lillqvist2013-10-111-35/+39
| | | | Change-Id: I459308bbc0f957b11f3088e56cd21b4aeef9721a
* Use libc++ on iOSTor Lillqvist2013-10-111-1/+2
| | | | Change-Id: I722b28f0d432c051fbe3a55823bc64b8a86e9a17
* Use -fvisibility=hidden also for 3rd-party libs for iOSTor Lillqvist2013-10-111-2/+5
| | | | Change-Id: Ib2806d71f9c2dc18c64f2c92012eaa1c77ddd9d2
* Normalize ENABLE_VALGRIND: TRUE or emptyTor Lillqvist2013-10-101-5/+6
| | | | Change-Id: I21521d1d7e4a139a1ea0c3f4fe6c51b4637c595f
* UntabifyTor Lillqvist2013-10-101-2/+2
| | | | Change-Id: I8cd9246f9f8866ebbf19455b00cfadee5db8354a
* Normalize ENABLE_PDFIMPORT: TRUE or emptyTor Lillqvist2013-10-101-6/+11
| | | | Change-Id: I962b37757dbf3569df73e70ae2d7c666d7cdf43e
* ENABLE_OPENCL should be TRUE or emptyTor Lillqvist2013-10-091-1/+0
| | | | | | Should make the Android tinderboxes happy. Change-Id: Idf33106514a1d0e34566d76d97d689e7543eda3c
* OpenCL is not available for iOS or AndroidTor Lillqvist2013-10-091-1/+1
| | | | Change-Id: Iac0cd17dfa0544ec686120d50a6cfdb70336e042
* only build openGL canvas when libGL supports shaderChristian Lohmaier2013-10-071-2/+10
| | | | | | | | | 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>
* Add opengl canvas implementation.Thorsten Behrens2013-10-071-1/+1
| | | | | | | | | | Adds opengl canvas implementation - display-list-based, all rendering done as textured geometry. Needs shader support. Currently compiles and works on Linux, Mac should be ~easy to add, win32 eventually. Change-Id: Ibf3eb88d6a36a91b2960a3a6320d708160e4fc14
* make system-bluez build not use -I$S/bluez_bluetooth/inc in sd...Rene Engelhard2013-10-061-1/+7
| | | | Change-Id: Icdd90a7aadf7cfbc464e11a1e0386576cbc5c06c
* Point out that --enable-canonical-installation-tree-structure is broken nowTor Lillqvist2013-10-061-1/+1
| | | | Change-Id: I2b14c3a5e7b3945e40334b961024ef243e957efa
* URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist2013-10-051-4/+5
| | | | Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
* configure.ac: always search for md5sumBenedikt Morbach2013-10-041-6/+11
| | | | | | | | | | | | | | | | | | Since edf8db717f49199833de9fc9d2c9817bab613795, the MD5SUM env variable is used by solenv/bin/modules/{installer.pm,installer/systemactions.pm} like this: echo $languagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g" Because the MD5SUM check is behind "$enable_fetch_external" != "no", this causes an error with --disable-fetch external: sh: -c: line 0: syntax error near unexpected token `|' Move it out of the enable_fetch_external check. Change-Id: Ib0a9694226deed3957868c17fe4d982f38fd84b1 Reviewed-on: https://gerrit.libreoffice.org/6127 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
* put result of make test-install into top-level test-install dirMichael Stahl2013-10-011-2/+2
| | | | | | ... and rename all DEVINSTALL variables to TESTINSTALL. Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
* Simiplify testTor Lillqvist2013-09-301-3/+3
| | | | Change-Id: I8ab1842ef1eb6f2988a547f0837daa81bbaff595
* Check separately and more thoroughly what the C++ library isTor Lillqvist2013-09-301-17/+39
| | | | | | | I.e., GNU libstdc++, LLVM libc++, or Microsoft. Also, do the grepping for "visibility push" only in the libstdc++ case. Change-Id: Ibf1038e37780774d9595eccfe47894dd88fc5591
* Enable orucs by default on Windows.Kohei Yoshida2013-09-251-1/+0
| | | | Change-Id: Ic23a7a85a162e61660a8aee877fee4de83af52ed
* Use portable '=' comparison operator for test(1).Thomas Klausner2013-09-241-6/+6
| | | | | | '==' only supported by bash, not even GNU coreutils. Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
* remove unused EXEEXT_FOR_BUILDMatúš Kukan2013-09-241-3/+0
| | | | Change-Id: I6ac851e3ba418bb681f69f5417c74688776498be
* Create a proper Info.plist for the OS X app bundle already in configureTor Lillqvist2013-09-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | After recent instdir changes the SCPZIP_REPLACE thing was not used any more for Info.plist, so all the ${FOO} things were left in Info.plist unexpanded with predictably wonky results, a non-working app. Instead just expand it from the configure script. While at it, use a correct CFBundleShortVersionString: only three integers should be in that. Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION as 1.0, and drop the "variables", as that is what those "variables" *means*. They were used to refer to the OOo 1.0 formats. (It would have been utterly wrong to define them as something else, like another product name and a newer version number, in openoffice.lst, so pointless to have them there.) Drop the meaningless BUILDIDCWS. Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
* Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist2013-09-231-53/+59
| | | | | | | | | | | 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
* ThinkoTor Lillqvist2013-09-231-1/+1
| | | | Change-Id: I31e1c7a7f0017abe6d4e45f32ea4aad6545cffe1
* Try to fix cross-compilationTor Lillqvist2013-09-231-12/+27
| | | | | | | | 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
* configure: oops, there were 2 harfbuzz lines to fixMichael Stahl2013-09-221-1/+1
| | | | Change-Id: Ib1869134b971c04a9cbd5d15b206898e943aaa5e
* find lots of external static libraries in UnpackedTarball dirMichael Stahl2013-09-221-8/+27
| | | | | | | | | | | | Note: do NOT put file paths to static libraries into FOO_LIBS variables that are passed to bundled externals that are built with --enable-static: on Mac OS X this will result in .a archives that contain other .a archives as entries, and trying to link those results in errors like: ld: warning: ignoring file .../libodfgen-0.0.a, file was built for archive which is not the architecture being linked (i386) Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
generated by cgit (git 2.34.1) at 2024-07-23 10:35:36 +0000