libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

better check for header

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-27 08:35:46 +00:00
parent 2779b16ad0
commit 8dc609f5ca
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2015-07-27 06:33 marc
* configure.ac: remove test output
2015-07-22 10:09 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh, libpcscxx:
buildsystem updated
2015-07-22 10:04 marc 2015-07-22 10:04 marc
* ax_init_standard_project.m4, configure.ac: mingw/windows-build * ax_init_standard_project.m4, configure.ac: mingw/windows-build

12
ax_check_qt.m4
View File

@@ -42,10 +42,10 @@ 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:-$(${ac_tool_prefix}pkg-config --variable=$2_location Qt5Core)} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins Qt5Core)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=$2_location QtCore)} $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
$1=${$1:-$(${ac_tool_prefix}pkg-config --variable=host_bins QtCore)/$2} $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
if ! which "${$1%% *}" > /dev/null; then if ! which "${$1%% *}" > /dev/null; then
if which "$2" > /dev/null; then if which "$2" > /dev/null; then
$1=$2 $1=$2
@@ -100,7 +100,7 @@ AC_DEFUN([AX_CHECK_QT], [
PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [ PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [
HAVE_$1=1 HAVE_$1=1
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix Qt5Core) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
CPPFLAGS+=" ${[$1]5_CFLAGS}" CPPFLAGS+=" ${[$1]5_CFLAGS}"
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
@@ -122,7 +122,7 @@ AC_DEFUN([AX_CHECK_QT], [
PKG_CHECK_MODULES([$1], [${qt_modules}], [ PKG_CHECK_MODULES([$1], [${qt_modules}], [
HAVE_$1=1 HAVE_$1=1
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${ac_tool_prefix}pkg-config --variable=prefix QtCore) QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
CPPFLAGS+=" ${$1_CFLAGS}" CPPFLAGS+=" ${$1_CFLAGS}"
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"

10
ax_init_standard_project.m4
View File

@@ -415,8 +415,12 @@ AC_DEFUN([AX_PKG_REQUIRE], [
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(CXXFLAGS) AC_SUBST(CXXFLAGS)
AC_SUBST(PKG_REQUIREMENTS) AC_SUBST(PKG_REQUIREMENTS)
if test -n "$3" -a "${$1_found}" != "no"; then if test -n "$3"; then
tmp_package=${$1_found} if test "${$1_found}" = "no"; then
tmp_package="yes"
else
tmp_package=${$1_found}
fi
$1_found=no $1_found=no
old_CPPFLAGS=${CPPFLAGS} old_CPPFLAGS=${CPPFLAGS}
CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}" CPPFLAGS=" ${$1_CFLAGS} ${CPPFLAGS}"
@@ -438,7 +442,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
fi fi
done done
if test "${$1_found}" = "no"; then if test "${$1_found}" = "no"; then
tmp_includedir=$(${ac_tool_prefix}pkg-config --variable=includedir $tmp_package) tmp_includedir=$(${PKG_CONFIG} --variable=includedir $tmp_package)
for x in ${tmp_includedir}; do for x in ${tmp_includedir}; do
AC_MSG_NOTICE([search for $3 in $x]) AC_MSG_NOTICE([search for $3 in $x])
for f in $(find ${x} -name "$3"); do for f in $(find ${x} -name "$3"); do

2
bootstrap.sh
View File

@@ -720,7 +720,7 @@ ${HEADER}%:
EOF EOF
echo 7 | to debian/compat echo 7 | to debian/compat
fi fi
to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME} <<EOF to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
Summary: @DESCRIPTION@ Summary: @DESCRIPTION@
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Version: @VERSION@ Version: @VERSION@