Commit graph

49 commits

Author SHA1 Message Date
Kurt Zenker
a4032a42f3 INTEGRATION: CWS mozooo (1.10.6.2.10); FILE MERGED
2005/01/27 19:45:00 rene 1.10.6.2.10.14: RESYNC: (1.33-1.39); FILE MERGED
2005/01/20 06:47:35 windly 1.10.6.2.10.13: RESYNC: (1.31-1.33); FILE MERGED
2005/01/08 17:19:46 vq 1.10.6.2.10.12: RESYNC: (1.29-1.31); FILE MERGED
2004/12/31 18:09:26 vq 1.10.6.2.10.11: #i11424# Fix inconsistency between $ENABLE_BUILD_MOZAB and $BUILD_MOZAB and
regenerate configure.
2004/12/24 23:45:32 vq 1.10.6.2.10.10: RESYNC: (1.26-1.29); FILE MERGED
2004/11/30 07:50:40 windly 1.10.6.2.10.9: #i11424# choose mozilla version and default toolkit at configure time
2004/11/30 04:34:20 vq 1.10.6.2.10.8: RESYNC: (1.25-1.26); FILE MERGED
2004/11/27 00:24:40 vq 1.10.6.2.10.7: RESYNC: (1.23-1.25); FILE MERGED
2004/10/29 09:26:18 fs 1.10.6.2.10.6: RESYNC: (1.18-1.23); FILE MERGED
2004/07/07 10:14:14 fs 1.10.6.2.10.5: RESYNC: (1.17-1.18); FILE MERGED
2004/03/29 07:46:24 fs 1.10.6.2.10.4: #100000# syntax
2004/03/15 14:53:24 fs 1.10.6.2.10.3: RESYNC: (1.10.6.4-1.17); FILE MERGED
2004/01/30 09:03:06 fs 1.10.6.2.10.2: RESYNC: (1.10.6.2-1.10.6.4); FILE MERGED
2004/01/07 09:02:47 fs 1.10.6.2.10.1: #i11424# allow for building Mozilla tarballs (needed for Mozilla Address Book integration)
during an OOo build
thanks to Wind Li (yl146652@openoffice.org)
2005-03-01 16:17:28 +00:00
Kurt Zenker
f5e054af82 INTEGRATION: CWS libwpdupgrade (1.39.10); FILE MERGED
2005/02/25 01:38:47 rene 1.39.10.3: RESYNC: (1.43-1.46); FILE MERGED
2005/02/16 08:27:40 rene 1.39.10.2: RESYNC: (1.39-1.43); FILE MERGED
2005/02/02 20:44:39 rene 1.39.10.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd.
Remove old libwpd/ stuff, tarball will come when the actual release happened :-)
2005-03-01 15:58:10 +00:00
Vladimir Glazounov
f27ca79e14 INTEGRATION: CWS cmcfixes2 (1.39.26); FILE MERGED
2005/02/15 11:37:17 cmc 1.39.26.1: #i41026# use unxlngi6 like Hamburg if compiler >= 3.4.1
2005-02-24 13:44:57 +00:00
Vladimir Glazounov
b7559b06c4 INTEGRATION: CWS macosx02 (1.39.6); FILE MERGED
2005/02/11 19:01:30 pjanik 1.39.6.2: #i39952#: Add current directory to DYLD_LIBRARY_PATH for MacOS X.
2005/01/31 14:22:38 pjanik 1.39.6.1: #i41722#: Append old PATH to the PATH varible for the environment (Mac OS
X/Darwin).
2005-02-24 13:07:05 +00:00
Vladimir Glazounov
7927b3cb13 INTEGRATION: CWS moresystemstuff (1.43.2); FILE MERGED
2005/02/16 13:22:58 rene 1.43.2.1: #i42902# patch to conditionalize putting libstdc++/libgcc_s into the installset
#i42911# patch to use system sane and system xrender headers
2005-02-21 14:16:50 +00:00
Vladimir Glazounov
c82a44c0e2 INTEGRATION: CWS pasf4ooo (1.39.18); FILE MERGED
2005/02/15 08:38:34 rene 1.39.18.2: RESYNC: (1.39-1.43); FILE MERGED
2005/02/08 14:42:05 rene 1.39.18.1: build sndfile/portaudio for OOo, too. Implement --enable-pasf and
--with-system-{sndfile,portaudio}
2005-02-16 15:46:56 +00:00
Vladimir Glazounov
7250d7ac20 INTEGRATION: CWS vq11 (1.39.22); FILE MERGED
2005/02/13 22:23:24 vq 1.39.22.1: #i29788# Remove last traces of unused $MAC_LIB.
2005-02-16 14:43:09 +00:00
Jens-Heiner Rechtien
90963f5ae4 INTEGRATION: CWS vq09 (1.39.2); FILE MERGED
2005/01/27 23:39:30 vq 1.39.2.1: #i39743# Detect library directory for newer directx sdk.
2005-02-11 17:25:50 +00:00
Jens-Heiner Rechtien
215d3691d4 INTEGRATION: CWS configure5 (1.39.14); FILE MERGED
2005/02/05 13:04:16 rene 1.39.14.1: check for gnome-vfs-2.0 in configure
2005-02-11 16:59:05 +00:00
Jens-Heiner Rechtien
ae649b2d39 INTEGRATION: CWS buildcond02 (1.26.8); FILE MERGED
2005/01/31 13:20:39 mmeeks 1.26.8.5: RESYNC: (1.29-1.39); FILE MERGED
2005/01/06 17:15:00 mmeeks 1.26.8.4: RESYNC: (1.27-1.29); FILE MERGED
2004/12/10 14:03:26 mmeeks 1.26.8.3: RESYNC: (1.26-1.27); FILE MERGED
2004/12/09 14:44:29 mmeeks 1.26.8.2: Issue number: #i29937#
Submitted by: mmeeks

