libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fixed qt detection

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-30 09:33:54 +00:00
parent 0a1c2e312b
commit 4ff73dce28
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ax_check_qt.m4
View File

@@ -1,16 +1,16 @@
# SYNOPSIS
#
# Check if a module exists:
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
#
# Abort if a module does not exist:
# AX_CXX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
# AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
#
# DESCRIPTIONS
#
# qt_prefix
#
# Each call to AX_CXX_CHECK_QT should have a different prefix
# Each call to AX_CHECK_QT should have a different prefix
# value (with a few exceptions discussed later on). This value,
# usually provided in uppercase, is used as prefix to the
# variables holding the compiler flags and libraries reported by
@@ -179,13 +179,13 @@ qrc_%.cxx: %.qrc
# SYNOPSIS
#
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
#
# DESCRIPTIONS
#
# qt_prefix
#
# Each call to AX_CXX_CHECK_QT should have a different prefix
# Each call to AX_CHECK_QT should have a different prefix
# value (with a few exceptions discussed later on). This value,
# usually provided in uppercase, is used as prefix to the
# variables holding the compiler flags and libraries reported by

2
ax_init_standard_project.m4
View File

@@ -85,7 +85,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
# $1 = variable name
AC_DEFUN([AX_SUBST], [
AC_SUBST([$1])
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n')
tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
tmp_var=${tmp_var//\"/\\\"}
tmp_var=${tmp_var//\'/\'\"\'\"\'}
tmp_var=${tmp_var//#/\\#}

8
bootstrap.sh
View File

@@ -732,7 +732,13 @@ else
echo Applications/...;
fi)
Source0: %{name}-%{version}.tar.gz
BuildRequires: gnupg, subversion, automake, autoconf $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools"; fi)
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)

3
libpcscxx.spec.in
View File

@@ -5,7 +5,7 @@ Release: @BUILD_NUMBER@%{?dist}
License: LGPL
Group: Development/Libraries/C++
Source0: %{name}-%{version}.tar.gz
BuildRequires: gnupg, subversion, automake, autoconf , doxygen, graphviz
BuildRequires: gnupg, subversion, automake, autoconf, doxygen, graphviz, qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools
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
@@ -39,7 +39,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
/usr/bin
/usr/%_lib/@PACKAGE_NAME@.so.*
%doc
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS