libraries
/
libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fixed qt detection

Browse Source
master
Marc Wäckerlin 9 years ago
parent 0a1c2e312b
commit 4ff73dce28
4 changed files with 14 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ax_check_qt.m4
  2. 2
      ax_init_standard_project.m4
  3. 8
      bootstrap.sh
  4. 3
      libpcscxx.spec.in

10
ax_check_qt.m4
Unescape View File

@ -1,16 +1,16 @@
# SYNOPSIS # SYNOPSIS
# #
# Check if a module exists: # 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: # 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 # DESCRIPTIONS
# #
# qt_prefix # 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, # value (with a few exceptions discussed later on). This value,
# usually provided in uppercase, is used as prefix to the # usually provided in uppercase, is used as prefix to the
# variables holding the compiler flags and libraries reported by # variables holding the compiler flags and libraries reported by
@ -179,13 +179,13 @@ qrc_%.cxx: %.qrc
# SYNOPSIS # 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 # DESCRIPTIONS
# #
# qt_prefix # 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, # value (with a few exceptions discussed later on). This value,
# usually provided in uppercase, is used as prefix to the # usually provided in uppercase, is used as prefix to the
# variables holding the compiler flags and libraries reported by # variables holding the compiler flags and libraries reported by

2
ax_init_standard_project.m4
Unescape View File

@ -85,7 +85,7 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
# $1 = variable name # $1 = variable name
AC_DEFUN([AX_SUBST], [ AC_DEFUN([AX_SUBST], [
AC_SUBST([$1]) 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//\'/\'\"\'\"\'} tmp_var=${tmp_var//\'/\'\"\'\"\'}
tmp_var=${tmp_var//#/\\#} tmp_var=${tmp_var//#/\\#}

8
bootstrap.sh
Unescape View File

@ -732,7 +732,13 @@ else
echo Applications/...; echo Applications/...;
fi) fi)
Source0: %{name}-%{version}.tar.gz 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 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$(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)

3
libpcscxx.spec.in
Unescape View File

@ -5,7 +5,7 @@ Release: @BUILD_NUMBER@%{?dist}
License: LGPL 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, qtbase5-devel | libqt4-devel, qtbase5-devel-tools | qt4-devel-tools
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
@ -39,7 +39,6 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/bin
/usr/%_lib/@PACKAGE_NAME@.so.* /usr/%_lib/@PACKAGE_NAME@.so.*
%doc %doc
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS

Write Preview
Loading…
Cancel
Save