Add myspell dictionary packaging disablement.
2004/12/09 14:32:25 mmeeks 1.26.8.1: Issue number: #i35742#
Submitted by: mmeeks

Add BUILD_TYPE conditionals & --with-binfilter conditional.
2005-02-11 14:50:36 +00:00
Jens-Heiner Rechtien
39561e5dfc INTEGRATION: CWS vq10 (1.39.12); FILE MERGED
2005/02/08 00:45:11 vq 1.39.12.2: #i41780# Fix typo.
2005/02/03 22:31:59 vq 1.39.12.1: #i41780# Fix wrong path order problem. Regenerate configure.
2005-02-11 13:37:00 +00:00
Oliver Bolte
3f7a615f7a INTEGRATION: CWS gcj1 (1.26.4); FILE MERGED
2005/01/07 08:57:22 cmc 1.26.4.5: RESYNC: (1.26-1.29); FILE MERGED
2005/01/06 14:10:12 cmc 1.26.4.4: #i38188# don't poke CLASSPATH with gcj and require javadoc
2004/12/10 09:22:33 cmc 1.26.4.3: #i38188# dont use disruptive sun java includes when using gcj
2004/12/03 08:47:24 cmc 1.26.4.2: #i38188# don't need xsltproc with gcj, search seperately for javadoc, and don't get too excited if it is missing
2004/12/01 08:24:14 cmc 1.26.4.1: #i38188# convert --enable-java/--disable-java into --with[out]java=foo where --without-java is like --disable-java, --with-java is like --enable-java, and --with-java=foo where foo is specified overrides the default java interpreter, e.g. --with-java=gij
2005-01-25 15:55:07 +00:00
Oliver Bolte
0da37bfa11 INTEGRATION: CWS configure4 (1.25.6); FILE MERGED
2005/01/24 00:53:49 vq 1.25.6.10: #i39460# Remove obsolete comment about interactively entered values.
2005/01/19 17:53:17 rene 1.25.6.9: RESYNC: (1.33-1.37); FILE MERGED
2005/01/18 15:38:35 rene 1.25.6.8: RESYNC: (1.32-1.33); FILE MERGED
2005/01/17 14:53:48 rene 1.25.6.7: RESYNC: (1.31-1.32); FILE MERGED
2005/01/14 01:49:58 rene 1.25.6.6: #i39160# s390
2005/01/13 23:14:05 rene 1.25.6.5: #i36052# configure needs to test for visibility
2005/01/12 13:49:24 rene 1.25.6.4: RESYNC: (1.25-1.31); FILE MERGED
2005/01/12 13:21:44 rene 1.25.6.3: - comment out system-dbd and system-icu, not working/incomplete
- fix curl version check
2004/12/22 14:35:29 rene 1.25.6.2: #i38460# patch to beautify configure script and its output
2004/11/08 19:33:04 rodarvus 1.25.6.1: Issue number: i30357 - needs rpm to build sysui
Submitted by: waratah
Reviewed by: rodarvus
2005-01-25 11:43:16 +00:00
Kurt Zenker
fbfacca07e INTEGRATION: CWS systemboost (1.29.14); FILE MERGED
2005/01/13 15:03:49 cmc 1.29.14.1: #i36983# optional build with system-boost
2005-01-18 15:13:37 +00:00
Kurt Zenker
ca0547fc32 INTEGRATION: CWS pj16 (1.31.4); FILE MERGED
2005/01/09 16:37:29 pjanik 1.31.4.1: #i37731#: Remove LINK variable from the environment. It should be set in
the solenv/inc/unx*.mk file.
2005-01-18 14:07:38 +00:00
Kurt Zenker
562c922242 INTEGRATION: CWS solarisgcc01 (1.27.2); FILE MERGED
2004/12/11 13:21:11 pjanik 1.27.2.1: #i34342#: Add changes for Solaris gcc on x86.

