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

master
Marc Wäckerlin 10 years ago
parent 39069f37a2
commit 1495434f56
  1. 3
      configure.ac
  2. 2
      m4/ax_check_qt.m4

@ -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)

@ -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)

Loading…
Cancel
Save