Commit graph

160 commits

Author SHA1 Message Date
Kurt Zenker
7c68fb29c1 INTEGRATION: CWS geordi2q15 (1.60.4); FILE MERGED
2004/02/20 13:13:22 hr 1.60.4.1: #111934#: merge CWS ooo111regression2
2004-02-25 12:50:21 +00:00
Kurt Zenker
ad884f58e0 INTEGRATION: CWS geordi2q15 (1.41.4); FILE MERGED
2004/02/20 13:13:21 hr 1.41.4.1: #111934#: merge CWS ooo111regression2
2004-02-25 12:50:07 +00:00
Jens-Heiner Rechtien
4904d4a0c7 INTEGRATION: CWS ooo20031216 (1.38.2); FILE MERGED
2003/12/22 13:33:55 waratah 1.38.2.3: #i23772# improve the pam security header test for linux
2003/12/15 21:04:54 waratah 1.38.2.2: #i23464#  Implement test for ANT_LIB to be used by ant.mk
2003/12/10 15:57:13 dsherwin 1.38.2.1:
#i19048# Add support for building with Visual Studio .NET 2003
2004-02-04 14:10:15 +00:00
Jens-Heiner Rechtien
d63cb9716a INTEGRATION: CWS ooo20031216 (1.12.2); FILE MERGED
2004/01/23 11:20:30 mh 1.12.2.7: RESYNC: (1.12-1.13); FILE MERGED
2003/12/29 23:58:14 pjanik 1.12.2.6: Blackdown.org JDK porting project uses server in JDK 1.4.2 RC1
2003/12/29 22:24:30 pjanik 1.12.2.5: Blackdown.org JDK porting project uses amd64 in JDK 1.4.2 RC1
2003/12/28 12:07:32 pjanik 1.12.2.4: #i8585#: Configure updates for x86_64.
2003/12/20 12:58:42 waratah 1.12.2.3: #i23464# implement ANT_LIB in the set environment
2003/12/15 09:35:25 waratah 1.12.2.2: Remove incorrect warnings from the Windows builds
2003/12/10 15:57:15 dsherwin 1.12.2.1:
#i19048# Add support for building with Visual Studio .NET 2003
2004-02-04 14:08:23 +00:00
Jens-Heiner Rechtien
d23e07cd50 INTEGRATION: CWS ooo20031216 (1.57.2); FILE MERGED
2004/01/23 11:20:17 mh 1.57.2.4: RESYNC: (1.57-1.58); FILE MERGED
2003/12/22 13:33:09 waratah 1.57.2.3: #i23772# improve the pam security header test for linux
2003/12/15 21:03:41 waratah 1.57.2.2: #i23464#  Implement test for ANT_LIB to be used by ant.mk
2003/12/10 15:57:13 dsherwin 1.57.2.1:
#i19048# Add support for building with Visual Studio .NET 2003
2004-02-04 11:32:51 +00:00
Jens-Heiner Rechtien
25e51f2fbd INTEGRATION: CWS geordi2q14 (1.13.4); FILE MERGED
2004/01/29 12:50:12 hr 1.13.4.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:17:15 +00:00
Jens-Heiner Rechtien
fa081f14cf INTEGRATION: CWS geordi2q14 (1.58.4); FILE MERGED
2004/01/29 12:50:11 hr 1.58.4.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:16:59 +00:00
Jens-Heiner Rechtien
e124491b30 INTEGRATION: CWS geordi2q14 (1.39.4); FILE MERGED
2004/01/29 12:50:09 hr 1.39.4.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:16:38 +00:00
Vladimir Glazounov
19b77d8f14 INTEGRATION: CWS geordi2q11 (1.12.4); FILE MERGED
2003/12/15 17:45:58 hr 1.12.4.1: #111934#: join CWS ooo111fix1
2003-12-17 14:01:33 +00:00
Vladimir Glazounov
438052114b INTEGRATION: CWS geordi2q11 (1.57.4); FILE MERGED
2003/12/15 17:45:57 hr 1.57.4.1: #111934#: join CWS ooo111fix1
2003-12-17 14:01:13 +00:00
Vladimir Glazounov
6f7c004501 INTEGRATION: CWS geordi2q11 (1.38.4); FILE MERGED
2003/12/15 17:45:54 hr 1.38.4.1: #111934#: join CWS ooo111fix1
2003-12-17 14:00:50 +00:00
Vladimir Glazounov
f991d6af29 INTEGRATION: CWS geordi2q11 (1.14.4); FILE MERGED
2003/12/15 17:45:52 hr 1.14.4.1: #111934#: join CWS ooo111fix1
2003-12-17 14:00:10 +00:00
Rüdiger Timm
ce7a8ada41 INTEGRATION: CWS ooo20031110 (1.11.4); FILE MERGED
2003/10/26 18:57:15 vq 1.11.4.2: #21441 Adjust configure to detect the new requirements for Windows when
building OOo 2.0.
2003/10/18 12:38:06 waratah 1.11.4.1: #i21389#  merge configure patches from the 1.1 branches
2003-12-01 16:39:16 +00:00
Rüdiger Timm
123805410d INTEGRATION: CWS ooo20031110 (1.56.4); FILE MERGED
2003/11/24 12:46:45 waratah 1.56.4.6: Deprecated gcc 2.95 from support
2003/11/20 22:20:11 waratah 1.56.4.5: Correct recolution of enable_symbols in script
2003/11/19 08:18:51 waratah 1.56.4.4: #i17700# implement testing for x windows include files
2003/11/05 12:55:20 waratah 1.56.4.3: Correct --disable-symbols option should work
2003/10/26 18:57:14 vq 1.56.4.2: #21441 Adjust configure to detect the new requirements for Windows when
building OOo 2.0.
2003/10/18 12:38:06 waratah 1.56.4.1: #i21389#  merge configure patches from the 1.1 branches
2003-12-01 16:39:04 +00:00
Rüdiger Timm
74b0b0eed5 INTEGRATION: CWS ooo20031110 (1.37.4); FILE MERGED
2003/11/24 12:55:26 waratah 1.37.4.6: Deprecated gcc 2.95 from support
2003/11/20 22:21:59 waratah 1.37.4.5: Correct recolution of enable_symbols in script
2003/11/19 08:19:43 waratah 1.37.4.4: #i17700# implement testing for x windows include files
2003/11/05 12:56:30 waratah 1.37.4.3: Correct --disable-symbols option should work
2003/10/26 18:57:13 vq 1.37.4.2: #21441 Adjust configure to detect the new requirements for Windows when
building OOo 2.0.
2003/10/18 12:41:23 waratah 1.37.4.1: #i21389#  merge configure patches from the 1.1 branches
2003-12-01 16:38:50 +00:00
Rüdiger Timm
87840aa02a INTEGRATION: CWS ooo20031110 (1.13.28); FILE MERGED
2003/11/06 09:19:59 vq 1.13.28.1: #19167 Merge missing parts of the cygwin 1.5.x patch.

