diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-04-29 16:48:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-29 15:49:04 +0000 |
| commit | 2f205ee79ea929c6fce5686512bd468ab78a877a (patch) | |
| tree | f6377f79368e2cae31d6546ef2279e4ef93dfa14 /configure.ac | |
| parent | 9fa0ce282f808fb68ed7a5e29e8052dc3af74119 (diff) | |
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 <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
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 |