[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[David Ostrovsky]

 config_host.mk.in |    3 ---
 configure.ac      |   32 --------------------------------
 2 files changed, 35 deletions(-)

New commits:
commit d74c5e82a4650c955a0b83d06a7570a7c39ac7f3
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Tue Feb 26 08:42:30 2013 +0100

    moz: clean up after gbuildification
    
    Change-Id: I1cbb3a9f3f869e8df4dca5cc71f529949c81d544

diff --git a/config_host.mk.in b/config_host.mk.in
old mode 100644
new mode 100755
index 82d75e3..5c48021
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -171,7 +171,6 @@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
-export EXTMSV80=$(gb_Space)@EXTMSV80@
 export debug=@ENABLE_DEBUG@
 @x_Cygwin@ export FIND=@WIN_FIND@
 export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@
@@ -400,8 +399,6 @@ export MOC=@MOC@
 export MSM_PATH=@MSM_PATH@
 export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
 export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
-export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@
-export MSVC80_MNFST=@MSVC80_MNFST@
 export MSVC_DLLS=@MSVC_DLLS@
 export MSVC_DLL_PATH=@MSVC_DLL_PATH@
 export MYSQLC_MAJOR=@MYSQLC_MAJOR@
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index c4d6c6b..0663125
--- a/configure.ac
+++ b/configure.ac
@@ -8173,44 +8173,12 @@ if test "$_os" = "WINNT"; then
         WITH_MOZAB4WIN=YES
         AC_MSG_RESULT([yes, internal (old windows mozab driver)])
         BUILD_TYPE="$BUILD_TYPE MOZ"
-        EXTMSV80=`cygpath  -u "$SRC_ROOT/external/msvcp80"`
-        AC_MSG_CHECKING([for MSVC 2005 runtime needed for prebuilt Mozilla])
-        if test -e "$EXTMSV80/Microsoft.VC80.CRT.manifest" -a \
-                -e "$EXTMSV80/msvcp80.dll" -a \
-                -e "$EXTMSV80/msvcr80.dll"; then
-            AC_MSG_RESULT([Found])
-            EXTMSV80=
-        else
-            #uwin-prefixed paths are with no quotes to allow for mask, and uwin to not have spaces, btw
-            uwin=`cygpath -d "$WINDIR"`
-            uwin=`cygpath -u "$uwin"`
-            #if we have one we have all
-            if test -e $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053* ; then
-                MSVC80_DLL_DIR=`ls -d $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
-                MSVC80_MNFST=`ls $uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
-                AC_MSG_RESULT([Found])
-            else
-                EXTMSV80=
-                AC_MSG_RESULT([Not Found])
-                AC_MSG_ERROR([For the pre-built Mozilla libraries, you need MSVC 2005 runtime files
-    Microsoft.VC80.CRT.manifest, msvcp80.dll, and msvcr80.dll
-    in external/msvcp80.
-
-    You can get them by installing:
-    <http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE>
-    and relaunch ./autogen.sh])
-            fi
-        fi
     else
         AC_MSG_RESULT([no])
         WITH_MOZAB4WIN=NO
     fi
 fi
 AC_SUBST(WITH_MOZAB4WIN)
-AC_SUBST(MSVC80_DLL_DIR)
-AC_SUBST(MSVC80_MNFST)
-AC_SUBST(EXTMSV80)
-AC_SUBST(EXTMSV80)
 
 dnl ===================================================================
 dnl Check for system NSS