[vlc-commits] [Git][videolan/vlc][master] configure: favor qmake from contribs when using qt.conf from contribs

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
aeef0307 by Steve Lhomme at 2024-12-01T20:46:23+00:00
configure: favor qmake from contribs when using qt.conf from contribs

qmake doesn't provide the proper contrib QT_VERSION when using
a -qtconf. It provides the version it was compiled with (!).
So we use the one from contribs if possible.

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -4012,8 +4012,6 @@ have_qt65="no"
 have_fxc="no"
 AS_IF([test "${enable_qt}" != "no"], [
   have_qt="yes"
-  AC_PATH_PROGS(QMAKE6, [qmake6], qmake6, ["$PATH:${CONTRIB_DIR}/../bin"])
-
   AC_ARG_WITH([qtconf],
     AS_HELP_STRING([--with-qtconf=PATH], [location of Qt6 qt.conf file (auto)])
   )
@@ -4027,6 +4025,22 @@ AS_IF([test "${enable_qt}" != "no"], [
     ])
   ])
 
+  AC_PATH_PROGS(QMAKE6, [qmake6], qmake6)
+  AS_IF([test -z "${QMAKE6}"], [
+    have_qt="no"
+  ],[
+    AS_IF([test -n "${with_qtconf}"], [
+      QT_BIN_DIRECTORY="$(${QMAKE6} -qtconf ${with_qtconf} -query QT_HOST_BINS 2>/dev/null)"
+      AC_MSG_CHECKING([if qmake6 is found with qtconf])
+      AS_IF([test -n "${QT_BIN_DIRECTORY}" -a -x "${QT_BIN_DIRECTORY}/qmake6"], [
+        QMAKE6="${QT_BIN_DIRECTORY}/qmake6"
+        AC_MSG_RESULT([yes])
+      ],[
+        AC_MSG_RESULT([no])
+      ])
+    ])
+  ])
+
   QT_PATHS=${QMAKE6}
   AS_IF([test -n "${with_qtconf}"], [
     QT_PATHS="${QMAKE6} -qtconf ${with_qtconf}"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/aeef0307f398e69e12bbb57231b2295aa893d626

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/aeef0307f398e69e12bbb57231b2295aa893d626
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance