libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

need variables; refs #41

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-09-19 09:04:03 +00:00
parent 1afcd433e2
commit fd931786fd
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ax_check_qt.m4
View File

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

3
configure.in
View File

@@ -117,6 +117,9 @@ case $host in
esac esac
AX_CXX_CHECK_QT([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5Network]) AX_CXX_CHECK_QT([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5Network])
AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete]) 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, AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic], [AS_HELP_STRING([--enable-pedantic],