Merge pull request #3206 from matt335672/ubuntu_2404_ci

Make xrdp compatible with github runner ubuntu-24.04
2024-08-15 12:14:42 +01:00 · 2024-08-15 12:14:42 +01:00 · 9f59c6aafc
commit 9f59c6aafc
parent abbc1076bc 2aeec83bab
4 changed files with 3 additions and 4 deletions
--- a/configure.ac
+++ b/configure.ac
@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CXX
-AC_C_CONST
 LT_INIT

 PKG_PROG_PKG_CONFIG
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 81f8237dec6de1669b231aa847e221931c4d176f
+Subproject commit 379b8fbf40f309829364bf3414d721f9ba77766d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 429c1126e04444511712d594e357ed4ed6f4ab5d
+Subproject commit 26e40b29d05877e926f977c4b40b2a44bbb07216
--- a/scripts/install_cppcheck_dependencies_with_apt.sh
+++ b/scripts/install_cppcheck_dependencies_with_apt.sh
@ -2,7 +2,7 @@
 set -eufx

 # these are the packages necessary to run ./configure so config_ac.h is generated
-PACKAGES="libpam0g-dev libxfixes-dev libxrandr-dev nasm"
+PACKAGES="libpam0g-dev libxfixes-dev libxrandr-dev libxkbfile-dev nasm"

 usage()
 {