[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac

[Libreoffice Gerrit user]

 configure.ac |   33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 9ba9307e0d3b4ddf370bb03189bebd172ab7f46d
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue Jul 17 11:30:22 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Oct 11 12:48:24 2018 +0200

    Don't search for old (<= 2.0) .NET SDK anymore
    
    Try to find >= 4.6 .NET SDK first.
    
    +allow .NET SDK 4.7.2.
    
    Change-Id: I64084e894ee829ecff091fe16a45f309a51eb4d5
    Reviewed-on: https://gerrit.libreoffice.org/57550
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 9b8c8c70fa8116f606ce0ebacdaad04ed9402c9f)
    Reviewed-on: https://gerrit.libreoffice.org/59205
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index 93eaaed43a1a..07718c3e912e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4997,7 +4997,7 @@ find_al()
     done
 
     # We need this additional check to detect 4.6.1 or above.
-    for ver in 4.7.1 4.7 4.6.2 4.6.1; do
+    for ver in 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder"
         if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then
             altest=$regvalue
@@ -5012,26 +5012,11 @@ find_al()
     done
 }
 
-find_dotnetsdk()
-{
-    # Return value: $frametest (that's a silly name...)
-
-    unset frametest
-
-    for ver in 1.1 2.0; do
-        reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv$ver
-        if test -n "$regvalue"; then
-            frametest=$regvalue
-            return
-        fi
-    done
-}
-
 find_dotnetsdk46()
 {
     unset frametest
 
-    for ver in 4.7.1 4.7 4.6.2 4.6.1 4.6; do
+    for ver in 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
         reg_get_value_64 "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
         if test -n "$regvalue"; then
             frametest=$regvalue
@@ -5398,23 +5383,17 @@ if test "$build_os" = "cygwin"; then
 
     dnl Check mscoree.lib / .NET Framework dir
     AC_MSG_CHECKING(.NET Framework)
-    find_dotnetsdk
-    if test -f "$frametest/lib/mscoree.lib"; then
+    find_dotnetsdk46
+    PathFormat "$frametest"
+    frametest="$formatted_path"
+    if test -f "$frametest/Lib/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then
         DOTNET_FRAMEWORK_HOME="$frametest"
     else
         find_winsdk
         if test -f "$winsdktest/lib/mscoree.lib" -o -f "$winsdktest/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then
             DOTNET_FRAMEWORK_HOME="$winsdktest"
-        else
-            find_dotnetsdk46
-            PathFormat "$frametest"
-            frametest="$formatted_path"
-            if test -f "$frametest/Lib/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then
-                 DOTNET_FRAMEWORK_HOME="$frametest"
-            fi
         fi
     fi
-
     if test ! -f "$DOTNET_FRAMEWORK_HOME/lib/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/mscoree.lib" -a ! -f "$DOTNET_FRAMEWORK_HOME/Lib/um/$WINDOWS_SDK_ARCH/mscoree.lib"; then
         AC_MSG_ERROR([mscoree.lib not found])
     fi