libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fix build on mac, fix wrong AX_PKG_CHECK

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-05-18 09:21:38 +00:00
parent 9d574925b8
commit 51359325c1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2015-05-12 13:32 marc
* ax_check_qt.m4, ax_init_standard_project.m4, configure.ac:
QtNetwork depends on QT >= 5.2
2015-05-12 08:57 marc
* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
src/makefile.am: fixed build
2015-05-11 13:45 marc
* src/makefile.am: don't miss build of cert2text

6
ax_init_standard_project.m4
View File

@@ -68,7 +68,7 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice.
# $3 = filename of makefile.in
AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
sh_add_makefile_target_dep() {
sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
echo "${1}: ${2}" >> "${srcdir}/${3}"
fi
@@ -442,8 +442,6 @@ AC_DEFUN([AX_PKG_REQUIRE], [
if test ${$1_found} -eq 0; then
AC_MSG_ERROR([Required package $2 or $4 for feature $1 not installed])
fi
else
AC_MSG_ERROR([Required package $2 for feature $1 not installed])
fi
])
AC_SUBST(AM_CPPFLAGS)
@@ -457,6 +455,8 @@ AC_DEFUN([AX_PKG_REQUIRE], [
AC_MSG_ERROR([Required header $3 for feature $1 not found])
])
CPPFLAGS=${old_CPPFLAGS}
elif test ${$1_found} -eq 0; then
AC_MSG_ERROR([Required package $2 for feature $1 not installed])
fi
])