From cfb512d1a055596a0e68391b81506183fa0afdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=95=EC=B1=84?= Date: Mon, 8 Jul 2024 18:13:12 +0900 Subject: [PATCH] Fixed qt6 module path for ubuntu 22.04 --- configure.ac | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ec15fb1..247b18e 100644 --- a/configure.ac +++ b/configure.ac @@ -194,11 +194,25 @@ AS_IF([test "x$has_qt6" = "xyes"], [ fi fi + # Detect distribution + AC_MSG_CHECKING([distribution]) + DISTRIB_ID=$(lsb_release -is | tr '[:upper:]' '[:lower:]') + DISTRIB_RELEASE=$(lsb_release -rs | tr '[:upper:]' '[:lower:]') + AC_MSG_RESULT([$DISTRIB_ID $DISTRIB_RELEASE]) + QT6_LIB_DIR=`pkg-config --variable=libdir Qt6Core` case `pkg-config --variable=includedir Qt6Core` in */qt6) - QT6_IM_MODULE_DIR=$QT6_LIB_DIR/qt6/plugins/platforminputcontexts + if test "x$DISTRIB_ID$DISTRIB_RELEASE" = "xUbuntu22.04"; then + AC_MSG_NOTICE("Found Ubuntu 22.04") + QT6_IM_MODULE_DIR=/usr/lib/x86_64-linux-gnu/qt6/plugins/platforminputcontexts + elif test "x$DISTRIB_ID$DISTRIB_RELEASE" = "xHamonikr7.0"; then + AC_MSG_NOTICE("Found HamoniKR 7.0") + QT6_IM_MODULE_DIR=/usr/lib/x86_64-linux-gnu/qt6/plugins/platforminputcontexts + else + QT6_IM_MODULE_DIR=$QT6_LIB_DIR/qt6/plugins/platforminputcontexts + fi ;; */qt) QT6_IM_MODULE_DIR=$QT6_LIB_DIR/qt/plugins/platforminputcontexts