78 lines
4.4 KiB
Diff
78 lines
4.4 KiB
Diff
From: caomeng <caomeng5@huawei.com>
|
|
Date: Fri, 15 Nov 2019 16:19:37 +0400
|
|
Subject: [PATCH] add lib gobject when config
|
|
Sometimes, if requires a initialization call to lib gobject, it should
|
|
make that call itself rather than expecting the application to to the
|
|
initialization.
|
|
|
|
Signed-off-by: caomeng <caomeng5@huawei.com>
|
|
---
|
|
configure | 20 +-
|
|
1 file changed, 10 insertion(+), 10 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/configure b/configure
|
|
--- a/configure 2019-11-15 09:49:05.702501694 +0800
|
|
+++ a/configure 2019-11-15 09:47:57.641501400 +0800
|
|
@@ -13980,12 +13980,12 @@
|
|
pkg_cv_CAIROPDF_CFLAGS="$CAIROPDF_CFLAGS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_CAIROPDF_CFLAGS=`$PKG_CONFIG --cflags " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0" 2>/dev/null`
|
|
+ pkg_cv_CAIROPDF_CFLAGS=`$PKG_CONFIG --cflags " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -13998,12 +13998,12 @@
|
|
pkg_cv_CAIROPDF_LIBS="$CAIROPDF_LIBS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_CAIROPDF_LIBS=`$PKG_CONFIG --libs " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0" 2>/dev/null`
|
|
+ pkg_cv_CAIROPDF_LIBS=`$PKG_CONFIG --libs " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -14022,15 +14022,15 @@
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0"`
|
|
+ CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0"`
|
|
else
|
|
- CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0"`
|
|
+ CAIROPDF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0"`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$CAIROPDF_PKG_ERRORS" >&5
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
|
-Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0) were not met:
|
|
+Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0) were not met:
|
|
|
|
$CAIROPDF_PKG_ERRORS
|
|
|
|
@@ -14042,7 +14042,7 @@
|
|
See the pkg-config man page for more details.
|
|
" >&5
|
|
$as_echo "$as_me: WARNING:
|
|
-Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 glib-2.0) were not met:
|
|
+Package requirements ( cairo >= 1.2 cairo-pdf >= 1.2 pango >= 1.10 pangocairo >= 1.10 gobject-2.0 glib-2.0) were not met:
|
|
|
|
$CAIROPDF_PKG_ERRORS
|
|
|