Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Feature #873419 » 0001-Replace-Qt-configure-flags-with-a-single-with-qmake-.patch

Zoltán Žarkov, 2020-05-14 10:02 PM

View differences:

m4/qt5.m4
[
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([Qt5 headers])
AC_ARG_WITH([qt5-includes],
AS_HELP_STRING([--with-qt5-includes], [path to Qt5 includes]),
[FC_QT5_COMPILETEST([$withval])],
[POTENTIAL_PATHS="/usr/include /usr/include/qt5 /usr/include/qt"
# search multiarch paths too (if the multiarch tuple can be found)
FC_MULTIARCH_TUPLE()
AS_IF(test "x$MULTIARCH_TUPLE" != "x",
POTENTIAL_PATHS="$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5")
dnl First test without any additional include paths to see if it works already
FC_QT5_COMPILETEST
for TEST_PATH in $POTENTIAL_PATHS
do
if test "x$qt5_headers" != "xyes" ; then
FC_QT5_COMPILETEST($TEST_PATH)
fi
done])
AC_ARG_WITH([qmake],
AS_HELP_STRING([--with-qmake], [path to qmake]),
[AC_MSG_CHECKING([Qt5 qmake])
if test -x "$withval" ; then
QMAKE=$withval
AC_MSG_RESULT([found])
else
QMAKE=no
AC_MSG_RESULT([not found])
fi],
[AC_PATH_PROG(QMAKE, qmake, no, [$PATH])])
if test "x$QMAKE" != "xno" ; then
AC_MSG_CHECKING([Qt5 headers])
qt5_install_headers=`$QMAKE -query QT_INSTALL_HEADERS`
FC_QT5_COMPILETEST([$qt5_install_headers])
fi
if test "x$qt5_headers" = "xyes" ; then
AC_MSG_RESULT([found])
AC_MSG_CHECKING([Qt5 libraries])
AC_ARG_WITH([qt5-libs],
AS_HELP_STRING([--with-qt5-libs], [path to Qt5 libraries]),
[FC_QT5_LINKTEST([$withval])],
[POTENTIAL_PATHS="/usr/lib/qt5 /usr/lib/qt"
# search multiarch paths too (if the multiarch tuple can be found)
FC_MULTIARCH_TUPLE()
AS_IF(test "x$MULTIARCH_TUPLE" != "x",
POTENTIAL_PATHS="$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5")
dnl First test without any additional library paths to see if it works already
FC_QT5_LINKTEST
for TEST_PATH in $POTENTIAL_PATHS
do
if test "x$qt5_libs" != "xyes" ; then
FC_QT5_LINKTEST($TEST_PATH)
fi
done])
qt5_install_libs=`$QMAKE -query QT_INSTALL_LIBS`
FC_QT5_LINKTEST([$qt5_install_libs])
fi
if test "x$qt5_libs" = "xyes" ; then
......
AC_DEFUN([FC_QT5_TRY_MOC],
[FC_QT5_IF_QT5_MOC([$1], [MOCCMD="$1"], [$2])])
dnl If a usable moc command is found do $1 else do $2
AC_DEFUN([FC_QT5_VALIDATE_MOC], [
AC_MSG_CHECKING([the Qt 5 moc command])
m4/qt6.m4
[
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([Qt5 headers])
AC_ARG_WITH([qt5-includes],
AS_HELP_STRING([--with-qt5-includes], [path to Qt5 includes]),
[FC_QT6_COMPILETEST([$withval])],
[POTENTIAL_PATHS="/usr/include /usr/include/qt5 /usr/include/qt"
# search multiarch paths too (if the multiarch tuple can be found)
FC_MULTIARCH_TUPLE()
AS_IF(test "x$MULTIARCH_TUPLE" != "x",
POTENTIAL_PATHS="$POTENTIAL_PATHS /usr/include/$MULTIARCH_TUPLE/qt5")
dnl First test without any additional include paths to see if it works already
FC_QT6_COMPILETEST
for TEST_PATH in $POTENTIAL_PATHS
do
if test "x$qt6_headers" != "xyes" ; then
FC_QT6_COMPILETEST($TEST_PATH)
fi
done])
AC_ARG_WITH([qmake],
AS_HELP_STRING([--with-qmake], [path to qmake]),
[AC_MSG_CHECKING([Qt6 qmake])
if test -x "$withval" ; then
QMAKE=$withval
AC_MSG_RESULT([found])
else
QMAKE=no
AC_MSG_RESULT([not found])
fi],
[AC_PATH_PROG(QMAKE, qmake, no, [$PATH])])
if test "x$QMAKE" != "xno" ; then
AC_MSG_CHECKING([Qt6 headers])
qt6_install_headers=`$QMAKE -query QT_INSTALL_HEADERS`
FC_QT6_COMPILETEST([$qt6_install_headers])
fi
if test "x$qt6_headers" = "xyes" ; then
AC_MSG_RESULT([found])
AC_MSG_CHECKING([Qt5 libraries])
AC_ARG_WITH([qt5-libs],
AS_HELP_STRING([--with-qt5-libs], [path to Qt5 libraries]),
[FC_QT6_LINKTEST([$withval])],
[POTENTIAL_PATHS="/usr/lib/qt5 /usr/lib/qt"
# search multiarch paths too (if the multiarch tuple can be found)
FC_MULTIARCH_TUPLE()
AS_IF(test "x$MULTIARCH_TUPLE" != "x",
POTENTIAL_PATHS="$POTENTIAL_PATHS /usr/lib/$MULTIARCH_TUPLE/qt5")
dnl First test without any additional library paths to see if it works already
FC_QT6_LINKTEST
for TEST_PATH in $POTENTIAL_PATHS
do
if test "x$qt6_libs" != "xyes" ; then
FC_QT6_LINKTEST($TEST_PATH)
fi
done])
AC_MSG_CHECKING([Qt6 libraries])
qt6_install_libs=`$QMAKE -query QT_INSTALL_LIBS`
FC_QT6_LINKTEST([$qt6_install_libs])
fi
if test "x$qt6_libs" = "xyes" ; then
    (1-1/1)