configure.ac (386ca866) configure.ac (edd74ba5)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 257 unchanged lines hidden (view full) ---

266[ --enable-crashdump Enable the crashdump feature code.
267],,)
268AC_ARG_ENABLE(cl-standard,
269[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
270 standard compiler. ( This just disables optimization
271 options and therefore removes a lot of warnings when
272 using the cheaper standard compiler. )
273],,)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 257 unchanged lines hidden (view full) ---

266[ --enable-crashdump Enable the crashdump feature code.
267],,)
268AC_ARG_ENABLE(cl-standard,
269[ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
270 standard compiler. ( This just disables optimization
271 options and therefore removes a lot of warnings when
272 using the cheaper standard compiler. )
273],,)
274AC_ARG_ENABLE(win64,
275[ --enable-win64 Enable building 64 bit OpenOffice on 64 bit Windows, (as
276 opposed to 32 bit OpenOffice that is usually built there).
277 This is a temporary option during the transition,
278 as 64 bit OpenOffice doesn't fully build on Windows yet.
279],,enable_win64=no)
274AC_ARG_ENABLE(win-x64-shellext,
275[ --enable-win-x64-shellext Enable the build/usage of Windows 64bit shell extensions.
276 These extensions are used for the system integration on
277 Windows 64bit systems. For example supporting the search
278 in ODF files with the standard Windows search feature.
279],,)
280AC_ARG_ENABLE(gtk,
281[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms

--- 997 unchanged lines hidden (view full) ---

1279 if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" = "no"; then
1280 BUILD_X64=""
1281 AC_MSG_RESULT([no])
1282 else
1283 BUILD_X64="TRUE"
1284 AC_MSG_RESULT([yes])
1285 fi
1286 AC_SUBST(BUILD_X64)
280AC_ARG_ENABLE(win-x64-shellext,
281[ --enable-win-x64-shellext Enable the build/usage of Windows 64bit shell extensions.
282 These extensions are used for the system integration on
283 Windows 64bit systems. For example supporting the search
284 in ODF files with the standard Windows search feature.
285],,)
286AC_ARG_ENABLE(gtk,
287[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms

--- 997 unchanged lines hidden (view full) ---

1285 if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" = "no"; then
1286 BUILD_X64=""
1287 AC_MSG_RESULT([no])
1288 else
1289 BUILD_X64="TRUE"
1290 AC_MSG_RESULT([yes])
1291 fi
1292 AC_SUBST(BUILD_X64)
1293
1294 dnl ===================================================================
1295 dnl Set the BUILD_WIN64 variable.
1296 dnl ===================================================================
1297 AC_MSG_CHECKING([whether to build 64 bit OpenOffice on 64 bit Windows])
1298 if test "$build_cpu" = "x86_64" ; then
1299 if test "x$enable_win64" != "xno" ; then
1300 BUILD_WIN64="TRUE"
1301 AC_MSG_RESULT([yes])
1302 OOWINTOOL="./oowintool"
1303 else
1304 BUILD_WIN64=""
1305 AC_MSG_RESULT([no])
1306 OOWINTOOL="./oowintool --aoo32-on-win64"
1307 fi
1308 else
1309 if test "x$enable_win64" != "xno" ; then
1310 AC_MSG_ERROR([the --enable-win64 option can only be used on an AMD64 CPU])
1311 fi
1312 BUILD_WIN64=""
1313 AC_MSG_RESULT([no])
1314 OOWINTOOL="./oowintool"
1315 fi
1316 AC_SUBST(BUILD_WIN64)
1287fi
1288
1289dnl ===================================================================
1290dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
1291dnl ===================================================================
1292AC_MSG_CHECKING([whether to turn warnings to errors])
1293if test -n "$enable_werror" && test "$enable_werror" != "no"; then
1294 ENABLE_WERROR="TRUE"

--- 745 unchanged lines hidden (view full) ---

2040dnl ===================================================================
2041dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
2042dnl ===================================================================
2043if test "$_os" = "WINNT"; then
2044 if test "$WITH_MINGWIN" != "yes"; then
2045 AC_MSG_CHECKING([for friendly registry keys])
2046 # VS.Net 2003, VS.Net 2005
2047 if test -z "$with_cl_home"; then
1317fi
1318
1319dnl ===================================================================
1320dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
1321dnl ===================================================================
1322AC_MSG_CHECKING([whether to turn warnings to errors])
1323if test -n "$enable_werror" && test "$enable_werror" != "no"; then
1324 ENABLE_WERROR="TRUE"

--- 745 unchanged lines hidden (view full) ---

2070dnl ===================================================================
2071dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
2072dnl ===================================================================
2073if test "$_os" = "WINNT"; then
2074 if test "$WITH_MINGWIN" != "yes"; then
2075 AC_MSG_CHECKING([for friendly registry keys])
2076 # VS.Net 2003, VS.Net 2005
2077 if test -z "$with_cl_home"; then
2048 vctest=`./oowintool --msvc-productdir`;
2078 vctest=`$OOWINTOOL --msvc-productdir`;
2049 if test -x "$vctest/bin/cl.exe"; then
2050 with_cl_home=$vctest;
2051 fi
2052 else
2053 with_cl_home=`cygpath -u "$with_cl_home"`
2054 fi
2055 AC_MSG_RESULT([done])
2056

--- 31 unchanged lines hidden (view full) ---

2088 AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path])
2089 fi
2090 MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
2091 MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
2092 dnl The path needs to be added before cl is called
2093 PATH="$MSPDB_PATH:$PATH"
2094
2095 AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
2079 if test -x "$vctest/bin/cl.exe"; then
2080 with_cl_home=$vctest;
2081 fi
2082 else
2083 with_cl_home=`cygpath -u "$with_cl_home"`
2084 fi
2085 AC_MSG_RESULT([done])
2086

--- 31 unchanged lines hidden (view full) ---

2118 AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path])
2119 fi
2120 MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
2121 MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
2122 dnl The path needs to be added before cl is called
2123 PATH="$MSPDB_PATH:$PATH"
2124
2125 AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
2096 if test -x "$with_cl_home/bin/cl.exe"; then
2097 CC="$with_cl_home/bin/cl.exe"
2098 else
2099 AC_PATH_PROG(CC, cl.exe)
2100 fi
2101 if test -e "$CC"; then
2126 case "$build_cpu" in
2127 i?86)
2128 cl_subdirectory="bin"
2129 ;;
2130 x86_64)
2131 if test "$BUILD_WIN64" = "TRUE" ; then
2132 cl_subdirectory="bin/amd64"
2133 else
2134 cl_subdirectory="bin"
2135 fi
2136 ;;
2137 *)
2138 AC_MSG_ERROR([Unknown/unsupported Windows CPU $build_cpu.])
2139 ;;
2140 esac
2141 if test -x "$with_cl_home/$cl_subdirectory/cl.exe"; then
2142 CC="$with_cl_home/$cl_subdirectory/cl.exe"
2143 COMPATH="$with_cl_home"
2102 # This gives us a posix path with 8.3 filename restrictions
2103 CC=`cygpath -d "$CC"`
2104 CC=`cygpath -u "$CC"`
2144 # This gives us a posix path with 8.3 filename restrictions
2145 CC=`cygpath -d "$CC"`
2146 CC=`cygpath -u "$CC"`
2147 COMPATH=`cygpath -d "$COMPATH"`
2148 COMPATH=`cygpath -u "$COMPATH"`
2105 # Remove /cl.exe from CC case insensitive
2106 AC_MSG_RESULT([found ($CC)])
2149 # Remove /cl.exe from CC case insensitive
2150 AC_MSG_RESULT([found ($CC)])
2107 COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
2108 export INCLUDE=`cygpath -d "$COMPATH/Include"`
2109 dnl Check which Microsoft C/C++ compiler is found
2110 AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
2111dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
2112 CCTXTVER=`$CC 2>&1 | head -n1`
2113 CCNUMVER=`echo $CCTXTVER | $AWK "/Microsoft/ && /..\\...\\...../ {
2114 x = match( \\\$0, /..\\...\\...../ )
2115 CCversion = substr( \\\$0, RSTART, RLENGTH)

--- 6 unchanged lines hidden (view full) ---

2122 if test "$CCNUMVER" -ge "001500000000"; then
2123 COMEX=12
2124 MSVSVER=2008
2125 AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
2126 else
2127 AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2008.])
2128 fi
2129 else
2151 export INCLUDE=`cygpath -d "$COMPATH/Include"`
2152 dnl Check which Microsoft C/C++ compiler is found
2153 AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
2154dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
2155 CCTXTVER=`$CC 2>&1 | head -n1`
2156 CCNUMVER=`echo $CCTXTVER | $AWK "/Microsoft/ && /..\\...\\...../ {
2157 x = match( \\\$0, /..\\...\\...../ )
2158 CCversion = substr( \\\$0, RSTART, RLENGTH)

