|
|
|
@ -90,13 +90,13 @@ AC_DEFUN([AX_CHECK_QT], [ |
|
|
|
|
HAVE_$1=1 |
|
|
|
|
AC_DEFINE([HAVE_$1]) |
|
|
|
|
AM_CPPFLAGS+=" ${[$1]5_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" ${[$1]5_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" |
|
|
|
|
AM_CXXFLAGS+=" ${[$1]5_CFLAGS}" |
|
|
|
|
LIBS+=" ${[$1]5_LIBS}" |
|
|
|
|
if test -n "${qt_modules_optional}"; then |
|
|
|
|
PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [ |
|
|
|
|
AM_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_OPTIONAL_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" |
|
|
|
|
AM_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}" |
|
|
|
|
LIBS+=" ${[$1]5_OPTIONAL_LIBS}" |
|
|
|
|
], [ |
|
|
|
@ -108,13 +108,13 @@ AC_DEFUN([AX_CHECK_QT], [ |
|
|
|
|
HAVE_$1=1 |
|
|
|
|
AC_DEFINE([HAVE_$1]) |
|
|
|
|
AM_CPPFLAGS+=" ${$1_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" ${$1_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}" |
|
|
|
|
AM_CXXFLAGS+=" ${$1_CFLAGS}" |
|
|
|
|
LIBS+=" ${$1_LIBS}" |
|
|
|
|
if test -n "$3"; then |
|
|
|
|
PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [ |
|
|
|
|
AM_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_OPTIONAL_CFLAGS}" |
|
|
|
|
MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}" |
|
|
|
|
AM_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}" |
|
|
|
|
LIBS+=" ${$1_OPTIONAL_LIBS}" |
|
|
|
|
], [ |
|
|
|
|