/[svn]/qsampler/trunk/configure.ac
ViewVC logotype

Diff of /qsampler/trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3873 by capela, Thu Apr 15 13:28:01 2021 UTC revision 3874 by capela, Sat May 8 09:10:57 2021 UTC
# Line 246  if test "x$ac_qmake" = "xno"; then Line 246  if test "x$ac_qmake" = "xno"; then
246  fi  fi
247    
248  # Check for proper Qt install path.  # Check for proper Qt install path.
249  AC_CACHE_CHECK([for Qt install path], [ac_cv_qt_install_path], [  AC_CACHE_CHECK([for Qt install path (bin)], [ac_cv_qt_install_bins], [
250     ac_cv_qt_install_path=$($ac_qmake -query QT_INSTALL_BINS)     ac_cv_qt_install_bins=$($ac_qmake -query QT_INSTALL_BINS)
251  ])  ])
252  ac_qt_install_path=$ac_cv_qt_install_path  ac_qt_install_bins=$ac_cv_qt_install_bins
253  if test -d $ac_qt_install_path; then  if test -d $ac_qt_install_bins; then
254     ac_path="$ac_qt_install_path:$ac_path"     ac_path="$ac_qt_install_bins:$ac_path"
255    fi
256    
257    AC_CACHE_CHECK([for Qt install path (libexec)], [ac_cv_qt_install_libexecs], [
258       ac_cv_qt_install_libexecs=$($ac_qmake -query QT_INSTALL_LIBEXECS)
259    ])
260    ac_qt_install_libexecs=$ac_cv_qt_install_libexecs
261    if test -d $ac_qt_install_libexecs; then
262       ac_path="$ac_qt_install_libexecs:$ac_path"
263  fi  fi
264    
265  # Check it again, now with updated PATH, just in case...  # Check it again, now with updated PATH, just in case...
# Line 541  if test "x$ac_xunique" = "xyes"; then Line 549  if test "x$ac_xunique" = "xyes"; then
549     if test $ac_qt_version_major -lt 6; then     if test $ac_qt_version_major -lt 6; then
550        PKG_CHECK_MODULES([QT5NETWORK], [Qt5Network], [ac_xunique="yes"], [ac_xunique="no"])        PKG_CHECK_MODULES([QT5NETWORK], [Qt5Network], [ac_xunique="yes"], [ac_xunique="no"])
551     else     else
552        PKG_CHECK_MODULES([QT6NETWORK], [Qt6Network], [ac_xunique="yes"], [ac_xunique="no"])       #PKG_CHECK_MODULES([QT6NETWORK], [Qt6Network], [ac_xunique="yes"], [ac_xunique="no"])
553          AC_CHECK_LIB(Qt6Network, main, [ac_xunique="yes"], [ac_xunique="no"])
554     fi     fi
555  fi  fi
556  if test "x$ac_xunique" = "xyes"; then  if test "x$ac_xunique" = "xyes"; then
Legend:
Removed from v.3873  
changed lines
  Added in v.3874
  ViewVC Help
Powered by ViewVC