--- 6 unchanged lines hidden (view full) ---

2165 if test "$CCNUMVER" -ge "001500000000"; then
2166 COMEX=12
2167 MSVSVER=2008
2168 AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
2169 else
2170 AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2008.])
2171 fi
2172 else
2130 AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
2173 AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home.])
2131 fi
2132 else
2133 AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
2134 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
2135 AC_MSG_RESULT([found.])
2136 if $CC -dumpspecs | $GREP -q "mno-cygwin"; then
2137 USE_MINGW="cygwin"
2138 else

--- 62 unchanged lines hidden (view full) ---

2201 COMID="gcc3";
2202 COMNAME="gcc3";
2203 fi;;
2204 MSC)
2205 CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
2206 CCNUMVER=`${CC} 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
2207 if test "${CCNUMVER}" -ge 001200000000; then
2208 COMID="MSC";
2174 fi
2175 else
2176 AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
2177 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
2178 AC_MSG_RESULT([found.])
2179 if $CC -dumpspecs | $GREP -q "mno-cygwin"; then
2180 USE_MINGW="cygwin"
2181 else

--- 62 unchanged lines hidden (view full) ---

2244 COMID="gcc3";
2245 COMNAME="gcc3";
2246 fi;;
2247 MSC)
2248 CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
2249 CCNUMVER=`${CC} 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
2250 if test "${CCNUMVER}" -ge 001200000000; then
2251 COMID="MSC";
2209 COMNAME="msci";
2252 case "$build_cpu" in
2253 i?86)
2254 COMNAME="msci";
2255 ;;
2256 x86_64)
2257 if test "$BUILD_WIN64" = "TRUE" ; then
2258 COMNAME="mscx";
2259 else
2260 COMNAME="msci";
2261 fi
2262 ;;
2263 *)
2264 AC_MSG_ERROR([Unknown/unsupported Windows CPU $build_cpu.])
2265 ;;
2266 esac
2210 else
2211 AC_MSG_ERROR([MSC compiler too old]);
2212 fi
2213 ;;
2214 C55 | C54 | C52 | C40 | sunpro)
2215 CCVER=`${CC} -V 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
2216 CCNUMVER=`${CC} -V 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
2217 if test "${CCNUMVER}" -ge 00050002; then

