--- qsampler/trunk/configure.ac 2019/07/25 10:08:43 3523 +++ qsampler/trunk/configure.ac 2019/10/17 14:09:09 3633 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Qsampler, 0.5.7, rncbc@rncbc.org, qsampler) +AC_INIT(Qsampler, 0.6.0, rncbc@rncbc.org, qsampler) AC_CONFIG_SRCDIR(src/qsampler.cpp) AC_CONFIG_HEADERS(src/config.h) @@ -276,17 +276,28 @@ fi AC_SUBST(ac_uic) + # Check for Qt lupdate utility. AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path) if test "x$ac_lupdate" = "xno"; then - AC_MSG_ERROR([lupdate $ac_errmsg]) + AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path) + if test "x$ac_cv_lupdate" = "xno"; then + AC_MSG_ERROR([lupdate $ac_errmsg (qt5-linguist)]) + else + ac_lupdate=$ac_cv_lupdate; + fi fi AC_SUBST(ac_lupdate) # Check for Qt lrelease utility. AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path) -if test "x$ac_release" = "xno"; then - AC_MSG_ERROR([lrelease $ac_errmsg]) +if test "x$ac_lrelease" = "xno"; then + AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path) + if test "x$ac_cv_lrelease" = "xno"; then + AC_MSG_ERROR([lrelease $ac_errmsg (qt5-linguist)]) + else + ac_lrelease=$ac_cv_lrelease; + fi fi AC_SUBST(ac_lrelease)