From 069a44e35e6e9f3a9835fed3ea71a325583df2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 19 Oct 2015 13:03:02 +0000 Subject: [PATCH] fixed automatic qt-plugins prefix patch --- ax_check_qt.m4 | 4 +++- src/languages.qrc | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 src/languages.qrc diff --git a/ax_check_qt.m4 b/ax_check_qt.m4 index 8f1860d..af3a238 100644 --- a/ax_check_qt.m4 +++ b/ax_check_qt.m4 @@ -198,7 +198,8 @@ AC_DEFUN([AX_CHECK_QT], [ if test -n "${MINGW}"; then AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag]) fi - if test "$prefix" != '/usr' -a "${QT_PLUGIN_PATH}" != "${QT_PLUGIN_PATH#/usr}"; then + test "x$prefix" = xNONE && prefix=$ac_default_prefix + if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr} fi AC_ARG_WITH([qt-plugin-path], @@ -206,6 +207,7 @@ AC_DEFUN([AX_CHECK_QT], [ [define a different qt plugin path, current @<:@default=check@:>@])], [QT_PLUGIN_PATH=$with_qt_plugin_path], []) + AC_MSG_NOTICE([Qt Plugins are installed to ${QT_PLUGIN_PATH}]) AC_SUBST(QTDIR) AC_SUBST(QT_PLUGIN_PATH) AC_SUBST(CPPFLAGS) diff --git a/src/languages.qrc b/src/languages.qrc deleted file mode 100644 index f32ce14..0000000 --- a/src/languages.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - swisssurfer_de.qm - swisssurfer_fr.qm - swisssurfer_it.qm - swisssurfer_en.qm - -