summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-11-19 13:48:59 +0200
committerTor Lillqvist <tml@collabora.com>2015-11-19 14:05:31 +0200
commit0c5e59d93345a6a4a1fc965adcb0bb743a933ebf (patch)
tree2a3e1ca8ea24298b6dbfd841a201a19fb92c9f6e /configure.ac
parent77cea16a2805364ab78eeec4a80155da25dcbd66 (diff)
Check for system GLyphy only on Linux and Windows
Won't ever be any "system" one on Windows, of course. And I think it will take some time before Linux distros packages GLyphy, too. But the main point is that I don't want to bother with building GLyphy for anything it isn't used on anyway. (Sure, it isn't actually used on Linux, either, but there might be somebody who wants to work on that.) Also, there is no "include" in the GLyphy source tree. Change-Id: I063369c92e8d4b868cc66513c9ec12aa4fc65f37
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b068e9b5cf4c..6829c709e48c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8813,7 +8813,9 @@ AS_IF([test "$with_system_glew" = "yes"],
dnl ===================================================================
dnl Check for system glyphy
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/include"])
+if test $_os = Linux -o $_os = WINNT; then
+ libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/src"])
+fi
dnl ===================================================================
dnl Check for system vigra