ObjFW/ObjSQLite3
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix automatically running tests

Browse source 
FossilOrigin-Name: 076176fd9898dd36494693d893bf2ba76e27665cadf1c058a208b7cb61e22bb9
This commit is contained in:
Jonathan Schleifer 2020-10-01 23:55:07 +00:00
parent 9f22b628f2
commit e480f8892d
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
configure.ac
View file

@ -106,6 +106,35 @@ AS_IF([test x"$GOBJC" = x"yes"], [
]) ])
]) ])
AS_IF([test x"$cross_compiling" = x"yes"], [
case "$host" in
i?86-*-mingw*)
AC_CHECK_PROG(WINE, wine, wine)
;;
x86_64-*-mingw*)
AC_CHECK_PROG(WINE, wine64, wine64)
;;
esac
AS_IF([test x"$WINE" != x""], [
AC_SUBST(RUN_TESTS, "run")
AC_SUBST(WRAPPER, "$WINE")
])
AS_IF([test x"$with_wii" = x"yes"], [
dnl Keep this lowercase, as WIILOAD is a variable used by
dnl wiiload and thus likely already set by the user to something
dnl that is not the path of the wiiload binary.
AC_CHECK_PROG(wiiload, wiiload, wiiload)
AS_IF([test x"$wiiload" != x""], [
AC_SUBST(WRAPPER, "$wiiload")
])
])
], [
AC_SUBST(RUN_TESTS, "run")
])
dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself. dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP) AC_SUBST(CPP)

1
extra.mk.in
View file

@ -12,3 +12,4 @@ LIBOBJSQLITE3_DEP = @LIBOBJSQLITE3_DEP@
OBJFW_CONFIG = @OBJFW_CONFIG@ OBJFW_CONFIG = @OBJFW_CONFIG@
OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@ OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
OBJFW_LIBS = @OBJFW_LIBS@ OBJFW_LIBS = @OBJFW_LIBS@
RUN_TESTS = @RUN_TESTS@