[PATCH] add fallback for Merge-Modules directory (when not found in ...

[Christian Lohmaier (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3680

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3680/1

add fallback for Merge-Modules directory (when not found in registry)

Add "C:\Program Files (x86)\Common Files\Merge Modules" as fallback,
since on Windows Server 2012, the registry entry has not been created
when installing Visual Studio Express

Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
---
M configure.ac
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/configure.ac b/configure.ac
index 312998b..9f95298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4808,6 +4808,10 @@
             fi
         fi
     done
+    if test -z "$msmdir"; then
+        AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "C:\Program Files (x86)\Common Files\Merge Modules"])
+        msmdir="C:\Program Files (x86)\Common Files\Merge Modules"
+    fi
     msmdir=`cygpath -d "$msmdir"`
     msmdir=`cygpath -u "$msmdir"`
     if test -z "$msmdir"; then

-- 
To view, visit https://gerrit.libreoffice.org/3680
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>