diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-09-22 19:29:04 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-18 20:41:31 +0200 |
| commit | 610eceb035280ed5714b314051913d2412cde604 (patch) | |
| tree | 73012fe1f8fa23d61381034002ac315972837bc2 /configure.ac | |
| parent | 5e65efcaa38ea5fbe655a18082a3ba7c8cf7d5fe (diff) | |
Always build HarfBuzz everywhere
It is no longer an optional feature on any platform.
Change-Id: I70cdcd2c0df69d961ecc5f36b4e8d035d251ef16
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 335b2d433db8..365599f6b78c 100644 --- a/configure.ac +++ b/configure.ac @@ -2135,12 +2135,6 @@ AC_ARG_WITH(iwyu, Use only if you are hacking on it.]), ,) -AC_ARG_WITH(harfbuzz, - AS_HELP_STRING([--with-harfbuzz], - [Enable HarfBuzz support regardless of the platform. - Experimental only. Use only if working on it.]), -,) - dnl =================================================================== dnl Branding dnl =================================================================== @@ -9340,32 +9334,20 @@ AC_SUBST(ENABLE_ORCUS) dnl =================================================================== dnl HarfBuzz dnl =================================================================== -AC_MSG_CHECKING([whether to enable HarfBuzz support]) -if test "$with_harfbuzz" = "yes" -o \( $_os != WINNT -a $_os != Darwin -a $_os != iOS \); then - AC_MSG_RESULT([yes]) - ENABLE_HARFBUZZ="TRUE" - if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) - else - libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) - fi - if test "$COM" = "MSC"; then # override the above - HARFBUZZ_LIBS="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.lib" - fi - if test "$with_system_harfbuzz" = "yes"; then - AC_MSG_CHECKING([whether system Harfbuzz is built with Graphite support]) - _save_libs="$LIBS" - _save_cflags="$CFLAGS" - LIBS="$LIBS $HARFBUZZ_LIBS" - CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS" - AC_CHECK_FUNC(hb_graphite2_face_get_gr_face,,[AC_MSG_ERROR([Harfbuzz needs to be built with Graphite support.])]) - LIBS="$_save_libs" - CFLAGS="$_save_cflags" - fi -else - AC_MSG_RESULT([no]) +libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) +if test "$COM" = "MSC"; then # override the above + HARFBUZZ_LIBS="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.lib" +fi +if test "$with_system_harfbuzz" = "yes"; then + AC_MSG_CHECKING([whether system Harfbuzz is built with Graphite support]) + _save_libs="$LIBS" + _save_cflags="$CFLAGS" + LIBS="$LIBS $HARFBUZZ_LIBS" + CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS" + AC_CHECK_FUNC(hb_graphite2_face_get_gr_face,,[AC_MSG_ERROR([Harfbuzz needs to be built with Graphite support.])]) + LIBS="$_save_libs" + CFLAGS="$_save_cflags" fi -AC_SUBST(ENABLE_HARFBUZZ) AC_MSG_CHECKING([whether to use X11]) dnl *************************************** |