Commit graph

211 commits

Author SHA1 Message Date
Stephan Bergmann
a6139f6fe6 Key different browser plugin features to specific flags
This is a rework of f9059d4eee "Key all browser
plugin features to --enable-nsplugin."  The problem with that was that Mac OS X
supports pluging browser plugins into LO documents (which was originally
controlled by --enable-mozilla) but not plugging LO into browser windows (which
was originally controlled by --enable-nsplugin), so controlling the former with
the same switch as the latter did not actually work.

Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones,
ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and
ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows).  The
--enable-nsplugin configure switch is gone completely, setting the feature flags
is always done fully automatically now.

Change-Id: Iecf706637465e865c987563b5de489fa90b4c904
2012-11-20 11:24:05 +01:00
Enrico Weigelt, metux ITS
0e682df529 renamed --enable-bluetooth to --enable-sdremote-bluetooth
The current configure option --enable-bluetooth is a bit misleading,
it doesn't really tell what it's actually for. Therefore renamed it,
so it's more clear that it's an sdremote backend using bluetooth.

Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa
Reviewed-on: https://gerrit.libreoffice.org/1086
Reviewed-by: Rene Engelhard <rene.engelhard.re@googlemail.com>
Tested-by: Rene Engelhard <rene.engelhard.re@googlemail.com>
2012-11-16 13:55:23 +00:00
Stephan Bergmann
13ef9dcc20 Rename "Mozilla headers" to "NPAPI headers" (incl. configure option name)
...to avoid confusion what that is actually about.  (Especially, it is
completely unrelated to --enable-mozilla.)

ATTENTION:  This renames the configure option --with-system-mozilla-headers to
--with-system-npapi-headers.

Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc
2012-11-15 18:15:43 +01:00
Bjoern Michaelsen
4e7f9650e2 remove ancient lo-menubar implementation now that we have the shiny new one
Change-Id: Ie5ea41e7376838ac7f2ebfbe0d703e6a28d8a8a9
2012-11-14 16:30:28 +01:00
Norbert Thiebaud
06b68aaf9b allow to override PARALLELISM and CHECK_PARALLELISM at make time
this allow for
CHECK_PARALLELISM=1 make check

Change-Id: Id7dee09440dda54588965a846f950176d2b4c671
2012-11-14 05:18:38 -06:00
Tor Lillqvist
97d8b88221 Revert "fdo#38878 upgrade xpdf to poppler"
Also revert my two minor follow-up popper commits.

Poppler doesn't build on Mac OS X. It uses fontconfig, and we don't
depend on that on the Mac.

There is a patch from 2009
http://lists.freedesktop.org/archives/poppler/2009-July/004932.html
(actual patch at
http://lists.freedesktop.org/archives/poppler/attachments/20090712/f3b154d0/attachment-0001.obj
) that makes poppler not use fontconfig on the Mac, but it was never
upstreamed.

And that patch uses the obsolete ATSUI API, which we want to stop
using in LO code, not introduce new uses of.

This reverts commit 39f9eb0d85.
This reverts commit 0941c21185.
This reverts commit a6e9bb4c7b.
2012-11-13 10:28:15 +02:00
Peter Foley
a6e9bb4c7b fdo#38878 upgrade xpdf to poppler
Change-Id: Ib908a3acba1faabeb411b4d1459968a362ee8029
Reviewed-on: https://gerrit.libreoffice.org/1036
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-13 07:29:34 +00:00
Eike Rathke
bfd8721577 fix gb_SPACE in LIBPNG_CFLAGS
Change-Id: I901390b39573f7cf8b3a8971e32e52e9d479d645
2012-11-12 12:55:53 +01:00
Luboš Luňák
136d8962d7 remove make-specific code from config_host.mk
Apparently some people still try to source it from shell (scripts).

