From 2f205ee79ea929c6fce5686512bd468ab78a877a Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 29 Apr 2013 16:48:57 +0200 Subject: add fallback for Merge-Modules directory (when not found in registry) Add "$COMMONPROGRAMFILES\Merge Modules" (on current versions of Windows that probably is "C:\Program Files (x86)\Common Files\Merge Modules") as fallback, since for example on Windows Server 2012, the registry entry has not been created when installing Visual Studio Express Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a Reviewed-on: https://gerrit.libreoffice.org/3680 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 312998b79ae1..bc20decdb8c3 100644 --- a/configure.ac +++ b/configure.ac @@ -4808,6 +4808,10 @@ find_msms() fi fi done + if test -z "$msmdir"; then + AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "$COMMONPROGRAMFILES\Merge Modules"]) + msmdir="$COMMONPROGRAMFILES\Merge Modules" + fi msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -u "$msmdir"` if test -z "$msmdir"; then -- cgit