diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 9 insertions, 19 deletions
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) |