summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)Author
2020-11-18AC_CHECK_SIZEOF works fine when cross-compiling, no need to hard-code for iOSTor Lillqvist
Possibly it didn't work when cross-compiling back when that hard-coding was added. Change-Id: I763d26ae1922907265636ba0be0757700bfe2a8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106058 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-18Accept iOS SDK 14.2Tor Lillqvist
Change-Id: Icd30133588f3cffb5de41303dc03cb325c20fe83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105788 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106044 Tested-by: Jenkins
2020-11-17Update to ICU 68.1Eike Rathke
Also made it necessary to adapt two places in libcdr and libebook that used UBool TRUE which is gone now to use standard true instead. Change-Id: I1c1df3030f8b883bec6045756907ee0b78060382 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105964 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2020-11-10Remove obsolete AC_HEADER_STDC checkStephan Bergmann
Autoconf 2.70 beta autoupdate says: > configure.ac:6540: warning: The preprocessor macro `STDC_HEADERS' is obsolete. > Except in unusual embedded environments, you can safely include all > ISO C90 headers unconditionally. Change-Id: I3d7e96ccd1683f51d47250c013cb0b6ea11d70ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105554 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-09lok:configure: replace obsolete configuration linksHenry Castro
The "AC_LINK_FILES" is replaced by "AC_CONFIG_LINKS" Change-Id: I9c82d3f54cf78f08489453389d4e5070529a4f69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105423 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-11-07configure: OpenSSL needs perl-FindBin to buildMichael Stahl
Change-Id: Idcea17d2418a2e847a5713293d7a225ed86bd305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105435 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-06Replace obsolete AC_FD_CC with AS_MESSAGE_LOG_FDStephan Bergmann
...see <http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit; h=cc2c99e90bd58b3d5022581eada72ca10df99bb0> "Move AC_MSG_* into M4sh" stating > (AC_FD_MSG, AC_FD_LOG): Be AU_ALIAS'es of... > (AS_MESSAGE_FD, AS_MESSAGE_LOG_FD): new. and which is present in branch-2.59 matching our AC_PREREQ([2.59]) baseline. (This change is suggested by running autoupdate from the current Autoconf 2.69 suite.) Change-Id: If5826489b3416b4029b9c922f9415576978306b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105393 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-04Make --without-webdav work even with --enable-mpl-subsetTor Lillqvist
Change-Id: I319e0b3aefa721f2503494783af6d73470f592a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105271 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-03I am sure the fill-column value of 102 here was accidentalTor Lillqvist
I can't think of any reason to use such a pointlessly seemingly specific value. Let's just use the round number 100, as for source code (see TEMPLATE.SOURCECODE.HEADER). Change-Id: If61af553f8142dfcba31e775d050d167f89c010b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105235 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-03i386 is not used at all on macOS since many yearsTor Lillqvist
Change-Id: I6e9b61da73509f40575640209082defc34bcbf63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105230 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-01Use save_CFLAGS etc in a uniform wayTor Lillqvist
Restore the old CFLAGS (etc) as soon as possible. Always use the same variable names for the saved values. Change-Id: I523bbf66ec5400d24993b7e11e444bb63d61751e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105130 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-11-01Find ODBC headers when building for Windows on WSL, tooTor Lillqvist
Change-Id: I3a05def839c14d59545c4891418577ed36f2b8cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105099 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-31Set CPPFLAGS instead of the INCLUDE environment variableTor Lillqvist
INCLUDE is not exported from WSL to Win32 programs without including it in the list of environment variable names in the WSLENV environment variable, and I think we want to minimize the number that need to be mentioned there. Should not affect Cygwin builds. Change-Id: I0af480873badac446305e396b69eec360eb8a270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105098 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-30build-tools: default to system PCH settingJan-Marek Glogowski
Originally disabled for the build-tools to get rid of an other potential build failure while implementing the cross build on Windows for the Windows Arm64 build. Change-Id: I720d0812de26ddb1f71a14db708595babbefe84c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105035 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-10-26configure: pdfium is used during pdf sig verifyMiklos Vajna
So make it more obvious that disabling pdfium is not too secure. Change-Id: Ie67d2ea76bfbcca928927f974be46ae708472cf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104809 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-10-26Must use the Unix form of a pathname in a test command on WSLTor Lillqvist
(Using the Unix form doesn't hurt on Cygwin either.) Change-Id: I43c6c66feabadd9dec2287e440e5748db264fc6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104788 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-26Make more of the Windows SDK checks work on WSLTor Lillqvist
Part of work in progress. Committing in smaller bits to make potential bisecting easier. Change-Id: I604bdd993288369051b3365014be54090f987559 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104789 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-26Use consistent slashes in the INCLUDE variableTor Lillqvist
Change-Id: I9b68eeca92b9ee5722884384a740bfac85a26bed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104784 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-26Don't ever display harmless error messages from wsl-lo-helperTor Lillqvist
It is expected that some of the Registry entries that we try to read do not exist. Change-Id: I48b40cd6a3cf0961abd7259ad02da18c2ee65601 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104787 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25bump product version to 7.1.0.0.alpha1+Christian Lohmaier
Change-Id: I4a9c2122b8d0511311a6101c2eeda6e86220b1fc
2020-10-25Must use the Unix form of a pathname in a test command on WSLTor Lillqvist
Change-Id: Ib785ba0b22a555136a64c97c50aa2c17a75f6c03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104774 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Don't display harmless error messages from wsl-lo-helperTor Lillqvist
Change-Id: I6ae91b093eaad3b59ca939045ba0d045377f3978 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104773 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Improve PathFormat on WSL: Don't lose a final slashTor Lillqvist
Change-Id: If0f09dab3a7eb0849aeabcb52bfee39c3a71b719 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104769 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Fix win_get_env_from_vsvars32bat and find_ucrt for WSLTor Lillqvist
Change-Id: I8cb2d6b6170d427c0f622b1377b6fd21e3b90383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104770 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Improve the WSL cygpath emulationTor Lillqvist
Handle also Windows pathnames passed to it in mixed format, and Unix pathnames for Windows files (starting with /mnt/). Change-Id: I07a01b8680a6ed203e9fe44c37822e0490c3f296 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104771 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Use wsl-lo-helper to read a Registry valueTor Lillqvist
Change-Id: Ie006ed818e91e5cd4869fabb1b8fa9bcf0da943f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104768 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25More cases of treating wsl like cygwinTor Lillqvist
Change-Id: I7ae3c86fc42d5232b168a55d1993ad373075b773 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104765 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Fix the find_msvc function for building on WSLTor Lillqvist
Use the PROGRAMFILESX86 environment variable that autogen.sh exports. Use the $formatted_path_unix return value from PathFormat. Change-Id: Ifa2c05e57248a9c05d60ebf7b93fbdc1c1e59b1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104764 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Interix is dead since long, but check for WSL insteadTor Lillqvist
Change-Id: I0f5324528b87ca76c602cb788e9c8648e61188ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104763 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Add another return value to the PathFormat function, for WSLTor Lillqvist
This is just one step towards the goal of being able to build for Windows on WSL (instead of Cygwin). Unlike Cygwin, WSL can not use Windows pathnames at all. So to be able to build for Windows on WSL, we will need to be much more careful in keeping track of which pathnames are in Windows format and which are in Unix format. Add a second return value for PathFormat that on WSL is in Unix format. Like in c6d8e4b36f9575267244119c0a7e6a2275168625, also add a simple "unit test" (just for visual inspection) of the new functionality. Change-Id: Ief4584243227677d0705de2c83e2a0bf54eac0a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104761 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-25Set also ac_cv_{build,host}_{cpu,os} in the case of building for Windows on WSLTor Lillqvist
Change-Id: I095f5169c0e9969531995ff0b533642aeaae9135 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104759 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-21Accept iOS SDK 14.1Tor Lillqvist
Change-Id: I093ee0a6cb6483a8891dd9ed4576da0108303c66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104586 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-21Add "freebsd_powerpc" and "freebsd_powerpc64" platforms to configure.ac.Gleb Popov
Change-Id: If21b074c7a9f5da45101866ee071967bdc668af9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104561 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-10-20Allow to opt in for --enable-gtk3 plus --without-system-cairoStephan Bergmann
This check had been introduced with 5ad60c5d69042a73d7a1632d3c04e15783817db4 "more configure, and scp2 pieces for gtk3 integration", but without stating any reason. In a comment at <https://gerrit.libreoffice.org/c/core/+/104549/1# message-4b5fcbdabf9c7e40782df682d68efb6282b37c6e> "Allow to opt in for --enable-gtk3 plus --without-system-cairo", mmeeks now states: "My recollection is of horrors with the internal cairo being linked before the system one, and being older - such that various gtk3 themes / bits of functionality which would now link to an older (or even newer ;-) internal cairo randomly stop working / crash / burn / etc." However, at least my Linux build appears to work fine with (among others) --enable-gtk3 --enable-gtk3-kde5 --without-system-cairo And that combination proved useful to me when I wanted to run SAL_USE_VCLPLUGIN=gtk3 LO against a libcairo built with ASan the other day. So, while keeping the default of implicit --with-system-cairo if any of --enable-gtk3 or --enable-gtk3-kde5 is (implicitly) set, lets allow to nevertheless explicitly opt in to that combination---with a prominent warning. Change-Id: Ie5231085966a4f3e35b080ca162d8b846cc1ad34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104549 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2020-10-20Do not check for GNU patch utility on FreeBSD.Gleb Popov
While FreeBSD patch is indeed not a GNU one, it is sufficient to build LO. Change-Id: I55783f5bc7b4e2886e31936a317f52916d9a1e5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104519 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-10-19Add FreeBSD to the list of OSes that have OpenSSL in its base.Gleb Popov
Change-Id: I9ebbaf78c06e23f1fc44d9b97547c0a5c990cd11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104482 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-10-17fix build with box2d 2.4.0Rene Engelhard
Change-Id: I60f25f04e2bfcdabf832f42b44ba3d945f4ec169 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104456 Tested-by: Jenkins Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-10-16Rename CLANG_CC, CLANG_CXX configuration vars (avoid clash with scan-build)Stephan Bergmann
Clang's scan-build tool uses the CLANG_CXX environment variable (setting it up in the scan-build script to pass it to the ccc-analyzer script), but happens to erroneously set it to a non-existing path (see <https://reviews.llvm.org/D89481> "[scan-build] Fix clang++ pathname again"). So wrapping LO's autogen.sh and make in scan-build picked up that broken CLANG_CXX and caused build failures like > [CXX] external/skia/source/SkMemory_malloc.cxx > /bin/sh: ~/llvm/inst/bin/clang-12++: No such file or directory (see <https://lists.freedesktop.org/archives/libreoffice/2020-October/086113.html> "Re: llvm/clang static analyzer reports"). So rename CLANG_CXX, and for consistency also CLANG_CC and the various CLANG_CXXFLAGS_INTRINSICS_*, by prefixing each with LO_. Change-Id: Ib41cabe940f8bfb1997f74e865cca5725f859e07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104383 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-10-15Fix check for inclusion of <sys/sysmacros.h>Stephan Bergmann
30a5d201144cba04dd708c11d87cc5517c04c0c3 "Do not include <sys/sysmacros.h> header unconditionally, but perform a check for it in the configure script" had added an AC_DEFINE without a corresponding mention in any config_host/config_*.h.in (we use AC_CONFIG_HEADERS), so the #ifdef was always false. The #include <sys/sysmacros.h> had been added with 01bf741a79241829b0d5c048e8f45e3cf6914d3e "WaE: include needed header" for the declaration of a major function, but which is only used in #ifdef LINUX code anyway. Change-Id: I81b574c4a3e5fa2ef4e64a507b4841044217409b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104351 Tested-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-15Do not include <sys/sysmacros.h> header unconditionally, but perform a check ↵Gleb Popov
for it in the configure script. This header is missing at least on FreeBSD. Change-Id: Iecb8c35e2ea8af84cf1488334a4d39ba0b5af7e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104214 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-10-09Allow CXX_X86_BINARY to be passed into autogen.sh againStephan Bergmann
...after 114ed73a7ba56e013e6d7f886798915fb20c0946 "WIN drop --enable-64bit to select Windows target" had broken a6c22d4e086957b743a135163c71ac233062619e "Allow CXX_X86_BINARY to be passed into autogen.sh" (and see the commit message of the latter commit for how this is used by builds with clang-cl) Change-Id: I7247e41a77d4f65ccae4e0ee522792646068e7b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104101 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-10-07raise min version of gtk to 3.20.0Caolán McNamara
Change-Id: I7e463f48dabbcc27b0d5533fa2c46610cbd7aa82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103901 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-10-05Pre-set the host and build platform on WSLTor Lillqvist
WSL is otherwise detected as Linux, which it of course is, but on WSL we typically (?) don't want to build LibreOffice for Linux, but for Windows. Do this only if no explicit host platform has been passed on the command line. We do want it to be possible to actually build for Linux on WSL, too. For WSL, define an emulation of the cygpath command on Cygwin. Also add a simple "test" for it, for visual inspection, not an actual unit test. Change-Id: I9d9fd8f8039692d754fb96762ed00727e97130b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103936 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-05Small cleanup of shell functionsTor Lillqvist
Use "local" for local variables. Document the (global) variables used to return values. Change-Id: Iadb567af9e19a627da616f05a5dc650af1c070de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103926 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-10-04Don't forward JDK home option to the cross-buildJan-Marek Glogowski
The configure flags on the command line always specify the host config, so it doesn't make any sense to forward this setting in case of a cross build. You can add a --with-jdk-home=... to the --with-build-platform-configure-options flags, if the build config finds the wrong build JDK. Also add this info to the --with-jdk-home help. For convenience (and because I don't want to adapt tinderboxes again), this forwards the host JDK to the build for Android. And explicitly disables Java for iOS build tools, as it used to be. The whole --with-java handling should probably be removed in favour of the --with-jdk-home. Do we have a real use case, where we just need the Java interpreter but not the JDK (ok - the document validators come to mind, but then you could also just simply provide a JDK...)? Change-Id: I328a15c090001bb025f4ba66d13b0cd020991fa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103878 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-10-04skia: don't fail Windows Arm64 build without clangJan-Marek Glogowski
Since commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e we build Windows Arm64 with Skia, but since there is no clang compiler for Arm64 in VS2019, we use the normal MSVC one. So don't even try to detect it currently. Change-Id: I1e82a1a92bce3b8f52fe24e3095ab6e70a7a1256 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103924 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-10-04Replace "newlined" sed with trJan-Marek Glogowski
This doesn't filter the list on Windows Cygwin, resulting in a lot of wrong stuff in the BUILD_TYPE, which actually isn't build. Since the next line uses tr, use this here too. Regressed-by: d4105c8aec2e1815aa536c50bc742dd5c8bff940 Change-Id: I750bd1bd5084ff5a23b4635f3ee63f46ba1dd83f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103871 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-10-04Document what PathFormat doesTor Lillqvist
Change-Id: If8b0ca9b55fb601bc3da2172f5acc00a7d83ea85
2020-10-02gpgme, coinmp, firebird: disable on Windows Arm64Jan-Marek Glogowski
There is currently no gpgme package for Arm64, coinmp uses MSbuild, which probably just needs an additional ARM64 build target via VS. Firebird configure fails with cross-build errors, and I simply stopped early trying to fix them. I'm actually wondering, why LO doesn't use the VS solutions to build Firebird on Windows. Change-Id: I3acbe91e1df287afd557a07b48e3db46b31e6d95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103781 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-09-30use -fpch-codegen rather than -fmodules-codegenLuboš Luňák
The -fmodules-codegen flag has been in Clang for quite a while, but it officially works with PCHs only with Clang11+, and even there's it's better to use the properly named -fpch-codegen. This also fixes a problem with Clang9 having only -fmodules-codegen but not the -fno-* variant, causing the build to break. Change-Id: I9a8c979426f95e8c1f77cbeab1df64390d7243b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103677 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>