Commit graph

420 commits

Author SHA1 Message Date
Kurt Zenker
1322d33d22 INTEGRATION: CWS freebsd04 (1.86.2); FILE MERGED
2006/01/19 01:44:49 maho 1.86.2.1: #i56949#
 Add conditional the case of @GCCVER@ >= 30401 for FreeBSD as well
2006-01-31 17:26:43 +00:00
Oliver Bolte
574cd0fd1b #i10000# generated with changes from cws cmcfixes23 and macosx20xfixes01 2006-01-20 14:00:27 +00:00
Oliver Bolte
4943f76bab INTEGRATION: CWS macosx20xfixes01 (1.139.2); FILE MERGED
2006/01/09 20:21:47 tra 1.139.2.3: RESYNC: (1.140-1.146); FILE MERGED
2005/12/16 16:17:40 tra 1.139.2.2: RESYNC: (1.139-1.140); FILE MERGED
2005/10/27 08:48:21 ericb 1.139.2.1: #i55093# fix typo external epm is used in Mac OSX build
2006-01-20 12:28:25 +00:00
Oliver Bolte
091188c5c2 INTEGRATION: CWS cmcfixes23 (1.139.20); FILE MERGED
2006/01/12 12:52:40 cmc 1.139.20.6: disable mozilla implies np_sdk
2006/01/12 10:52:35 cmc 1.139.20.5: RESYNC: (1.139-1.146); FILE MERGED
2005/12/19 10:05:52 cmc 1.139.20.4: #i58817# check for prelinked libgcc to avoid the md5sum mismatch error
2005/12/19 09:51:35 cmc 1.139.20.3: #i59537# nss is a standalone package in fedora core 5
2005/11/30 12:54:41 cmc 1.139.20.2: #i58675# add a TWAIN build_type
2005/11/29 13:56:08 cmc 1.139.20.1: #i44027# enable building out of the box with ntpl
2006-01-20 09:52:29 +00:00
Rüdiger Timm
4a95bcab44 INTEGRATION: CWS cmcfixes22 (1.123.18); FILE MERGED
2006/01/04 14:26:27 cmc 1.123.18.3: #i58292 ecj + gij != use gcj specific aot feature
2006/01/04 10:21:09 cmc 1.123.18.2: RESYNC: (1.123-1.127); FILE MERGED
2005/11/22 10:15:09 cmc 1.123.18.1: #i58292# move gcj configuration from solenv into config_office
2006-01-13 15:39:55 +00:00
Rüdiger Timm
ad748858ba INTEGRATION: CWS cmcfixes22 (1.78.14); FILE MERGED
2006/01/04 14:26:34 cmc 1.78.14.3: #i58292 ecj + gij != use gcj specific aot feature
2006/01/04 10:20:42 cmc 1.78.14.2: RESYNC: (1.78-1.81); FILE MERGED
2005/11/22 10:15:14 cmc 1.78.14.1: #i58292# move gcj configuration from solenv into config_office
2006-01-13 15:37:16 +00:00
Rüdiger Timm
fb2b11feb9 INTEGRATION: CWS cmcfixes22 (1.139.16); FILE MERGED
2006/01/04 14:26:32 cmc 1.139.16.3: #i58292 ecj + gij != use gcj specific aot feature
2006/01/04 10:20:34 cmc 1.139.16.2: RESYNC: (1.139-1.143); FILE MERGED
2005/11/22 10:15:13 cmc 1.139.16.1: #i58292# move gcj configuration from solenv into config_office
2006-01-13 15:37:01 +00:00
Rüdiger Timm
f4d4e9ec56 INTEGRATION: CWS configure13 (1.127.4); FILE MERGED
2006/01/03 11:02:59 rene 1.127.4.9: try to fix gcc/g++ handling
2006/01/03 09:21:38 rene 1.127.4.8: fix misplaced description
2006/01/01 23:00:51 rene 1.127.4.7: add missing conbditional in scp2's makefile.mk and make configure set ENABLE_KAB= wince we check for it with != ""
2006/01/01 22:33:08 rene 1.127.4.6: TRUE/FALSE instead of YES/NO, oops
2006/01/01 16:08:28 rene 1.127.4.5: #i59727# fix kab check: add new conditional and check for needed KDE version
2005/12/28 18:19:29 rene 1.127.4.4: #i59850# make --with-system-python default on Mac OS X
2005/12/28 18:07:29 rene 1.127.4.3: #i53943# fix spelling errors
2005/12/28 17:53:38 rene 1.127.4.2: #i52082# check for $MOZ_INC/ldap
2005/12/28 17:41:09 rene 1.127.4.1: #i10917# check for unzip
2006-01-10 13:50:13 +00:00
Rüdiger Timm
5ae173684a INTEGRATION: CWS configure13 (1.81.2); FILE MERGED
2006/01/03 08:34:42 rene 1.81.2.4: revert the whole SOLARVER sync completely for now
2006/01/02 21:30:32 rene 1.81.2.3: fix SOLARVER(SION) sync. again.
2006/01/01 16:18:32 rene 1.81.2.2: #i54961# /home/rene/OpenOffice.org/cws_src680_configure13/solver = /home/rene/OpenOffice.org/cws_src680_configure13/solver/680
2006/01/01 16:08:34 rene 1.81.2.1: #i59727# fix kab check: add new conditional and check for needed KDE version
2006-01-10 13:33:19 +00:00
Rüdiger Timm
d4f87217a3 INTEGRATION: CWS configure13 (1.143.4); FILE MERGED
2006/01/03 11:03:42 rene 1.143.4.9: try to fix gcc/g++ handling
2006/01/03 09:21:42 rene 1.143.4.8: fix misplaced description
2006/01/01 23:00:53 rene 1.143.4.7: add missing conbditional in scp2's makefile.mk and make configure set ENABLE_KAB= wince we check for it with != ""
2006/01/01 22:33:47 rene 1.143.4.6: TRUE/FALSE instead of YES/NO, oops
2006/01/01 16:08:33 rene 1.143.4.5: #i59727# fix kab check: add new conditional and check for needed KDE version
2005/12/28 18:19:36 rene 1.143.4.4: #i59850# make --with-system-python default on Mac OS X
2005/12/28 18:07:35 rene 1.143.4.3: #i53943# fix spelling errors
2005/12/28 17:53:45 rene 1.143.4.2: #i52082# check for $MOZ_INC/ldap
2005/12/28 17:41:11 rene 1.143.4.1: #i10917# check for unzip
2006-01-10 13:33:05 +00:00
Kurt Zenker
be88f6ed1b INTEGRATION: CWS hunspell (1.118.8); FILE MERGED
2005/12/10 09:31:56 nemeth 1.118.8.2: RESYNC: (1.118-1.123); FILE MERGED
2005/09/20 12:48:28 rene 1.118.8.1: add --with-system-hunspell
2006-01-06 12:24:56 +00:00
Kurt Zenker
49ec5942a8 INTEGRATION: CWS hunspell (1.74.8); FILE MERGED
2005/12/10 09:32:35 nemeth 1.74.8.2: RESYNC: (1.74-1.78); FILE MERGED
2005/09/20 12:48:35 rene 1.74.8.1: add --with-system-hunspell
2006-01-06 12:14:28 +00:00
Kurt Zenker
045ead381f INTEGRATION: CWS hunspell (1.135.8); FILE MERGED
2005/12/10 09:32:23 nemeth 1.135.8.2: RESYNC: (1.135-1.139); FILE MERGED
2005/09/20 12:48:33 rene 1.135.8.1: add --with-system-hunspell
2006-01-06 12:13:53 +00:00
Kurt Zenker
dc47e6d117 INTEGRATION: CWS vq25 (1.127.2); FILE MERGED
2005/12/26 20:15:11 vq 1.127.2.3: #i54285# Fix problems with $PSDK_HOME ending in a slash.
2005/12/26 18:45:58 vq 1.127.2.2: #i59595# Deal with possible backslash at the end.
2005/12/26 17:35:44 vq 1.127.2.1: #i59595# Make configure aware of the latest DirectX SDK version.
(regenerate configure)
2006-01-06 10:25:57 +00:00
Kurt Zenker
2851c0e835 INTEGRATION: CWS vq25 (1.78.24); FILE MERGED
2005/12/26 16:52:33 vq 1.78.24.2: RESYNC: (1.78-1.81); FILE MERGED
2005/12/17 23:59:09 vq 1.78.24.1: #i22030# Patch to check for the right cygwin vs. native build dmake version.
2006-01-06 10:17:44 +00:00
Kurt Zenker
77392f2cfb INTEGRATION: CWS vq25 (1.51.50); FILE MERGED
2005/12/26 17:56:54 vq 1.51.50.1: #i57756# Add check to toplevel makefile to check if all required (by build.pl)
modules are present.
2006-01-06 10:17:31 +00:00
Kurt Zenker
9882f7a94a INTEGRATION: CWS vq25 (1.143.2); FILE MERGED
2005/12/26 20:15:14 vq 1.143.2.3: #i54285# Fix problems with $PSDK_HOME ending in a slash.
2005/12/26 18:46:21 vq 1.143.2.2: #i59595# Deal with possible backslash at the end.
2005/12/26 17:35:49 vq 1.143.2.1: #i59595# Make configure aware of the latest DirectX SDK version.
(regenerate configure)
2006-01-06 10:17:18 +00:00
Kurt Zenker
9b39ba0c73 INTEGRATION: CWS iconswitching1 (1.110.4); FILE MERGED
2005/11/30 14:53:08 kendy 1.110.4.3: RESYNC: (1.122-1.123); FILE MERGED
2005/11/02 00:00:19 kendy 1.110.4.2: RESYNC: (1.110-1.122); FILE MERGED
2005/07/21 15:47:28 kendy 1.110.4.1: #i36518#
Remove --with-icons configure switch, build with custom icons by default.
Create HiContrast icon set from the lch_*, sch_* etc. icons.
2006-01-05 17:42:22 +00:00
Kurt Zenker
095a970e02 INTEGRATION: CWS iconswitching1 (1.70.2); FILE MERGED
2005/11/30 14:53:34 kendy 1.70.2.3: RESYNC: (1.76-1.78); FILE MERGED
2005/11/02 00:00:49 kendy 1.70.2.2: RESYNC: (1.70-1.76); FILE MERGED
2005/07/21 15:47:31 kendy 1.70.2.1: #i36518#
Remove --with-icons configure switch, build with custom icons by default.
Create HiContrast icon set from the lch_*, sch_* etc. icons.
2006-01-05 17:17:04 +00:00
Kurt Zenker
107d55228e INTEGRATION: CWS iconswitching1 (1.128.2); FILE MERGED
2005/11/30 14:53:24 kendy 1.128.2.3: RESYNC: (1.138-1.139); FILE MERGED
2005/11/02 00:00:30 kendy 1.128.2.2: RESYNC: (1.128-1.138); FILE MERGED
2005/07/21 15:47:30 kendy 1.128.2.1: #i36518#
Remove --with-icons configure switch, build with custom icons by default.
Create HiContrast icon set from the lch_*, sch_* etc. icons.
2006-01-05 17:16:50 +00:00
Oliver Bolte
497a8cee67 #i10000# contains changes from CWS kaddrbook,cmcfixes21,hr24 2005-12-21 17:35:00 +00:00
Oliver Bolte
2f3ca91a95 INTEGRATION: CWS hr24 (1.139.28); FILE MERGED
2005/12/20 14:49:42 pjanik 1.139.28.1: #i59476#: Allow SunONE 11 (5.8).
2005-12-21 15:50:43 +00:00
Oliver Bolte
9306efd2e3 INTEGRATION: CWS hr24 (1.123.2); FILE MERGED
2005/12/20 14:58:11 pjanik 1.123.2.1: #i59476#: Allow SunONE 11 (5.8).
2005-12-21 15:50:23 +00:00
Oliver Bolte
380659e91c INTEGRATION: CWS cmcfixes21 (1.78.10); FILE MERGED
2005/11/10 15:51:12 cmc 1.78.10.1: #ii49720# some distros have a seperate nspr package instead of mozilla-nspr
2005-12-21 10:09:50 +00:00
Oliver Bolte
a10b219f11 INTEGRATION: CWS cmcfixes21 (1.139.10); FILE MERGED
2005/11/10 15:51:09 cmc 1.139.10.1: #ii49720# some distros have a seperate nspr package instead of mozilla-nspr
2005-12-21 10:09:36 +00:00
Oliver Bolte
1495ea29f7 INTEGRATION: CWS kaddrbook (1.129.8); FILE MERGED
2005/11/29 22:56:39 kendy 1.129.8.2: RESYNC: (1.129-1.139); FILE MERGED
2005/08/26 14:53:46 kendy 1.129.8.1: #i52449#
QT_NO_EMIT is not necessary and breaks KAB compilation; removed.
2005-12-19 16:09:30 +00:00
Oliver Bolte
850e155252 INTEGRATION: CWS kaddrbook (1.112.8); FILE MERGED
2005/11/29 22:56:16 kendy 1.112.8.2: RESYNC: (1.112-1.123); FILE MERGED
2005/08/26 14:53:44 kendy 1.112.8.1: #i52449#
QT_NO_EMIT is not necessary and breaks KAB compilation; removed.
2005-12-19 16:09:14 +00:00
Rüdiger Timm
7bf13b22b2 INTEGRATION: CWS ause044 (1.78.12); FILE MERGED
2005/11/17 14:32:16 hjs 1.78.12.1: #i56611# no more environment variables set to empty
2005-12-14 14:38:22 +00:00
Rüdiger Timm
37221f8809 INTEGRATION: CWS systemagg (1.78.16); FILE MERGED
2005/11/23 10:58:36 rene 1.78.16.1: #i58336# add --with-system-agg
2005-12-14 13:42:40 +00:00
Rüdiger Timm
898576f89b INTEGRATION: CWS systemagg (1.139.18); FILE MERGED
2005/11/23 10:58:35 rene 1.139.18.1: #i58336# add --with-system-agg
2005-12-14 13:42:25 +00:00
Rüdiger Timm
b8a9ea081e INTEGRATION: CWS systemagg (1.123.20); FILE MERGED
2005/11/23 10:58:31 rene 1.123.20.1: #i58336# add --with-system-agg
2005-12-14 13:42:06 +00:00
Jens-Heiner Rechtien
d220eccfc5 INTEGRATION: CWS vq22 (1.76.2); FILE MERGED
2005/10/25 22:34:49 vq 1.76.2.1: #i56512# Prepare config_office for future dmake versions.
2005-10-28 10:59:53 +00:00
Jens-Heiner Rechtien
8ffdbb5766 #i10000#: regenerate configure 2005-10-25 13:42:08 +00:00
Jens-Heiner Rechtien
cf5cbb5a71 INTEGRATION: CWS morejava (1.72.8); FILE MERGED
2005/08/26 13:47:19 fridrich_strba 1.72.8.1: Issue number:
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Allow building OpenOffice.org with java5 (jdk1.5.0); add JRE from BEA Systems, Inc.
among jres supported by OOo
2005-10-25 10:24:20 +00:00
Jens-Heiner Rechtien
db38491cbe INTEGRATION: CWS morejava (1.132.8); FILE MERGED
2005/08/26 13:47:18 fridrich_strba 1.132.8.1: Issue number:
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Allow building OpenOffice.org with java5 (jdk1.5.0); add JRE from BEA Systems, Inc.
among jres supported by OOo
2005-10-25 10:23:57 +00:00
Oliver Bolte
0803f0dc19 INTEGRATION: CWS merge20to201v2 (1.120.2); FILE MERGED
2005/10/07 14:06:25 hr 1.120.2.1: #i55617: merge OOO680 CWS macosx11
2005-10-13 09:45:56 +00:00
Oliver Bolte
3a17826acf INTEGRATION: CWS merge20to201v2 (1.136.2); FILE MERGED
2005/10/07 14:07:29 hr 1.136.2.2: #i55617: merge OOO680 CWS macosx11
2005/10/07 14:06:30 hr 1.136.2.1: #i55617: merge OOO680 CWS macosx11
2005-10-13 08:41:50 +00:00
Kurt Zenker
71f7ace8f9 INTEGRATION: CWS pj34 (1.74.12); FILE MERGED
2005/09/21 19:20:40 pjanik 1.74.12.1: #i54619#: rename AMD64's makefile and output tree to unxlngx6
2005-10-05 10:37:08 +00:00
Jens-Heiner Rechtien
c0098ce1af INTEGRATION: CWS cmcfixes19 (1.118.16); FILE MERGED
2005/09/23 09:28:38 cmc 1.118.16.1: #i54996# add xalan BUILD_TYPE
2005-09-28 15:20:42 +00:00
Jens-Heiner Rechtien
e3bfcca165 INTEGRATION: CWS cmcfixes19 (1.135.16); FILE MERGED
2005/09/23 09:28:40 cmc 1.135.16.1: #i54996# add xalan BUILD_TYPE
2005-09-28 14:26:19 +00:00
Jens-Heiner Rechtien
22c6d91719 #i10000#: regenerate configure 2005-09-26 14:38:11 +00:00
Jens-Heiner Rechtien
75b501e057 INTEGRATION: CWS merge20to201 (1.74.14); FILE MERGED
2005/09/23 10:12:59 hr 1.74.14.1: #i54997#: merge CWS dicconfigure
2005-09-26 12:24:57 +00:00
Jens-Heiner Rechtien
782a14148c INTEGRATION: CWS cmcfixes18 (1.135.4); FILE MERGED
2005/09/05 09:48:48 cmc 1.135.4.3: #i54220# add SABLOT build types
2005/09/05 09:41:49 cmc 1.135.4.2: #i54220# add BERKELEYDB build types
2005/09/05 09:29:42 cmc 1.135.4.1: #i54220# add CRASHREP build types
2005-09-23 12:48:01 +00:00
Jens-Heiner Rechtien
cbcee58117 INTEGRATION: CWS cmcfixes18 (1.118.4); FILE MERGED
2005/09/05 09:48:43 cmc 1.118.4.3: #i54220# add SABLOT build types
2005/09/05 09:41:46 cmc 1.118.4.2: #i54220# add BERKELEYDB build types
2005/09/05 09:29:37 cmc 1.118.4.1: #i54220# add CRASHREP build types
2005-09-23 12:47:38 +00:00
Kurt Zenker
99cd5b5828 #i54694# unzip removed 2005-09-16 14:20:13 +00:00
Rüdiger Timm
c849f513cc INTEGRATION: CWS ooo19126 (1.49.20); FILE MERGED
2005/09/05 14:55:30 rt 1.49.20.1: #i54170# Change license header: remove SISSL
2005-09-08 02:02:12 +00:00
Rüdiger Timm
76b891e9b0 INTEGRATION: CWS cmcfixes15 (1.115.2); FILE MERGED
2005/08/24 16:37:06 cmc 1.115.2.2: #i53701# add BOOST buildtype
2005/08/24 08:16:46 cmc 1.115.2.1: #i53701# make msfontextract and MathMLDTD optional builds
2005-08-30 08:42:25 +00:00
Rüdiger Timm
6c803925a0 INTEGRATION: CWS cmcfixes15 (1.132.2); FILE MERGED
2005/08/24 16:37:10 cmc 1.132.2.2: #i53701# add BOOST buildtype
2005/08/24 08:16:49 cmc 1.132.2.1: #i53701# make msfontextract and MathMLDTD optional builds
2005-08-30 08:34:09 +00:00
Rüdiger Timm
ce3aded501 INTEGRATION: CWS configure12 (1.115.4); FILE MERGED
2005/08/26 20:17:36 rene 1.115.4.4: missing -
2005/08/26 19:53:57 rene 1.115.4.3: remove bogus RPM=, thanks Pavel
actually add DPKG and PKGMK to set_soenv.in
2005/08/26 18:54:53 rene 1.115.4.2: #i53840# add help for --with-package-format
2005/08/25 10:42:12 rene 1.115.4.1: #i53640# support > 1 values in --with-package-format
2005-08-30 08:17:50 +00:00
Rüdiger Timm
e65294e872 INTEGRATION: CWS configure12 (1.72.4); FILE MERGED
2005/08/26 19:54:02 rene 1.72.4.1: remove bogus RPM=, thanks Pavel
actually add DPKG and PKGMK to set_soenv.in
2005-08-30 08:12:51 +00:00