Propably another merge conflict, sorry. Volker
2003-12-01 16:38:25 +00:00
Rüdiger Timm
8c523b5252 INTEGRATION: CWS ooo20031110 (1.2.18); FILE MERGED
2003/11/24 12:55:29 waratah 1.2.18.1: Deprecated gcc 2.95 from support
2003-12-01 16:38:14 +00:00
Hans-Joachim Lankenau
74a4c969a9 INTEGRATION: CWS geordi2q01 (1.10.8); FILE MERGED
2003/08/18 12:46:10 hr 1.10.8.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 13:54:11 +00:00
Hans-Joachim Lankenau
6eacea3115 INTEGRATION: CWS geordi2q01 (1.55.8); FILE MERGED
2003/08/18 12:46:10 hr 1.55.8.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 13:53:58 +00:00
Hans-Joachim Lankenau
b9edce3015 INTEGRATION: CWS geordi2q01 (1.36.8); FILE MERGED
2003/08/18 12:46:08 hr 1.36.8.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 13:53:43 +00:00
Jens-Heiner Rechtien
f0dfb4ca7d INTEGRATION: CWS ooo11rc2 (1.9.2); FILE MERGED
2003/07/15 03:12:44 svesik 1.9.2.5: #i14032#, #i15899# - need to be able to specifylocation of gnu patch and
gnu copy (cp) on solaris, so provide --with-gnu-patch and --with-gnu-cp.