Submitted by: TANIGUCHI Yasuaki.
2005-01-18 13:55:37 +00:00
Kurt Zenker
6eaf4b35bf INTEGRATION: CWS industrial01 (1.29.2); FILE MERGED
2004/12/20 17:26:43 mmeeks 1.29.2.1: Issue number: #i39341#
Submitted by: mmeeks

Add --with-images= ... -> CUSTOM_IMAGE_SETS piece.
2005-01-18 13:35:28 +00:00
Kurt Zenker
a1fe817d06 INTEGRATION: CWS ause015 (1.29.10); FILE MERGED
2005/01/11 14:05:04 hjs 1.29.10.1: #i39882# remove RSCRES from OOo environment
2005-01-14 10:35:31 +00:00
Rüdiger Timm
5de7d357c0 INTEGRATION: CWS pj15 (1.29.8); FILE MERGED
2005/01/03 15:30:26 pjanik 1.29.8.1: #i39818#: Remove now unused directory from PATH on MacOS X.
2005-01-11 10:23:59 +00:00
Oliver Bolte
c93b16a3d1 INTEGRATION: CWS fooobuild (1.25.14); FILE MERGED
2004/12/21 00:43:46 vq 1.25.14.2: RESYNC: (1.25-1.29); FILE MERGED
2004/11/26 13:10:09 rene 1.25.14.1: #i32814#

