fix qt plugin path detection

master
Marc Wäckerlin 7 years ago
parent 0e09a8e773
commit e06740b948
  1. 21
      ax_check_qt.m4
  2. 21
      scripts/ax_check_qt.m4

@ -119,10 +119,25 @@ AC_DEFUN([AX_CHECK_QT], [
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core)
if test -d "${qt_host_bins}"; then qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core)
QT_PLUGIN_PATH=${qt_host_bins}/../plugins if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
QT_PLUGIN_PATH="${qt_libdir}/plugins"
elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
elif test -d "${QTDIR}/plugins; then
QT_PLUGIN_PATH="${QTDIR}/plugins"
elif test -d "${QTDIR}/share/qt5/plugins; then
QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
else else
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins AC_MSG_ERROR([QT_PLUGIN_PATH not found
- not in: ${qt_libdir}/plugins
- not in: ${qt_libdir}/qt5/plugins
- not in: ${qt_host_bins}/../plugins
- not in: ${QTDIR}/plugins
- not in: ${QTDIR}/share/qt5/plugins
])
fi fi
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
[$1]_CPPFLAGS="${[$1]5_CFLAGS}" [$1]_CPPFLAGS="${[$1]5_CFLAGS}"

@ -119,10 +119,25 @@ AC_DEFUN([AX_CHECK_QT], [
AC_DEFINE([HAVE_$1]) AC_DEFINE([HAVE_$1])
QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core) QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core) qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core)
if test -d "${qt_host_bins}"; then qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core)
QT_PLUGIN_PATH=${qt_host_bins}/../plugins if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
QT_PLUGIN_PATH="${qt_libdir}/plugins"
elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
elif test -d "${QTDIR}/plugins; then
QT_PLUGIN_PATH="${QTDIR}/plugins"
elif test -d "${QTDIR}/share/qt5/plugins; then
QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
else else
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins AC_MSG_ERROR([QT_PLUGIN_PATH not found
- not in: ${qt_libdir}/plugins
- not in: ${qt_libdir}/qt5/plugins
- not in: ${qt_host_bins}/../plugins
- not in: ${QTDIR}/plugins
- not in: ${QTDIR}/share/qt5/plugins
])
fi fi
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}" MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
[$1]_CPPFLAGS="${[$1]5_CFLAGS}" [$1]_CPPFLAGS="${[$1]5_CFLAGS}"

Loading…
Cancel
Save