need variables; refs #41

master
Marc Wäckerlin 10 years ago
parent 1afcd433e2
commit fd931786fd
  1. 6
      ax_check_qt.m4
  2. 3
      configure.in

@ -62,10 +62,16 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
PKG_CHECK_MODULES([$1], [${qt_modules//Qt/Qt5}], [
HAVE_$1=1
AC_DEFINE([HAVE_$1])
CPPFLAGS+=" ${$1_CFLAGS}"
CXXFLAGS+=" ${$1_CFLAGS}"
LIBS+=" ${$1_LIBS}"
], [
PKG_CHECK_MODULES([$1], [${qt_modules}], [
HAVE_$1=1
AC_DEFINE([HAVE_$1])
CPPFLAGS+=" ${$1_CFLAGS}"
CXXFLAGS+=" ${$1_CFLAGS}"
LIBS+=" ${$1_LIBS}"
])
])
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)

@ -117,6 +117,9 @@ case $host in
esac
AX_CXX_CHECK_QT([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5Network])
AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
if test $HAVE_$1 -eq 1; then
CPPFLAGS+=" -DQT_NETWORK_LIB"
fi
AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic],

Loading…
Cancel
Save