fix incomplete conditional msfontextrat/FontOOo merge
2005-01-05 11:10:00 +00:00
Oliver Bolte
f928990351 INTEGRATION: CWS vq08 (1.29.4); FILE MERGED
2004/12/22 04:47:16 vq 1.29.4.2: #i10000# $ENABLE_DEBUG is never defined, @ENABLE_DEBUG@ is.
2004/12/22 03:24:18 vq 1.29.4.1: #i39424# Remove non-.NET2003 stuff from config_office for W32.
2005-01-05 09:42:09 +00:00
Jens-Heiner Rechtien
93ac3d63c8 INTEGRATION: CWS vq07 (1.26.6); FILE MERGED
2004/12/03 22:48:06 vq 1.26.6.1: #i38411# Remove check for wdevenv in configure.
2004-12-13 11:24:03 +00:00
Jens-Heiner Rechtien
cf24ea0686 INTEGRATION: CWS ant02 (1.25.10); FILE MERGED
2004/11/18 16:01:14 bei 1.25.10.1: #i27028# improve ant detection
2004-12-10 16:49:56 +00:00
Rüdiger Timm
2268f9a715 INTEGRATION: CWS vq06 (1.26.2); FILE MERGED
2004/12/01 05:28:27 vq 1.26.2.2: #i38100# Fixed typo.
2004/12/01 05:13:41 vq 1.26.2.1: #i38100# Add PSDK/bin to the PATH. Some executables of the Windows
Installer SDK are needed in instsetoo_native.
2004-12-03 13:20:01 +00:00
Oliver Bolte
a447886448 INTEGRATION: CWS openldap (1.23.6); FILE MERGED
2004/10/29 11:02:06 rene 1.23.6.1: #i36326# patch to be able to use OpenLDAP LDAP SDK instead of mozilla one
2004-11-15 13:11:32 +00:00
Pascal Junck
cfddafdc8a INTEGRATION: CWS rodarvus01 (1.19.6); FILE MERGED
2004/10/14 18:47:28 rodarvus 1.19.6.6: RESYNC: (1.22-1.23); FILE MERGED
2004/10/14 14:44:12 rodarvus 1.19.6.5: Issue number: #i27368# added support for hebrew
Submitted by: obr
Reviewed by: rodarvus
2004/10/14 13:21:32 rodarvus 1.19.6.4: Issue number: #i26571# - remove redundant GTK/KDE logic from config_office/set_soenv.in
Submitted by: rodarvus
2004/09/21 17:26:16 rodarvus 1.19.6.3: RESYNC: (1.19-1.22); FILE MERGED
2004/09/21 14:46:37 rodarvus 1.19.6.2: Issue number: i26571
Submitted by: kendy
Reviewed by: rodarvus
2004/09/14 13:40:08 rodarvus 1.19.6.1: Issue number: i26571
Submitted by: kendy
Reviewed by: rodarvus
2004-10-27 15:17:53 +00:00
Pascal Junck
6f3438351c INTEGRATION: CWS withlang (1.23.2); FILE MERGED
2004/10/23 19:13:14 pjanik 1.23.2.1: #i31784#: simplify handling of languages.
2004-10-27 14:23:18 +00:00
Jens-Heiner Rechtien
6ac2a605d9 INTEGRATION: CWS vq02 (1.19.8); FILE MERGED
2004/10/04 12:48:32 vq 1.19.8.4: #i34228# Typo, found while testing with .NET2003.
2004/09/21 17:00:29 vq 1.19.8.3: RESYNC: (1.19-1.22); FILE MERGED
2004/09/18 12:29:13 vq 1.19.8.2: #i34327# Make config_office DirectX SDK aware.
2004/09/16 18:18:44 vq 1.19.8.1: #i34228# configure and solenv changes for VCTK use.
2004-10-11 12:48:47 +00:00
Jens-Heiner Rechtien
d81245ef77 INTEGRATION: CWS ooo20040815 (1.19.2); FILE MERGED
2004/08/13 01:59:28 rene 1.19.2.1: #i32066# Xinerama is linked staticly even when dynamic is preffered

add check
2004-09-09 10:22:23 +00:00
Rüdiger Timm
f57e22b203 INTEGRATION: CWS ooo20040704 (1.18.2); FILE MERGED
2004/08/09 14:35:22 vg 1.18.2.12: RESYNC MERGED 1.18 1.19
Everything below this line will be added to the revision comment.
2004/07/18 20:13:15 vq 1.18.2.11: #i31676# Fix the dmake build problem for W32-4NT.
2004/07/14 16:16:23 vq 1.18.2.10: #i31446# Remove cygwin b2x cruft from set_soenv.in.
2004/07/09 21:39:48 rene 1.18.2.9: #i23779# Patch to use system libs

