diff --git a/ax_check_qt.m4 b/ax_check_qt.m4 index 39da720..3a067ef 100644 --- a/ax_check_qt.m4 +++ b/ax_check_qt.m4 @@ -42,12 +42,16 @@ AC_DEFUN([AX_CXX_QT_TOOL], [ HAVE_$1=1 AC_MSG_CHECKING([for $2]) AC_ARG_VAR([$1], [path to Qt tool $2]) + $1=${$1:-$(${PKG_CONFIG} --variable=$2-qt5_location Qt5Core)} + $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2} if ! which "${$1%% *}" > /dev/null; then - if which "$2" > /dev/null; then + if which "$2-qt5" > /dev/null; then + $1=$2 + elif which "$2" > /dev/null; then $1=$2 else HAVE_$1=0 diff --git a/bootstrap.sh b/bootstrap.sh index 68a5a27..84d2aec 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -735,15 +735,24 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: gnupg, subversion, automake, autoconf$( if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; - fi; - if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then - echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} -BuildRequires: pkgconfig, redhat-lsb$(if testtag AX_USE_CPPUNIT; then echo -n ", cppunit-devel"; fi) +BuildRequires: pkgconfig, redhat-lsb$( + if testtag AX_USE_CPPUNIT; then + echo -n ", cppunit-devel"; + fi; + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n ", qtbase5-devel, qtbase5-devel-tools, qt5-qtwebkit-devel"; + fi) %else%if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: pkg-config, lsb-release$(if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-devel"; fi) +BuildRequires: pkg-config, lsb-release$( + if testtag AX_USE_CPPUNIT; then + echo -n ", libcppunit-devel"; + fi; + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n ", libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; + fi) %endif%endif %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)