diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 11:32:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 11:32:36 +0000 |
| commit | 94b3853fa877ee4dcf156414ac70678c5ffa4f66 (patch) | |
| tree | 63cfab3a0dae50e90f8fffd4f3dcb2db441f5118 /config_office | |
| parent | 3dcaf28b39a5a3a7c4a7267298a86e8f9075a4c9 (diff) | |
INTEGRATION: CWS vq05 (1.74.6); FILE MERGED
2004/11/10 17:05:51 vq 1.74.6.2: #i36807# Fix cut-n-paste error.
2004/11/09 17:58:58 vq 1.74.6.1: #i36807# Check/deliver instmsi[aw].exe for W32 build.
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index f1a488ce5c88..4e774f6de00f 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2004-11-09 18:41:26 $ +dnl * Date: $Date: 2004-11-15 12:32:36 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.75 $ ) +AC_REVISION( $Revision: 1.76 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -2428,7 +2428,7 @@ if test "$_os" = "WINNT" -a "$COMEX" = "10"; then AC_MSG_ERROR([msvcp71.dll and/or msvcr71.dll are/is missing in the default location. These dlls are part of the .NET installation and should be found in a directory similar to: -"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\" +"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Visual C++ .NET Professional - English\\" As the automatic detection fails please copy the files to external/msvcp71/.]) else AC_MSG_RESULT([found and copied]) @@ -2437,6 +2437,32 @@ As the automatic detection fails please copy the files to external/msvcp71/.]) fi dnl =================================================================== +dnl Windows builds with .NET 2003 need instmsia.exe and instmsiw.exe in external/msi +dnl =================================================================== +if test "$_os" = "WINNT" -a "$COMEX" = "10"; then + AC_MSG_CHECKING([instmsia.exe/instmsiw.exe]) + 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` + 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" + fi + if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then + AC_MSG_ERROR([instmsia.exe and/or instmsiw.exe are/is missing in the default location. +These programs are part of the .NET installation and should be found in a +directory similar to: +"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\" +As the automatic detection fails please copy the files to external/msi/.]) + else + AC_MSG_RESULT([found and copied]) + fi + fi +fi + +dnl =================================================================== dnl Test for the presence of the right polygon clipping code dnl =================================================================== |