--- 39 unchanged lines hidden (view full) ---

2257 fi
2258 if test -x "$with_midl_path/midl.exe"; then
2259 MIDL_PATH="$with_midl_path"
2260 fi
2261 if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
2262 MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
2263 fi
2264 if test -z "$MIDL_PATH" ; then
2267 else
2268 AC_MSG_ERROR([MSC compiler too old]);
2269 fi
2270 ;;
2271 C55 | C54 | C52 | C40 | sunpro)
2272 CCVER=`${CC} -V 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
2273 CCNUMVER=`${CC} -V 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
2274 if test "${CCNUMVER}" -ge 00050002; then

--- 39 unchanged lines hidden (view full) ---

2314 fi
2315 if test -x "$with_midl_path/midl.exe"; then
2316 MIDL_PATH="$with_midl_path"
2317 fi
2318 if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
2319 MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
2320 fi
2321 if test -z "$MIDL_PATH" ; then
2265 vstest=`./oowintool --msvs-productdir`;
2322 vstest=`$OOWINTOOL --msvs-productdir`;
2266 if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
2267 MIDL_PATH="$vstest/Common7/Tools/Bin"
2268 fi
2269 fi
2270 if test -z "$MIDL_PATH" ; then
2323 if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
2324 MIDL_PATH="$vstest/Common7/Tools/Bin"
2325 fi
2326 fi
2327 if test -z "$MIDL_PATH" ; then
2271 psdktest=`./oowintool --psdk-home`
2328 psdktest=`$OOWINTOOL --psdk-home`
2272 if test -x "$psdktest/Bin/midl.exe" ; then
2273 MIDL_PATH="$psdktest/Bin"
2274 fi
2275 fi
2276 if test ! -x "$MIDL_PATH/midl.exe"; then
2277 AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
2278 fi
2279 # Convert to posix path with 8.3 filename restrictions ( No spaces )

--- 6 unchanged lines hidden (view full) ---

2286 CSC_PATH=`dirname "$CSC_PATH"`
2287 fi
2288 if test -n "$with_csc_path";then
2289 with_csc_path=`cygpath -u "$with_csc_path"`
2290 fi
2291 if test -x "$with_csc_path/csc.exe"; then
2292 CSC_PATH="$with_csc_path"
2293 else
2329 if test -x "$psdktest/Bin/midl.exe" ; then
2330 MIDL_PATH="$psdktest/Bin"
2331 fi
2332 fi
2333 if test ! -x "$MIDL_PATH/midl.exe"; then
2334 AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
2335 fi
2336 # Convert to posix path with 8.3 filename restrictions ( No spaces )