Change-Id: If26a5c5eb83739d3ccce043afd095000d355a543
2012-11-09 17:53:13 +01:00
Michael Stahl
cedd9ebdd2 configure: define FOO_CFLAGS/FOO_LIBS so that they are never empty
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.

Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
2012-11-09 17:37:01 +01:00
Norbert Thiebaud
060219ac1a binfilter.die.die.die
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3
Reviewed-on: https://gerrit.libreoffice.org/1014
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-09 07:58:02 +00:00
Peter Foley
f745212f96 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-08 19:56:11 -05:00
Stefan Knorr
84ba49c55d Add more fonts
(PT Serif, Source Code Pro and Souce Sans Pro under OFL; Open Sans
under ALv2)

Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd
Reviewed-on: https://gerrit.libreoffice.org/1007
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-11-08 21:04:16 +00:00
Matúš Kukan
f6abeab070 move more tarball names to configure
Change-Id: I10e3a1f9d375ded2087b7bbd9c3d98b35e7868be
2012-11-08 14:03:23 +01:00
Peter Foley
085346f80d convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Reviewed-on: https://gerrit.libreoffice.org/1002
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-07 22:33:48 +00:00
Tor Lillqvist
e10124b20e Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg
Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.

Initial work by rene, continued by tml.

Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
2012-11-06 18:59:44 +02:00
Norbert Thiebaud
1b61693a15 Enough with that...
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess

reverting the whole mess for now...
to be resubmited when a bit less borked...

This reverts commit c4c160a451.
This reverts commit faef2e51d0.
This reverts commit 057ce1fe29.
This reverts commit a7d34af344.
This reverts commit befae0ceb8.
This reverts commit 433b43bcd2.
This reverts commit 93e2c4a9d2.
2012-11-04 16:33:21 -06:00
Peter Foley
433b43bcd2 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-04 09:02:09 -05:00
Peter Foley
93e2c4a9d2 convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
2012-11-03 19:52:07 -04:00
Peter Foley
dd584cb4ea convert hyphen to gbuild
Change-Id: I55b3832128aa096eb44b67a26ec2afeb6c573604
2012-11-03 14:45:45 -04:00
Matúš Kukan
d281a19e1d these have been converted; use _tarball variables
Change-Id: I9215fbfaf5c2e5d40e7257cd52d8d9544599ea63
2012-11-03 00:24:23 +01:00
Christian Lohmaier
664012b313 remove GIT_REPO_NAMES (duplicated by GIT_NEEDED_SUBMODULES)
use plain copy instead of git-new-workdir when using --with-linked-git
configure switch (point it to your master copy of the core-repo)
also remove obsolete bin/create_bootstrap_links, bin/mkworkdir and
bin/repo-list[.in]

Change-Id: I37028badf2c46a24a3d628e80476efe4dd365d06
Reviewed-on: https://gerrit.libreoffice.org/912
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-10-31 16:29:12 +00:00
David Tardon
069704d390 fdo#55514 libgmodule is needed too
Change-Id: Icee2ffbe18ea732220f174cd4bf433ceb03d128b
2012-10-31 13:22:30 +01:00
David Tardon
a6f97a750d fdo#54327 put system nss dlls into the install set
Change-Id: Ie809bba726c4d17eac25d36381d93ea9781d74be
2012-10-31 13:22:29 +01:00
Matúš Kukan
ed0b160041 fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
  modules outside of tail_build anyway.

Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
  use parent's jobservers in sub-make where possible

Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-30 20:34:03 +00:00
David Tardon
5644397e44 fdo#55514 put liblangtag dll to install set
Change-Id: Ia2df651604358c70c0af129b5d60b149d2f1629e
2012-10-30 15:25:20 +01:00
Stephan Bergmann
14d45795b2 Setting CLASSPATH/XCLASSPATH appears to be a leftover
...from the old dmake and/or Hamburg-specific set up.

