/[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 3824 by capela, Sat Sep 26 18:49:03 2020 UTC revision 3833 by capela, Thu Oct 22 16:51:16 2020 UTC
# Line 210  if test "x$ac_qmake" = "xno"; then Line 210  if test "x$ac_qmake" = "xno"; then
210     AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)     AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
211     ac_qmake=$ac_cv_qmake     ac_qmake=$ac_cv_qmake
212  fi  fi
213    if test "x$ac_qmake" = "xno"; then
214       AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)
215       ac_qmake=$ac_cv_qmake
216    fi
217    
218  # Check for proper Qt major version.  # Check for proper Qt major version.
219  AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [  AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
# Line 217  AC_CACHE_CHECK([for Qt major version], [ Line 221  AC_CACHE_CHECK([for Qt major version], [
221     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))     ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
222  ])  ])
223  ac_qt_version_major=$ac_cv_qt_version_major  ac_qt_version_major=$ac_cv_qt_version_major
 if test $ac_qt_version_major -lt 5; then  
         AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)  
         ac_qmake=$ac_cv_qmake  
 fi  
   
224  if test "x$ac_qmake" = "xno"; then  if test "x$ac_qmake" = "xno"; then
225     AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])     if test $ac_qt_version_major -lt 6; then
226          AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
227       else
228          AC_MSG_ERROR([qmake-qt6 $ac_errmsg (qt6-devel)])
229       fi
230  fi  fi
231    
232  # Check for proper Qt install path.  # Check for proper Qt install path.
# Line 294  AC_SUBST(ac_uic) Line 297  AC_SUBST(ac_uic)
297  # Check for Qt lupdate utility.  # Check for Qt lupdate utility.
298  AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)  AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
299  if test "x$ac_lupdate" = "xno"; then  if test "x$ac_lupdate" = "xno"; then
300     AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path)     if test $ac_qt_version_major -lt 6; then
301          AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path)
302       else
303          AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt6, [no], $ac_path)
304       fi
305     if test "x$ac_cv_lupdate" = "xno"; then     if test "x$ac_cv_lupdate" = "xno"; then
306        AC_MSG_ERROR([lupdate $ac_errmsg (qt5-linguist)])        if test $ac_qt_version_major -lt 6; then
307             AC_MSG_ERROR([lupdate $ac_errmsg (qt5-linguist)])
308          else
309             AC_MSG_ERROR([lupdate $ac_errmsg (qt6-linguist)])
310          fi
311     else     else
312        ac_lupdate=$ac_cv_lupdate;        ac_lupdate=$ac_cv_lupdate;
313     fi     fi
# Line 306  AC_SUBST(ac_lupdate) Line 317  AC_SUBST(ac_lupdate)
317  # Check for Qt lrelease utility.  # Check for Qt lrelease utility.
318  AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)  AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
319  if test "x$ac_lrelease" = "xno"; then  if test "x$ac_lrelease" = "xno"; then
320     AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path)     if test $ac_qt_version_major -lt 6; then
321          AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path)
322       else
323          AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt6, [no], $ac_path)
324       fi
325     if test "x$ac_cv_lrelease" = "xno"; then     if test "x$ac_cv_lrelease" = "xno"; then
326        AC_MSG_ERROR([lrelease $ac_errmsg (qt5-linguist)])        if test $ac_qt_version_major -lt 6; then
327             AC_MSG_ERROR([lrelease $ac_errmsg (qt5-linguist)])
328          else
329             AC_MSG_ERROR([lrelease $ac_errmsg (qt6-linguist)])
330          fi
331     else     else
332        ac_lrelease=$ac_cv_lrelease;        ac_lrelease=$ac_cv_lrelease;
333     fi     fi
# Line 503  fi Line 522  fi
522    
523  # Check for unique/single instance support.  # Check for unique/single instance support.
524  if test "x$ac_xunique" = "xyes"; then  if test "x$ac_xunique" = "xyes"; then
525     PKG_CHECK_MODULES([QT5NETWORK], [Qt5Network], [ac_qt5network="yes"], [ac_qt5network="no"])     if test $ac_qt_version_major -lt 6; then
526     if test "x$ac_qt5network" = "xyes"; then        PKG_CHECK_MODULES([QT5NETWORK], [Qt5Network], [ac_xunique="yes"], [ac_xunique="no"])
527        AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if unique/single instance is enabled.])     else
528        ac_qnetwork="network"        PKG_CHECK_MODULES([QT6NETWORK], [Qt6Network], [ac_xunique="yes"], [ac_xunique="no"])
529     fi     fi
530  fi  fi
531    if test "x$ac_xunique" = "xyes"; then
532       AC_DEFINE(CONFIG_XUNIQUE, 1, [Define if unique/single instance is enabled.])
533       ac_qnetwork="network"
534    fi
535  AC_SUBST(ac_qnetwork)  AC_SUBST(ac_qnetwork)
536    
537  # Check for debugging stack-trace.  # Check for debugging stack-trace.
Legend:
Removed from v.3824  
changed lines
  Added in v.3833
  ViewVC Help
Powered by ViewVC