From c666035bc6a51e4dd76daebefffaf8bbc951977c Mon Sep 17 00:00:00 2001
From: vimene <vincent.menegaux@gmail.com>
Date: Wed, 10 Dec 2025 17:16:12 +0100
Subject: improved autotools usage

---
 configure.ac | 52 +++++-----------------------------------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ebdbcad..d26e69b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,54 +5,12 @@ AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile])
 
-DEPS_CPPFLAGS=""
-DEPS_LIBS=""
-
-PKG_CHECK_MODULES([GLFW3], [glfw3 >= 3.3.10])
-DEPS_CPPFLAGS="$GLFW3_CFLAGS $DEPS_CPPFLAGS"
-DEPS_LIBS="$GLFW3_LIBS $DEPS_LIBS"
-
-PKG_CHECK_MODULES([VULKAN], [vulkan >= 1.3.275])
-DEPS_CPPFLAGS="$VULKAN_CFLAGS $DEPS_CPPFLAGS"
-# Not sure why they are needed
-DEPS_LIBS="-ldl -lpthread -lX11 -lXxf86vm -lXrandr -lXi $DEPS_LIBS"
-DEPS_LIBS="$VULKAN_LIBS $DEPS_LIBS"
-
-// TODO: add check for Vulkan Utility Library
-
-PKG_CHECK_MODULES([NCURSES], [ncurses >= 6.4.20230625], [
-    DEPS_CPPFLAGS="$NCURSES_CFLAGS $DEPS_CPPFLAGS"
-    DEPS_LIBS="$NCURSES_LIBS $DEPS_LIBS"
-    AC_DEFINE([ENABLE_NCURSES], [], [Enable ncurses])
-], :)
-
-AC_SUBST(DEPS_CPPFLAGS)
-AC_SUBST(DEPS_LIBS)
-
-TESTS_DEPS_CPPFLAGS=""
-TESTS_DEPS_LIBS=""
-
-PKG_CHECK_MODULES([CRITERION], [criterion >= 2.4.1], [
-    enable_tests=yes
-    TESTS_DEPS_CPPFLAGS="$CRITERION_CFLAGS $TESTS_DEPS_CPPFLAGS"
-    TESTS_DEPS_LIBS="$CRITERION_LIBS $TESTS_DEPS_LIBS"
-    AC_CONFIG_FILES([tests/Makefile])
-], [enable_tests=no])
-AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes])
-
-AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [enable debugging, default: no]),
-    [case "${enableval}" in
-        yes) debug=true  ;;
-        no)  debug=false ;;
-        *)   AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-    esac],
-    [debug=false])
-AM_CONDITIONAL([DEBUG], test x"$debug" = x"true")
-
-AC_SUBST(TESTS_DEPS_CPPFLAGS)
-AC_SUBST(TESTS_DEPS_LIBS)
+dnl TODO: add check for Vulkan Utility Library
+PKG_CHECK_MODULES(           [GLFW3],   [glfw3  >= 3.3.10])
+PKG_CHECK_MODULES(           [VULKAN],  [vulkan >= 1.3.275])
+PKG_HAVE_DEFINE_WITH_MODULES([NCURSES], [ncurses >= 6.4.20230625])
 
 AC_PROG_CXX
 AC_TYPE_UINT32_T
-- 
cgit v1.2.3