Commit graph

406 commits

Author SHA1 Message Date
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
Rüdiger Timm
5de5a04863 INTEGRATION: CWS configure12 (1.132.4); FILE MERGED
2005/08/26 20:17:39 rene 1.132.4.4: missing -
2005/08/26 19:54:00 rene 1.132.4.3: remove bogus RPM=, thanks Pavel
actually add DPKG and PKGMK to set_soenv.in
2005/08/26 18:54:55 rene 1.132.4.2: #i53840# add help for --with-package-format
2005/08/25 10:42:16 rene 1.132.4.1: #i53640# support > 1 values in --with-package-format
2005-08-30 08:12:36 +00:00
Rüdiger Timm
0a37589faf #i51735#, #i10000#: generated new 'configure' after integration of CWS gslpatches4 bringing new 'configure.in'. 2005-08-29 06:53:14 +00:00
Kurt Zenker
3444512c19 INTEGRATION: CWS gslpatches4 (1.69.4); FILE MERGED
2005/07/19 11:22:03 pl 1.69.4.2: RESYNC: (1.69-1.70); FILE MERGED
2005/07/11 10:21:42 pl 1.69.4.1: #i51735# optional NAS support
2005-08-25 15:11:37 +00:00
Kurt Zenker
cd43906117 INTEGRATION: CWS gslpatches4 (1.127.2); FILE MERGED
2005/07/19 11:21:55 pl 1.127.2.2: RESYNC: (1.127-1.128); FILE MERGED
2005/07/11 10:21:41 pl 1.127.2.1: #i51735# optional NAS support
2005-08-25 15:11:15 +00:00
Rüdiger Timm
f4d29ad91a INTEGRATION: CWS ibmjdk01 (1.110.14); FILE MERGED
2005/08/04 07:09:41 fridrich_strba 1.110.14.3: Issue number:  N/A
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Be gratious with IBM JDK newer than 1.4.2
2005/08/03 13:05:44 fridrich_strba 1.110.14.2: Issue number:  47836
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Check IBM SDK version and require JAVA_HOME to be explicitely set
2005/08/03 11:01:55 fridrich_strba 1.110.14.1: Issue number:  47836
Submitted by:  maxweber
Reviewed by:   fridrich_strba
Enable the use of IBM JDK for building OOo and IBM JRE for using OOo :-)
2005-08-18 07:44:23 +00:00
Rüdiger Timm
0eb5dd5622 INTEGRATION: CWS ibmjdk01 (1.70.12); FILE MERGED
2005/08/03 11:01:58 fridrich_strba 1.70.12.1: Issue number:  47836
Submitted by:  maxweber
Reviewed by:   fridrich_strba
Enable the use of IBM JDK for building OOo and IBM JRE for using OOo :-)
2005-08-18 07:21:30 +00:00
Rüdiger Timm
e056aa13b1 INTEGRATION: CWS ibmjdk01 (1.128.12); FILE MERGED
2005/08/04 07:09:44 fridrich_strba 1.128.12.3: Issue number:  N/A
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Be gratious with IBM JDK newer than 1.4.2
2005/08/03 13:05:46 fridrich_strba 1.128.12.2: Issue number:  47836
Submitted by:  fridrich_strba
Reviewed by:   fridrich_strba
Check IBM SDK version and require JAVA_HOME to be explicitely set
2005/08/03 11:01:57 fridrich_strba 1.128.12.1: Issue number:  47836
Submitted by:  maxweber
Reviewed by:   fridrich_strba
Enable the use of IBM JDK for building OOo and IBM JRE for using OOo :-)
2005-08-18 07:21:16 +00:00
Rüdiger Timm
53a39889c0 INTEGRATION: CWS nojava3 (1.128.6); FILE MERGED
2005/08/09 15:25:22 rene 1.128.6.2: RESYNC: (1.128-1.129); FILE MERGED
2005/08/05 09:36:33 rene 1.128.6.1: #i40239# use system-libxml when we build with xsltproc (--without-java and --enable-xsltproc)
2005-08-18 06:24:10 +00:00
Rüdiger Timm
ed6e21fac7 INTEGRATION: CWS nojava3 (1.110.8); FILE MERGED
2005/08/09 15:25:32 rene 1.110.8.2: RESYNC: (1.110-1.112); FILE MERGED
2005/08/05 09:36:31 rene 1.110.8.1: #i40239# use system-libxml when we build with xsltproc (--without-java and --enable-xsltproc)
2005-08-18 06:23:53 +00:00
Rüdiger Timm
6c93833b29 INTEGRATION: CWS cmcfixes14 (1.129.2); FILE MERGED
2005/08/10 11:09:13 cmc 1.129.2.1: #i53151# make ODK and QADEVOOO build items optional
2005-08-16 08:27:11 +00:00
Rüdiger Timm
1619f8cf90 INTEGRATION: CWS cmcfixes14 (1.112.2); FILE MERGED
2005/08/10 11:09:11 cmc 1.112.2.1: #i53151# make ODK and QADEVOOO build items optional
2005-08-16 08:26:54 +00:00
Jens-Heiner Rechtien
913f626a9a #i10000#: regenerate configure 2005-08-05 14:58:49 +00:00
Jens-Heiner Rechtien
3489540555 INTEGRATION: CWS configure11 (1.70.4); FILE MERGED
2005/07/29 17:52:10 rene 1.70.4.2: remove forgotten @...
2005/07/29 13:38:38 rene 1.70.4.1: #i52532# export NO_BRP_STALE_LINK_ERROR
2005-08-05 14:06:12 +00:00
Jens-Heiner Rechtien
32e58a667c INTEGRATION: CWS configure11 (1.128.4); FILE MERGED
2005/07/31 18:39:00 rene 1.128.4.7: #i47680# disable crashdump feature per default
2005/07/31 18:30:39 rene 1.128.4.6: actually set SYSTEM_PORTAUDIO to yes in the system-portaudio casse
2005/07/29 12:46:16 rene 1.128.4.5: #i48770# enbale binfilter only per default if ../binfilter exists and enable gpc only per default if ../external/gpc/gpc.* exists
2005/07/26 18:01:24 rene 1.128.4.4: #i53187# require gtk >= 2.4
2005/07/26 15:47:14 rene 1.128.4.3: add missing "test"
#i51736# add --enable-xsltproc to allow building with xsltproc even when we build with Java. patch from cmc
2005/07/26 15:33:44 rene 1.128.4.2: #i48755# Xinerama check needs -lXt on FreeBSD, too
2005/07/26 15:29:53 rene 1.128.4.1: #i52489# move xmkmf check in the else clause for internal nas since we only need it there
2005-08-05 14:05:56 +00:00