- remove unneeded AC_MSG_CHECKING's
- rename system{_,-}odbc / SYSTEM_ODBC to
  system{_,-}odbc{_,-}headers / SYSTEM_ODBC_HEADERS
- regenerate configure
2004/07/06 12:48:42 rene 1.18.2.8: #i23779# Patch to use system libs

- add missing curl configure help
- add system-nas and system-neon + checks
- check for headers with AC_CHECK_HEADER not AC_TRY_COMPILE
Issue number:
Submitted by:
Reviewed by:
2004/07/05 14:01:24 cmc 1.18.2.7: #i30801# make curl an optional compile
2004/07/04 03:08:11 waratah 1.18.2.6: #i28835#  Implement a switch for non-product builds without full debugging
2004/07/03 02:45:01 vq 1.18.2.5: #i29893# *crossmerge* Switch SOLARSRC to default style.
2004/07/02 16:52:25 cmc 1.18.2.4: #i30801# restrict to db3
2004/06/28 07:14:23 cmc 1.18.2.3: #i30801 allow using system libs if possible
2004/06/26 13:14:46 waratah 1.18.2.2: Correct missing semicolon
2004/06/26 13:10:32 waratah 1.18.2.1: Clean up old gcc 2.94 code
2004-09-08 14:24:19 +00:00
Rüdiger Timm
9527165af5 INTEGRATION: CWS pj01 (1.19.4); FILE MERGED
2004/08/30 19:27:56 pjanik 1.19.4.1: #i33459#: Use ENABLE_DIRECTX instead of DIRECTX_SUPPORT
2004-09-08 11:26:43 +00:00
Rüdiger Timm
3d3907a600 INTEGRATION: CWS ooo20040620 (1.17.16); FILE MERGED
2004/06/20 23:44:29 svesik 1.17.16.3: RESYNC: (1.17-1.18); FILE MERGED
2004/06/12 04:30:40 waratah 1.17.16.2: Clean up an unused variable
2004/06/11 02:07:11 vq 1.17.16.1: #i29893# Switch SOLARSRC to default (POSIX) style for w32-tcsh builds.
2004-07-13 14:43:01 +00:00
Rüdiger Timm
027b588fd8 INTEGRATION: CWS ooo20040509 (1.17.12); FILE MERGED
2004/05/10 14:54:14 vq 1.17.12.6: #i28579# Change $CYGWIN to $CYGWIN_PATH and prevent the incorrect
shortening done by dirname.
2004/05/10 01:45:37 vq 1.17.12.5: #i27968# Remove WIN_LIB/LIB from set_soenv.in
2004/05/07 13:52:31 waratah 1.17.12.4: #i26548# Implemented enable directx option for windows
2004/05/07 13:45:32 waratah 1.17.12.3: #i26857# added enable-fontconfig and enable cups option to configure sript
2004/05/07 12:58:43 waratah 1.17.12.2: #i24006# Force language ENUS as well no matter what language selected
2004/05/07 00:23:02 vq 1.17.12.1: #i27968# Only use SOLARINC, remove the use of INCLUDE and SOLARINCLUDES.
2004-06-16 09:48:31 +00:00
Jens-Heiner Rechtien
79f252ab9d INTEGRATION: CWS ooo20040225 (1.15.2); FILE MERGED
2004/02/15 16:05:17 vq 1.15.2.1: #22751 Require .NET 2002 or newer for MS compiler version.
2004-03-09 11:31:38 +00:00
Kurt Zenker
f19be04e0d INTEGRATION: CWS geordi2q15 (1.15.4); FILE MERGED
2004/02/20 12:10:44 hr 1.15.4.1: #111934#: merge CWS ooo111fix3
2004-02-25 12:50:35 +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
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
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
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
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
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
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
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
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
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
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
Sander Vesik
2beb925bd9 Merge from OO642C to HEAD 2002-08-27 10:31:48 +00:00