mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-05-31 14:29:14 +08:00
test/acinclude.m4 (AM_PATH_SDL2): apply recent sdl2.m4 PKG_CONFIG patch
This commit is contained in:
+1
-3
@@ -5,8 +5,6 @@
|
|||||||
# stolen from Manish Singh
|
# stolen from Manish Singh
|
||||||
# Shamelessly stolen from Owen Taylor
|
# Shamelessly stolen from Owen Taylor
|
||||||
|
|
||||||
# serial 2
|
|
||||||
|
|
||||||
dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||||
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
||||||
dnl
|
dnl
|
||||||
@@ -45,7 +43,7 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
|
|||||||
|
|
||||||
if test "x$sdl_pc" = xyes ; then
|
if test "x$sdl_pc" = xyes ; then
|
||||||
no_sdl=""
|
no_sdl=""
|
||||||
SDL2_CONFIG="pkg-config sdl2"
|
SDL2_CONFIG="$PKG_CONFIG sdl2"
|
||||||
else
|
else
|
||||||
as_save_PATH="$PATH"
|
as_save_PATH="$PATH"
|
||||||
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
|
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
|
||||||
|
|||||||
Vendored
+1
-1
@@ -3966,7 +3966,7 @@ fi
|
|||||||
|
|
||||||
if test "x$sdl_pc" = xyes ; then
|
if test "x$sdl_pc" = xyes ; then
|
||||||
no_sdl=""
|
no_sdl=""
|
||||||
SDL2_CONFIG="pkg-config sdl2"
|
SDL2_CONFIG="$PKG_CONFIG sdl2"
|
||||||
else
|
else
|
||||||
as_save_PATH="$PATH"
|
as_save_PATH="$PATH"
|
||||||
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
|
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
|
||||||
|
|||||||
Reference in New Issue
Block a user