Use pkg-config to discover Qt (pkg-config is already a requirement anyway). * build-aux/common.mk (do_subst_config_vals): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * configure.ac: Likewise and use pkg-config to discover the new variables. * libgui/Makefile.am (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): Delete variable definitions. * libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS): Use automake @QT_LIBS@. (LIBOCTGUI_LIK_OPTS): Use automake @QT_LDFLAGS@. * libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. (MOC_CPPFLAGS): Define Q_OS_WIN32 instead of WIN32. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. * libinterp/interpfcn/toplev.cc (Foctave_config_info): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * libinterp/oct-conf.in.h: Replace OCTAVE_CONF_QT_INCDIR and OCTAVE_CONF_QT_LIBDIR with OCTAVE_CONF_QT_CPPFLAGS, OCTAVE_CONF_QT_LDFLAGS and OCTAVE_CONF_QT_LIBS. * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_FINDFIRST_MODERN, OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT): Use QT_CPPFLAGS instead of QT_INCDIR.

include $(top_srcdir)/libinterp/link-deps.mk

if AMCOND_ENABLE_DYNAMIC_LINKING
  LIBOCTGUI_LINK_DEPS =
else
  LIBOCTGUI_LINK_DEPS = $(DLDFCN_LIBS)
endif

LIBOCTGUI_LINK_DEPS += \
  @QT_LIBS@

LIBOCTGUI_LINK_OPTS = \
  @QT_LDFLAGS@

if AMCOND_LINK_ALL_DEPS
  LIBOCTGUI_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS)
  LIBOCTGUI_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS)

  OCTAVE_GUI_LINK_DEPS = $(LIBOCTGUI_LINK_DEPS)
  OCTAVE_GUI_LINK_OPTS = $(LIBOCTGUI_LINK_OPTS)
endif