aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-07-05 20:14:34 +0100
committerJoão Valverde <j@v6e.pt>2016-07-06 12:42:25 +0000
commit0bc8cf2557d3bb99f552edccd8ba01c752797ab4 (patch)
treee2b0a196f3c8e89ccdf41b91e289e939ed1c3462
parent5758aa541dc0641879fa5fa475c9be7a16da0bdf (diff)
configure: Check for working lrelease
The qtchooser package in many (all?) distros installs executable symlinks to qtchooser that can mislead AC_PROG_PATH if the corresponding Qt linguist tools package is missing. Bug: 12570 Change-Id: I98795a3a7b8a05214c56a0c7b50829ea3b2976fa Reviewed-on: https://code.wireshark.org/review/16316 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--acinclude.m413
-rw-r--r--configure.ac2
2 files changed, 14 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 8881203f23..b9be1d29eb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1879,3 +1879,16 @@ AC_DEFUN([AC_WIRESHARK_QT_TOOL_CHECK],
fi
fi
])
+
+AC_DEFUN([AC_WIRESHARK_QT_TOOL_CHECK_LRELEASE],
+[
+ AC_WIRESHARK_QT_TOOL_CHECK(LRELEASE, lrelease, $2)
+ AC_MSG_CHECKING(whether lrelease -version works)
+ lrelease_version=`$LRELEASE -version 2>&AS_MESSAGE_LOG_FD`
+ AS_IF([test $? -ne 0],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$LRELEASE -version returned non-zero exit status])
+ ])
+ AC_MSG_RESULT([ok, $lrelease_version])
+])
diff --git a/configure.ac b/configure.ac
index c9b4d00152..caa29a32a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1302,7 +1302,7 @@ if test "x$enable_wireshark" = "xyes"; then
AC_SUBST(MOC)
AC_WIRESHARK_QT_TOOL_CHECK(RCC, rcc, "$qt_version")
AC_SUBST(RCC)
- AC_WIRESHARK_QT_TOOL_CHECK(LRELEASE, lrelease, "$qt_version")
+ AC_WIRESHARK_QT_TOOL_CHECK_LRELEASE("$qt_version")
AC_SUBST(LRELEASE)
#