summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOzkan Sezer <sezeroz@gmail.com>2020-12-22 17:00:28 +0300
committerOzkan Sezer <sezeroz@gmail.com>2020-12-22 17:00:28 +0300
commit3f8209bb2e30b729ad673e3e1cde528de855c6f8 (patch)
tree1cb56944a44c95c561aceb470d35179b22e58dd1 /test
parent8b3d1f660bbaadc3d2bcde94b1e2fadffa68b6d8 (diff)
downloadsdl-3f8209bb2e30b729ad673e3e1cde528de855c6f8.tar.gz
acinclude & sdl2.m4 updates:
- acinclude/alsa.m4, esd.m4: Ran through autoupdate to replace several AC_TRY_[COMPILE|LINK|RUN] with corresponding AC_???_IFELSE , so that autoconf-2.70 doesn't warn. - sdl2.m4: Ditto. - test/acinclude.m4 (sdl2): Ditto.
Diffstat (limited to 'test')
-rw-r--r--test/acinclude.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/test/acinclude.m4 b/test/acinclude.m4
index 290929dc8..69ea6aea6 100644
--- a/test/acinclude.m4
+++ b/test/acinclude.m4
@@ -80,7 +80,7 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl2-config to some extent
dnl
rm -f conf.sdltest
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <stdlib.h>
#include "SDL.h"
@@ -115,7 +115,7 @@ int main (int argc, char *argv[])
}
}
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
@@ -143,7 +143,7 @@ int main (int argc, char *argv[])
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include "SDL.h"
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
-], [ return 0; ],
+]], [[ return 0; ]])],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"