--- 6 unchanged lines hidden (view full) ---

2343 CSC_PATH=`dirname "$CSC_PATH"`
2344 fi
2345 if test -n "$with_csc_path";then
2346 with_csc_path=`cygpath -u "$with_csc_path"`
2347 fi
2348 if test -x "$with_csc_path/csc.exe"; then
2349 CSC_PATH="$with_csc_path"
2350 else
2294 csctest=`./oowintool --csc-compilerdir`;
2351 csctest=`$OOWINTOOL --csc-compilerdir`;
2295 if test -x "$csctest/csc.exe"; then
2296 CSC_PATH="$csctest"
2297 fi
2298 fi
2299 if test ! -x "$CSC_PATH/csc.exe"; then
2300 AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
2301 fi
2302 # Convert to posix path with 8.3 filename restrictions ( No spaces )

--- 8 unchanged lines hidden (view full) ---

2311 fi
2312 if test -f "$with_frame_home/lib/mscoree.lib"; then
2313 FRAME_HOME="$with_frame_home"
2314 fi
2315 if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
2316 FRAME_HOME="$with_cl_home/../SDK/v1.1"
2317 fi
2318 if test -z "$FRAME_HOME" ; then
2352 if test -x "$csctest/csc.exe"; then
2353 CSC_PATH="$csctest"
2354 fi
2355 fi
2356 if test ! -x "$CSC_PATH/csc.exe"; then
2357 AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
2358 fi
2359 # Convert to posix path with 8.3 filename restrictions ( No spaces )

--- 8 unchanged lines hidden (view full) ---

2368 fi
2369 if test -f "$with_frame_home/lib/mscoree.lib"; then
2370 FRAME_HOME="$with_frame_home"
2371 fi
2372 if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
2373 FRAME_HOME="$with_cl_home/../SDK/v1.1"
2374 fi
2375 if test -z "$FRAME_HOME" ; then
2319 frametest=`./oowintool --dotnetsdk-dir`
2376 frametest=`$OOWINTOOL --dotnetsdk-dir`
2320 if test -f "$frametest/lib/mscoree.lib"; then
2321 FRAME_HOME="$frametest"
2322 else
2377 if test -f "$frametest/lib/mscoree.lib"; then
2378 FRAME_HOME="$frametest"
2379 else
2323 frametest=`./oowintool --psdk-home`
2380 frametest=`$OOWINTOOL --psdk-home`
2324 if test -f "$frametest/lib/mscoree.lib"; then
2325 FRAME_HOME="$frametest"
2326 fi
2327 fi
2328 fi
2329 if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
2330 AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
2331 fi

--- 568 unchanged lines hidden (view full) ---

2900if test "$_os" = "Linux" && test "$build_cpu" = "powerpc"; then
2901 # IBMs JDK needs this...
2902 JITC_PROCESSOR_TYPE=6
2903 export JITC_PROCESSOR_TYPE
2904fi
2905
2906if test "$_os" = "WINNT"; then
2907 if test -z "$with_jdk_home"; then
2381 if test -f "$frametest/lib/mscoree.lib"; then
2382 FRAME_HOME="$frametest"
2383 fi
2384 fi
2385 fi
2386 if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
2387 AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
2388 fi

--- 568 unchanged lines hidden (view full) ---

2957if test "$_os" = "Linux" && test "$build_cpu" = "powerpc"; then
2958 # IBMs JDK needs this...
2959 JITC_PROCESSOR_TYPE=6
2960 export JITC_PROCESSOR_TYPE
2961fi
2962
2963if test "$_os" = "WINNT"; then
2964 if test -z "$with_jdk_home"; then
2908 _jdk_home=`./oowintool --jdk-home`
2965 _jdk_home=`$OOWINTOOL --jdk-home`
2909 if test -d "$_jdk_home"; then
2910 with_jdk_home="$_jdk_home"
2911 fi
2912 else
2913 with_jdk_home=`cygpath -u "$with_jdk_home"`
2914 fi
2915fi
2916

--- 2295 unchanged lines hidden (view full) ---

5212dnl Check for the Microsoft Platform SDK.
5213dnl =========================================
5214dnl FIXME: I don't know yet if PSDK works with MinGW, keep it until I know better,
5215dnl and add "-a \( "$WITH_MINGWIN" != "yes" \)" then
5216if test \( "$_os" = "WINNT" \) ; then
5217 AC_MSG_CHECKING([for PSDK files])
5218 if test -z "$with_psdk_home"; then
5219 # This first line will detect a February 2003 Microsoft Platform SDK
2966 if test -d "$_jdk_home"; then
2967 with_jdk_home="$_jdk_home"
2968 fi
2969 else
2970 with_jdk_home=`cygpath -u "$with_jdk_home"`
2971 fi
2972fi
2973

