Commit Graph

1018 Commits

Author SHA1 Message Date
Tor Lillqvist
d5dcd61f07 ANDROID_NDK_HOME is not used outside configure.ac
Change-Id: I67b4ffa9c6cfe5558a9340495baad924aa16e11a
2013-05-15 09:13:07 +03:00
Tor Lillqvist
35fdbea1a1 FRAMEWORKSHOME is not used outside configure.ac
Change-Id: Ic8eae6d7e9590ad75c414568877aa093c92ce536
2013-05-15 07:31:35 +03:00
Mark Wielaard
34cf34d651 Require at least gio 2.26 for the dbus support.
Change-Id: I6276d55081098f567104f61fde896d1b66591522
Reviewed-on: https://gerrit.libreoffice.org/3904
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-14 13:39:00 +00:00
Lionel Elie Mamane
ba26c5e633 configure.ac: don't use python2 values for python3
unset more internal python-related variables, so that the test for runtime-python >=3 does not reuse *any* value from test for build-python >= 2.5

Change-Id: I508292713d582476db70fcd2b05ce0abb300f38a
2013-05-13 08:25:20 +02:00
Lionel Elie Mamane
ca8201ef54 configure.ac: fix error message on non-MacOS X builds
Change-Id: I33c0b7218054d8d879d72a2a47899b39ae8458ca
2013-05-13 07:56:03 +02:00
Lionel Elie Mamane
4af1a4a086 configure.ac: remove duplicate "no" AC_MSG_RESULT
AC_PATH_PROG already says no

Change-Id: Ib920492c89eeb5113474b834ca00882cf47bd322
2013-05-13 07:56:02 +02:00
Lionel Elie Mamane
180b1e1e18 configure.ac: check for newly needed mdds header
Change-Id: Id7dcf5b6c2946b2445dfd4eacf5b78f84607491a
2013-05-12 13:33:03 +02:00
Michael Meeks
8659ca5c35 fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.
Change-Id: Ide7d833801e96a3375909238d036687082f34605
2013-05-11 17:36:58 +01:00
Khaled Hosny
fe9def183b USE_FT_EMBOLDEN has never been used
Change-Id: Idd30f6fcf9d1e4d2af5f49caffa91d6ce30bb196
2013-05-11 08:55:40 +02:00
Khaled Hosny
1266602a0d Fix FreeType version check
FreeType has 3 different kinds of versions
* release, like 2.4.10
* libtool, like 13.0.7 (this what pkg-config returns)
* soname

FreeType's docs/VERSION.DLL provides a table mapping between the three

We were checking for >= 2.0 which is always true of course, so I
replaced it with 9.4.3 i.e. 2.1.5; the first FreeType release to provide
a freetype2.pc file (I could have omitted the version check at all,
since it is practically the same), but this should be replaced with a
real minimum required version.

Change-Id: I95f6c398a5b19d4bb728a6dddc957a9f95f27efa
2013-05-11 08:55:40 +02:00
Tor Lillqvist
1feb672b5e Use bundled OpenSSL when building for OS X 10.7 or later
http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion
http://stackoverflow.com/questions/7475914/libcrypto-deprecated-on-mac-os-x-10-7-lion

Apple apparently got fed up with the unstable ABI of OpenSSL, or
something, and recommend you either move to their "Common Crypto
Architecture", or, if you have to stay with OpenSSL, just build it
yourself statically and bundle with your application. So let's do
that.

Change-Id: I5f19fcce9b4e00ff2ce3089a2398b3f08f76a9a0
2013-05-10 18:55:03 +03:00
Christian Lohmaier
ebef182253 don't override TMPDIR with /tmp on cygwin, cleanup TMPDIR/TMP handling
on cygwin, configure forced TMPDIR to /tmp, regardless whether it is set
or not. And while it respects an existing value of TMP, TMP is only used
in a few places. Changes the ones that explicitly check for TMP to
prefer TMPDIR, and don't duplicate configure's check in other scripts.

