configure.ac | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit b469ba0e7628199d40100d98ff19a835e273db43
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Nov 23 10:02:13 2017 +0200
Don't warn about the installer unless we are building an installer
Change-Id: Iefb40baab9eeaab6923a0f95681466afc6dc6643
diff --git a/configure.ac b/configure.ac
index 08a9c9cccf39..d36e75b472b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6500,8 +6500,16 @@ if test $_os = "WINNT"; then
cd -
else
UCRT_REDISTDIR=""
- AC_MSG_WARN([--without-ucrt-dir not specified or dlls not found -
installer will have runtime dependency])
- add_warning "--without-ucrt-dir not specified or dlls not found -
installer will have runtime dependency"
+ if test -n "$PKGFORMAT"; then
+ for i in "$PKGFORMAT"; do
+ case "$i" in
+ msi)
+ AC_MSG_WARN([--without-ucrt-dir not specified or dlls
not found - installer will have runtime dependency])
+ add_warning "--without-ucrt-dir not specified or dlls
not found - installer will have runtime dependency"
+ ;;
+ esac
+ done
+ fi
fi
fi
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