Change-Id: I441ce66dd91d353196cd9d1a9853720195a6fcdc
2012-10-29 17:32:51 +01:00
Peter Foley
0f075129c9 convert curl to gbuild
Change-Id: I8c038a0c59660f4fb672d71c08e6ee0b56c302ee
2012-10-29 12:25:53 -04:00
Peter Foley
2e4ab69246 convert hunspell to gbuild
Change-Id: I285292ca7f7252399c3898ca49f73727ab569fca
2012-10-28 14:23:32 -04:00
Matúš Kukan
c3a586a716 openldap: convert to gbuild
Change-Id: Ic1c4c58a09fd41bce78731e61349baa129f5e935
2012-10-28 15:16:19 +01:00
Matúš Kukan
51fca817e2 epm: convert to gbuild
Change-Id: I1548f3b9339163a7abab637acad620b50cfc3a26
2012-10-28 15:14:28 +01:00
Peter Foley
7e2c27cfb0 convert mythes to gbuild
Change-Id: I9c6b670a2df8b1d3a868d91737fcf93e7d40bcb4
2012-10-28 09:57:01 -04:00
David Tardon
50857f22df minizip is not used anymore
Change-Id: I0ddc4d343882248d208c9f96366625bcbe6ac4f7
2012-10-26 17:33:31 +02:00
David Tardon
cb2762360f gbuildify zlib
Change-Id: I702c044fdf510c67364f2fc32889ca394583edf6
2012-10-26 17:33:30 +02:00
Matúš Kukan
1ceb47d96d graphite: convert to gbuild
Change-Id: I47c279d1cf53ef2c092467070d97b13f949d06f6
2012-10-25 23:24:32 +02:00
David Ostrovsky
2ffde7b171 gbuildification of expat
Two different xmlparse libraries are created: ascii_expat_xmlparse and
expat_xmlparse. One without -DXML_UNICODE and one with. Source file are
duplicated and renamed with gb_UnpackedTarball_set_post_action function
to be able to add artifacts twice to gbuild machinery.

On windows 64 bit additional two librares are created: expat_xmlparse_x64 and
expat_xmltok_x64. That is due the problem with shell/shlxthandler (comment):
------------------------------------------------------
use UNICODE only because shell/shlxthandler
doesn't link against ascii_expat_xmlparse
------------------------------------------------------

Include files are delivered to $(OUTDIR)/inc/external/expat
now and not to $(OUTDIR)/inc/external any more.
set_include call is added in RepositoryExternal.mk.

To define dependency between StaticLibrary and ExternalProject
new function was introduced: gb_StaticLibrary_use_external_project.

Change-Id: I3b3aa40f39ef82c70f6f28790b582c83e48bdf76
2012-10-25 17:37:34 +02:00
David Tardon
725eba738e remove all traces of saxon
Change-Id: I33ca2c27d557d24e3900d7ebf8f3ea2d99b3cfb0
2012-10-25 14:48:23 +02:00
Matúš Kukan
9a3fe78320 freetype: convert to gbuild
Change-Id: I67f550385fa1f4073873f1e503eb153665e718ef
2012-10-24 12:40:39 +02:00
Matúš Kukan
526c9bdd04 fontconfig: convert to gbuild
Change-Id: Ia0ba9294e36c30147ed52826eac4b0059cfed200
2012-10-24 12:40:39 +02:00
David Ostrovsky
97d83c45fa gbuildification of ct2n
Conflicts:
	config_host.mk.in

Change-Id: I98ca1bb2af19d99a7a908991cf27a148ee84c543
2012-10-23 19:11:01 +02:00
Stephan Bergmann
9cabab002b CLANGPLUGIN_CPPFLAGS for building plugin for Clang in nonstandard location
(i.e., configure with CLANGPLUGIN_CPPFLAGS=-I.../clang-installation/include
-I.../clang-build/tools/clang/include)

Change-Id: Ic6d2973629103f71c32f44ebba2ac70d137d18e7
2012-10-22 16:25:41 +02:00
Lubos Lunak
3c00ff3a45 make configure remember C/CXX/OBJC/OBJCXX/LDFLAGS if explicitly passed to it
If not, the build system selects the right flags depending on --enable-debug
etc. , but e.g. packagers may want to do builds with e.g. both -O and -g.
This is also reasonably close to what autotools do, except that there configure
forces -g -O2 if nothing is explicitly given.

