From 2cb7649648771d723097d18dfdde7e1c162fd620 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 15 Jul 2009 11:06:05 +0000 Subject: CWS-TOOLING: integrate CWS moz2seamonkey01 2009-06-18 20:56:43 +0200 fs r273133 : #i10000# corrected resolved of merge conflict 2009-06-18 20:55:34 +0200 fs r273132 : #i10000# corrected resolved of merge conflict 2009-06-18 10:49:26 +0200 fs r273105 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@272827 (milestone: DEV300:m50) 2009-06-17 20:48:35 +0200 fs r273094 : #i84961# removed 'pointless and buggy' echo statement 2009-05-22 11:27:08 +0200 fs r272176 : #i101763# provided by tono@openoffice.org make compile with mingw 2009-05-22 11:22:25 +0200 fs r272175 : #i101763# provided by tono@openoffice.org allow compilation in with mingw 2009-04-15 12:09:28 +0200 fs r270830 : unconditionally disable moz executables 2009-03-27 12:29:38 +0100 fs r270149 : ignore some configure-related files 2009-03-27 11:47:35 +0100 fs r270145 : SolarisSparc needs libfreebl_32fpu_3.so 2009-03-27 11:38:09 +0100 fs r270141 : regxpcom call not needed nowadays / also pack libfreebl3 (needed for signature/encryption) 2009-03-26 21:40:17 +0100 fs r270108 : superseded by 1.1.14 version 2009-03-24 13:07:21 +0100 fs r269938 : xptitemp.dat seemingly not needed anymore 2009-03-23 12:56:29 +0100 fs r269869 : files with : in their name break the build 2009-03-23 12:22:01 +0100 fs r269866 : files with : in their name break the build 2009-03-21 23:12:06 +0100 fs r269843 : manual resync: merge the changes which happened on TRUNK in mozilla-source-1.7.5.patch herein 2009-03-21 21:58:17 +0100 fs r269841 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@269781 (milestone: DEV300:m44) 2009-03-18 12:04:25 +0100 fs r269649 : in SunHH environment, use pre-requisites from /so/env 2009-03-16 12:33:18 +0100 pastea_p r269522 : correct makefile.mk sorry again 2009-03-15 17:32:43 +0100 pastea_p r269506 : last files about migration to 1.1.14 2009-03-15 17:19:39 +0100 pastea_p r269505 : Migrates some files to 1.1.14 2009-03-04 07:45:40 +0100 fs r268782 : also add pref.xpt 2009-02-27 09:57:37 +0100 fs r268555 : #i66338# for the moment, disable Mozilla-based code for unxlngx6 2009-02-23 10:56:28 +0100 fs r268346 : syntax 2009-02-19 14:14:56 +0100 fs r268283 : make PrintPDE compile in Sun's internal build environment by removing some unneeded stuff 2009-02-18 15:40:40 +0100 fs r268236 : #i66338# re-enable MozAB on Mac 2009-02-18 15:39:55 +0100 fs r268235 : #i66338# 2009-02-18 15:30:38 +0100 fs r268232 : #i66338# tar => $(TAR) (provided by hjs) 2009-02-18 15:28:45 +0100 fs r268231 : more build envs supported (thanks to hjs for all this work!) 2009-02-18 15:27:02 +0100 fs r268230 : #i66338# 2009-02-18 15:23:04 +0100 fs r268229 : #i66338# let it build on Solaris, in Sun Hamburg's build environment 2009-02-18 12:00:12 +0100 fs r268210 : #i10000# 2009-02-18 08:17:29 +0100 fs r268198 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now 2009-02-18 08:16:50 +0100 fs r268197 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now 2009-02-14 14:05:24 +0100 fs r267757 : redo the Windows related changes lost with recent resync 2009-02-14 00:06:33 +0100 ericb r267755 : #i94628# remove the config_office dir now 2009-02-14 00:04:59 +0100 ericb r267754 : #i94628# remove all files in config_office now 2009-02-14 00:01:26 +0100 ericb r267753 : #i94628# remove guw in config_office 2009-02-13 23:53:00 +0100 ericb r267752 : #i94628# remove files in config_office 2009-02-13 16:02:58 +0100 fs r267725 : #i10000# 2009-02-12 18:14:31 +0100 ericb r267685 : #i94628# new generated configure 2009-02-12 18:13:52 +0100 ericb r267684 : #i94628# fix a path issue for finding seamonkey01 2009-02-12 14:39:17 +0100 ericb r267662 : #i94628# removing seamonkey.1.1.12 patch 2009-02-12 14:21:04 +0100 ericb r267658 : #i94628# the new configure, after autoconf 2009-02-12 14:13:21 +0100 ericb r267656 : #i94628# other missing changes for Windows 2009-02-12 14:04:26 +0100 ericb r267655 : #i94628# recommit configure.in changes after config_office removing 2009-02-12 13:46:12 +0100 ericb r267653 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41) 2009-02-12 12:00:48 +0100 ericb r267643 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41) 2009-02-11 13:28:50 +0100 pl r267595 : #i94628# add MACDEVSDK variable for unxmacxi 2009-02-06 09:44:15 +0100 ericb r267446 : #i98957# provide the zipped archives too 2009-02-06 09:43:32 +0100 ericb r267445 : #i98957# make seamonkey buildable on OpenSolaris, adding the right options for configure 2009-02-06 09:42:45 +0100 ericb r267444 : #i98957# make seamonkey buildable on OpenSolaris 2009-02-02 09:41:57 +0100 fs r267252 : #i66338# 2009-02-02 09:41:43 +0100 fs r267251 : #i66338# 2009-01-30 15:12:03 +0100 fs r267200 : code consolidation - MQueryHelper now uses MLdapAttributeMap's fillCardFromResult and fillResultFromCard, which makes the code as such shorter, and eliminates information duplication 2009-01-30 11:53:31 +0100 fs r267189 : reworked the statement parsing / statement execution / result set creation: now we don't anymore create three result sets (two of them leaking) for a single prepared statement ... 2009-01-29 20:37:01 +0100 fs r267170 : #i10000# 2009-01-29 20:32:50 +0100 fs r267169 : more explicit return type of parseSql 2009-01-29 17:32:56 +0100 fs r267163 : slightly refactored the statement class hierarchy (basically remove OStatement_BASE2, and renamed the other base classes) 2009-01-29 17:14:58 +0100 fs r267161 : #i66338# first implementation to re-enable LDAP access. Still work in progress (but hey, you can see the data already :) 2009-01-12 11:25:56 +0100 fs r266138 : allow using a debug-enabled version of Mozilla/SeaMonkey when MOZILLA_ENABLE_DEBUG is set 2009-01-10 22:01:40 +0100 fs r266126 : #i95772# nsldap32v50.dll also needs an embedded manifest (the LDP configuration backend links directly against it) 2009-01-09 11:15:32 +0100 fs r266065 : manifests for DLLs need to have ID 2, not 1 2009-01-08 20:02:24 +0100 fs r266035 : #i95772# embed manifest file in shared libs built in directory/c-sdk, too 2009-01-05 20:45:38 +0100 ericb r265886 : #i66338# commiting the correct configure for the tinderboxes 2009-01-05 17:42:34 +0100 ericb r265883 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@265758 (milestone: DEV300:m38) 2008-12-16 15:34:26 +0100 ericb r265550 : #i94628# change for seamonkey1.1.13 : do not forget to do autoconf in config_office before configure 2008-12-16 15:25:37 +0100 pastea_p r265547 : 1.1.12 to 1.1.13 2008-12-16 14:20:18 +0100 pastea_p r265540 : correct the hunk about no core_abspath which one broke linux build 2008-12-16 13:10:06 +0100 pastea_p r265535 : Change name of patch to 1.1.13 2008-12-15 23:32:54 +0100 pastea_p r265518 : 2008-12-12 18:43:36 +0100 pastea_p r265435 : update to 1.1.13 2008-12-12 10:56:38 +0100 fs r265398 : #i95772# embed .manifest files into SHARED_LIBRARYs built in nsprpub, too 2008-12-12 09:56:38 +0100 fs r265391 : #i95772# don't use regxpcomp on Windows, it's not needed 2008-12-11 11:22:43 +0100 fs r265269 : #i95772# Moz/SeaMonkey libs on Windows now link against msvc?80.dll 2008-12-10 13:45:51 +0100 fs r265182 : proper OSL_ENSURE message 2008-11-13 13:18:03 +0100 fs r263635 : #i95772# more patches 2008-11-13 12:14:41 +0100 fs r263630 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:13:33 +0100 fs r263629 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:08:22 +0100 fs r263628 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip 2008-11-13 12:04:15 +0100 fs r263627 : #i95772# 2008-11-12 08:23:20 +0100 fs r263575 : i95772# use xpcom_core on Windows, too 2008-11-11 21:02:14 +0100 fs r263574 : i95772# use xpcom_core.lib on Windows, too 2008-11-11 20:58:07 +0100 fs r263573 : i95772# use xpcom_core.lib on Windows, too 2008-11-11 15:05:42 +0100 fs r263564 : alternative fix for part 1 of #i94957# 2008-11-10 22:18:14 +0100 fs r263541 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842) 2008-11-10 22:15:57 +0100 fs r263540 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842) 2008-11-10 09:28:26 +0100 fs r263509 : #i95772# when building on WNT, embed the .manifest file into the .dll/.exe 2008-11-10 09:19:06 +0100 fs r263508 : collect single patches which comprise the complete patch 2008-11-06 09:10:21 +0100 fs r263360 : #i95772# core_abspath does not work on Windows, too (at least in security/nss/cmd/shlibsign). Replace with 'cygpath -d -a' 2008-11-02 22:51:27 +0100 fs r263277 : #i95772# sanitize INCLUDEDIR and GENHEADERS to use cygwin path notation - cygwin's make 1.81 doesn't cope with Windows path notation 2008-11-02 22:50:15 +0100 fs r263276 : #i95772# no --enable-system-cairo on Windows 2008-10-18 20:12:36 +0200 pastea_p r262297 : 2008-10-16 17:15:35 +0200 ericb r262267 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-16 17:14:49 +0200 ericb r262266 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-16 16:58:21 +0200 ericb r262263 : #i94957# fix the breakage in connectivity, for the seamonkey migration 2008-10-15 20:16:28 +0200 ericb r262242 : #i94628# use mac as default toolkit on mac 2008-10-14 18:54:13 +0200 ericb r262216 : #i90774# modify the configure.in for moz2seamonkey migration 2008-10-14 18:48:57 +0200 ericb r262215 : #i90774# commit moz2seamonkey changes for svn migration 2008-10-14 18:47:05 +0200 ericb r262214 : #i90774# commit moz2seamonkey changes for svn migration --- configure.in | 56 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 94d57c0245df..e46776bb2ad0 100644 --- a/configure.in +++ b/configure.in @@ -1760,12 +1760,15 @@ dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out AC_MSG_RESULT([found Compiler version $CCNUMVER.]) if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 + MSVSVER=2008 AC_MSG_RESULT([found .NET 2008 / VS 9.0.]) elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 + MSVSVER=2005 AC_MSG_RESULT([found .NET 2005.]) elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 + MSVSVER=2003 AC_MSG_RESULT([found .NET 2003.]) else AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.]) @@ -4126,9 +4129,14 @@ AC_SUBST(MOZILLA_VERSION) AC_MSG_CHECKING([for toolkit mozilla should use]) if test -z "$with_mozilla_toolkit"; then - if test "$_os" != "WINNT"; then - MOZILLA_TOOLKIT=gtk2 - AC_MSG_RESULT([gtk2]) + if test "$_os" != "WINNT" ; then + if test "$_os" = "Darwin" ; then + MOZILLA_TOOLKIT=mac + AC_MSG_RESULT([mac]) + else + MOZILLA_TOOLKIT=gtk2 + AC_MSG_RESULT([gtk2]) + fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit @@ -4150,7 +4158,7 @@ else enable_build_mozilla= fi -AC_MSG_CHECKING([whether to build Mozilla]) +AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey]) if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" AC_MSG_RESULT([yes]) @@ -4160,17 +4168,25 @@ else fi if test "$BUILD_MOZAB" = "TRUE"; then + if test "$_os" = "WINNT"; then + if test "$WITH_MINGWIN" != "yes"; then + # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. + if test "$MSVSVER" != "2005"; then + AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.]) + fi + else + AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.]) + echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn + fi + fi + if test -z "$MOZILLA_VERSION"; then - MOZILLA_VERSION=1.7.5 - fi - if test "$MOZILLA_VERSION" = "1.7b" ; then - MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source" - else - MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}" + MOZILLA_VERSION=1.1.14 fi + MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e]) - if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then + if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then AC_MSG_RESULT([not found]) HAVE_MOZILLA_TARBALL=n else @@ -4179,22 +4195,16 @@ if test "$BUILD_MOZAB" = "TRUE"; then fi done if test "$HAVE_MOZILLA_TARBALL" != "y"; then - AC_MSG_ERROR([Mozilla source archive not found. + AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/]) +http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) fi if test "$_os" = "WINNT"; then - AC_MSG_CHECKING([for glib and libIDL binaries]) - if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \ - -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \ - -o ! -e "./moz/download/wintools.zip" ; then -AC_MSG_ERROR([One or more of the following archives is missing in moz/download/ - vc71-glib-1.2.10-bin.zip - vc71-libIDL-0.6.8-bin.zip -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/) - wintools.zip -(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)]) + AC_MSG_CHECKING([for moztools binaries]) + if test ! -e "moz/download/vc8-moztools.zip" ; then + AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)]) else AC_MSG_RESULT([ok]) fi -- cgit From f46813f452685d41abfa389a4634e02dffc2c4bd Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 16 Jul 2009 13:36:50 +0000 Subject: CWS-TOOLING: integrate CWS tbo07 2009-07-15 12:50:18 +0200 tbo r274002 : #ii97838# fine tuning of text 2009-07-09 11:58:53 +0200 tbo r273855 : #i102592# add configur switch --enable-hids 2009-07-07 18:37:46 +0200 tbo r273812 : last fixes 2009-06-30 17:44:03 +0200 tbo r273527 : #i97838# dynamik hid.lst found 2009-06-30 12:53:57 +0200 tbo r273503 : #i100285# use other name of dialog 2009-06-25 18:56:33 +0200 tbo r273390 : CWS-TOOLING: rebase CWS tbo07 to trunk@272827 (milestone: DEV300:m50) 2009-06-25 15:31:23 +0200 tbo r273383 : #i100285# use other name of dialog 2009-06-25 14:15:33 +0200 tbo r273381 : #i100285# use other name of dialog + context problem with macos 2009-05-20 16:36:54 +0200 tbo r272140 : readme.txt fot the lost hid.lst file 2009-05-20 16:30:31 +0200 tbo r272139 : removal of hid.lst file 2009-05-20 16:28:26 +0200 tbo r272138 : corrections 2009-05-16 19:27:00 +0200 tbo r271982 : #i# copy hid.lst from OOo installation to global/hid 2009-04-21 13:36:36 +0200 tbo r271034 : #i101044# 2009-04-20 18:49:50 +0200 tbo r271009 : #i101044# 2009-04-20 18:47:35 +0200 tbo r271008 : #i100909# --- configure.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e46776bb2ad0..cc9a533e5553 100644 --- a/configure.in +++ b/configure.in @@ -61,6 +61,9 @@ AC_ARG_WITH(vba-package-format, AC_ARG_ENABLE(pch, [ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++. ],,) +AC_ARG_ENABLE(hids, +[ --enable-hids Enables generation of HelpId lists. +],,) AC_ARG_ENABLE(mozilla, [ --disable-mozilla OO.o usually includes a strangely hacked up mozilla binary for your platform, to build without this @@ -1491,6 +1494,19 @@ else fi AC_SUBST(ENABLE_PCH) +dnl =================================================================== +dnl Set the NO_HIDS variable. (enable with --enable-hids) +dnl =================================================================== +AC_MSG_CHECKING([whether to enable hid list feature]) +if test -n "$enable_hids" && test "$enable_hids" != "no"; then + NO_HIDS="" + AC_MSG_RESULT([yes]) +else + NO_HIDS="TRUE" + AC_MSG_RESULT([no]) +fi +AC_SUBST(NO_HIDS) + dnl =================================================================== dnl Search all the common names for GNU make dnl =================================================================== -- cgit From adff17ff66d58e9a7ec5815b5e343017f88d4664 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 6 Aug 2009 15:00:07 +0000 Subject: CWS-TOOLING: integrate CWS tempdir 2009-08-03 21:39:51 +0200 cloph r274596 : ups, broke the build, get_tmp_dir always creates additional dir (misnomer), use TMPPATH var 2009-08-03 18:03:30 +0200 cloph r274593 : use get_tmp_dir for the html-output #i83414# 2009-08-03 17:51:06 +0200 cloph r274590 : mention issue-number in description for GXX_INCLUDE_PATH workaround (100049) whitespace cleanup 2009-07-25 15:05:27 +0200 rene r274340 : #i100049# workaround for mandriva gcc 2009-07-25 14:15:08 +0200 rene r274339 : #i83414#, #i83901#, #i103782# remove T(E)MP, rely on TMPDIR. Default to /tmp 2009-07-25 13:51:00 +0200 rene r274337 : #i103805# missing @ --- configure.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index cc9a533e5553..3a565ebefb7a 100644 --- a/configure.in +++ b/configure.in @@ -2122,6 +2122,10 @@ if test "$GXX" = "yes"; then with_gxx_include_path=`cygpath -d "$with_gxx_include_path"` with_gxx_include_path=`cygpath -u "$with_gxx_include_path"` fi + if echo $with_gxx_include_path | grep -q linux; then + # workaround for Mandriva - issue 100049 + with_gxx_include_path=`cd $with_gxx_include_path && pwd` + fi fi fi dnl This is the original code... -- cgit From 5bf54b56d622370084cf8029500d75208601113e Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 7 Aug 2009 10:16:34 +0000 Subject: CWS-TOOLING: integrate CWS kde4int 2009-07-15 10:40:52 +0200 pl r273993 : #i103288# configure 2009-07-09 14:57:24 +0200 pl r273867 : #i103284# spin fields 2009-07-09 13:49:13 +0200 pl r273864 : #i103284# min size for dropdown comboboxes 2009-07-09 13:46:11 +0200 pl r273860 : #i103284# min size fro dropdown listboxes 2009-07-09 13:01:48 +0200 pl r273857 : #i103284# fix most radiobuttons and checboxes, also on tabpages 2009-07-08 19:38:12 +0200 pl r273847 : #i103290# clean up, enable KDE4 fpicker 2009-07-08 15:54:06 +0200 pl r273837 : #i103284# background mode opaque doesn't look that good 2009-07-07 19:29:01 +0200 pl r273814 : add kde4 directory and deliverables 2009-07-07 11:18:08 +0200 pl r273786 : make compile with Qt 4.1 2009-07-02 19:20:47 +0200 pl r273673 : #i103290# add: KDE4 file picker (thanks Roman Shtylman) 2009-07-02 19:16:07 +0200 pl r273672 : #i103289# add: KDE4integration (thanks Roman Shtylman) 2009-07-02 19:01:20 +0200 pl r273671 : #i103286# add: KDE4 checks (thanks Roman Shtylman) 2009-07-02 18:58:15 +0200 pl r273670 : #i103286# initial import for KDE4 backend (thanks Roman Shtylman) 2009-07-02 18:08:06 +0200 pl r273668 : #i103284# initial import for KDE4 plugin (thanks Roman Shtylman) --- configure.in | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 6 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 3a565ebefb7a..0fa4670b0d48 100644 --- a/configure.in +++ b/configure.in @@ -259,6 +259,11 @@ AC_ARG_ENABLE(kde, AC_ARG_ENABLE(kdeab, [ --disable-kdeab Disable the KDE address book support ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi) +AC_ARG_ENABLE(kde4, +[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms + where Qt4 and KDE4 are available. May be used with --enable-kde + if you want to support both KDE3 and KDE4. +],,) AC_ARG_ENABLE(binfilter, [ --disable-binfilter Disable legacy binary file formats filters ],,if ! test -d ./binfilter; then enable_binfilter=no; fi) @@ -908,6 +913,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes @@ -951,6 +957,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes @@ -984,6 +991,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=no test_randr=yes test_freetype=yes @@ -5242,6 +5250,13 @@ if test "x$enable_kde" = "xyes"; then fi AC_SUBST(ENABLE_KDE) +ENABLE_KDE4="" +if test "x$enable_kde4" = "xyes"; then + ENABLE_KDE4="TRUE" + R="$R kde4" +fi +AC_SUBST(ENABLE_KDE4) + if test -z "$R"; then AC_MSG_RESULT([none]) else @@ -5780,11 +5795,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then fi fi if test "$build_cpu" != "x86_64" ; then - kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries" else - kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries" fi if test -n "$KDEDIR" ; then kde_incdirs="$KDEDIR/include $kde_incdirs" @@ -5831,12 +5846,13 @@ your Qt installation by exporting QTDIR before running "configure".]) your Qt installation by exporting QTDIR before running "configure".]) fi + dnl Check for Meta Object Compiler AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] ) if test "$MOC" = "no" ; then AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running "configure".]) - fi - + fi + dnl Check for KDE headers AC_MSG_CHECKING([for KDE headers]) kde_incdir="no" @@ -5875,6 +5891,102 @@ AC_SUBST(KDE_CFLAGS) AC_SUBST(KDE_LIBS) AC_SUBST(MOC) +dnl =================================================================== +dnl KDE4 Integration +dnl =================================================================== + +KDE4_CFLAGS="" +KDE4_LIBS="" +MOC4="moc" +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QTLIB /usr/lib $x_libraries" + + kde_incdirs="/usr/include $x_includes" + kde_libdirs="/usr/lib $x_libraries" + + if test "$build_cpu" == "x86_64" ; then + qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" + kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" + fi + + qt_test_include="Qt/qobject.h" + qt_test_library="libQtCore.so" + kde_test_include="ksharedptr.h" + kde_test_library="libkdeui.so" + + AC_MSG_CHECKING([for Qt4 headers]) + qt_header_dir="no" + for inc_dir in $qt_incdirs ; do + if test -r "$inc_dir/$qt_test_include" ; then + qt_header_dir="$inc_dir" + break + fi + done + + AC_MSG_RESULT([$qt_header_dir]) + if test "x$qt_header_dir" = "xno" ; then + AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + fi + + AC_MSG_CHECKING([for Qt4 libraries]) + qt_lib_dir="no" + for lib_dir in $qt_libdirs ; do + if test -r "$lib_dir/$qt_test_library" ; then + qt_lib_dir="$lib_dir" + break + fi + done + + AC_MSG_RESULT([$qt_lib_dir]) + + if test "x$qt_lib_dir" = "xno" ; then + AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + fi + + dnl Check for Meta Object Compiler + AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] ) + if test "$MOC4" = "no" ; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running "configure".]) + fi + + dnl Check for KDE4 headers + AC_MSG_CHECKING([for KDE4 headers]) + kde_incdir="no" + for kde_check in $kde_incdirs ; do + if test -r "$kde_check/$kde_test_include" ; then + kde_incdir="$kde_check" + break + fi + done + AC_MSG_RESULT([$kde_incdir]) + if test "x$kde_incdir" = "xno" ; then + AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + fi + + dnl Check for KDE4 libraries + AC_MSG_CHECKING([for KDE4 libraries]) + kde_libdir="no" + for kde_check in $kde_libdirs ; do + if test -r "$kde_check/$kde_test_library" ; then + kde_libdir="$kde_check" + break + fi + done + + AC_MSG_RESULT([$kde_libdir]) + if test "x$kde_libdir" = "xno" ; then + AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + fi + + KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui" +fi +AC_SUBST(KDE4_CFLAGS) +AC_SUBST(KDE4_LIBS) +AC_SUBST(MOC4) + dnl =================================================================== dnl Test for the enabling the lockdown pieces dnl =================================================================== -- cgit From 8f3d03669bac6c79d17a46edf7482ebc5f3120aa Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 17 Aug 2009 14:12:14 +0000 Subject: CWS-TOOLING: integrate CWS graphite01 2009-08-06 11:09:01 +0200 hdu r274708 : #i10000# fix build breaker for SYSTEM_GRAPHITE=NO 2009-07-21 12:01:52 +0200 hdu r274174 : #i93645# fix include files for EXT_USE_STLPORT 2009-07-21 11:51:07 +0200 hdu r274173 : #i93645# convert line-endings of files to be patched 2009-07-21 10:49:01 +0200 hdu r274170 : #i93645# adjust makefile.vc8 for HH-RelEng env (thanks ause) 2009-07-20 05:21:32 +0200 kstribley r274105 : attempt to fix Windows build error caused by NULL variable in nmake file 2009-07-16 10:22:36 +0200 hdu r274032 : #i69129# also use solar minor version to find graphite lib 2009-07-16 05:36:06 +0200 kstribley r274029 : allow windows build to have Graphite disabled with SAL_DISABLE_GRAPHITE 2009-07-15 13:59:22 +0200 hdu r274011 : #i69129# default to ENABLE_GRAPHITE=TRUE 2009-07-15 13:19:54 +0200 hdu r274008 : #i93645# ignore compile warnings for graphite 2009-07-15 13:18:25 +0200 hdu r274006 : #i93645# stlport needs libmath, use solar minor version to find matching libs 2009-07-15 09:21:13 +0200 hdu r273989 : #i100000# avoid compile warning 2009-07-14 12:19:08 +0200 hdu r273963 : CWS-TOOLING: rebase CWS graphite01 to trunk@273858 (milestone: DEV300:m52) 2009-07-13 06:54:56 +0200 kstribley r273912 : change to use standard file headers 2009-07-13 05:39:14 +0200 kstribley r273911 : Remove unnecessary change to configure.in as reported by Rene 2009-07-10 16:58:44 +0200 hdu r273902 : #i100000# fix compile for precompiled-header support 2009-07-02 13:48:26 +0200 kstribley r273647 : #69129# fix a graphite bug which could crash with fonts containing obscure GDL positioning rules 2009-07-02 01:44:02 +0200 rene r273616 : #i10000# we need to link with -licuuc 2009-07-01 04:02:20 +0200 kstribley r273540 : restore missing sdf files from base 2009-07-01 04:01:40 +0200 kstribley r273539 : restore missing sdf files from base 2009-07-01 04:01:12 +0200 kstribley r273538 : restore missing sdf files from base 2009-07-01 03:59:41 +0200 kstribley r273537 : restore missing sdf files from base 2009-06-29 10:16:51 +0200 kstribley r273456 : #i69129# fixes a bug which caused occasional incorrect linebreaking when graphite is asked to render a part of a cluster not containing a base 2009-06-27 10:43:58 +0200 kstribley r273445 : #i69129# added kashida support for justified RTL text 2009-06-01 12:57:06 +0200 kstribley r272476 : CWS-TOOLING: rebase CWS graphite01 to trunk@272291 (milestone: DEV300:m49) 2009-05-26 10:50:06 +0200 kstribley r272286 : #i69129# fixes a build error when NDEBUG is not defined 2009-05-25 13:14:06 +0200 kstribley r272237 : #i69129# enable debugging by fixing compile warnings 2009-05-25 13:07:47 +0200 kstribley r272234 : #i69129# added env variable to disable GRAPHITE at run time on linux and fixed a bug with a rare attachment sequence 2009-04-20 17:39:25 +0200 kstribley r271001 : CWS-TOOLING: rebase CWS graphite01 to trunk@270723 (milestone: DEV300:m46) 2009-04-18 07:11:33 +0200 kstribley r270957 : #i101178# attempt to fix buildbot builds by reordering configure.in 2009-04-14 17:37:07 +0200 kstribley r270801 : #i93645# tweak configure to enable graphite by default on windows and linux to assist testing with tinderbox build 2009-04-14 16:33:17 +0200 kstribley r270796 : #i96925# another fix for rtl fallback and add optional debug info in MultiSalLayout 2009-04-08 13:27:55 +0200 kstribley r270641 : #i69129# fix features after a bad merge 2009-04-08 13:26:34 +0200 kstribley r270640 : #i69129# add a patch for WinFont 2009-03-24 12:37:54 +0100 kstribley r269937 : #i69129# fix build error due to locale being included in method for features 2009-03-24 12:36:10 +0100 kstribley r269936 : #i93645# change patch variable and fix configure 2009-03-20 04:18:56 +0100 kstribley r269776 : CWS-TOOLING: rebase CWS graphite01 to trunk@269297 (milestone: DEV300:m43) 2009-03-01 13:10:59 +0100 kstribley r268622 : added a patch to improve handling of a font with bad graphite language feature tables #i93645# 2009-02-12 04:50:51 +0100 kstribley r267631 : #i93645# fix windows build for graphite 2.3.1 and remove unnecessary patch 2009-02-10 04:48:50 +0100 kstribley r267535 : #i93645# fix a build error with stlport on Ubuntu 8.10 x86 2009-02-10 03:51:10 +0100 kstribley r267534 : #i69129# remove legacy config_office 2009-02-07 19:12:54 +0100 kstribley r267482 : #i93645# upgrade to using silgraphite-2.3.1 2009-02-02 18:17:57 +0100 kstribley r267290 : #i69129# backout unwanted checkin 2009-02-02 17:44:03 +0100 kstribley r267281 : #i69129# backout erroneous update to aclocal.m4 2009-02-01 10:05:03 +0100 kstribley r267236 : #i69129# fix build error due to locale being added to set font attributes 2009-02-01 06:02:52 +0100 kstribley r267235 : #i69129# fix erroneous merge 2009-01-31 16:24:56 +0100 kstribley r267234 : #i69129# update configure.in solenv.in in their new locations with enable graphite 2009-01-31 10:53:18 +0100 kstribley r267232 : CWS-TOOLING: rebase CWS graphite01 to trunk@267171 (milestone: DEV300:m41) 2008-12-17 04:17:33 +0100 kstribley r265577 : #i93645# remove superfluous autoreconf check and autoconf patch 2008-12-16 10:07:20 +0100 rene r265529 : fix aclocal.m4 breakage 2008-12-16 05:13:29 +0100 kstribley r265520 : #i93645# change to autoconf && configure 2008-12-16 04:39:48 +0100 kstribley r265519 : #i93645# modified LD_FLAGS so that system graphite isn't pulled in by accident and fixed autoconf problem 2008-12-15 14:16:25 +0100 rene r265497 : check for working STL 2008-12-15 12:53:39 +0100 rene r265473 : revert broken check 2008-12-15 11:59:21 +0100 kstribley r265472 : #i93645# added check for system STL, since this is a requirement for system graphite to work correctly and moved the position of the check further down 2008-12-15 11:55:34 +0100 kstribley r265471 : #i93645# remove references to gr3ooo to allow system graphite to be used 2008-12-12 18:48:18 +0100 rene r265437 : fix link for system-graphite 2008-12-12 18:46:45 +0100 rene r265436 : the tarball is in graphite, remove obsolete check 2008-12-12 18:22:22 +0100 rene r265433 : typo; re-autoconf 2008-12-12 17:35:26 +0100 rene r265432 : actually implement SYSTEM_GRAPHIT checks (as already checked for in makefile.mks) but remove the checks in graphit itself and move to BUILD_TYPE 2008-12-12 08:08:33 +0100 kstribley r265387 : #i69129# 2 of the patched files need windows line endings so patch works on linux as well as windows 2008-12-12 08:04:41 +0100 kstribley r265386 : #i69129# rtl fallback fix which prevents caching of segments with fallback 2008-12-08 04:28:12 +0100 kstribley r264969 : results of running autoconf with graphite config changes #i69129# 2008-12-05 08:12:47 +0100 kstribley r264886 : backout unintential change at r264884 2008-12-05 06:26:33 +0100 kstribley r264884 : #i96925# fixes for uniscribe fallback 2008-12-05 06:11:37 +0100 kstribley r264883 : #i69129# improvements to windows graphite code, including caching of sila table lookup 2008-12-02 13:28:51 +0100 kstribley r264694 : #i93645# add graphite library and append to patch 2008-11-27 06:47:10 +0100 kstribley r264445 : #69129# fix rtl loop bug and rtl caching problem 2008-11-27 06:42:20 +0100 kstribley r264444 : add caching for GraphiteFontAdaptor 2008-11-14 15:57:03 +0100 kstribley r263681 : #69129# add graphite addtional files from cvs 2008-11-14 15:54:47 +0100 kstribley r263680 : #69129# fix for modified resolution api 2008-11-13 16:24:09 +0100 kstribley r263652 : #69129# add skeleton to build graphite module library 2008-11-13 16:22:19 +0100 kstribley r263651 : #69129# add skeleton to build graphite module library 2008-11-13 16:16:10 +0100 kstribley r263650 : #69129# migrate from cvs 2008-11-13 15:26:54 +0100 kstribley r263646 : #69129# add a module for the graphite library --- configure.in | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0fa4670b0d48..5cb5c0f61097 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,12 @@ AC_ARG_WITH(gpc, [ --without-gpc Use the internal polygon clipping code instead of the external GPC polygon clipping library. ],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi) +AC_ARG_ENABLE(graphite, +[ --enable-graphite Enables the compilation of Graphite smart font rendering +],,) +AC_ARG_WITH(system-graphite, +[ --with-system-graphite use graphite library already installed on system +],,) AC_ARG_ENABLE(ldap, [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK @@ -4344,6 +4350,39 @@ AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) AC_SUBST(SYSTEM_GENCMN) +dnl =================================================================== +dnl Graphite +dnl =================================================================== + +AC_MSG_CHECKING([whether to enable graphite support]) +if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) + if test -n "$with_system_graphite" -o -n "$with_system_libs" && \ + test "$with_system_graphite" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_GRAPHITE=YES + PKG_CHECK_MODULES( GRAPHITE, silgraphite ) + AC_MSG_CHECKING([STL compatibility]) + if test "$WITH_STLPORT" != "no"; then + AC_MSG_ERROR([to use system graphite you need to use --without-stlport]) + else + AC_MSG_RESULT([OK]) + fi + else + AC_MSG_RESULT([internal]) + SYSTEM_GRAPHITE=NO + BUILD_TYPE="$BUILD_TYPE GRAPHITE" + fi +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_GRAPHITE) +AC_SUBST(SYSTEM_GRAPHITE) +AC_SUBST(GRAPHITE_LIBS) +AC_SUBST(GRAPHITE_CFLAGS) + dnl =================================================================== dnl Checks for libraries. dnl =================================================================== -- cgit From f09524dfff4e7cbdc2422ea3290b3de7a0e0811c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 06:36:38 +0000 Subject: CWS-TOOLING: integrate CWS mingwport22 2009-08-19 16:18:46 +0200 tono r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-08-05 12:27:41 +0200 tono r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54) 2009-08-01 00:56:35 +0200 tono r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-27 00:13:27 +0200 tono r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 06:19:59 +0200 tono r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static" 2009-07-25 06:13:56 +0200 tono r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread 2009-07-25 06:05:22 +0200 tono r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section 2009-07-25 05:54:09 +0200 tono r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope 2009-07-25 05:44:58 +0200 tono r274328 : i#103799: mingw gcc-4.4.0 port: add some #include 2009-07-25 05:33:09 +0200 tono r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path 2009-07-25 05:24:42 +0200 tono r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge 2009-07-25 05:16:20 +0200 tono r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 04:01:59 +0200 tono r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-07-25 02:44:01 +0200 tono r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging 2009-07-25 02:28:21 +0200 tono r274321 : i#103791: mingw port fix typo --- configure.in | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 5cb5c0f61097..d447e30f2fcf 100644 --- a/configure.in +++ b/configure.in @@ -2179,8 +2179,65 @@ _ACEOF else AC_MSG_RESULT([$_mingw_lib_include_path]) fi -MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" -AC_SUBST(MINGW_LIB_INCLUDE_PATH) + MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" + AC_SUBST(MINGW_LIB_INCLUDE_PATH) +dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map + AC_MSG_CHECKING([for mingwin c++ backward include path]) + cat >conftest.$ac_ext <<_ACEOF +#include +_ACEOF + _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo` + rm conftest.$ac_ext + if test -n "$_mingw_backward_include_path"; then + _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path` + _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path` + AC_MSG_RESULT([$_mingw_backward_include_path]) + else + _mingw_backward_include_path="NO_BACKWARD_INCLUDE" + AC_MSG_RESULT([no mingwin c++ backward includes]) + fi + MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path" + AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH) + mingw_crtbegin=`$CC -print-file-name=crtbegin.o` + MINGW_CLIB_DIR=`dirname $mingw_crtbegin` + AC_MSG_CHECKING([whether to use dynamic libgcc]) + if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then + AC_MSG_CHECKING([dynamic libgcc name]) + MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + if test -n "$MINGW_GCCDLL"; then + MINGW_SHARED_GCCLIB=YES + AC_MSG_RESULT([use $MINGW_GCCDLL]) + else + AC_MSG_RESULT([no]) + fi + else + AC_MSG_RESULT([no]) + fi + if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then + MINGW_GCCLIB_EH=YES + fi + AC_MSG_CHECKING([whether to use dynamic libstdc++]) + if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then + AC_MSG_CHECKING([dynamic libstdc++ name]) + MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + if test -n "$MINGW_GXXDLL"; then + MINGW_SHARED_GXXLIB=YES + AC_MSG_RESULT([use $MINGW_GXXDLL]) + else + AC_MSG_RESULT([no]) + fi + else + AC_MSG_RESULT([no]) + fi + MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR` + AC_SUBST(MINGW_CLIB_DIR) + AC_SUBST(MINGW_SHARED_GCCLIB) + AC_SUBST(MINGW_GCCLIB_EH) + AC_SUBST(MINGW_SHARED_GXXLIB) + AC_SUBST(MINGW_GCCDLL) + AC_SUBST(MINGW_GXXDLL) fi dnl =================================================================== @@ -2245,6 +2302,29 @@ if test "$_os" = "OSF1"; then fi fi +dnl ************************************************************* +dnl Testing for exception handling - dwarf2 or sjlj exceptions... +dnl ************************************************************* +AC_MSG_CHECKING([exception type]) +AC_LANG_PUSH([C++]) +if test "$WITH_MINGWIN" = "yes"; then + AC_TRY_LINK( + [#include + +extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__)); + + ], + [_Unwind_SjLj_RaiseException() ], + [exceptions_type="sjlj"], + [exceptions_type="dwarf2"] + ) +fi + +AC_MSG_RESULT($exceptions_type) +AC_LANG_POP([C++]) +EXCEPTIONS="$exceptions_type" +AC_SUBST(EXCEPTIONS) + dnl ************************************************************** dnl Testing for required Solaris and SunStudio compiler patches... dnl ************************************************************** -- cgit From 86792bd0e0f81d1677c1da4888fbeb3f2072131e Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 26 Aug 2009 08:22:01 +0000 Subject: CWS-TOOLING: integrate CWS jl127 2009-07-30 10:12:10 +0200 jl r274470 : #i100873# switch on checking for symbol definitions. It works with the current xpcom lib. 2009-07-29 09:48:29 +0200 jl r274443 : #i100873# 2009-07-29 09:47:36 +0200 jl r274442 : #i100873# changes after resync with DEV300m53 which contains the seamonkey update 2009-07-28 10:00:03 +0200 jl r274389 : #100873# Patches from tono 2009-07-27 16:59:39 +0200 jl r274372 : CWS-TOOLING: rebase CWS jl127 to trunk@274203 (milestone: DEV300:m53) 2009-07-07 09:08:53 +0200 jl r273768 : #100873# 2009-07-06 17:16:10 +0200 jl r273754 : #100873# 2009-07-01 13:58:09 +0200 jl r273576 : #100873# added to readme 2009-07-01 13:15:02 +0200 jl r273573 : #100873# deliver lib files when building with MS compiler 2009-06-30 11:22:06 +0200 jl r273498 : #i100873# accidentally commented out patch_files 2009-06-30 09:01:10 +0200 jl r273489 : #100873# make rc.exe work in ooo windows build 2009-06-29 09:47:56 +0200 jl r273451 : #i100873# applied mingw patch from tono 2009-06-24 12:52:14 +0200 jl r273332 : #100873# reapplying the configure.in patch on version 273150 2009-06-24 12:51:12 +0200 jl r273331 : #100873# reapplying the patch on version 273150 2009-06-23 17:17:36 +0200 jl r273299 : #100873# manually modified patch from tono 2009-06-22 17:05:41 +0200 jl r273243 : #100873# applying mingw patch from tono 2009-06-22 17:02:30 +0200 jl r273242 : #100873# applying mingw patch from tono 2009-06-22 12:49:57 +0200 jl r273216 : #100873# dependency to stlport 2009-06-19 11:56:16 +0200 jl r273155 : #100873# undoing a previous change, instset_native complained about missing libjpipe.jnilib (jurt) 2009-06-19 10:13:03 +0200 jl r273150 : #100873# ooo builds shall also use the new nss by default 2009-06-18 14:32:07 +0200 jl r273117 : #110873# more debug output when verifying a certificate 2009-06-16 11:23:50 +0200 jl r273012 : #i10873# 2009-06-16 10:57:41 +0200 jl r273011 : #100873# wrong parameter definition in nsscrypto_initialize 2009-06-16 10:56:45 +0200 jl r273010 : #100873# wrong parameter definition in nsscrypto_initialize 2009-06-15 16:20:42 +0200 jl r272996 : #100873# initialization of NSS is now threadsafe 2009-06-10 12:50:46 +0200 jl r272804 : #100873# rename in foreach fails in 4nt 2009-06-09 13:43:00 +0200 jl r272768 : #i100873# deliver only .h from inc/nss otherwise we get a warning when nss/nssck.api is delivered 2009-06-08 16:15:44 +0200 jl r272739 : #i100873# 2009-06-08 16:04:54 +0200 jl r272738 : #i100873# 2009-06-08 15:45:52 +0200 jl r272736 : #i100873# 2009-06-08 15:44:15 +0200 jl r272735 : #i100873# unzipping of nss.tar.z not working with 4nt 2009-06-08 09:45:46 +0200 jl r272720 : #i100873# 2009-06-03 13:53:52 +0200 jl r272562 : #i100873# MOZILLABUILD not correct 2009-06-03 13:17:54 +0200 jl r272557 : #i100873# readme and makefile changes from cws jl125, support of new nss module 2009-06-03 09:57:40 +0200 jl r272544 : #i100873# added readme 2009-06-02 16:47:47 +0200 jl r272512 : #i100873# removed no longer needed stuff regarding jnilibs 2009-06-02 15:54:42 +0200 jl r272510 : #i100873# added NSS to BUILD_TYPE 2009-06-02 15:20:18 +0200 jl r272508 : #i100873# DEREFERENCE option for copy command 2009-06-02 13:00:12 +0200 jl r272496 : #i100873# PATCH_FILE_NAMES is now PATCH_FILES 2009-06-02 12:23:39 +0200 jl r272494 : #i100873# build dependency to nss 2009-05-29 16:21:40 +0200 jl r272470 : #i100873# seting ENABLE_NSS_MODULE==YES and includeing mozilla-build-1.3 folder in environment 2009-05-29 16:03:23 +0200 jl r272468 : #i100873# use intermediate certificates when validating a certificate 2009-05-29 15:57:16 +0200 jl r272466 : #i100873# use intermediate certificates when validating a certificate 2009-05-29 15:49:58 +0200 jl r272464 : #i100873# using ENABLE_NSS_MODULE 2009-05-29 15:33:14 +0200 jl r272463 : #i100873# using ENABLE_NSS_MODULE 2009-05-29 15:28:39 +0200 jl r272461 : #i100873# build dependency to nss module 2009-05-29 15:24:57 +0200 jl r272460 : #i100873# pass additional certificates into verifyCertificate function 2009-05-29 14:49:40 +0200 jl r272458 : #i100873# new NSS module 2009-05-29 14:43:44 +0200 jl r272457 : #i100873# new NSS module --- configure.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d447e30f2fcf..b66be4e664a3 100644 --- a/configure.in +++ b/configure.in @@ -258,6 +258,9 @@ AC_ARG_WITH(mozilla-toolkit, [ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla components. Default: gtk2 ],,) +AC_ARG_ENABLE(nss_module, +[ --disable-nss-module Whether to use provided NSS module +],,enable_nss_module=yes) AC_ARG_ENABLE(kde, [ --enable-kde Determines whether to use Qt/KDE vclplug on platforms where Qt and KDE are available. @@ -652,6 +655,12 @@ AC_ARG_WITH(directx-home, Usage: --with-directx-home= ],,) +AC_ARG_WITH(mozilla-build, +[ --with-mozilla-build For Windows users, please supply the path to the + mozilla build tools. + + Usage: --with-mozilla-build= +],[MOZILLABUILD=$withval],) AC_ARG_WITH(local-solenv, [ --with-local-solenv If you have solenv in a location other than ./solenv, please supply the path here. @@ -4071,6 +4080,7 @@ AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components if test "$enable_mozilla" = "no"; then AC_MSG_RESULT([no]) WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO else AC_MSG_RESULT([yes]) WITH_MOZILLA=YES @@ -4140,6 +4150,8 @@ AC_MSG_CHECKING([which mozilla to use]) if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then AC_MSG_RESULT([external]) SYSTEM_MOZILLA=YES + ENABLE_NSS_MODULE=NO + enable_nss_module=no AC_MSG_CHECKING([which Mozilla flavour to use]) if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul @@ -4226,6 +4238,8 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.]) elif test "$enable_mozilla" = "no"; then AC_MSG_RESULT([none]) WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO + enable_nss_module=no else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA=NO @@ -4281,6 +4295,37 @@ else AC_MSG_RESULT([no]) fi +AC_MSG_CHECKING([whether to build provided NSS module]) +if test "$enable_nss_module" != "no"; then + ENABLE_NSS_MODULE="YES" + BUILD_TYPE="$BUILD_TYPE NSS" + AC_MSG_RESULT([yes]) + if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for Mozilla build tooling]) + if test -z "$MOZILLABUILD" ; then +AC_MSG_ERROR([Mozilla build tooling not found. Use --with-mozilla-build=]) + else + if test \( "$WITH_MINGWIN" = "yes" \) ; then + if test ! -d "$MOZILLABUILD" ; then +AC_MSG_ERROR([Mozilla build tooling incomplete!]) + else + AC_MSG_RESULT([ok]) + fi + else + if test ! -d "$MOZILLABUILD/moztools" \ + -o ! -d "$MOZILLABUILD/msys" ; then +AC_MSG_ERROR([Mozilla build tooling incomplete!]) + else + AC_MSG_RESULT([ok]) + fi + fi + fi + fi +else + ENABLE_NSS_MODULE="NO" + AC_MSG_RESULT([no]) +fi + if test "$BUILD_MOZAB" = "TRUE"; then if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then @@ -4359,6 +4404,8 @@ fi AC_SUBST(BUILD_MOZAB) fi +AC_SUBST(ENABLE_NSS_MODULE) +AC_SUBST(MOZILLABUILD) AC_SUBST(SYSTEM_MOZILLA) AC_SUBST(MOZ_FLAVOUR) AC_SUBST(MOZ_INC) -- cgit From 8cc653f0612455b9f2730a31ecb7ad001ec05b29 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 01:14:49 +0000 Subject: CWS-TOOLING: integrate CWS gpc100 2009-08-07 20:21:15 +0200 ka r274784 : CWS-TOOLING: rebase CWS gpc100 to trunk@274622 (milestone: DEV300:m54) 2009-08-07 14:11:35 +0200 ka r274764 : #i75026#: removal of GPC dependency --- configure.in | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b66be4e664a3..8ebcc3dc4a97 100644 --- a/configure.in +++ b/configure.in @@ -25,10 +25,6 @@ AC_ARG_WITH(agg, AC_ARG_WITH(gnu-cp, [ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD ],,) -AC_ARG_WITH(gpc, -[ --without-gpc Use the internal polygon clipping code instead of - the external GPC polygon clipping library. -],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi) AC_ARG_ENABLE(graphite, [ --enable-graphite Enables the compilation of Graphite smart font rendering ],,) @@ -5364,40 +5360,6 @@ As the automatic detection fails please copy the files to external/msi/.]) fi fi -dnl =================================================================== -dnl Test for the presence of the right polygon clipping code -dnl =================================================================== -AC_MSG_CHECKING([which polygon clipping code to use]) -WITH_GPC=NO - -if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then - WITH_GPC=YES - AC_MSG_RESULT([GPC]) - - AC_MSG_CHECKING([for GPC files]) - if test -f ./external/gpc/gpc.h; then - HAVE_GPC_H="yes" - else - HAVE_GPC_H="no" - fi - if test -f ./external/gpc/gpc.c; then - HAVE_GPC_C="yes" - else - HAVE_GPC_C="no" - fi - - if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - AC_MSG_RESULT([GPC files found]) - else - AC_MSG_ERROR([GPC files not found -ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, -or use basegfx' implementation using --without-gpc]) - fi -else - AC_MSG_RESULT([internal]) -fi -AC_SUBST(WITH_GPC) - dnl =================================================================== dnl Test which vclplugs have to be built. dnl =================================================================== -- cgit From 42093d37028d6e3a0e0e877253b8be70fe10876f Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 8 Sep 2009 08:54:47 +0000 Subject: CWS-TOOLING: integrate CWS dba32f 2009-08-31 10:43:51 +0200 msc r275590 : #no issuezilla available# make the testcase more error proof 2009-08-31 10:43:28 +0200 msc r275589 : #no issuezilla available# make the testcase more error proof 2009-08-31 10:40:33 +0200 msc r275588 : i85993 remove bugid 2009-08-31 10:38:28 +0200 msc r275587 : i100000 2009-08-27 13:27:32 +0200 fs r275476 : #i103882# 2009-08-27 12:47:54 +0200 fs r275474 : #i104544# do not allow re-entrance for impl_ensureControl_nothrow Actually, this is part of the fix only. I also removed the code which triggered this re-entrance (from the grid control implementation), but to ensure it won't happen, again, I added some safety herein. 2009-08-27 12:47:16 +0200 fs r275473 : #i104544# SetState: Do not call Update at the window which we just set text for. It should (sic\!) not be needed, but causes trouble 2009-08-27 10:18:05 +0200 mav r275461 : #i103266# do not allow any stream operation on package streams while commiting the package 2009-08-20 15:25:48 +0200 fs r275184 : #i104362# fall back to a ViewObjectContactOfSdrObj in case we don't have a page view 2009-08-20 15:25:06 +0200 fs r275183 : AUGMENT_LIBRARY_PATH 2009-08-20 15:10:34 +0200 fs r275182 : AUGMENT_LIBRARY_PATH 2009-08-20 09:50:36 +0200 oj r275167 : #i104266# notify propertyforward when new dest was created 2009-08-19 08:01:28 +0200 mav r275133 : #i103266# fix the typo 2009-08-18 22:45:34 +0200 fs r275131 : #i10000# 2009-08-18 13:53:07 +0200 oj r275105 : #i104266# set column settings after alter columns 2009-08-18 13:41:49 +0200 fs r275103 : #i102550# do not interpret names of existing data sources as system path 2009-08-18 13:13:05 +0200 oj r275097 : #i103882# use correct number Format 2009-08-18 12:59:13 +0200 fs r275094 : #i104181# 2009-08-18 09:07:48 +0200 fs r275079 : updated readme to refer to proper 1.1.14 2009-08-18 08:32:31 +0200 oj r275077 : #i104187# wrong default for FirstCellAsLabel corrected 2009-08-18 08:10:00 +0200 oj r275076 : #i104187# dispose status controller to avoid access of dead statusBar in sfx 2009-08-17 21:56:19 +0200 fs r275074 : merge fix for issue #102564# from dba32e 2009-08-17 15:34:40 +0200 fs r275058 : don't set MaxFieldSize to 0 unconditionally 2009-08-17 14:33:57 +0200 oj r275054 : #i103528# patch for bitxtor 2009-08-17 14:12:26 +0200 oj r275051 : #i104160# fix VerticalAlignment 2009-08-17 14:11:47 +0200 oj r275050 : #i104160# fix VerticalAlignment 2009-08-14 15:54:04 +0200 mav r274989 : #i103266# avoid possibility for race condition 2009-08-13 13:52:43 +0200 fs r274939 : improved diagnostics 2009-08-13 13:52:28 +0200 fs r274938 : typo 2009-08-13 12:51:03 +0200 fs r274934 : #i103763# provided by cloph: correct libIDL check when compiling Mozilla 2009-08-13 12:43:23 +0200 fs r274933 : #i103763# provided by cloph: allow to cross-compile prebuilt zips on Mac 2009-08-13 12:41:15 +0200 fs r274932 : #i103371# fire PREPARECLOSEDOC even for embedded objects (why not?) 2009-08-13 12:24:49 +0200 fs r274930 : #i99890# remove 'Insert Control' from the popup menu 2009-08-13 12:23:38 +0200 fs r274929 : #i99890# DoToolboxAction: assert unknown/unimplemented actions 2009-08-13 09:32:07 +0200 fs r274923 : #i103721# 2009-08-13 09:26:32 +0200 fs r274922 : #i99894# provided by dtardon: xforms_nowFunction: use proper memory allocation function 2009-08-13 09:20:21 +0200 fs r274921 : #i103938# provided by cmc: pass proper arguments to OUString::intern 2009-08-12 22:34:28 +0200 fs r274916 : #i104139# when executing a PopupMenu, pass the POPUPMENU_NOMOUSEUPCLOSE flag --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 8ebcc3dc4a97..a417e8bc800f 100644 --- a/configure.in +++ b/configure.in @@ -4353,7 +4353,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) +ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) fi if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for moztools binaries]) @@ -4368,9 +4368,9 @@ http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/ AC_MSG_NOTICE([checking whether mozilla can be built...]) PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages])) else - PKG_CHECK_MODULES(MOZLIBREQ, libIDL >= 0.6.3 libIDL <= 0.6.8, MOZIDL="TRUE", MOZIDL="") + PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3, MOZIDL="TRUE", MOZIDL="") if test -z "$MOZIDL"; then - AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.]) + AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit.]) fi fi else -- cgit From e35f41e161aaa25ca180b1966a0f465a99a1903a Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 16 Sep 2009 14:49:32 +0000 Subject: CWS-TOOLING: integrate CWS cloph13 2009-09-01 #i104566# also use syslibroot/isysroot for external components 2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot /Developer/..." arguments for OOo's cpp --- configure.in | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index a417e8bc800f..36c217986e00 100644 --- a/configure.in +++ b/configure.in @@ -676,6 +676,15 @@ AC_ARG_ENABLE(check-only, Usage: --enable-check-only=yes ],,) +AC_ARG_ENABLE(ccache-skip, +[[ --enable-ccache-skip [default=auto] allow the use of --ccache-skip to + escape compiler flags that would otherwise prevent + caching of the result (currently used on Mac only) + NOTE: requires patched version because of a bug in + ccache (see issue 104567 for details and patch) + explicitly enable if your version of ccache doesn't + identify as version 2.4_OOo +]],,enable_ccache_skip=auto) AC_ARG_WITH(lang, [ --with-lang Use this option to build OpenOffice.org with additional language support. English (US) is always @@ -2588,6 +2597,55 @@ if test "$GCC" = "yes"; then fi fi +# =================================================================== +# use --ccache-skip? +# =================================================================== +dnl used to escape compiler options for ccache that otherwise prevent +dnl caching of the results (like "-x objective-c++" for Mac) +AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip]) +if test "$_os" != "Darwin" ; then + AC_MSG_RESULT([only used on Mac currently, skipping]) +elif test "$enable_ccache_skip" = "no" ; then + AC_MSG_RESULT([no - diabled explicitly]) +elif test "$enable_ccache_skip" = "yes" ; then + AC_MSG_RESULT([yes - enabled explicitly, skipping checks]) + AC_SUBST([USE_CCACHE], [YES]) +elif test "$enable_ccache_skip" = "auto" ; then + # checking for ccache presence/version + AC_MSG_RESULT([probing...]) + AC_PATH_PROG([CCACHE],[ccache],[not_found]) + if test "$CCACHE" = "not_found" ; then + AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)]) + else + # check ccache version + AC_MSG_CHECKING([whether version of ccache is suitable]) + CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'` + if test "$CCACHE_VERSION" = "2.4_OOo"; then + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([whether ccache is actually used for the build]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]), + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes ; then + AC_MSG_RESULT([yes, will enable --ccache-skip]) + AC_SUBST([USE_CCACHE], [YES]) + else + AC_MSG_RESULT([no, will not enable --ccache-skip]) + fi + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + else + AC_MSG_RESULT([no]) + AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip]) + fi + fi +else + AC_MSG_ERROR([invalid option to --enable-ccache-skip. Valid values are "auto", "yes" and "no"]) +fi + dnl =================================================================== dnl system stl sanity tests dnl =================================================================== -- cgit From 2b685c20949e50245495002aafbbdf7c6a1b5aaa Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 17 Sep 2009 10:11:42 +0000 Subject: CWS-TOOLING: integrate CWS boost134 2009-09-09 10:30:24 +0200 fs r275970 : #i100127# provided by rene: check whether system-boost's function.hpp compiles without exception support 2009-09-04 21:58:00 +0200 fs r275832 : indention 2009-09-04 21:57:10 +0200 fs r275831 : #i10000# type in boost/spirit check. Thanks to thb 2009-09-04 10:58:54 +0200 fs r275787 : #i100127# provided by tono@openoffice.org: mingw needs using directives for std::min/max 2009-09-04 10:31:54 +0200 fs r275782 : #i100127# (approved by hjs) on Solaris, set GNUTAR to /usr/sfw/bin/gtar, this is available on baseline machines (Solaris 10.x), but not necessarily available in LD_LIBRARY_PATH 2009-08-19 21:47:55 +0200 rene r275161 : #i10000# check for the header actually used now 2009-08-17 21:55:31 +0200 fs r275073 : CWS-TOOLING: rebase CWS boost134 to trunk@275001 (milestone: DEV300:m55) 2009-07-16 09:39:25 +0200 fs r274031 : #i100127# extract download/% with GNUTAR instead of TAR 2009-07-14 09:18:15 +0200 fs r273960 : CWS-TOOLING: rebase CWS boost134 to trunk@273858 (milestone: DEV300:m52) 2009-07-13 09:55:14 +0200 fs r273919 : #i100127# use boost 1.39, not 1.34 2009-07-13 09:45:57 +0200 fs r273918 : use GNUTAR when extracting download/%.tar.gz, not TAR (necessary with boost 1.39 tarball) 2009-07-10 21:10:52 +0200 fs r273905 : #i100127# spirit now part of boost 2009-07-06 12:12:13 +0200 fs r273732 : #i10000# lngconvex, used in src/wizards, is built in shell => added missing module dependency 2009-07-02 15:34:51 +0200 fs r273660 : #i100127# 2009-07-02 13:35:24 +0200 fs r273645 : #i100127# MSVC needs some hinting when using boost::bind on (some) member functions 2009-07-02 10:33:59 +0200 fs r273625 : removed unused include (lead to an internal compiler error with MSVC and boost 1.34+) 2009-07-02 09:44:35 +0200 fs r273619 : change some include orders, prevents 'internal compiler errors' with MSVC 2009-07-01 09:19:25 +0200 fs r273547 : #i100127# who the heck is defining max as something unusable? 2009-07-01 09:17:28 +0200 fs r273546 : #i100127# defining min/max is causing trouble now 2009-07-01 09:15:40 +0200 fs r273545 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL, and disabling warning 4180 2009-07-01 09:14:23 +0200 fs r273544 : #i100127# re-disable warning 4180, still needed for some files 2009-07-01 09:07:33 +0200 fs r273543 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL 2009-06-24 11:00:32 +0200 fs r273319 : oops, re-introduced some inc locations 2009-06-23 22:10:02 +0200 fs r273304 : #i100127# disable warning C4180 2009-06-23 22:08:36 +0200 fs r273303 : #i100127# disable warning C4180 2009-06-16 12:26:49 +0200 fs r273015 : #i10000# (provided by mst@openoffice.org) 2009-06-15 09:10:27 +0200 fs r272962 : #i10000# use -r instead of -a when copying the include files, this prevents the spurious 'failed to preserve ownership' errors 2009-06-11 23:55:06 +0200 fs r272902 : #i100127# 2009-06-11 23:54:47 +0200 fs r272901 : #i100127# 2009-06-11 23:54:05 +0200 fs r272900 : make compile on unxsol[i|s]4 2009-06-10 10:12:22 +0200 fs r272798 : #i100127# don't deliver from within unxlngi6/misc/build/boost, but from a 'normalized' location unxlngi6/inc 2009-06-10 09:48:00 +0200 fs r272795 : #i100127# use 1.34.1 unconditionally on all platforms --- configure.in | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 36c217986e00..814d11084117 100644 --- a/configure.in +++ b/configure.in @@ -4083,8 +4083,24 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \ AC_LANG_PUSH([C++]) AC_CHECK_HEADER(boost/shared_ptr.hpp, [], [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], []) - AC_CHECK_HEADER(boost/spirit/core.hpp, [], - [AC_MSG_ERROR(boost/spirit/core.hpp not found. install boost)], []) + AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [], + [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], []) + AC_CHECK_HEADER(boost/function.hpp, [], + [AC_MSG_ERROR(boost/function.hpp not found. install boost)], []) + + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -fno-exceptions" + AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions]) + AC_TRY_COMPILE([#include +], [], + ac_cv_cxx_boost_no_exceptons_broken=no, ac_cv_cxx_boost_no_exceptons_broken=yes) + + if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then + AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131]) + else + AC_MSG_RESULT([yes]) + fi + CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) -- cgit From 90df1ca60d56ffb696f11a31c48ec642008d01b3 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 17 Sep 2009 16:34:35 +0000 Subject: CWS-TOOLING: integrate CWS vcl105 2009-09-07 Philipp Lohmann fix path issues 2009-09-07 hdu #i104525# Aqua: workaround OSX problem in RecentlyUsed list 2009-09-07 Philipp Lohmann add missing dollar sign 2009-09-07 Philipp Lohmann remove warnings 2009-09-07 hdu #i104011# need to use real-vals in cff-subsetter for some fonts 2009-09-05 Philipp Lohmann #i103674# less noise 2009-09-05 Philipp Lohmann #i103674# add garmin communicator to list of crashing plugins 2009-09-05 Philipp Lohmann #i103674# confiuration option to disable plugin support 2009-09-05 Philipp Lohmann merge #i102735# 2009-09-05 Philipp Lohmann #i88802# enable transparency resolution for PDF/A 2009-09-04 Philipp Lohmann rebase to DEV300m57 2009-09-03 Philipp Lohmann #i90083# fix a typo 2009-09-03 Philipp Lohmann merge 2009-09-03 Philipp Lohmann #i90083# workaround for application frame switching 2009-09-03 hdu #i104720# better description for --without-fonts configure option 2009-09-02 hdu #i104723# update third-party fonts 2009-09-02 hdu #i104723# update default-installed Liberation fonts from 1.04->1.05.1.20090721 2009-09-02 hdu #i104720# update default-installed DejaVu fonts from 2.21->2.30 2009-09-02 hdu #i89682# add Gentium fonts to default installation 2009-09-02 hdu #i89682# add Gentium fonts to default installation 2009-09-01 hdu #i104011# fix vertical offset in PDF-export of USP-layouted text 2009-08-27 Philipp Lohmann #i102033# ignore transients 2009-08-27 Philipp Lohmann merge 2009-08-27 Philipp Lohmann fix warning, remove crappy early exits 2009-08-26 Philipp Lohmann #i63494# user event time for generic plugin always regotten to work around metacity 2009-08-26 Philipp Lohmann merge 2009-08-26 Philipp Lohmann #i104526# fix string conversion 2009-08-25 Philipp Lohmann #b6855541# show newly added driver, repair remove driver 2009-08-25 Philipp Lohmann #i104469# maximizing issue (thanks haggai) --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 814d11084117..5c76458df632 100644 --- a/configure.in +++ b/configure.in @@ -72,10 +72,10 @@ AC_ARG_ENABLE(mozilla, version, use this option. ],,enable_mozilla="yes") AC_ARG_WITH(fonts, -[ --without-fonts Removes Bitstream Vera fonts from - openoffice.org installation set, for people building - for specific distributions where the fonts are known - to be already available +[ --without-fonts OOo includes some third-party fonts to provide a reliable + basis for help content, templates, samples, etc. + When these fonts are already known to be available on the + system then you should use this option. ],,) AC_ARG_WITH(ppds, [ --without-ppds Removes Postscript Printer definition files from -- cgit From 2c16d8bfc2f7a12be44d5f1e2a5c593cdc83465c Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Fri, 18 Sep 2009 14:30:31 +0000 Subject: #i10000# #i105127# kde configure patch --- configure.in | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 5c76458df632..cf91e5170170 100644 --- a/configure.in +++ b/configure.in @@ -6101,8 +6101,8 @@ KDE4_CFLAGS="" KDE4_LIBS="" MOC4="moc" if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" - qt_libdirs="$QTLIB /usr/lib $x_libraries" + qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QT4LIB /usr/lib $x_libraries" kde_incdirs="/usr/include $x_includes" kde_libdirs="/usr/lib $x_libraries" @@ -6112,6 +6112,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" fi + if test -n "$KDE4DIR" ; then + kde_incdirs="$KDE4DIR/include $kde_incdirs" + if test "$build_cpu" != "x86_64" ; then + kde_libdirs="$KDE4DIR/lib $kde_libdirs" + else + kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs" + fi + fi + qt_test_include="Qt/qobject.h" qt_test_library="libQtCore.so" kde_test_include="ksharedptr.h" @@ -6128,7 +6137,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then AC_MSG_RESULT([$qt_header_dir]) if test "x$qt_header_dir" = "xno" ; then - AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi AC_MSG_CHECKING([for Qt4 libraries]) @@ -6143,14 +6152,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then AC_MSG_RESULT([$qt_lib_dir]) if test "x$qt_lib_dir" = "xno" ; then - AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi dnl Check for Meta Object Compiler - AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] ) + AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] ) if test "$MOC4" = "no" ; then AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QTDIR before running "configure".]) +the root of your Qt installation by exporting QT4DIR before running "configure".]) fi dnl Check for KDE4 headers @@ -6164,7 +6173,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".] done AC_MSG_RESULT([$kde_incdir]) if test "x$kde_incdir" = "xno" ; then - AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi dnl Check for KDE4 libraries @@ -6179,7 +6188,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".] AC_MSG_RESULT([$kde_libdir]) if test "x$kde_libdir" = "xno" ; then - AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" -- cgit From 47207271b60230ac578af6f20de1f56ea8ce0b3a Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 23 Sep 2009 11:08:28 +0000 Subject: #i10000# #i105293# ext. openssl check --- configure.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index cf91e5170170..aff65d6d1583 100644 --- a/configure.in +++ b/configure.in @@ -4795,8 +4795,14 @@ else NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" fi +AC_SUBST(SYSTEM_NEON) +AC_SUBST(NEON_VERSION) +AC_SUBST(NEON_LIBS) +AC_SUBST(NEON_CFLAGS) +fi + dnl =================================================================== -dnl Check for system openssl (only neon needs it!) +dnl Check for system openssl dnl =================================================================== if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes @@ -4823,12 +4829,6 @@ AC_SUBST(SYSTEM_OPENSSL) AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LIBS) -AC_SUBST(SYSTEM_NEON) -AC_SUBST(NEON_VERSION) -AC_SUBST(NEON_LIBS) -AC_SUBST(NEON_CFLAGS) -fi - dnl =================================================================== dnl Test for disabling agg dnl =================================================================== -- cgit From 9862e4b5acdd970ee586fdb5108a89e3032c9c45 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 16:04:03 +0100 Subject: ause109: #i106293# remove 4nt from configure --- configure.in | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index aff65d6d1583..e41fa919e752 100644 --- a/configure.in +++ b/configure.in @@ -773,9 +773,8 @@ AC_ARG_WITH(use-shell, Supported options: tcsh (default) bash - 4nt (windows only) - Usage: --with-use-shell=tcsh|bash|4nt + Usage: --with-use-shell=tcsh|bash ],with_use_shell=$withval,with_use_shell="tcsh") AC_ARG_WITH(build-version, [ --with-build-version Allows the builder to add a custom version tag @@ -1317,14 +1316,14 @@ AC_SUBST(HYPH_SYSTEM_DIR) AC_SUBST(THES_SYSTEM_DIR) dnl =================================================================== -dnl WINNT uses tcsh, bash or 4nt all other O/S use tcsh or bash. +dnl all O/S use tcsh or bash. dnl The following sets the with_use_shell variable. dnl =================================================================== AC_MSG_CHECKING([which shell to use]) if test $_os = "WINNT"; then dnl =================================================================== - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then - AC_MSG_ERROR([only "tcsh","bash" or "4nt" are supported options]) + if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then + AC_MSG_ERROR([only "tcsh" or "bash" are supported options]) fi dnl =================================================================== dnl Sanity check! Native windows programs cannot use cygwin symlinks! @@ -1356,7 +1355,7 @@ link, and copy the program to the name of the link.]) dnl If using Mingwin32 then don't use 4NT dnl =================================================================== if test "$WITH_MINGWIN" = "yes" ; then - if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then + if test "x$with_use_shell" = "x"; then with_use_shell="tcsh" fi if test -z "$CC"; then @@ -1365,8 +1364,8 @@ link, and copy the program to the name of the link.]) fi fi elif test $_os = "OS2"; then - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then - AC_MSG_ERROR([only "tcsh" or "4nt" are supported options]) + if test "$with_use_shell" != "tcsh"; then + AC_MSG_ERROR([only "tcsh" is supported options]) fi else dnl =================================================================== @@ -1382,11 +1381,11 @@ AC_SUBST(USE_SHELL) AC_SUBST(WITH_MINGWIN) dnl =================================================================== -dnl Extra check for Windows. Non 4nt-builds need gcc to build dmake +dnl Extra check for Windows. cygwin builds need gcc to build dmake dnl and g++ to build guw.exe although MS cl (or MinGW) is used to dnl build OOo. dnl =================================================================== -if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then +if test "$_os" = "WINNT" ; then AC_MSG_CHECKING([for cygwin gcc/g++]) if which gcc > /dev/null && which g++ > /dev/null ; then AC_MSG_RESULT([found]) @@ -5328,15 +5327,8 @@ dnl =================================================================== dnl Zip must be a specific type for different build types. dnl =================================================================== if test "$_os" = "WINNT"; then - if test "$with_use_shell" = "4nt" ; then - if test -z "`$ZIP -h | grep -i WinNT`" ; then -AC_MSG_ERROR([$ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. -Probably there is a cygwin version in the path.]) - fi - else - if test -n "`$ZIP -h | grep -i WinNT`" ; then + if test -n "`$ZIP -h | grep -i WinNT`" ; then AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.]) - fi fi fi AC_SUBST(ZIP_HOME) -- cgit From 329fca3ae435ce21801480984ecd52603728a8a9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 15:41:16 +0000 Subject: linuxhppa1: #i107051#: port to linux hppa (parisc) --- configure.in | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e41fa919e752..37fa42796ce9 100644 --- a/configure.in +++ b/configure.in @@ -130,7 +130,7 @@ AC_ARG_ENABLE(evolution2, ],,) AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system -],,checkforprelink=yes) +],,checkforstdlibproblems=yes) AC_ARG_WITH(system-mspack, [ --with-system-mspack use libmspack already installed on system ],,) @@ -2709,7 +2709,7 @@ _ACEOF if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then gccvisbroken=yes else - if $EGREP -q '@PLT|\$stub' visibility.s; then + if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then gccvisbroken=no; else gccvisbroken=yes; @@ -2889,8 +2889,8 @@ if test "$SOLAR_JAVA" != ""; then _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10600; then - AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6]) + if test "$_jdk_ver" -lt 10500; then + AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5]) fi AC_MSG_RESULT([checked (IBM JDK $_jdk)]) @@ -3581,10 +3581,16 @@ dnl =================================================================== dnl Check for prelinked libgcc_s.so.1 dnl =================================================================== if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then - if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then - with_system_stdlibs=yes - AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + if test -n "$checkforstdlibproblems"; then + if test -f /etc/rpm/macros.prelink; then + with_system_stdlibs=yes + AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) + echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then + with_system_stdlibs=yes + AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) + echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + fi fi fi -- cgit From da8ef83f41bee5a4f68c53ed34b292d1807ee606 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 20:39:52 +0000 Subject: cmcfixes67: #i107058#: make system db test faster, and extend to all >= 4.1 --- configure.in | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e41fa919e752..b29bec95b2b6 100644 --- a/configure.in +++ b/configure.in @@ -3843,25 +3843,14 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \ ], [] ) AC_MSG_CHECKING([whether db is at least 4.1]) - for v in `seq 1 7`; do - AC_TRY_RUN([ + AC_TRY_RUN([ #include int main(int argc, char **argv) { - if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0; + if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0; else return 1; } - ], [DB_VERSION_MINOR=$v], []) - done - if test "$DB_VERSION_MINOR" -gt "1"; then - AC_MSG_RESULT([OK]) - DB_VERSION=4.$DB_VERSION_MINOR - else - AC_MSG_ERROR([no. you need at least db 4.1]) - fi - # does not work :/ - #AC_CHECK_LIB(db, db_create, [], - # [AC_MSG_ERROR([db library not installed or functional])], []) + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) AC_HAVE_LIBRARY(db, [], [AC_MSG_ERROR([db not installed or functional])], []) SCPDEFS="$SCPDEFS -DSYSTEM_DB" -- cgit From 900d8d6ec2103e5205083e18e76a68d560107918 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 20:45:36 +0000 Subject: cmcfixes67: #i107060#: make system jars easier --- configure.in | 89 ++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 26 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b29bec95b2b6..e38c866424b7 100644 --- a/configure.in +++ b/configure.in @@ -5914,37 +5914,74 @@ AC_SUBST(LIBSERIALIZER_JAR) if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test "$with_system_apache_commons" = "yes"; then - SYSTEM_APACHE_COMMONS=YES - AC_MSG_RESULT([external]) + SYSTEM_APACHE_COMMONS=YES + AC_MSG_RESULT([external]) if test "$ENABLE_MEDIAWIKI" = "YES"; then - if test -z "$COMMONS_CODEC_JAR"; then - COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar - fi - AC_CHECK_FILE($COMMONS_CODEC_JAR, [], - [AC_MSG_ERROR(commons-codec.jar not found.)], []) - if test -z "$COMMONS_LANG_JAR"; then - COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar - fi - AC_CHECK_FILE($COMMONS_LANG_JAR, [], - [AC_MSG_ERROR(commons-lang.jar not found.)], []) - if test -z "$COMMONS_HTTPCLIENT_JAR"; then - COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar - fi - AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], - [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + if test -z $COMMONS_CODEC_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-codec.jar, + [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ], + [AC_MSG_ERROR(commons-codec.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_CODEC_JAR, [], + [AC_MSG_ERROR(commons-codec.jar not found.)], []) + fi + + if test -z $COMMONS_LANG_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-lang.jar, + [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ], + [AC_MSG_ERROR(commons-lang.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LANG_JAR, [], + [AC_MSG_ERROR(commons-lang.jar not found.)], []) + fi + + if test -z $COMMONS_HTTPCLIENT_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, + [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ], + [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [], + [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) + fi fi if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - if test -z "$COMMONS_LOGGING_JAR"; then - COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar - fi - AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], - [AC_MSG_ERROR(commons-logging.jar not found.)], []) - + if test -z $COMMONS_LOGGING_JAR; then + AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], + [ + AC_CHECK_FILE(/usr/share/java/commons-logging.jar, + [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], + [AC_MSG_ERROR(commons-logging.jar replacement not found.)] + ) + ] + ) + else + AC_CHECK_FILE($COMMONS_LOGGING_JAR, [], + [AC_MSG_ERROR(commons-logging.jar not found.)], []) + fi fi else - AC_MSG_RESULT([internal]) - SYSTEM_APACHE_COMMONS=NO - BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" + AC_MSG_RESULT([internal]) + SYSTEM_APACHE_COMMONS=NO + BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi fi AC_SUBST(SYSTEM_APACHE_COMMONS) -- cgit From 291172672f3b89a644814aa7f30e77360cf07f11 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 19 Nov 2009 20:52:15 +0000 Subject: cmcfixes67: #i107061#: avoid the libfreebl3.so + libcrypt problem on Fedora --- configure.in | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e38c866424b7..7333bf5b56a2 100644 --- a/configure.in +++ b/configure.in @@ -284,8 +284,9 @@ AC_ARG_ENABLE(pam-link, AC_ARG_ENABLE(crypt-link, [ --disable-crypt-link disable linking with libcrypt instead of dynamically open it (needed for ancient GNU/Linux distributions - without crypt()/libcrypt) -],,enable_crypt_link=yes) + without crypt()/libcrypt or distributions which link + libcrypt against conflicting nss libraries) +],,) AC_ARG_ENABLE(xrender-link, [ --enable-xrender-link link with libXrender instead of dynamically open it ],,) @@ -2062,14 +2063,39 @@ AC_SUBST(PAM_LINK) if test "$_os" = "Linux"; then AC_MSG_CHECKING([whether to link to libcrypt]) - if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then + if test -n "$enable_crypt_link" -a "$enable_crypt_link" == "no"; then + AC_MSG_RESULT([no, dynamically open it]) + CRYPT_LINK=NO + elif test -n "$enable_crypt_link" -a "$enable_crypt_link" == "yes"; then AC_MSG_RESULT([yes]) CRYPT_LINK=YES AC_CHECK_LIB(crypt, crypt, [], [AC_MSG_ERROR(libcrypt not found or functional)], []) else - AC_MSG_RESULT([no, dynamically open it]) - CRYPT_LINK=NO + cat >crypttest.c <<_ACEOF +#include +#include + +int main(void) +{ + char key[[64]]; + setkey(key); + return 0; +} +_ACEOF + if ! $CC $CFLAGS $LDFLAGS crypttest.c -o crypttest -lcrypt 2>/dev/null > /dev/null; then + CRYPT_LINK=NO + AC_MSG_RESULT([no, dynamically open it]) + elif test "$enable_mozilla" = "yes" -a "$with_system_mozilla" != "yes" && `ldd ./crypttest |$EGREP -q libfreebl`; then + AC_MSG_RESULT([no, dynamically open it]) + CRYPT_LINK=NO + AC_MSG_WARN([libcrypt links against nss libraries, disabling --enable-crypt-link, use --enable-crypt-link, to override]) + echo "libcrypt links against nss libraries, disabling --enable-crypt-link, use --enable-crypt-link, to override" >> warn + else + AC_MSG_RESULT([yes]) + CRYPT_LINK=YES + fi + rm -f crypttest.c crypttest fi fi AC_SUBST(CRYPT_LINK) -- cgit From 9f1383d99c28a753c30e9ab740b29896af64b9b1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Nov 2009 12:10:32 +0000 Subject: cmcfixes67: #i105566#: better upstream-used fix to avoid the libfreebl3.so + libcrypt problem on Fedora --- configure.in | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 7333bf5b56a2..e38c866424b7 100644 --- a/configure.in +++ b/configure.in @@ -284,9 +284,8 @@ AC_ARG_ENABLE(pam-link, AC_ARG_ENABLE(crypt-link, [ --disable-crypt-link disable linking with libcrypt instead of dynamically open it (needed for ancient GNU/Linux distributions - without crypt()/libcrypt or distributions which link - libcrypt against conflicting nss libraries) -],,) + without crypt()/libcrypt) +],,enable_crypt_link=yes) AC_ARG_ENABLE(xrender-link, [ --enable-xrender-link link with libXrender instead of dynamically open it ],,) @@ -2063,39 +2062,14 @@ AC_SUBST(PAM_LINK) if test "$_os" = "Linux"; then AC_MSG_CHECKING([whether to link to libcrypt]) - if test -n "$enable_crypt_link" -a "$enable_crypt_link" == "no"; then - AC_MSG_RESULT([no, dynamically open it]) - CRYPT_LINK=NO - elif test -n "$enable_crypt_link" -a "$enable_crypt_link" == "yes"; then + if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then AC_MSG_RESULT([yes]) CRYPT_LINK=YES AC_CHECK_LIB(crypt, crypt, [], [AC_MSG_ERROR(libcrypt not found or functional)], []) else - cat >crypttest.c <<_ACEOF -#include -#include - -int main(void) -{ - char key[[64]]; - setkey(key); - return 0; -} -_ACEOF - if ! $CC $CFLAGS $LDFLAGS crypttest.c -o crypttest -lcrypt 2>/dev/null > /dev/null; then - CRYPT_LINK=NO - AC_MSG_RESULT([no, dynamically open it]) - elif test "$enable_mozilla" = "yes" -a "$with_system_mozilla" != "yes" && `ldd ./crypttest |$EGREP -q libfreebl`; then - AC_MSG_RESULT([no, dynamically open it]) - CRYPT_LINK=NO - AC_MSG_WARN([libcrypt links against nss libraries, disabling --enable-crypt-link, use --enable-crypt-link, to override]) - echo "libcrypt links against nss libraries, disabling --enable-crypt-link, use --enable-crypt-link, to override" >> warn - else - AC_MSG_RESULT([yes]) - CRYPT_LINK=YES - fi - rm -f crypttest.c crypttest + AC_MSG_RESULT([no, dynamically open it]) + CRYPT_LINK=NO fi fi AC_SUBST(CRYPT_LINK) -- cgit From c28f4b8bf149d6cfb09ba61640204ac6f4412f61 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 24 Nov 2009 12:50:19 +0000 Subject: cmcfixes67: #i107169# fix up gij ver tests --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e38c866424b7..b398903edecd 100644 --- a/configure.in +++ b/configure.in @@ -2974,7 +2974,7 @@ if test "$SOLAR_JAVA" != ""; then AC_MSG_RESULT([checked (ecj)]) #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" - _gij_longver="50000" + _gij_longver="40200" fi fi @@ -3029,7 +3029,7 @@ fi if test "$SOLAR_JAVA" != ""; then dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then - if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then + if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then cat > findhome.java <<_ACEOF [import java.io.File; @@ -3069,7 +3069,7 @@ _ACEOF fi dnl second sanity check JAVA_HOME if possible - if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then + if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then -- cgit From b221a93ea124d9cce756b08b6b0cf82f1fdac7aa Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 27 Nov 2009 15:39:46 +0100 Subject: #i53089# make COMPATH point to compiler root --- configure.in | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e41fa919e752..cbd3a7b95de0 100644 --- a/configure.in +++ b/configure.in @@ -1448,7 +1448,8 @@ if test "$COMPATH" = "." ; then dnl double square bracket to get single because of M4 quote... COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`; fi - +COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`; +echo $COMPATH dnl =================================================================== dnl Test the gcc version, 3 is OK dnl =================================================================== @@ -1592,7 +1593,7 @@ dnl =================================================================== if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_CHECKING([the SunStudio C/C++ compiler version]) dnl cc -V outputs to standard error!!!! _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` @@ -1636,7 +1637,7 @@ dnl =================================================================== if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_CHECKING([the SGI MIPSpro C compiler version]) dnl cc -version outputs to standard error!!!! _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` @@ -1661,7 +1662,7 @@ dnl =================================================================== if test "$_os" = "OSF1"; then if test "$CC" = "cc"; then AC_PATH_PROGS(_cc, cc) - COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` + COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` AC_MSG_WARN([******* $_cc , $COMPATH]) AC_MSG_CHECKING([the Compaq C compiler version]) dnl cc -V outputs to standard error!!!! @@ -1787,8 +1788,8 @@ if test "$_os" = "WINNT"; then CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive AC_MSG_RESULT([found ($CC)]) - COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` - export INCLUDE=`cygpath -d "$COMPATH/../Include"` + COMPATH=`echo $CC | $SED 's@/\/[Bb][Ii][Nn]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` + export INCLUDE=`cygpath -d "$COMPATH/Include"` dnl Check which Microsoft C/C++ compiler is found AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler]) dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out. @@ -2217,7 +2218,7 @@ _ACEOF if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then AC_MSG_CHECKING([dynamic libgcc name]) MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null` if test -n "$MINGW_GCCDLL"; then MINGW_SHARED_GCCLIB=YES AC_MSG_RESULT([use $MINGW_GCCDLL]) @@ -2234,7 +2235,7 @@ _ACEOF if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then AC_MSG_CHECKING([dynamic libstdc++ name]) MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` - MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null` if test -n "$MINGW_GXXDLL"; then MINGW_SHARED_GXXLIB=YES AC_MSG_RESULT([use $MINGW_GXXDLL]) @@ -5407,8 +5408,8 @@ if test "$_os" = "WINNT"; then if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then AC_MSG_RESULT([found]) else - MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` - MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` + MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1` + MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1` if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK" cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" -- cgit From a2eff97ccfc4b0882e0527aa748dab8a5de3469d Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 30 Nov 2009 16:32:24 +0100 Subject: #i53089# fix stripping of bin/cl.exe on windows --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index cbd3a7b95de0..b6ceb83a6c55 100644 --- a/configure.in +++ b/configure.in @@ -1788,7 +1788,7 @@ if test "$_os" = "WINNT"; then CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive AC_MSG_RESULT([found ($CC)]) - COMPATH=`echo $CC | $SED 's@/\/[Bb][Ii][Nn]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` + COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'` export INCLUDE=`cygpath -d "$COMPATH/Include"` dnl Check which Microsoft C/C++ compiler is found AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler]) -- cgit From 01295a98f33358a536ee310fbb863c7c2f02b505 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 1 Dec 2009 09:53:35 +0000 Subject: CWS-TOOLING: integrate CWS dba32j 2009-11-26 09:30:10 +0100 msc r277648 : #100000 fix urgent testscript error 2009-11-25 10:27:56 +0100 msc r277625 : #i100000 fix urgent testscript error 2009-11-17 22:16:46 +0100 fs r277544 : CWS-TOOLING: rebase CWS dba32j to branches/OOO320@277531 (milestone: OOO320:m5) 2009-11-17 14:26:47 +0100 fs r277535 : ooops, didn't mean to commit this uncommented line 2009-11-14 20:50:29 +0100 fs r277505 : add a --disable-pango switch to SM's configure options, and add a patch which makes certain code respect it (well, respect it better than currently, by not using some pango_x_* functions, which are not always available, even when pango itself is present) 2009-11-14 20:47:41 +0100 fs r277504 : spelling 2009-11-13 14:04:00 +0100 fs r277502 : #i100764# (commit approved by ab@openoffice.org): getModelFromBasic: do not start with the parent's parent when looking for ThisComponent, but walk up the anchestor chain, starting with the immediate parent 2009-11-13 11:04:15 +0100 fs r277496 : #i100764# better heuristics for determining whether or not to participate in the ThisComponent game 2009-11-13 11:02:30 +0100 fs r277495 : #i100764# set the WB_EXT_DOCUMENT style at the backing component's container window, when creating it without the TaskCreator (which would normally do this) 2009-11-11 13:49:11 +0100 fs r277452 : #i106816# 2009-11-11 13:48:53 +0100 fs r277451 : fix the CREATETARBAL target, which is expected to create the zips used as prebuilts. The *inc.zip missed the NSS files in case NSS was built externally 2009-11-11 12:15:34 +0100 fs r277449 : update ignore list 2009-11-11 12:09:23 +0100 fs r277448 : add a link to the Mozilla build tools download location 2009-11-11 12:07:16 +0100 fs r277447 : add a link to the Mozilla build tools download location 2009-11-06 16:23:12 +0100 fs r277393 : #i106643# 2009-11-03 23:20:29 +0100 fs r277328 : #i106574# reverted the recent fix for issue #i105235#, and implemented a better one. 2009-11-02 12:59:48 +0100 fs r277294 : #i106550# errorOccured: also display the error when we're not in a nested form action - form actions are allowed to be triggered by other instances as well --- configure.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 37fa42796ce9..3505be436cf6 100644 --- a/configure.in +++ b/configure.in @@ -652,10 +652,13 @@ AC_ARG_WITH(directx-home, Usage: --with-directx-home= ],,) AC_ARG_WITH(mozilla-build, -[ --with-mozilla-build For Windows users, please supply the path to the +[ --with-mozilla-build For Windows users, please supply the path to the mozilla build tools. Usage: --with-mozilla-build= + + At the moment of this writing, an installer for the mozilla build tools + can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32. ],[MOZILLABUILD=$withval],) AC_ARG_WITH(local-solenv, [ --with-local-solenv If you have solenv in a location other than ./solenv, @@ -4378,7 +4381,9 @@ if test "$enable_nss_module" != "no"; then if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for Mozilla build tooling]) if test -z "$MOZILLABUILD" ; then -AC_MSG_ERROR([Mozilla build tooling not found. Use --with-mozilla-build=]) +AC_MSG_ERROR([Mozilla build tooling not found. +Use the --with-mozilla-build option after installling the tools obtained +from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32]) else if test \( "$WITH_MINGWIN" = "yes" \) ; then if test ! -d "$MOZILLABUILD" ; then -- cgit From 86e8883dae23fbb71eb937828caa94dc39927662 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 2 Dec 2009 12:46:33 +0100 Subject: ause106: #i53089# new autoconf triggered old solaris problem --- configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b6ceb83a6c55..1fda5bf5e863 100644 --- a/configure.in +++ b/configure.in @@ -4679,7 +4679,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then [#include ]) else AC_MSG_RESULT([yes]) - AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])]) + AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])], + [#include ]) AC_CHECK_LIB(Xaw, main, [], [AC_MSG_ERROR(Xaw library not found or functional)], []) fi -- cgit