Skip to content

Commit 173f6fd

Browse files
Check for Qt5Svg when configuring.
1 parent bbe7821 commit 173f6fd

2 files changed

Lines changed: 104 additions & 0 deletions

File tree

configure

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,8 @@ libtorrent_CFLAGS
606606
BOOST_SYSTEM_LIB
607607
BOOST_LDFLAGS
608608
BOOST_CPPFLAGS
609+
Qt5Svg_LIBS
610+
Qt5Svg_CFLAGS
609611
QT_QMAKE
610612
PKG_CONFIG_LIBDIR
611613
PKG_CONFIG_PATH
@@ -738,6 +740,8 @@ PKG_CONFIG
738740
PKG_CONFIG_PATH
739741
PKG_CONFIG_LIBDIR
740742
QT_QMAKE
743+
Qt5Svg_CFLAGS
744+
Qt5Svg_LIBS
741745
libtorrent_CFLAGS
742746
libtorrent_LIBS
743747
zlib_CFLAGS
@@ -1420,6 +1424,9 @@ Some influential environment variables:
14201424
PKG_CONFIG_LIBDIR
14211425
path overriding pkg-config's built-in search path
14221426
QT_QMAKE value of host_bins for Qt5Core >= 5.5.1, overriding pkg-config
1427+
Qt5Svg_CFLAGS
1428+
C compiler flags for Qt5Svg, overriding pkg-config
1429+
Qt5Svg_LIBS linker flags for Qt5Svg, overriding pkg-config
14231430
libtorrent_CFLAGS
14241431
C compiler flags for libtorrent, overriding pkg-config
14251432
libtorrent_LIBS
@@ -4492,6 +4499,100 @@ fi
44924499
if test "x$QT_QMAKE" = "x"; then :
44934500
as_fn_error $? "Could not find qmake" "$LINENO" 5
44944501

4502+
fi
4503+
if test "x$enable_gui" = "xyes"; then :
4504+
4505+
pkg_failed=no
4506+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5Svg" >&5
4507+
$as_echo_n "checking for Qt5Svg... " >&6; }
4508+
4509+
if test -n "$Qt5Svg_CFLAGS"; then
4510+
pkg_cv_Qt5Svg_CFLAGS="$Qt5Svg_CFLAGS"
4511+
elif test -n "$PKG_CONFIG"; then
4512+
if test -n "$PKG_CONFIG" && \
4513+
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Svg >= 5.5.1\""; } >&5
4514+
($PKG_CONFIG --exists --print-errors "Qt5Svg >= 5.5.1") 2>&5
4515+
ac_status=$?
4516+
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4517+
test $ac_status = 0; }; then
4518+
pkg_cv_Qt5Svg_CFLAGS=`$PKG_CONFIG --cflags "Qt5Svg >= 5.5.1" 2>/dev/null`
4519+
test "x$?" != "x0" && pkg_failed=yes
4520+
else
4521+
pkg_failed=yes
4522+
fi
4523+
else
4524+
pkg_failed=untried
4525+
fi
4526+
if test -n "$Qt5Svg_LIBS"; then
4527+
pkg_cv_Qt5Svg_LIBS="$Qt5Svg_LIBS"
4528+
elif test -n "$PKG_CONFIG"; then
4529+
if test -n "$PKG_CONFIG" && \
4530+
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Svg >= 5.5.1\""; } >&5
4531+
($PKG_CONFIG --exists --print-errors "Qt5Svg >= 5.5.1") 2>&5
4532+
ac_status=$?
4533+
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4534+
test $ac_status = 0; }; then
4535+
pkg_cv_Qt5Svg_LIBS=`$PKG_CONFIG --libs "Qt5Svg >= 5.5.1" 2>/dev/null`
4536+
test "x$?" != "x0" && pkg_failed=yes
4537+
else
4538+
pkg_failed=yes
4539+
fi
4540+
else
4541+
pkg_failed=untried
4542+
fi
4543+
4544+
4545+
4546+
if test $pkg_failed = yes; then
4547+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4548+
$as_echo "no" >&6; }
4549+
4550+
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
4551+
_pkg_short_errors_supported=yes
4552+
else
4553+
_pkg_short_errors_supported=no
4554+
fi
4555+
if test $_pkg_short_errors_supported = yes; then
4556+
Qt5Svg_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Svg >= 5.5.1" 2>&1`
4557+
else
4558+
Qt5Svg_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Svg >= 5.5.1" 2>&1`
4559+
fi
4560+
# Put the nasty error message in config.log where it belongs
4561+
echo "$Qt5Svg_PKG_ERRORS" >&5
4562+
4563+
as_fn_error $? "Package requirements (Qt5Svg >= 5.5.1) were not met:
4564+
4565+
$Qt5Svg_PKG_ERRORS
4566+
4567+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
4568+
installed software in a non-standard prefix.
4569+
4570+
Alternatively, you may set the environment variables Qt5Svg_CFLAGS
4571+
and Qt5Svg_LIBS to avoid the need to call pkg-config.
4572+
See the pkg-config man page for more details." "$LINENO" 5
4573+
elif test $pkg_failed = untried; then
4574+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4575+
$as_echo "no" >&6; }
4576+
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4577+
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4578+
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
4579+
is in your PATH or set the PKG_CONFIG environment variable to the full
4580+
path to pkg-config.
4581+
4582+
Alternatively, you may set the environment variables Qt5Svg_CFLAGS
4583+
and Qt5Svg_LIBS to avoid the need to call pkg-config.
4584+
See the pkg-config man page for more details.
4585+
4586+
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
4587+
See \`config.log' for more details" "$LINENO" 5; }
4588+
else
4589+
Qt5Svg_CFLAGS=$pkg_cv_Qt5Svg_CFLAGS
4590+
Qt5Svg_LIBS=$pkg_cv_Qt5Svg_LIBS
4591+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4592+
$as_echo "yes" >&6; }
4593+
4594+
fi
4595+
44954596
fi
44964597
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether QtDBus should be enabled" >&5
44974598
$as_echo_n "checking whether QtDBus should be enabled... " >&6; }

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ FIND_QT5()
119119
AS_IF([test "x$QT_QMAKE" = "x"],
120120
[AC_MSG_ERROR([Could not find qmake])
121121
])
122+
AS_IF([test "x$enable_gui" = "xyes"],
123+
[PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
124+
])
122125
AC_MSG_CHECKING([whether QtDBus should be enabled])
123126
AS_CASE(["x$enable_qt_dbus"],
124127
["xyes"],

0 commit comments

Comments
 (0)