|
Line
Link Here
|
| 0 |
-- a/configure.ac |
0 |
++ b/configure.ac |
|
Lines 528-535
fi
Link Here
|
| 528 |
dnl |
529 |
dnl |
| 529 |
dnl Check for KF5WaylandClient library |
530 |
dnl Check for KF5WaylandClient library |
| 530 |
dnl |
531 |
dnl |
|
|
532 |
|
| 533 |
AC_ARG_ENABLE(kf5-wayland, |
| 534 |
AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]), |
| 535 |
[want_kf5_wayland=$enableval], [want_kf5_wayland=maybe]) |
| 536 |
|
| 531 |
have_kf5waylandclient=no |
537 |
have_kf5waylandclient=no |
| 532 |
if test "$have_w32_system" != "yes"; then |
538 |
AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [ |
| 533 |
PKG_CHECK_MODULES( |
539 |
PKG_CHECK_MODULES( |
| 534 |
KF5WAYLANDCLIENT, |
540 |
KF5WAYLANDCLIENT, |
| 535 |
[KF5WaylandClient >= 5.60], |
541 |
[KF5WaylandClient >= 5.60], |
|
Lines 539-545
if test "$have_w32_system" != "yes"; then
Link Here
|
| 539 |
have_kf5waylandclient=no |
545 |
have_kf5waylandclient=no |
| 540 |
] |
546 |
] |
| 541 |
) |
547 |
) |
| 542 |
fi |
548 |
]) |
| 543 |
|
549 |
|
| 544 |
dnl |
550 |
dnl |
| 545 |
dnl Check for Qt5 pinentry program. |
551 |
dnl Check for Qt5 pinentry program. |
| 546 |
-- a/m4/qt.m4 |
552 |
++ b/m4/qt.m4 |
|
Lines 33-38
AC_DEFUN([FIND_QT],
Link Here
|
| 33 |
enable_pinentry_qt5=$enableval, |
33 |
enable_pinentry_qt5=$enableval, |
| 34 |
enable_pinentry_qt5="try") |
34 |
enable_pinentry_qt5="try") |
| 35 |
|
35 |
|
|
|
36 |
AC_ARG_ENABLE(qtx11extras, |
| 37 |
AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]), |
| 38 |
[want_qtx11extras=$enableval], [want_qtx11extras=maybe]) |
| 39 |
|
| 36 |
have_qt5_libs="no"; |
40 |
have_qt5_libs="no"; |
| 37 |
require_qt_cpp11="no"; |
41 |
require_qt_cpp11="no"; |
| 38 |
|
42 |
|
|
Lines 63-82
AC_DEFUN([FIND_QT],
Link Here
|
| 63 |
fi |
67 |
fi |
| 64 |
fi |
68 |
fi |
| 65 |
|
69 |
|
| 66 |
if test "$have_x11" = "yes"; then |
70 |
have_qt5_x11extras=no |
|
|
71 |
AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [ |
| 67 |
PKG_CHECK_MODULES( |
72 |
PKG_CHECK_MODULES( |
| 68 |
PINENTRY_QT_X11_EXTRAS, |
73 |
PINENTRY_QT_X11_EXTRAS, |
| 69 |
Qt5X11Extras >= 5.1.0, |
74 |
Qt5X11Extras >= 5.1.0, |
| 70 |
[have_qt5_x11extras="yes"], |
75 |
[have_qt5_x11extras="yes"], |
| 71 |
[ |
76 |
[have_qt5_x11extras="no"] |
| 72 |
AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) |
77 |
) |
| 73 |
have_qt5_x11extras="no" |
78 |
]) |
| 74 |
]) |
79 |
|
| 75 |
if test "$have_qt5_x11extras" = "yes"; then |
80 |
AS_IF([test "$have_qt5_x11extras" = "yes"], [ |
| 76 |
PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS" |
81 |
PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS" |
| 77 |
PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS" |
82 |
PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS" |
| 78 |
fi |
83 |
], [ |
| 79 |
fi |
84 |
AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) |
|
|
85 |
]) |
| 80 |
|
86 |
|
| 81 |
AC_CHECK_TOOL(MOC, moc) |
87 |
AC_CHECK_TOOL(MOC, moc) |
| 82 |
AC_MSG_CHECKING([moc version]) |
88 |
AC_MSG_CHECKING([moc version]) |
