Skip to content

Commit

Permalink
remove dependency on pkg-config
Browse files Browse the repository at this point in the history
let's just assume the SDL2 library is called libSDL2 and can be linked against

Signed-off-by: Martin Kepplinger <martink@posteo.de>
  • Loading branch information
merge committed Aug 31, 2017
1 parent dfbb200 commit 18dfd8b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@ AC_ARG_WITH(sdl2,
AM_CONDITIONAL(SDL, test x"$with_sdl2" = "xyes")
AS_IF([test "x$with_sdl2" = "xyes"], [
AC_DEFINE(HAVE_SDL2,,[Use SDL2.])
PKG_CHECK_MODULES([SDL2], [sdl2], [], [
AC_CHECK_LIB([SDL2], [SDL_Init], [], [exit 1])
])
AC_CHECK_LIB([SDL2], [SDL_Init], [], [exit 1])
])

# libts Library versioning
Expand Down
4 changes: 2 additions & 2 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

if SDL
ts_test_mt_SOURCES = ts_test_mt_sdl.c sdlutils.c sdlutils.h
ts_test_mt_LDADD = $(top_builddir)/src/libts.la @SDL2_LIBS@
ts_test_mt_LDADD = $(top_builddir)/src/libts.la -lSDL2
else
ts_test_mt_SOURCES = ts_test_mt.c testutils.c testutils.h fbutils.h font_8x8.c font_8x16.c font.h
ts_test_mt_LDADD = $(top_builddir)/src/libts.la
Expand All @@ -78,7 +78,7 @@ ts_print_raw_LDADD = $(top_builddir)/src/libts.la

if SDL
ts_calibrate_SOURCES = ts_calibrate_sdl.c ts_calibrate.h ts_calibrate_common.c sdlutils.c sdlutils.h
ts_calibrate_LDADD = $(top_builddir)/src/libts.la @SDL2_LIBS@
ts_calibrate_LDADD = $(top_builddir)/src/libts.la -lSDL2
else
ts_calibrate_SOURCES = ts_calibrate.c ts_calibrate.h ts_calibrate_common.c fbutils.h testutils.c testutils.h font_8x8.c font_8x16.c font.h
ts_calibrate_LDADD = $(top_builddir)/src/libts.la
Expand Down

0 comments on commit 18dfd8b

Please sign in to comment.