diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2006-05-05 07:10:49 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2006-05-05 07:10:49 +0000 |
commit | 2079aab3320615b1da6216f9217f836fcf82690d (patch) | |
tree | 6f9e23eb5aa9f59a8ebc51437fc9f9918b3da945 /config_office | |
parent | ccd770e77a4c7dd694762dd9329f8d2a44a052f4 (diff) |
INTEGRATION: CWS tml01 (1.147.6); FILE MERGED
2006/05/03 16:57:57 vq 1.147.6.1: #i62916# Regenerate configure.
Diffstat (limited to 'config_office')
-rwxr-xr-x | config_office/configure | 319 |
1 files changed, 187 insertions, 132 deletions
diff --git a/config_office/configure b/config_office/configure index cebe8792ca47..a9afd69a93e3 100755 --- a/config_office/configure +++ b/config_office/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision . +# From configure.in Revision: 1.160.2.3 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4559,20 +4559,17 @@ echo "${ECHO_T}checked" >&6 fi fi -if test "$_os" = "WINNT"; then - if test "$WITH_MINGWIN" != "yes"; then - echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 -echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 - # Extract the first word of "mspdb71.dll", so it can be a program name with args. -set dummy mspdb71.dll; ac_word=$2 +if test -z "$with_perl_home"; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSPDB_PATH+set}" = set; then +if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $MSPDB_PATH in + case $PERL in [\\/]* | ?:[\\/]*) - ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path. + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4582,7 +4579,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -4592,17 +4589,72 @@ done ;; esac fi -MSPDB_PATH=$ac_cv_path_MSPDB_PATH +PERL=$ac_cv_path_PERL -if test -n "$MSPDB_PATH"; then - echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -echo "${ECHO_T}$MSPDB_PATH" >&6 +if test -n "$PERL"; then + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - if test -n "$MSPDB_PATH";then +else + _perl_path="$with_perl_home/bin/perl" + if test -x "$_perl_path"; then + PERL=$_perl_path + else + { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5 +echo "$as_me: error: $_perl_path not found" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +if test "$PERL"; then + echo "$as_me:$LINENO: checking the Perl version" >&5 +echo $ECHO_N "checking the Perl version... $ECHO_C" >&6 + ${PERL} -e "exit($]);" + _perl_version=$? + if test "$_perl_version" -lt 5; then + { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 +echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 +echo "${ECHO_T}checked (perl $_perl_version)" >&6 +else + { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 +echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} + { (exit 1); exit 1; }; } +fi + + +echo "$as_me:$LINENO: checking for required Perl modules" >&5 +echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6 +if `$PERL -e 'use Archive::Zip;'`; then + echo "$as_me:$LINENO: result: all modules found" >&5 +echo "${ECHO_T}all modules found" >&6 +else + { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 +echo "$as_me: error: Failed to find some modules" >&2;} + { (exit 1); exit 1; }; } +fi + +if test "$_os" = "WINNT"; then + if test "$WITH_MINGWIN" != "yes"; then + echo "$as_me:$LINENO: checking for friendly registry keys" >&5 +echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6 + # VS.Net 2003, VS.Net 2002, VC6 + if test -z "$with_cl_home"; then + vctest=`./oowintool --msvc-productdir`; + if test -x "$vctest/bin/cl.exe"; then + with_cl_home=$vctest; + fi + fi + echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 + + if test -n "$MSPDB_PATH";then MSPDB_PATH=`dirname "$MSPDB_PATH"` fi if test -e "$with_mspdb_path/mspdb71.dll"; then @@ -4623,6 +4675,48 @@ echo "$as_me: error: You need a mspdb71.dll, make sure it's in the path or use - MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" + # Extract the first word of "mspdb71.dll", so it can be a program name with args. +set dummy mspdb71.dll; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSPDB_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MSPDB_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +MSPDB_PATH=$ac_cv_path_MSPDB_PATH + +if test -n "$MSPDB_PATH"; then + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + + echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 if test -x "$with_cl_home/bin/cl.exe"; then CC="$with_cl_home/bin/cl.exe" else @@ -4687,7 +4781,7 @@ echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 }"` echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 echo "${ECHO_T}found Compiler version $CCNUMVER." >&6 - if test "$CCNUMVER" -ge "001300100000"; then + if test "$CCNUMVER" -ge "001300102240"; then COMEX=10 else { { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003 compiler." >&5 @@ -4716,7 +4810,30 @@ fi if test "$COMEX" = "8" -o "$COMEX" = "10"; then - # Extract the first word of "midl.exe", so it can be a program name with args. + if test -n "$MIDL_PATH";then + MIDL_PATH=`dirname "$MIDL_PATH"` + fi + if test -x "$with_midl_path/midl.exe"; then + MIDL_PATH="$with_midl_path" + fi + if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then + MIDL_PATH="$with_cl_home/../Common7/Tools/Bin" + fi + if test -z "$MIDL_PATH" ; then + vstest=`./oowintool --msvs-productdir`; + if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then + MIDL_PATH="$vstest/Common7/Tools/Bin" + fi + fi + if test ! -x "$MIDL_PATH/midl.exe"; then + { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 +echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} + { (exit 1); exit 1; }; } + fi + # Convert to posix path with 8.3 filename restrictions ( No spaces ) + MIDL_PATH=`cygpath -d "$MIDL_PATH"` + MIDL_PATH=`cygpath -u "$MIDL_PATH"` + # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -4755,25 +4872,27 @@ else echo "${ECHO_T}no" >&6 fi - if test -n "$MIDL_PATH";then - MIDL_PATH=`dirname "$MIDL_PATH"` + + if test -n "$CSC_PATH";then + CSC_PATH=`dirname "$CSC_PATH"` fi - if test -x "$with_midl_path/midl.exe"; then - MIDL_PATH="$with_midl_path" + if test -x "$with_csc_path/csc.exe"; then + CSC_PATH="$with_csc_path" fi - if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then - MIDL_PATH="$with_cl_home/../Common7/Tools/Bin" + csctest=`./oowintool --csc-compilerdir`; + if test -x "$csctest/csc.exe"; then + CSC_PATH="$csctest" fi - if test ! -x "$MIDL_PATH/midl.exe"; then - { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 -echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} + + if test ! -x "$CSC_PATH/csc.exe"; then + { { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 +echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) - MIDL_PATH=`cygpath -d "$MIDL_PATH"` - MIDL_PATH=`cygpath -u "$MIDL_PATH"` - - # Extract the first word of "csc.exe", so it can be a program name with args. + CSC_PATH=`cygpath -d "$CSC_PATH"` + CSC_PATH=`cygpath -u "$CSC_PATH"` + # Extract the first word of "csc.exe", so it can be a program name with args. set dummy csc.exe; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -4812,20 +4931,6 @@ else echo "${ECHO_T}no" >&6 fi - if test -n "$CSC_PATH";then - CSC_PATH=`dirname "$CSC_PATH"` - fi - if test -x "$with_csc_path/csc.exe"; then - CSC_PATH="$with_csc_path" - fi - if test ! -x "$CSC_PATH/csc.exe"; then - { { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 -echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} - { (exit 1); exit 1; }; } - fi - # Convert to posix path with 8.3 filename restrictions ( No spaces ) - CSC_PATH=`cygpath -d "$CSC_PATH"` - CSC_PATH=`cygpath -u "$CSC_PATH"` if test -n "$ENABLE_VCTK"; then # Extract the first word of "nmake.exe", so it can be a program name with args. @@ -4884,17 +4989,27 @@ echo "$as_me: error: nmake.exe not found. Make sure it's in the path or use --wi fi if test -z "$ENABLE_VCTK"; then + echo "$as_me:$LINENO: checking .NET Framework" >&5 +echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6 if test -f "$with_frame_home/lib/mscoree.lib"; then FRAME_HOME="$with_frame_home" fi if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then FRAME_HOME="$with_cl_home/../SDK/v1.1" fi + if test -z "$FRAME_HOME" ; then + frametest=`./oowintool --dotnetsdk-dir` + if test -x "$frametest/lib/mscoree.lib"; then + FRAME_HOME="$frametest" + fi + fi if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then { { echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} { (exit 1); exit 1; }; } fi + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else if test ! -f "$COMPATH/../lib/mscoree.lib"; then { { echo "$as_me:$LINENO: error: mscoree.lib not found. Unexpected, ask dev@tools.openoffice.org for help." >&5 @@ -7336,6 +7451,12 @@ if test "$_os" = "Linux" && echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/ fi +if test -z "$with_jdk_home"; then + _jdk_home=`./oowintool --jdk-home` + if test -d "$_jdk_home"; then + with_jdk_home="$_jdk_home" + fi +fi if test "$SOLAR_JAVA" != ""; then JAVA_HOME=; export JAVA_HOME @@ -8610,87 +8731,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu fi -if test -z "$with_perl_home"; then - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -PERL=$ac_cv_path_PERL - -if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -else - _perl_path="$with_perl_home/bin/perl" - if test -x "$_perl_path"; then - PERL=$_perl_path - else - { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5 -echo "$as_me: error: $_perl_path not found" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -if test "$PERL"; then - echo "$as_me:$LINENO: checking the Perl version" >&5 -echo $ECHO_N "checking the Perl version... $ECHO_C" >&6 - ${PERL} -e "exit($]);" - _perl_version=$? - if test "$_perl_version" -lt 5; then - { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 -echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 -echo "${ECHO_T}checked (perl $_perl_version)" >&6 -else - { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 -echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} - { (exit 1); exit 1; }; } -fi - - -echo "$as_me:$LINENO: checking for required Perl modules" >&5 -echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6 -if `$PERL -e 'use Archive::Zip;'`; then - echo "$as_me:$LINENO: result: all modules found" >&5 -echo "${ECHO_T}all modules found" >&6 -else - { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 -echo "$as_me: error: Failed to find some modules" >&2;} - { (exit 1); exit 1; }; } -fi - # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -18317,7 +18357,7 @@ if test \( "$_os" = "WINNT" \) ; then echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6 if test -z "$with_psdk_home"; then # This first line will detect a February 2003 Microsoft Platform SDK - PSDK_HOME=`cat "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir" 2> /dev/null` + PSDK_HOME=`./oowintool --psdk-home` # But there might be also an April 2005 PSDK, unfortunately MS changed # the registry entry. (we prefer the old version!?) if test -z "$PSDK_HOME"; then @@ -18480,6 +18520,10 @@ fi if test -e "$with_nsis_path/nsis.exe"; then NSIS_PATH="$with_nsis_path" fi + nsistest=`./oowintool --nsis-dir`; + if test -x "$nsistest/nsis.exe"; then + NSIS_PATH="$nsistest" + fi if test -z "$NSIS_PATH"; then { echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} @@ -18814,6 +18858,8 @@ fi if test -z "$ML_EXE"; then if test -x "$with_cl_home/bin/ml.exe"; then with_asm_home=$with_cl_home/bin + echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 +echo "${ECHO_T}found ($with_asm_home)" >&6 else { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} @@ -18988,6 +19034,10 @@ may have to search Microsoft's website.) Last time it was seen at: fi fi +if test "$_os" = "WINNT"; then + ./oowintool --msvc-copy-dlls ../external/msvcp +fi + if test "$_os" = "WINNT" -a "$COMEX" = "8"; then echo "$as_me:$LINENO: checking for msvcp70.dll/msvcr70.dll" >&5 echo $ECHO_N "checking for msvcp70.dll/msvcr70.dll... $ECHO_C" >&6 @@ -19052,6 +19102,10 @@ echo "${ECHO_T}found and copied" >&6 fi fi +if test "$_os" = "WINNT"; then + ./oowintool --msvc-copy-instmsi ../external/msi +fi + if test "$_os" = "WINNT" -a "$COMEX" = "10"; then echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6 @@ -21309,9 +21363,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -21881,6 +21936,7 @@ s,@GCCVER@,$GCCVER,;t t s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t s,@GNUMAKE@,$GNUMAKE,;t t s,@_cc@,$_cc,;t t +s,@PERL@,$PERL,;t t s,@MSPDB_PATH@,$MSPDB_PATH,;t t s,@COMEX@,$COMEX,;t t s,@MIDL_PATH@,$MIDL_PATH,;t t @@ -21911,7 +21967,6 @@ s,@JAVACACHE@,$JAVACACHE,;t t s,@JAVA_HOME@,$JAVA_HOME,;t t s,@JDK@,$JDK,;t t s,@XSLTPROC@,$XSLTPROC,;t t -s,@PERL@,$PERL,;t t s,@DMAKE@,$DMAKE,;t t s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t s,@EPM@,$EPM,;t t |