osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
João Valverde 2016-07-05 20:14:34 +01:00 committed by João Valverde
parent 5758aa541d
commit 0bc8cf2557
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
acinclude.m4
View File

@ -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])
])

2
configure.ac
View File

@ -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)
#