Also, unitools.mk needs to pick the values up if set in the environment.
2003/07/14 21:02:02 fa 1.9.2.4: Allow gcc 3 to be used on OS X.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16831

Dan
fa@ooo
2003/07/14 16:02:42 mmeeks 1.9.2.3: Add --system-libart: #16721
2003/07/14 13:09:14 mh 1.9.2.2: add: FINN, #i14132#
2003/07/07 10:36:50 vq 1.9.2.1: #i14472# Merge --enable-crashdump to RC2
2003-07-16 16:25:06 +00:00
Jens-Heiner Rechtien
4a4a5366e4 INTEGRATION: CWS ooo11rc2 (1.43.22); FILE MERGED
2003/07/07 14:46:29 vq 1.43.22.1: #i16482# build.pl changed -all to --all.
2003-07-16 16:24:55 +00:00
Jens-Heiner Rechtien
c5fc7ad8f3 INTEGRATION: CWS ooo11rc2 (1.54.2); FILE MERGED
2003/07/15 03:12:44 svesik 1.54.2.5: #i14032#, #i15899# - need to be able to specifylocation of gnu patch and
gnu copy (cp) on solaris, so provide --with-gnu-patch and --with-gnu-cp.

Also, unitools.mk needs to pick the values up if set in the environment.
2003/07/14 16:02:41 mmeeks 1.54.2.4: Add --system-libart: #16721
2003/07/08 20:29:58 vq 1.54.2.3: #i14472# Allow also --disable-crashdump and fix Errormessage.
2003/07/08 15:49:48 vq 1.54.2.2: #i14472# let --enable-crashdump=.. accept only yes(=TRUE), TRUE and STATIC.
2003/07/07 10:36:49 vq 1.54.2.1: #i14472# Merge --enable-crashdump to RC2
2003-07-16 16:24:42 +00:00
Jens-Heiner Rechtien
db4d537970 INTEGRATION: CWS ooo11rc2 (1.35.2); FILE MERGED
2003/07/15 09:03:25 waratah 1.35.2.5: #i14032#, #i15899# - need to be able to specifylocation of gnu patch and
gnu copy (cp) on solaris, so provide --with-gnu-patch and --with-gnu-cp.
Also, unitools.mk needs to pick the values up if set in the environment.
2003/07/14 16:02:40 mmeeks 1.35.2.4: Add --system-libart: #16721
2003/07/08 20:29:56 vq 1.35.2.3: #i14472# Allow also --disable-crashdump and fix Errormessage.
2003/07/08 15:49:46 vq 1.35.2.2: #i14472# let --enable-crashdump=.. accept only yes(=TRUE), TRUE and STATIC.
2003/07/07 10:36:48 vq 1.35.2.1: #i14472# Merge --enable-crashdump to RC2
2003-07-16 16:24:30 +00:00
Vladimir Glazounov
3bfaa3aa99 INTEGRATION: CWS ooo11rc (1.8.2); FILE MERGED
2003/06/29 14:36:32 vq 1.8.2.4: #i15778# Add PYTHONHOME and PYTHONPATH
2003/06/27 14:58:39 vq 1.8.2.3: #i14320# .NET needs midl.exe
2003/06/27 14:22:26 haggai 1.8.2.2: #i10477# add --without-gpc switch to optionally build without gpc library
2003/06/27 00:46:37 nick 1.8.2.1: IZ 15349: IRIX should not include /usr/include (explicitly anyway)
2003-07-02 13:37:32 +00:00
Vladimir Glazounov
6f074038c0 INTEGRATION: CWS ooo11rc (1.53.2); FILE MERGED
2003/06/30 13:24:09 waratah 1.53.2.7: #I16226#  Implement gtk test for freebsd
2003/06/27 23:48:06 waratah 1.53.2.6: #I15893#   Implement the gtk test with the incrrect version number, at least test works
2003/06/27 14:22:25 haggai 1.53.2.5: #i10477# add --without-gpc switch to optionally build without gpc library
2003/06/24 21:28:33 vq 1.53.2.4: #i16034# Make the 02/2003 the default PSDK for windows builds, but
introduce --with-old-psdk for backward compatibility
2003/06/19 12:24:15 waratah 1.53.2.3: #14442# correct implementation of xmkmf test
2003/06/19 01:25:36 khendricks 1.53.2.2: changing --with-dict to default to ALL if nothing specified
2003/06/18 12:58:10 mh 1.53.2.1: join: from ooo11beta2
2003-07-02 13:36:46 +00:00
Vladimir Glazounov
8188847f63 INTEGRATION: CWS ooo11rc (1.34.2); FILE MERGED
2003/06/30 13:25:16 waratah 1.34.2.7: #I16226#  Implement gtk test for freebsd
2003/06/27 23:49:41 waratah 1.34.2.6: #I15893#   Implement the gtk test with the incrrect version number, at least test works
2003/06/27 15:07:22 haggai 1.34.2.5: #i10477# regenerate configure for --without-gpc switch
2003/06/24 21:28:32 vq 1.34.2.4: #i16034# Make the 02/2003 the default PSDK for windows builds, but
introduce --with-old-psdk for backward compatibility
2003/06/19 12:25:03 waratah 1.34.2.3: #14442# correct implementation of xmkmf test
2003/06/19 01:26:07 khendricks 1.34.2.2: updating to match configure.in
2003/06/18 12:58:08 mh 1.34.2.1: join: from ooo11beta2
2003-07-02 13:36:01 +00:00
Vladimir Glazounov
4653f76c5d INTEGRATION: CWS ooo11rc (1.1.2); FILE ADDED
2003/06/30 13:27:05 waratah 1.1.2.1: #I16226# Make it easier to build with autoconf
2003-07-02 13:35:04 +00:00
Rüdiger Timm
2c4266d6f6 INTEGRATION: CWS crashrepooo01 (1.32.8); FILE MERGED
2003/06/11 12:17:42 hro 1.32.8.1: #i15200# Inroduced --enable-static-gtk to set gtk linkage
2003-06-12 10:11:33 +00:00
Rüdiger Timm
210b962dcd INTEGRATION: CWS crashrepooo01 (1.6.8); FILE MERGED
2003/06/11 12:17:44 hro 1.6.8.1: #i15200# Inroduced --enable-static-gtk to set gtk linkage
2003-06-12 09:57:12 +00:00
Rüdiger Timm
471ff7778c INTEGRATION: CWS crashrepooo01 (1.51.8); FILE MERGED
2003/06/11 12:17:43 hro 1.51.8.1: #i15200# Inroduced --enable-static-gtk to set gtk linkage
2003-06-12 09:54:51 +00:00
Vladimir Glazounov
9e4411bf2f INTEGRATION: CWS mh11rc (1.6.6); FILE MERGED
2003/06/06 08:51:50 mh 1.6.6.1: join: from beta2
2003-06-12 09:16:12 +00:00
Vladimir Glazounov
e0dc839a92 INTEGRATION: CWS mh11rc (1.51.6); FILE MERGED
2003/06/06 08:51:49 mh 1.51.6.1: join: from beta2
2003-06-12 09:16:00 +00:00
Vladimir Glazounov
85f9012614 INTEGRATION: CWS mh11rc (1.32.6); FILE MERGED
2003/06/06 08:51:48 mh 1.32.6.1: join: from beta2
2003-06-12 09:15:48 +00:00
Vladimir Glazounov
b5561b4035 INTEGRATION: CWS mh11rc (1.8.16); FILE MERGED
2003/06/06 08:51:47 mh 1.8.16.1: join: from beta2
2003-06-12 09:15:33 +00:00
Jens-Heiner Rechtien
0bd236a1b8 INTEGRATION: CWS ooo20030412 (1.4.2.3.2); FILE MERGED
2003/04/02 13:01:07 waratah 1.4.2.3.2.3: 12442:  UPgrade warnings on required programs to errors
Correct bug in configure that warn does not work with autoconf 1.5
get rid of trailing blanks from dump messages from set_soenv.in
Remove bison_hairy and bison simple, no longer used
create logic to set symbols or full debug as required.
clean up logic on gcc version checking, added warning for gcc 2.95 to upgrade to gcc 3 if available
2003/03/31 14:30:33 waratah 1.4.2.3.2.2: 12872:  Remove all interactive queries from the configure environment
2003/03/28 12:02:25 waratah 1.4.2.3.2.1: 8181:Ensure that 'set' paths like gcc home come before the inheritted parms
2003-04-28 16:02:16 +00:00
Jens-Heiner Rechtien
7798c40829 INTEGRATION: CWS ooo20030412 (1.49.2.3.2); FILE MERGED
2003/04/16 12:12:10 waratah 1.49.2.3.2.6: COMPATH:  Back out incorrect changes
2003/04/16 10:36:45 waratah 1.49.2.3.2.5: COMPATH:  COrrect error idenitified by Kevin failing when there is a complete path
2003/04/04 14:21:31 waratah 1.49.2.3.2.4: 12442: remove gcc include path, not longer used in scripts
2003/04/02 13:01:08 waratah 1.49.2.3.2.3: 12442:  UPgrade warnings on required programs to errors
Correct bug in configure that warn does not work with autoconf 1.5
get rid of trailing blanks from dump messages from set_soenv.in
Remove bison_hairy and bison simple, no longer used
create logic to set symbols or full debug as required.
clean up logic on gcc version checking, added warning for gcc 2.95 to upgrade to gcc 3 if available
2003/03/31 14:30:32 waratah 1.49.2.3.2.2: 12872:  Remove all interactive queries from the configure environment
2003/03/28 11:58:43 waratah 1.49.2.3.2.1: 8181:Ensure that 'set' paths like gcc home come before the inheritted parms
2003-04-28 16:02:04 +00:00
Jens-Heiner Rechtien
d284291d96 INTEGRATION: CWS ooo20030412 (1.30.2.3.2); FILE MERGED
2003/04/16 12:15:08 waratah 1.30.2.3.2.6: COMPATH:  Back out incorrect changes
2003/04/16 10:37:23 waratah 1.30.2.3.2.5: COMPATH:  COrrect error idenitified by Kevin failing when there is a complete path
2003/04/04 14:21:59 waratah 1.30.2.3.2.4: 12442: remove gcc include path, not longer used in scripts
2003/04/02 13:03:17 waratah 1.30.2.3.2.3: 12442:  UPgrade warnings on required programs to errors
Correct bug in configure that warn does not work with autoconf 1.5
Remove bison_hairy and bison simple, no longer used
create logic to set symbols or full debug as required.
clean up logic on gcc version checking, added warning for gcc 2.95 to upgrade to gcc 3 if available
2003/03/31 14:30:59 waratah 1.30.2.3.2.2: 12872:  Remove all interactive queries from the configure environment
2003/03/28 12:02:53 waratah 1.30.2.3.2.1: 8181:Ensure that 'set' paths like gcc home come before the inheritted parms
2003-04-28 16:01:50 +00:00
Jens-Heiner Rechtien
e0ac98f6d9 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-19 15:03:25 +00:00
Martin Hollmichel
d611db5354 join OO643C to HEAD 2003-01-20 14:00:18 +00:00
Armin Theissen
d79016bd9c Merge from SRX643_OO 2002-10-22 12:24:17 +00:00
Armin Theissen
84a5ac0b80 Merge to new configure.in that was merged to head 2002-10-17 13:38:03 +00:00
Armin Theissen
572ec02979 Merge from SRX643_OO to HEAD 2002-10-17 09:54:15 +00:00
Ken Foskey
0bf41c3f1e dmake: amend the clean tag to work twice and also clean up dmake directory 2002-10-13 04:19:45 +00:00
Ken Foskey
2aacc1aaf3 Dmake: Create bootstrap patches based on subbranch of head 2002-10-09 12:17:17 +00:00
Martin Hollmichel
4531fc556f join: from SRX643_OO 2002-10-02 08:18:56 +00:00
Sander Vesik
2beb925bd9 Merge from OO642C to HEAD 2002-08-27 10:31:48 +00:00
Sander Vesik
aeddfb6137 Merge changes from OO642C (1.44 -> 1.44.2.5) 2002-08-27 09:31:11 +00:00
Jens-Heiner Rechtien
c59a93863d #i6886#,#101685#: merge OOO_STABLE_1_PORTS (1.41.2.5.2.1-1.41.2.5) -> HEAD; resolved conflict 2002-08-16 09:10:03 +00:00
Martin Hollmichel
28d1729860 add: join from OOO_STABLE_1 2002-07-11 11:18:48 +00:00