16385c4d1c
icu-config could print the list of libraries on more lines. We need one line for the variable. Change-Id: I08a0415c2c3baa226e9cd32e0c3da7d384511f87
108 lines
3 KiB
Groff
108 lines
3 KiB
Groff
diff -ur harfbuzz.org/configure harfbuzz/configure
|
|
--- harfbuzz.org/configure 2013-04-22 20:45:32.738213297 +0200
|
|
+++ harfbuzz/configure 2013-04-22 20:46:56.334209801 +0200
|
|
@@ -16813,7 +16885,7 @@
|
|
|
|
|
|
|
|
-have_hb_old=true
|
|
+have_hb_old=false
|
|
if $have_hb_old; then
|
|
|
|
$as_echo "#define HAVE_HB_OLD 1" >>confdefs.h
|
|
@@ -16829,7 +16901,7 @@
|
|
|
|
|
|
|
|
-have_ucdn=true
|
|
+have_ucdn=false
|
|
if $have_ucdn; then
|
|
|
|
$as_echo "#define HAVE_UCDN 1" >>confdefs.h
|
|
@@ -16914,7 +16986,7 @@
|
|
GLIB_LIBS=$pkg_cv_GLIB_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_glib=true
|
|
+ have_glib=false
|
|
fi
|
|
if $have_glib; then
|
|
|
|
@@ -16999,7 +17071,7 @@
|
|
GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_gobject=true
|
|
+ have_gobject=false
|
|
fi
|
|
if $have_gobject; then
|
|
|
|
@@ -17087,7 +17159,7 @@
|
|
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_cairo=true
|
|
+ have_cairo=false
|
|
fi
|
|
if $have_cairo; then
|
|
|
|
@@ -17172,7 +17244,7 @@
|
|
CAIRO_FT_LIBS=$pkg_cv_CAIRO_FT_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_cairo_ft=true
|
|
+ have_cairo_ft=false
|
|
fi
|
|
if $have_cairo_ft; then
|
|
|
|
@@ -17457,7 +17529,7 @@
|
|
ICU_LE_LIBS=$pkg_cv_ICU_LE_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_icu_le=true
|
|
+ have_icu_le=false
|
|
fi
|
|
if test "$have_icu_le" != "true"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
@@ -17555,12 +17555,12 @@
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using icu-config fallback" >&5
|
|
$as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; }
|
|
if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then
|
|
- have_icu_le=true
|
|
+ have_icu_le=false
|
|
# We don't use --cflags as this gives us a lot of things that we don't
|
|
# necessarily want, like debugging and optimization flags
|
|
# See man (1) icu-config for more info.
|
|
ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
|
|
- ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout`
|
|
+ ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout | tr "\n" " "`
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
@@ -17654,7 +17654,7 @@
|
|
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_graphite=true
|
|
+ have_graphite=false
|
|
fi
|
|
if $have_graphite; then
|
|
|
|
@@ -17740,7 +17812,7 @@
|
|
FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- have_freetype=true
|
|
+ have_freetype=false
|
|
fi
|
|
if $have_freetype; then
|
|
|
|
@@ -17825,7 +17897,7 @@
|
|
ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include <ApplicationServices/ApplicationServices.h>
|
|
"
|
|
if test "x$ac_cv_type_CTFontRef" = xyes; then :
|
|
- have_coretext=true
|
|
+ have_coretext=false
|
|
else
|
|
have_coretext=false
|
|
fi
|