diff -up usbguard-1.1.4/configure.ac.orig usbguard-1.1.4/configure.ac --- usbguard-1.1.4/configure.ac.orig 2025-11-04 09:27:33.016736712 +0100 +++ usbguard-1.1.4/configure.ac 2025-11-04 09:27:54.843249396 +0100 @@ -400,16 +400,13 @@ if test "x$enable_catch" = xyes; then catch_summary="bundled; $catch_CFLAGS $catch_LIBS" else SAVE_CPPFLAGS=$CPPFLAGS - CPPFLAGS="-std=c++17 $CPPFLAGS -I/usr/include/catch2" + CPPFLAGS="-std=c++17 $CPPFLAGS -I/usr/include/catch" AC_LANG_PUSH([C++]) - AC_CHECK_HEADER([catch_test_macros.hpp], - [catch_CFLAGS="-I/usr/include/catch2 -DHAVE_CATCH2_V3" - catch_LIBS="-lCatch2Main -lCatch2"], - [AC_CHECK_HEADER([catch.hpp], - [catch_CFLAGS="-I/usr/include/catch2" + AC_CHECK_HEADER([catch.hpp], + [catch_CFLAGS="-I/usr/include/catch" catch_LIBS=""], - [AC_MSG_FAILURE(Catch2 not found or not usable. Re-run with --with-bundled-catch to use the bundled library.)] - )]) + [AC_MSG_FAILURE(Catch not found or not usable. Re-run with --with-bundled-catch to use the bundled library.)] + ) AC_LANG_POP CPPFLAGS=$SAVE_CPPFLAGS catch_summary="system-wide; $catch_CFLAGS $catch_LIBS" @@ -417,7 +414,7 @@ if test "x$enable_catch" = xyes; then else catch_CFLAGS="" catch_LIBS="" - catch_summary="disabled; not checking for Catch2" + catch_summary="disabled; not checking for Catch" fi AC_SUBST([catch_CFLAGS]) AC_SUBST([catch_LIBS])