diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:54:55 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:56:41 +0200 |
commit | e461f7efcb77ce771835054c22ea0353555d9237 (patch) | |
tree | 4201bb1c5193d58808fc49d487df3bbbe52d13b7 /configure.ac | |
parent | a3eec8a043eae4417276938968a5a8e227d23111 (diff) |
Do use libo_CHECK_SYSTEM_MODULE for GLYPHY after all
Set the CFLAGS and LIBS for it in config_host.mk.in, and handle the
SYSTEM_GLYPHY case properly in RepositoryExternal.mk.
Change-Id: I56a7fe72b675b6dd4514bbd1739b53f5871ed36a
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e154efd268a5..30ec3972eaac 100644 --- a/configure.ac +++ b/configure.ac @@ -8815,8 +8815,7 @@ dnl Check for system glyphy dnl =================================================================== 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" + libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/src"]) fi dnl =================================================================== |