Change-Id: I1889569177ad3cbd6decdc7e9986f67ef5d4456a
2012-10-22 14:56:20 +02:00
Lubos Lunak
a0320a9088 clean up configure options for debugging build
By default a product (non-developer) build is done. Code is optimized and no debugging
information is included (may be overriden though, see below).

Developers should preferably build with --enable-dbgutil , or at least --enable-debug.

The --enable-symbols switch has been removed. Use explicit CFLAGS/CXXFLAGS/LDFLAGS instead
if needed.

With --enable-debug optimizations are turned off and debugging information is included
(in order to make it possible to examine the code in a debugger). Additionally assertions
and logging is enabled (see SAL_WARN/SAL_INFO documentation for details and better control).
This switch should primarily by used for occassional development (such as when it is needed
to debug one module in a non-debug build, see also 'make DEBUG=true' below).

Using --enable-dbgutil is the recommended developer option. In addition to --enable-debug
it also enables additional checks, such as debugging mode for STL or checking compiler
plugins. This switch may also enable additional logging from obsolete debugging tools
(which should be converted to SAL_WARN/SAL_INFO for better control). Note that this option
makes the build binary incompatible from a --disable-dbgutil build, so it is not possible
to mix them.

When using --enable-debug/--enable-dbgutil , the build is noticeably larger because of the included
debugging information (compiler -g option). When disk space is an issue (or the computer
is not very powerful), the --enable-selective-debuginfo option allow specifying where
the debugging information should or should not be used. The option takes a list of arguments,
where all means everything, - prepended means not to enable, / appended means everything
in the directory; there is no ordering, more specific overrides more general,
and disabling takes precedence). For example, --enable-selective-debuginfo="all -sw/ -Library_sc"
enables debugginfo for everything except for anything in the sw module and the sc library.

Explicitly specified CFLAGS/CXXFLAGS/LDFLAGS override optimization and debugging options
(can be now also passed to configure which will make the build system use them).

If in a non-debug build it is needed to temporary build something as a debug build,
'make DEBUG=true' temporarily works as if --enable-debug was specified. It also temporarily
overrides debuginfo disabled using --enable-selective-debuginfo.

Old code using old logging functionality also has a concept of a debug level, forced using
'make DBGLEVEL=2'. Using a debug level of 2 (or higher) enables additional logging output.
New code should use SAL_WARN/SAL_INFO and use extra areas for additional logging output
that can be selectively enabled/disabled using SAL_LOG variable.

(Some smaller parts of this design will be implemented by separate follow-up commits.)

Change-Id: Ia6420ee3c99c217ead648e8967165eed7f632258
2012-10-22 14:56:19 +02:00
Rene Engelhard
7c8c73dd5c fix sdremote related configure switches
sdremote itself apparently works also over IP (WLAN), so we don't need to
disable it when we just don't want/have bluetooth. And also dbus is also
needed in the bluez case

Change-Id: I55ba07cd715d1e9bd641ef28e2391e4fe85b85e0
2012-10-21 23:01:47 +02:00
Peter Foley
ffcaa7651f convert postgresql to gbuild
Change-Id: Ia1345904a819d8edfad53c8882be35b398e8bc6e
2012-10-21 09:49:03 -04:00
Matúš Kukan
8e7829a0e8 remove unset & unused variables
Change-Id: I565a3110c10eb94945ad08daabe29f0034ed0ddd
2012-10-19 23:10:45 +02:00
Norbert Thiebaud
9152c42a65 submodules migration
Change-Id: Ib3e472a4b1abf880f695be7a6667393d6a82f10d
2012-10-16 11:28:26 -05:00
Peter Foley
8615d09bb1 convert librsvg to gbuild
Change-Id: I1f84f85abc4e2db3679e64d34671458779ca97fa
2012-10-12 19:20:23 -04:00
David Ostrovsky
de8808f037 gbuildification of jpeg
Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553
2012-10-12 06:37:40 +02:00
Matúš Kukan
a58f677fd2 ooo.lst: use more variables
Change-Id: I478996c43d069648241d8c5cff64ff78b9230154
2012-10-11 19:33:57 +02:00