[vlc-commits] [Git][videolan/vlc][master] configure: look for the native qmake6 in contribs too

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
68e41fdb by Steve Lhomme at 2024-12-05T08:41:05+00:00
configure: look for the native qmake6 in contribs too

There might not be a qmake in the PATH but the contribs might be there.

Partial revert of aeef0307f398e69e12bbb57231b2295aa893d626.

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -4012,6 +4012,9 @@ have_qt65="no"
 have_fxc="no"
 AS_IF([test "${enable_qt}" != "no"], [
   have_qt="yes"
+  dnl use any qmake that is available, including from contrib tools
+  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)])
   )
@@ -4025,7 +4028,6 @@ AS_IF([test "${enable_qt}" != "no"], [
     ])
   ])
 
-  AC_PATH_PROGS(QMAKE6, [qmake6], qmake6)
   AS_IF([test -z "${QMAKE6}"], [
     have_qt="no"
   ],[



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

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


VideoLAN code repository instance