Change-Id: Ia8ac3f8d92e5f971c5237b85f66f7c0a58932930
Reviewed-on: https://gerrit.libreoffice.org/3701
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-10 13:18:50 +00:00
Tor Lillqvist
5d79c18c32 Untabify
Change-Id: I42f54c87384419f5f605c2a5a8146477238f4dfb
2013-05-10 13:31:04 +03:00
Kohei Yoshida
c239706d29 Go back to the old way of detecting headers.
Change-Id: Iabad8f0a3936fa30d4ba68a717a79e4e0b497991
2013-05-09 13:34:37 -04:00
Kohei Yoshida
338a6cb6c5 Update mdds to 0.8.0.
Change-Id: I5dcf3b14993ac4d699e884c4981af668277a41df
2013-05-09 13:34:37 -04:00
Michael Stahl
3c38b7727a zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
2013-05-08 23:34:26 +02:00
Michael Stahl
416b321666 libpng: remove ExternalPackage_libpng
Change-Id: I478a057c07b9fe850401b96297a14d7842c0703f
2013-05-08 17:49:58 +02:00
Michael Stahl
cc858aca0e configure: substantially de-bong libpng handling
- remove --unix-qstart-libpng:
  the internal libpng is static lib so this option is pointless
- clean up duplicative libpng checks
- replace usage of ENABLE_QUICKSTART_LIBPNG with ENABLE_HEADLESS,
  which is the one case where it could still be disabled

Change-Id: Ie2e2c7e4a2396572742fdf056bf23c4271f04811
2013-05-08 17:49:58 +02:00
Herbert Dürr
436be3ca0b update links for EPM
easysw.com closed its doors after 14years of business.
Thanks for providing EPM.

(cherry picked from commit 73a1f473b72f86d84f3ae542b6c2750911d6c876)

Conflicts:
	configure.in

Change-Id: I14244a7802055b5137c6cd10de2cad4b8628f799
2013-05-08 16:10:29 +01:00
Riccardo Magliocchetti
37690fe74c configure: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless
Change-Id: I7ab931bb7c4f0d83dd7701650ec0d6a1ef83fda2
2013-05-06 22:10:25 +02:00
Khaled Hosny
bff8fa97e1 Enable HarfBuzz by default
HarfBuzz integration should be functional now, so to give it more wider
testing it is made now a required dependency on non-Windows non-Mac OSs.
By default text layout is now done by HarfBuzz but ICU LayoutEngine is
kept as a fallback and can be enabled with SAL_USE_ICULE env variable.

After 4.1.x is branched, ICU LayoutEngine should be removed completely.

Change-Id: I4fe3beeaf6092f33dd436906c11b83aeafdfbd5d
2013-05-06 17:22:31 +02:00
Petr Mladek
29884e1f4b bump product version to 4.1.0.0.alpha1+
Change-Id: I131364a0c80626b82939b641012abdfd11e9fabe
2013-05-06 14:19:56 +02:00
Riccardo Magliocchetti
2ac38d1eac configure: with --enable-headless disable opengl by default
Change-Id: Ia09d30c7ffe6b8597c6b23921feed07151aab04c
2013-05-06 10:31:32 +02:00
Riccardo Magliocchetti
759cc27530 configure: no ENABLE_NPAPI_FROM_BROWSER for --enable-headless
Change-Id: Icc986a13700396913e89299826f58cd107ff2673
2013-05-04 18:16:25 +02:00
David Tardon
08f94626ef nuke MathMLDTD
math.dtd was dropped from installation in 2009, see
https://issues.apache.org/ooo/show_bug.cgi?id=97200#c3 :
"In agreement with MIB and MT it was diecided that the Math.dtd should
be removed from the installation set as well since it
a) has incorrect content
b) is no longer used nowadays at all"

Change-Id: Id2a727338c224b0beb4b8def197988ab071a7d94
2013-05-04 16:44:49 +02:00
Petr Mladek
7b57cbbba1 PRODUCTVERSION variable always used only major and minor version
For example, this fixes some mess in the desktop subpackages.
It probably fixes strange things also in other places where
we do not want the too detailed version 4.0.0.0.alpha0+

Change-Id: I23482db4f9e3c907f3c7452a111acb54879b1f4f
2013-05-03 17:28:34 +02:00
Andres Gomez
91f7fabe4f configure: minor typo
Change-Id: I13e4b91f62a3cbe02e504004b177efdcbe939edc
Reviewed-on: https://gerrit.libreoffice.org/3754
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-03 09:51:54 +00:00
Tomas Chvatal
12af4ae6fd Search for mariadb_config and mysql_config so it works everywhere
Change-Id: Id6ae4cde25998bb21981b7cccb23a094f217750f
2013-05-03 11:48:39 +02:00
Fridrich Štrba
93848e11ec Splitting writerperfect into serializer and libodfgen
Change-Id: I69f12fb097dbc977e63463b6b764a3553bcf9271
2013-05-02 20:26:23 +02:00
Tor Lillqvist
7de37ac7d6 Add --enable-desktop-gui-elements to show such even on non-DESKTOP platforms
Not my idea.

Change-Id: If4874d97a2035588cd65ded9f281de0c3598b7d7
2013-05-02 20:19:15 +03:00
Andre Fischer
f04463012e Fixed typo (missing $) in configure.ac
(cherry picked from commit e755623a1d2cb24fc8c339eb0c0888c42d6c0ba7)

Conflicts:
	configure.in

Change-Id: I2a7a9ab83ac29c0306366303374e93ab08cd10ce
2013-05-02 13:22:27 +01:00
Tor Lillqvist
35583e0202 Make configury work as well as possible for iOS without options
Change-Id: If28fbe59f55626aeca05fa93446a0e5034ea2b91
2013-05-01 09:48:18 +03:00
David Tardon
674a7b44f3 install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d3).

Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
2013-04-30 17:50:43 +02:00
Tor Lillqvist
788c152cc6 Revert "Don't enable postgresql-sdbc by default"
I simply didn't have the krb5-devel package installed, and assumed there was
something more complicated going on.

This reverts commit 0e1cc99685.

Conflicts:
	distro-configs/LibreOfficeWin64.conf

Change-Id: Ie3b226678862ed6388bcf1bf105da0b996f653d1
2013-04-30 12:17:45 +03:00
Tor Lillqvist
0e1cc99685 Don't enable postgresql-sdbc by default
Try to make it more likely that a build without any autogen.sh options
succeeds. We didn't even get past the autogen.sh phase on openSUSE 12.3 thanks
to some krb5 stuff needed by the postgresql-sdbc checks.

To compensate, add --enable-postgresql-sdbc to those distro-configs/*.conf
files that didn't already have --disable-postgresql-sdbc.

Change-Id: I967616993875b99d9d5a9fd0721f281bb1161a87
2013-04-30 10:42:29 +03:00
Christian Lohmaier
2f205ee79e add fallback for Merge-Modules directory (when not found in registry)
Add "$COMMONPROGRAMFILES\Merge Modules" (on current versions of Windows
that probably is "C:\Program Files (x86)\Common Files\Merge Modules") as
fallback, since for example on Windows Server 2012, the registry entry
has not been created when installing Visual Studio Express

Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
Reviewed-on: https://gerrit.libreoffice.org/3680
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-04-29 15:49:04 +00:00
David Ostrovsky
d47d311ff9 fix WaE with system libhunspell
Change-Id: I6d943136ef189a57bc5fa95530c76b0226ba874d
Reviewed-on: https://gerrit.libreoffice.org/3618
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-04-26 15:12:50 +00:00
Matúš Kukan
914ea9a78a -I$(SRCDIR)/include is added into SOLARINC later
Change-Id: Ib65b3fda5bc1224e569f38cf75607b07eb4a1501
2013-04-26 13:46:35 +02:00
Michael Meeks
cb33ae88e0 extend license filtering, and add fallback-checks.
Change-Id: Ia1ec3564326cf898d756c231a64a54db8698bf20
2013-04-24 16:21:40 +01:00
Michael Meeks
db52fd7123 Add license filtering to configure.
Change-Id: Icd53c6ccfcca25d828d79ad62d1e075869998850
2013-04-24 13:29:46 +01:00
David Tardon
9ccd994d44 Revert "add extra inc. dir for URE headers"
Not needed anymore after moving the headers to $(SRCDIR)/include .

This reverts commit ea09e0352a.

Conflicts:
	configure.ac

Change-Id: I96c86152d3eff66ccadc9fd76131c0b57763afae
Reviewed-on: https://gerrit.libreoffice.org/3500
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:17:25 +00:00
Bjoern Michaelsen
f4e1642a17 move global headers script
* ignores (for now) modules:
  - sal
* these might or might not consider themselves too special for their own
  good and break by the move
* these modules use Package_<module>_odk_headers.mk instead and stay
  untouched:
  - cppu
  - cppuhelper
  - sal
  - salhelper
* these modules have an inc/ subdir, but no Package_inc.mk
  - accessibility
  - autodoc
  - bridges
  - idlc
  - pyuno
  - svgio
  - unodevtools
  - xmlsecurity
  this should not hurt the move
* these folders are in solver/ with generated headers:
  - oovbaapi
  - offapi
  - udkapi
  - officecfg
  - systools
  - external
  - oox
  - svx (sdi)
  - sfx2 (sdi)
  - writerfilter
* these likely can be cleaned up still after the move:
  - dbaccess
  - npsdk
  - sd
  - helpcompiler
* should work with xmlscript after commit
  f4ebb99de6
* fixes/hotfixes some other insanities that would break on the move

Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a
2013-04-23 20:18:02 +00:00
Khaled Hosny
7e389f4def Add HarfBuzz support to the build system
To be used in the next commit.

Change-Id: I6ee286d0c050a5ca650e7fb3692b0facccb5f0c0
Reviewed-on: https://gerrit.libreoffice.org/3517
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-23 08:00:14 +00:00
Norbert Thiebaud
fd179c5f30 missing "" around identity in check for code signng key on Mac
Change-Id: I421b72dd58d1216c1f68731332bc6a41d3c0071e
2013-04-20 21:39:49 -05:00
Tor Lillqvist
7c0c20076d Do build libwps for iOS
Change-Id: Icd3120496e5548349ca58423ea537f392f6d5c6b
2013-04-19 14:14:00 +03:00
Michael Stahl
b9e6bd790f configure: try to make all PYTHON variables point to the same thing
Change-Id: Ifa6a22717d6911b1f5dd816144d3ee95a09879a3
2013-04-19 00:30:13 +02:00
Tor Lillqvist
ef5bd25341 Do build libwpd, libwpg, libcdr, libmspub, libmwaw and libvisio for iOS
Change-Id: I6b69d852bd503ffe07c61fb6f048d5dde28cdbf9
2013-04-19 00:19:41 +03:00
Matúš Kukan
be421269f9 move headers from solenv/inc/ to include/
Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
Reviewed-on: https://gerrit.libreoffice.org/3403
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-16 18:25:18 +00:00
Matúš Kukan
cefeae773f Revert "do not merge public ure libraries"
Does not work because cppuhelper depends on private libraries.
So, either by setting URELIBS we break API or can't merge that much or
need to think about it more and implement something clever.

This reverts commit 75ece7acdc.
2013-04-16 16:39:42 +02:00
Matúš Kukan
75ece7acdc do not merge public ure libraries
No more need for URELIBS, depend only on MERGELIBS.

Change-Id: I5a93031116c26bbbe375e9c467e7b427487ec18b
2013-04-16 11:50:25 +02:00