|
Lines 1469-1474
Link Here
|
| 1469 |
if test -z "$with_perl_home"; then |
1469 |
if test -z "$with_perl_home"; then |
| 1470 |
AC_PATH_PROG(PERL, perl) |
1470 |
AC_PATH_PROG(PERL, perl) |
| 1471 |
else |
1471 |
else |
|
|
1472 |
if test "$_os" = "WINNT"; then |
| 1473 |
with_perl_home=`cygpath -u "$with_perl_home"` |
| 1474 |
fi |
| 1472 |
_perl_path="$with_perl_home/bin/perl" |
1475 |
_perl_path="$with_perl_home/bin/perl" |
| 1473 |
if test -x "$_perl_path"; then |
1476 |
if test -x "$_perl_path"; then |
| 1474 |
PERL=$_perl_path |
1477 |
PERL=$_perl_path |
|
Lines 1516-1521
Link Here
|
| 1516 |
if test -x "$vctest/bin/cl.exe"; then |
1519 |
if test -x "$vctest/bin/cl.exe"; then |
| 1517 |
with_cl_home=$vctest; |
1520 |
with_cl_home=$vctest; |
| 1518 |
fi |
1521 |
fi |
|
|
1522 |
else |
| 1523 |
with_cl_home=`cygpath -u "$with_cl_home"` |
| 1519 |
fi |
1524 |
fi |
| 1520 |
AC_MSG_RESULT([done]) |
1525 |
AC_MSG_RESULT([done]) |
| 1521 |
|
1526 |
|
|
Lines 1523-1530
Link Here
|
| 1523 |
dnl Check for mspdb71.dll/mspdb80.dll |
1528 |
dnl Check for mspdb71.dll/mspdb80.dll |
| 1524 |
dnl =========================================================== |
1529 |
dnl =========================================================== |
| 1525 |
dnl .NET 2003/5/8 Compiler |
1530 |
dnl .NET 2003/5/8 Compiler |
| 1526 |
if test -n "$MSPDB_PATH";then |
1531 |
if test -n "$with_mspdb_path";then |
| 1527 |
MSPDB_PATH=`dirname "$MSPDB_PATH"` |
1532 |
with_mspdb_path=`cygpath -u "$with_mspdb_path"` |
| 1528 |
fi |
1533 |
fi |
| 1529 |
if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then |
1534 |
if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then |
| 1530 |
MSPDB_PATH="$with_mspdb_path" |
1535 |
MSPDB_PATH="$with_mspdb_path" |
|
Lines 1542-1554
Link Here
|
| 1542 |
MSPDB_PATH="$with_cl_home/bin" |
1547 |
MSPDB_PATH="$with_cl_home/bin" |
| 1543 |
fi |
1548 |
fi |
| 1544 |
|
1549 |
|
|
|
1550 |
if test -z "$MSPDB_PATH";then |
| 1551 |
dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty |
| 1552 |
AC_PATH_PROG(MSPDB_PATH, mspdb80.dll) |
| 1553 |
AC_PATH_PROG(MSPDB_PATH, mspdb71.dll) |
| 1554 |
MSPDB_PATH=`dirname "$MSPDB_PATH"` |
| 1555 |
fi |
| 1556 |
|
| 1545 |
if test -z "$MSPDB_PATH"; then |
1557 |
if test -z "$MSPDB_PATH"; then |
| 1546 |
AC_MSG_ERROR([You need a mspdb71.dll, make sure it's in the path or use --with-mspdb-path]) |
1558 |
AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path]) |
| 1547 |
fi |
1559 |
fi |
| 1548 |
MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` |
1560 |
MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` |
| 1549 |
MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` |
1561 |
MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` |
|
|
1562 |
dnl The path needs to be added before cl is called |
| 1550 |
PATH="$MSPDB_PATH:$PATH" |
1563 |
PATH="$MSPDB_PATH:$PATH" |
| 1551 |
AC_PATH_PROG(MSPDB_PATH, mspdb71.dll) |
|
|
| 1552 |
|
1564 |
|
| 1553 |
AC_MSG_CHECKING([the Microsoft C/C++ Compiler]) |
1565 |
AC_MSG_CHECKING([the Microsoft C/C++ Compiler]) |
| 1554 |
if test -x "$with_cl_home/bin/cl.exe"; then |
1566 |
if test -x "$with_cl_home/bin/cl.exe"; then |
|
Lines 1614-1622
Link Here
|
| 1614 |
dnl =================================================================== |
1626 |
dnl =================================================================== |
| 1615 |
if test "$COMEX" -ge "10"; then |
1627 |
if test "$COMEX" -ge "10"; then |
| 1616 |
dnl Check midl.exe |
1628 |
dnl Check midl.exe |
|
|
1629 |
AC_PATH_PROG(MIDL_PATH, midl.exe) |
| 1617 |
if test -n "$MIDL_PATH";then |
1630 |
if test -n "$MIDL_PATH";then |
| 1618 |
MIDL_PATH=`dirname "$MIDL_PATH"` |
1631 |
MIDL_PATH=`dirname "$MIDL_PATH"` |
| 1619 |
fi |
1632 |
fi |
|
|
1633 |
if test -n "$with_midl_path";then |
| 1634 |
with_midl_path=`cygpath -u "$with_midl_path"` |
| 1635 |
fi |
| 1620 |
if test -x "$with_midl_path/midl.exe"; then |
1636 |
if test -x "$with_midl_path/midl.exe"; then |
| 1621 |
MIDL_PATH="$with_midl_path" |
1637 |
MIDL_PATH="$with_midl_path" |
| 1622 |
fi |
1638 |
fi |
|
Lines 1635-1646
Link Here
|
| 1635 |
# Convert to posix path with 8.3 filename restrictions ( No spaces ) |
1651 |
# Convert to posix path with 8.3 filename restrictions ( No spaces ) |
| 1636 |
MIDL_PATH=`cygpath -d "$MIDL_PATH"` |
1652 |
MIDL_PATH=`cygpath -d "$MIDL_PATH"` |
| 1637 |
MIDL_PATH=`cygpath -u "$MIDL_PATH"` |
1653 |
MIDL_PATH=`cygpath -u "$MIDL_PATH"` |
| 1638 |
AC_PATH_PROG(MIDL_PATH, midl.exe) |
|
|
| 1639 |
|
1654 |
|
| 1640 |
dnl Check csc.exe |
1655 |
dnl Check csc.exe |
|
|
1656 |
AC_PATH_PROG(CSC_PATH, csc.exe) |
| 1641 |
if test -n "$CSC_PATH";then |
1657 |
if test -n "$CSC_PATH";then |
| 1642 |
CSC_PATH=`dirname "$CSC_PATH"` |
1658 |
CSC_PATH=`dirname "$CSC_PATH"` |
| 1643 |
fi |
1659 |
fi |
|
|
1660 |
if test -n "$with_csc_path";then |
| 1661 |
with_csc_path=`cygpath -u "$with_csc_path"` |
| 1662 |
fi |
| 1644 |
if test -x "$with_csc_path/csc.exe"; then |
1663 |
if test -x "$with_csc_path/csc.exe"; then |
| 1645 |
CSC_PATH="$with_csc_path" |
1664 |
CSC_PATH="$with_csc_path" |
| 1646 |
else |
1665 |
else |
|
Lines 1655-1665
Link Here
|
| 1655 |
# Convert to posix path with 8.3 filename restrictions ( No spaces ) |
1674 |
# Convert to posix path with 8.3 filename restrictions ( No spaces ) |
| 1656 |
CSC_PATH=`cygpath -d "$CSC_PATH"` |
1675 |
CSC_PATH=`cygpath -d "$CSC_PATH"` |
| 1657 |
CSC_PATH=`cygpath -u "$CSC_PATH"` |
1676 |
CSC_PATH=`cygpath -u "$CSC_PATH"` |
| 1658 |
AC_PATH_PROG(CSC_PATH, csc.exe) |
|
|
| 1659 |
|
1677 |
|
| 1660 |
dnl Check mscoree.lib / .NET Frameworks dir |
1678 |
dnl Check mscoree.lib / .NET Frameworks dir |
| 1661 |
dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib. |
1679 |
dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib. |
| 1662 |
AC_MSG_CHECKING(.NET Framework) |
1680 |
AC_MSG_CHECKING(.NET Framework) |
|
|
1681 |
if test -n "$with_frame_home"; then |
| 1682 |
with_frame_home=`cygpath -u "$with_frame_home"` |
| 1683 |
fi |
| 1663 |
if test -f "$with_frame_home/lib/mscoree.lib"; then |
1684 |
if test -f "$with_frame_home/lib/mscoree.lib"; then |
| 1664 |
FRAME_HOME="$with_frame_home" |
1685 |
FRAME_HOME="$with_frame_home" |
| 1665 |
fi |
1686 |
fi |
|
Lines 2364-2374
Link Here
|
| 2364 |
export JITC_PROCESSOR_TYPE |
2385 |
export JITC_PROCESSOR_TYPE |
| 2365 |
fi |
2386 |
fi |
| 2366 |
|
2387 |
|
| 2367 |
if test -z "$with_jdk_home" && test "$_os" = "WINNT"; then |
2388 |
if test "$_os" = "WINNT"; then |
| 2368 |
_jdk_home=`./oowintool --jdk-home` |
2389 |
if test -z "$with_jdk_home"; then |
| 2369 |
if test -d "$_jdk_home"; then |
2390 |
_jdk_home=`./oowintool --jdk-home` |
| 2370 |
with_jdk_home="$_jdk_home" |
2391 |
if test -d "$_jdk_home"; then |
| 2371 |
fi |
2392 |
with_jdk_home="$_jdk_home" |
|
|
2393 |
fi |
| 2394 |
else |
| 2395 |
with_jdk_home=`cygpath -u "$with_jdk_home"` |
| 2396 |
fi |
| 2372 |
fi |
2397 |
fi |
| 2373 |
|
2398 |
|
| 2374 |
dnl =================================================================== |
2399 |
dnl =================================================================== |
|
Lines 4409-4421
Link Here
|
| 4409 |
if test -z "$PSDK_HOME"; then |
4434 |
if test -z "$PSDK_HOME"; then |
| 4410 |
PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1` |
4435 |
PSDK_HOME=`cat /proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install\ Dir 2> /dev/null | tr '\000' '\n' | head -n 1` |
| 4411 |
fi |
4436 |
fi |
| 4412 |
# normalize if found |
4437 |
# normalize if found |
| 4413 |
if test -n "$PSDK_HOME"; then |
4438 |
if test -n "$PSDK_HOME"; then |
| 4414 |
PSDK_HOME=`cygpath -d "$PSDK_HOME"` |
4439 |
PSDK_HOME=`cygpath -d "$PSDK_HOME"` |
| 4415 |
PSDK_HOME=`cygpath -u "$PSDK_HOME"` |
4440 |
PSDK_HOME=`cygpath -u "$PSDK_HOME"` |
| 4416 |
fi |
4441 |
fi |
| 4417 |
else |
4442 |
else |
| 4418 |
PSDK_HOME="$with_psdk_home" |
4443 |
PSDK_HOME=`cygpath -u "$with_psdk_home"` |
| 4419 |
fi |
4444 |
fi |
| 4420 |
# Remove a possible trailing backslash |
4445 |
# Remove a possible trailing backslash |
| 4421 |
PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'` |
4446 |
PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'` |
|
Lines 4479-4487
Link Here
|
| 4479 |
fi |
4504 |
fi |
| 4480 |
# At this point $DIRECTXSDK_HOME might still be undefined. This will lead to |
4505 |
# At this point $DIRECTXSDK_HOME might still be undefined. This will lead to |
| 4481 |
# the "DirectX SDK files not found" error later |
4506 |
# the "DirectX SDK files not found" error later |
| 4482 |
else |
4507 |
else |
| 4483 |
DIRECTXSDK_HOME="$with_directx_home" |
4508 |
DIRECTXSDK_HOME=`cygpath -u "$with_directx_home"` |
| 4484 |
fi |
4509 |
fi |
| 4485 |
# Remove a possible trailing backslash |
4510 |
# Remove a possible trailing backslash |
| 4486 |
DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'` |
4511 |
DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'` |
| 4487 |
|
4512 |
|
|
Lines 4525-4530
Link Here
|
| 4525 |
if test -n "$NSIS_PATH"; then |
4550 |
if test -n "$NSIS_PATH"; then |
| 4526 |
NSIS_PATH=`dirname "$NSIS_PATH"` |
4551 |
NSIS_PATH=`dirname "$NSIS_PATH"` |
| 4527 |
fi |
4552 |
fi |
|
|
4553 |
if test -n "$with_nsis_path"; then |
| 4554 |
with_nsis_path=`cygpath -u "$with_nsis_path"` |
| 4555 |
fi |
| 4528 |
if test -e "$with_nsis_path/nsis.exe"; then |
4556 |
if test -e "$with_nsis_path/nsis.exe"; then |
| 4529 |
NSIS_PATH="$with_nsis_path" |
4557 |
NSIS_PATH="$with_nsis_path" |
| 4530 |
fi |
4558 |
fi |
|
Lines 4649-4654
Link Here
|
| 4649 |
dnl *************************************** |
4677 |
dnl *************************************** |
| 4650 |
if test "$_os" = "WINNT"; then |
4678 |
if test "$_os" = "WINNT"; then |
| 4651 |
AC_MSG_CHECKING([ml.exe assembler path]) |
4679 |
AC_MSG_CHECKING([ml.exe assembler path]) |
|
|
4680 |
if test -n "$with_asm_home"; then |
| 4681 |
with_asm_home=`cygpath -u "$with_asm_home"` |
| 4682 |
fi |
| 4652 |
if test ! -x "$with_asm_home/ml.exe"; then |
4683 |
if test ! -x "$with_asm_home/ml.exe"; then |
| 4653 |
AC_PATH_PROG(ML_EXE, ml.exe) |
4684 |
AC_PATH_PROG(ML_EXE, ml.exe) |
| 4654 |
if test -z "$ML_EXE"; then |
4685 |
if test -z "$ML_EXE"; then |
|
Lines 4681-4688
Link Here
|
| 4681 |
dnl Zip will be found where you tell me to find it |
4712 |
dnl Zip will be found where you tell me to find it |
| 4682 |
dnl =================================================================== |
4713 |
dnl =================================================================== |
| 4683 |
if test -n "$with_zip_home" ; then |
4714 |
if test -n "$with_zip_home" ; then |
| 4684 |
ZIP="$with_zip_home/zip" |
4715 |
with_zip_home=`cygpath -u "$with_zip_home"` |
| 4685 |
UNZIP="$with_unzip_home/unzip" |
4716 |
ZIP="$with_zip_home/zip" |
|
|
4717 |
UNZIP="$with_zip_home/unzip" |
| 4686 |
ZIP_HOME="$with_zip_home" |
4718 |
ZIP_HOME="$with_zip_home" |
| 4687 |
else |
4719 |
else |
| 4688 |
AC_PATH_PROG(ZIP, zip) |
4720 |
AC_PATH_PROG(ZIP, zip) |
|
Lines 5503-5508
Link Here
|
| 5503 |
if test -z "$with_ant_home"; then |
5535 |
if test -z "$with_ant_home"; then |
| 5504 |
AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd]) |
5536 |
AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd]) |
| 5505 |
else |
5537 |
else |
|
|
5538 |
if test "$_os" = "WINNT"; then |
| 5539 |
with_ant_home=`cygpath -u "$with_ant_home"` |
| 5540 |
fi |
| 5506 |
AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH) |
5541 |
AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH) |
| 5507 |
WITH_ANT_HOME=$with_ant_home |
5542 |
WITH_ANT_HOME=$with_ant_home |
| 5508 |
fi |
5543 |
fi |