[Libreoffice-commits] core.git: configure.ac

[Tomoyuki Kubota (via logerrit)]

 configure.ac |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 4bf62c1c04de1100e3f6fb3d5173eff2cb101fa6
Author:     Tomoyuki Kubota <himajin100000 at gmail.com>
AuthorDate: Thu Apr 25 08:38:56 2019 +0900
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri May 3 14:03:42 2019 +0200

    Add Support for .NET 4.8
    
    *Before this patch, Windows SDK came with .NET 4.5
    and .NET 4.6.1 or later was ignored.
    
    * the author of this configure.ac did not seem to understand that
    WOW6432Node should be given to reg_get_value_64
    instead of reg_get_value_32.
    sometimes the code redundantly fetched the same entry WOW6432
    (for 64 bit, wrongly passed to 32bit)
    and the 32 bit one. I removed the duplicate.
    
    Change-Id: Iff972d727907c480ef927d53fa1f53557fdeb1fd
    Reviewed-on: https://gerrit.libreoffice.org/71268
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/configure.ac b/configure.ac
index 36e0c359dedf..a0cf4cda626f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5350,40 +5350,31 @@ find_al()
 
     unset altest
 
-    for x in `ls /proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ SDKs/Windows`; do
-        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
-        if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then
-            altest=$regvalue
-            return
-        fi
-    done
-
-    # We need this additional check to detect 4.6.1 or above.
-    for ver in 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
+    # We need this check to detect 4.6.1 or above.
+    for ver in 4.8 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
             return
         fi
+    done
 
-        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/Microsoft SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools"
+    for x in `ls /proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ SDKs/Windows`; do
+        reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
         if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f "$regvalue/bin/al.exe" \); then
             altest=$regvalue
             return
         fi
     done
+
+
 }
 
 find_dotnetsdk46()
 {
     unset frametest
 
-    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
-            return
-        fi
+    for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
         reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/NETFXSDK/$ver/KitsInstallationFolder"
         if test -n "$regvalue"; then
             frametest=$regvalue