diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:27:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:27:09 +0200 |
| commit | 928fb2c711c10b372dc5b4fb3703a2fa5c40ac03 (patch) | |
| tree | d29a15745915f47b666232c3b3a05a560c2ddf88 /configure.ac | |
| parent | 0c5e59d93345a6a4a1fc965adcb0bb743a933ebf (diff) | |
We don't actually use GLyphy on Linux yet
So don't link with it, to avoid pointlessly depending on the very new
glyphy package in Debian. Change this back once needed, after 5.1
branch-off.
Change-Id: I4e2e873858841429738e2992676a0142acc528ee
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6829c709e48c..e154efd268a5 100644 --- a/configure.ac +++ b/configure.ac @@ -8813,8 +8813,10 @@ AS_IF([test "$with_system_glew" = "yes"], dnl =================================================================== dnl Check for system glyphy dnl =================================================================== -if test $_os = Linux -o $_os = WINNT; then - libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/src"]) +dnl We currently use GLyphy only on Windows +if test $_os = WINNT; then + # libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/src"]) + BUILD_TYPE="$BUILD_TYPE GLYPHY" fi dnl =================================================================== |