diff options
| author | vimene <vincent.menegaux@gmail.com> | 2023-11-28 09:05:11 +0100 |
|---|---|---|
| committer | vimene <vincent.menegaux@gmail.com> | 2023-11-28 09:05:11 +0100 |
| commit | 39b8d5d20f668e1248257feedc6c948d8cfad415 (patch) | |
| tree | 9e9b5b0c756386225a583d85faaebfa73c9c98b5 | |
| parent | f9bb9efb462d58db2e6f2fdea3236e3d824da841 (diff) | |
| download | engine-39b8d5d20f668e1248257feedc6c948d8cfad415.tar.gz | |
improved dependency management
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 28 |
2 files changed, 13 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 6a628f5..5926526 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ ACLOCAL_AMFLAGS = -Im4 --install +if ENABLE_TESTS TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh AM_TESTS_ENVIRONMENT = CRITERION_OUTPUTS='tap:-'; export CRITERION_OUTPUTS; +endif bin_PROGRAMS = engine engine_SOURCES = src/engine.cpp \ @@ -18,6 +20,7 @@ engine_CPPFLAGS = -Wall -Wextra $(DEPS_CPPFLAGS) engine_LDFLAGS = -Wall -Wextra engine_LDADD = $(DEPS_LIBS) +if ENABLE_TESTS check_PROGRAMS = engine-tests engine_tests_SOURCES = tests/test.c engine_tests_CPPFLAGS = -Wall -Wextra $(TESTS_DEPS_CPPFLAGS) @@ -25,5 +28,6 @@ engine_tests_LDFLAGS = -Wall -Wextra engine_tests_LDADD = $(TESTS_DEPS_LIBS) TESTS = engine-tests +endif EXTRA_DIST = m4/NOTES diff --git a/configure.ac b/configure.ac index 17923e3..78e1976 100644 --- a/configure.ac +++ b/configure.ac @@ -7,31 +7,18 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_FILES([Makefile]) -SDL_VERSION=2.0 -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], - sdl_prefix="$withval", sdl_prefix="") - DEPS_CPPFLAGS="" DEPS_LIBS="" -AS_IF([test "x$sdl_prefix" = x], [ - PKG_CHECK_MODULES([SDL], [sdl2 >= $SDL_VERSION]) - ], [ - sdl_config="$sdl_prefix/bin/sdl2-config" - SDL_CFLAGS=`"$sdl_config" --prefix="$sdl_prefix" --cflags` - SDL_LIBS=`"$sdl_config" --prefix="$sdl_prefix" --libs` - dnl TODO: check if sdl is present, check version - ]) +PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0]) DEPS_CPPFLAGS="$SDL_CFLAGS $DEPS_CPPFLAGS" DEPS_LIBS="$SDL_LIBS $DEPS_LIBS" -AC_CANONICAL_HOST -AS_IF([test "$host_os" != mingw32], [ - PKG_CHECK_MODULES([NCURSES], [ncurses]) +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) @@ -39,9 +26,12 @@ AC_SUBST(DEPS_LIBS) TESTS_DEPS_CPPFLAGS="" TESTS_DEPS_LIBS="" -PKG_CHECK_MODULES([CRITERION], [criterion >= 1.8.1]) -TESTS_DEPS_CPPFLAGS="$CRITERION_CFLAGS $TESTS_DEPS_CPPFLAGS" -TESTS_DEPS_LIBS="$CRITERION_LIBS $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" +], [enable_tests=no]) +AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes]) AC_SUBST(TESTS_DEPS_CPPFLAGS) AC_SUBST(TESTS_DEPS_LIBS) |