[ooo-build-commit] .: configure.in set_soenv.in

[Fridrich Strba]

 configure.in |   24 ++++++++++++++++++++++++
 set_soenv.in |    3 +++
 2 files changed, 27 insertions(+)

New commits:
commit 303ce3ce2d7c0f62329661879e19fb4eef1f99f3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Oct 4 12:26:27 2010 +0200

    Bundle the VC runtime distribuable installers in LibO installer

diff --git a/configure.in b/configure.in
index c0971fe..cecb4b1 100644
--- a/configure.in
+++ b/configure.in
@@ -5808,6 +5808,30 @@ You may have to search Microsoft's website. Last time it was seen at:
 fi
 
 dnl ===================================================================
+dnl Windows builds need vcredist_x86.exe and vcredist_x64.exe in external/vcredist/
+dnl ===================================================================
+if test "$_os" = "WINNT"; then
+   AC_MSG_CHECKING([for vcredist_x86.exe])
+   if test -x ./external/vcredist/vcredist_x86.exe; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([vcredist_x86.exe is missing in external/vcredist/.
+Get the version corresponding to your Visual Studio from the Microsoft site
+and put it into external/vcredist.])
+   fi
+   AC_MSG_CHECKING([for vcredist_x64.exe])
+   if test -x ./external/vcredist/vcredist_x64.exe; then
+      AC_MSG_RESULT([found])
+   else
+      AC_MSG_ERROR([vcredist_x64.exe is missing in external/vcredist/.
+Get the version corresponding to your Visual Studio from the Microsoft site
+and put it into external/vcredist.])
+   fi
+   WITH_VC_REDIST="TRUE"
+fi
+AC_SUBST(WITH_VC_REDIST)
+
+dnl ===================================================================
 dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
diff --git a/set_soenv.in b/set_soenv.in
index 068389d..84b337e 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1724,6 +1724,9 @@ if ( $platform =~ m/cygwin/ )
    chomp($tmpdir);
    ToFile( "TMPDIR",     $tmpdir,            "e" );
 }
+if ("@WITH_VC_REDIST@" eq "TRUE") {
+ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
+}
 ToFile( "PERL",              $PERL,              "e" );
 ToFile( "RPM",               "@RPM@",            "e" );
 ToFile( "DPKG",              "@DPKG@",           "e" );