libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

fix «HAVE_QTNETWORK does not appear in AM_CONDITIONAL» when there is no qt

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-04 14:40:29 +00:00
parent 39069f37a2
commit 1495434f56
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1,6 +1,9 @@
# $Id$ # $Id$
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
# prevent HAVE_QTxxx does not appear in AM_CONDITIONAL
m4_include(m4/ax_check_qt.m4)
m4_define(x_package_name, libpcscxx) m4_define(x_package_name, libpcscxx)
m4_define(x_major, 3) m4_define(x_major, 3)
m4_define(x_minor, 1) m4_define(x_minor, 1)

2
m4/ax_check_qt.m4
View File

@@ -73,7 +73,7 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
AM_CPPFLAGS+=" ${$1_CFLAGS}" AM_CPPFLAGS+=" ${$1_CFLAGS}"
AM_CXXFLAGS+=" ${$1_CFLAGS}" AM_CXXFLAGS+=" ${$1_CFLAGS}"
LIBS+=" ${$1_LIBS}" LIBS+=" ${$1_LIBS}"
], [HAVE_$1=0]) ])
]) ])
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1) AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)