walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PKG_CHECK_MODULES usage 

Bug 65246 - Fix build without graphite2

If we don't provide ACTION-IF-NOT-FOUND, configure aborts if it can't
find the libraries.  We handle that ourselves so we don't want the
macro to abort.
This commit is contained in:
Behdad Esfahbod 2013-06-06 18:57:15 -04:00
parent 2fd0e02706
commit 270cfd7a9c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -134,7 +134,7 @@ AC_ARG_WITH(glib,
[with_glib=auto]) [with_glib=auto])
have_glib=false have_glib=false
if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, :)
fi fi
if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then
AC_MSG_ERROR([glib support requested but glib-2.0 not found]) AC_MSG_ERROR([glib support requested but glib-2.0 not found])
@ -146,7 +146,7 @@ AM_CONDITIONAL(HAVE_GLIB, $have_glib)
have_gobject=false have_gobject=false
if $have_glib; then if $have_glib; then
PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true) PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true, :)
fi fi
if $have_gobject; then if $have_gobject; then
AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library])
@ -174,7 +174,7 @@ AC_ARG_WITH(cairo,
[with_cairo=auto]) [with_cairo=auto])
have_cairo=false have_cairo=false
if test "x$with_cairo" = "xyes" -o "x$with_cairo" = "xauto"; then if test "x$with_cairo" = "xyes" -o "x$with_cairo" = "xauto"; then
PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true) PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true, :)
fi fi
if test "x$with_cairo" = "xyes" -a "x$have_cairo" != "xtrue"; then if test "x$with_cairo" = "xyes" -a "x$have_cairo" != "xtrue"; then
AC_MSG_ERROR([cairo support requested but not found]) AC_MSG_ERROR([cairo support requested but not found])
@ -186,7 +186,7 @@ AM_CONDITIONAL(HAVE_CAIRO, $have_cairo)
have_cairo_ft=false have_cairo_ft=false
if $have_cairo; then if $have_cairo; then
PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true) PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true, :)
fi fi
if $have_cairo_ft; then if $have_cairo_ft; then
AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library]) AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library])
@ -201,7 +201,7 @@ AC_ARG_WITH(icu,
[with_icu=auto]) [with_icu=auto])
have_icu=false have_icu=false
if test "x$with_icu" = "xyes" -o "x$with_icu" = "xauto"; then if test "x$with_icu" = "xyes" -o "x$with_icu" = "xauto"; then
PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false) PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false, :)
dnl Fallback to icu-config if ICU pkg-config files could not be found dnl Fallback to icu-config if ICU pkg-config files could not be found
if test "$have_icu" != "true"; then if test "$have_icu" != "true"; then
@ -234,7 +234,7 @@ AM_CONDITIONAL(HAVE_ICU, $have_icu)
dnl ========================================================================== dnl ==========================================================================
have_icu_le=false have_icu_le=false
dnl PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true) dnl PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, :)
if $have_icu_le; then if $have_icu_le; then
AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library]) AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library])
fi fi
@ -248,7 +248,7 @@ AC_ARG_WITH(graphite2,
[with_graphite2=no]) [with_graphite2=no])
have_graphite2=false have_graphite2=false
if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then
PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite2=true) PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite2=true, :)
fi fi
if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then
AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found]) AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found])
@ -266,7 +266,7 @@ AC_ARG_WITH(freetype,
[with_freetype=auto]) [with_freetype=auto])
have_freetype=false have_freetype=false
if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then
PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.3.8, have_freetype=true) PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.3.8, have_freetype=true, :)
fi fi
if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then
AC_MSG_ERROR([FreeType support requested but libfreetype2 not found]) AC_MSG_ERROR([FreeType support requested but libfreetype2 not found])