--- 2295 unchanged lines hidden (view full) ---

5269dnl Check for the Microsoft Platform SDK.
5270dnl =========================================
5271dnl FIXME: I don't know yet if PSDK works with MinGW, keep it until I know better,
5272dnl and add "-a \( "$WITH_MINGWIN" != "yes" \)" then
5273if test \( "$_os" = "WINNT" \) ; then
5274 AC_MSG_CHECKING([for PSDK files])
5275 if test -z "$with_psdk_home"; then
5276 # This first line will detect a February 2003 Microsoft Platform SDK
5220 PSDK_HOME=`./oowintool --psdk-home`
5277 PSDK_HOME=`$OOWINTOOL --psdk-home`
5221 # But there might be also an April 2005 PSDK, unfortunately MS changed
5222 # the registry entry. (we prefer the old version!?)
5223 if test -z "$PSDK_HOME"; then
5224 PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
5225 fi
5226 # normalize if found
5227 if test -n "$PSDK_HOME"; then
5228 PSDK_HOME=`cygpath -d "$PSDK_HOME"`

--- 243 unchanged lines hidden (view full) ---

5472 NSIS_PATH=`dirname "$NSIS_PATH"`
5473 fi
5474 if test -n "$with_nsis_path"; then
5475 with_nsis_path=`cygpath -u "$with_nsis_path"`
5476 fi
5477 if test -e "$with_nsis_path/nsis.exe"; then
5478 NSIS_PATH="$with_nsis_path"
5479 fi
5278 # But there might be also an April 2005 PSDK, unfortunately MS changed
5279 # the registry entry. (we prefer the old version!?)
5280 if test -z "$PSDK_HOME"; then
5281 PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1`
5282 fi
5283 # normalize if found
5284 if test -n "$PSDK_HOME"; then
5285 PSDK_HOME=`cygpath -d "$PSDK_HOME"`

--- 243 unchanged lines hidden (view full) ---

5529 NSIS_PATH=`dirname "$NSIS_PATH"`
5530 fi
5531 if test -n "$with_nsis_path"; then
5532 with_nsis_path=`cygpath -u "$with_nsis_path"`
5533 fi
5534 if test -e "$with_nsis_path/nsis.exe"; then
5535 NSIS_PATH="$with_nsis_path"
5536 fi
5480 nsistest=`./oowintool --nsis-dir`;
5537 nsistest=`$OOWINTOOL --nsis-dir`;
5481 if test -x "$nsistest/nsis.exe"; then
5482 NSIS_PATH="$nsistest"
5483 fi
5484 if test -z "$NSIS_PATH"; then
5485 AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
5486 echo "NSIS not found, no self contained installer will be build." >> warn
5487 else
5488 NSIS_PATH=`cygpath -d "$NSIS_PATH"`

--- 259 unchanged lines hidden (view full) ---

5748 WITH_VC_REDIST=YES
5749 AC_SUBST(WITH_VC_REDIST)
5750fi
5751
5752dnl ===================================================================
5753dnl Windows builds - use oowintool to copy CRT dlls and manifest
5754dnl ===================================================================
5755if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
5538 if test -x "$nsistest/nsis.exe"; then
5539 NSIS_PATH="$nsistest"
5540 fi
5541 if test -z "$NSIS_PATH"; then
5542 AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
5543 echo "NSIS not found, no self contained installer will be build." >> warn
5544 else
5545 NSIS_PATH=`cygpath -d "$NSIS_PATH"`

--- 259 unchanged lines hidden (view full) ---

5805 WITH_VC_REDIST=YES
5806 AC_SUBST(WITH_VC_REDIST)
5807fi
5808
5809dnl ===================================================================
5810dnl Windows builds - use oowintool to copy CRT dlls and manifest
5811dnl ===================================================================
5812if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
5756 if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
5813 if $OOWINTOOL --msvc-copy-dlls ./external/msvcp ; then
5757 :
5758 else
5759 AC_MSG_ERROR([oowintool failed to copy CRT])
5760 fi
5761fi
5762
5763dnl ===================================================================
5764dnl Windows builds need gdiplus.dll in external/gdiplus/

--- 1609 unchanged lines hidden --- 		5814 :
5815 else
5816 AC_MSG_ERROR([oowintool failed to copy CRT])
5817 fi
5818fi
5819
5820dnl ===================================================================
5821dnl Windows builds need gdiplus.dll in external/gdiplus/

--- 1609 unchanged lines hidden ---