libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

qt4 in centos and p11 in suse11

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-30 13:56:02 +00:00
parent 50024f1c2f
commit 49b5bb11ae
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ax_check_qt.m4
View File

@@ -42,17 +42,19 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
HAVE_$1=1 HAVE_$1=1
AC_MSG_CHECKING([for $2]) AC_MSG_CHECKING([for $2])
AC_ARG_VAR([$1], [path to Qt tool $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=$2_location Qt5Core)}
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5}
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4}
if ! which "${$1%% *}" > /dev/null; then if ! which "${$1%% *}" > /dev/null; then
if which "$2-qt5" > /dev/null; then if which "$2-qt5" > /dev/null; then
$1=$2-qt5 $1=$2-qt5
elif which "$2" > /dev/null; then elif which "$2" > /dev/null; then
$1=$2 $1=$2
elif which "$2-qt4" > /dev/null; then
$1=$2
else else
HAVE_$1=0 HAVE_$1=0
$1="" $1=""

19
bootstrap.sh
View File

@@ -743,20 +743,25 @@ BuildRequires: pkgconfig, redhat-lsb$(
echo -n ", cppunit-devel"; echo -n ", cppunit-devel";
fi; fi;
if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
echo -n ", qtbase5-devel, qtbase5-devel-tools, qt5-qtwebkit-devel"; echo -n ", qt5-qtwebkit-devel";
fi) fi)
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl}
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
%else
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: qt-devel"; fi)
%endif
%else%if 0%{?suse_version} || 0%{?sles_version} %else%if 0%{?suse_version} || 0%{?sles_version}
BuildRequires: pkg-config, lsb-release$( BuildRequires: pkg-config, lsb-release$(
if testtag AX_USE_CPPUNIT; then if testtag AX_USE_CPPUNIT; then
echo -n ", libcppunit-devel"; 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) fi)
%endif%endif %if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi) %else
$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
%endif %endif
%endif%endif
%description %description
@README@ @README@

4
libpcscxx.spec.in
View File

@@ -6,7 +6,11 @@ License: LGPL
Group: Development/Libraries/C++ Group: Development/Libraries/C++
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRequires: gnupg, subversion, automake, autoconf, doxygen, graphviz BuildRequires: gnupg, subversion, automake, autoconf, doxygen, graphviz
%if 0%{?suse_version} < 1200 || 0%{?sles_version} < 1200
BuildRequires: libp11-devel
%else
BuildRequires: p11-kit-devel BuildRequires: p11-kit-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
BuildRequires: pkgconfig, redhat-lsb BuildRequires: pkgconfig, redhat-lsb