From f40445e386e9f944621dfa1568e905f7166999e4 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 6 Nov 2022 23:51:04 +0300
Subject: [PATCH] replace AM_PATH_SDL2 usage with corresponding
PKG_CHECK_MODULES.
---
Makefile.in | 5 +-
acinclude/sdl2.m4 | 180 -----------------------
aclocal.m4 | 1 -
configure | 361 ++++------------------------------------------
configure.ac | 5 +-
test/Makefile.in | 5 +-
6 files changed, 31 insertions(+), 526 deletions(-)
delete mode 100644 acinclude/sdl2.m4
diff --git a/Makefile.in b/Makefile.in
index 6694f99c..dbf908d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,8 +106,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/acinclude/ltsugar.m4 \
$(top_srcdir)/acinclude/ltversion.m4 \
$(top_srcdir)/acinclude/lt~obsolete.m4 \
- $(top_srcdir)/acinclude/pkg.m4 $(top_srcdir)/acinclude/sdl2.m4 \
- $(top_srcdir)/acinclude/tar.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude/pkg.m4 $(top_srcdir)/acinclude/tar.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -444,7 +444,6 @@ RANLIB = @RANLIB@
RC = @RC@
SDL2IMAGE_JPG_SAVE = @SDL2IMAGE_JPG_SAVE@
SDL2IMAGE_PNG_SAVE = @SDL2IMAGE_PNG_SAVE@
-SDL2_CONFIG = @SDL2_CONFIG@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_LIBS = @SDL_LIBS@
SDL_VERSION = @SDL_VERSION@
diff --git a/acinclude/sdl2.m4 b/acinclude/sdl2.m4
deleted file mode 100644
index af101a84..00000000
--- a/acinclude/sdl2.m4
+++ /dev/null
@@ -1,180 +0,0 @@
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-# serial 2
-
-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
-AC_DEFUN([AM_PATH_SDL2],
-[dnl
-dnl Get the cflags and libraries from the sdl2-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
- sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
- , enable_sdltest=yes)
-
- min_sdl_version=ifelse([$1], ,2.0.0,$1)
-
- if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
- PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version],
- [sdl_pc=yes],
- [sdl_pc=no])
- else
- sdl_pc=no
- if test x$sdl_exec_prefix != x ; then
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
- fi
- fi
- fi
-
- if test "x$sdl_pc" = xyes ; then
- no_sdl=""
- SDL2_CONFIG="pkg-config sdl2"
- else
- as_save_PATH="$PATH"
- if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH])
- PATH="$as_save_PATH"
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- no_sdl=""
-
- if test "$SDL2_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
- SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
-
- sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-dnl
-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_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <stdlib.h>
-#include "SDL.h"
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- FILE *fp = fopen("conf.sdltest", "w");
-
- if (fp) fclose(fp);
-
- if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
- printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- fi
- if test "x$no_sdl" = x ; then
- ifelse([$2], , :, [$2])
- else
- if test "$SDL2_CONFIG" = "no" ; then
- echo "*** The sdl2-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL2_CONFIG environment variable to the"
- echo "*** full path to sdl2-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-]], [[ 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"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
- rm -f conf.sdltest
-])
diff --git a/aclocal.m4 b/aclocal.m4
index 4c646e74..63baf103 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1024,5 +1024,4 @@ m4_include([acinclude/ltsugar.m4])
m4_include([acinclude/ltversion.m4])
m4_include([acinclude/lt~obsolete.m4])
m4_include([acinclude/pkg.m4])
-m4_include([acinclude/sdl2.m4])
m4_include([acinclude/tar.m4])
diff --git a/configure b/configure
index e289ca19..9be969ed 100755
--- a/configure
+++ b/configure
@@ -845,7 +845,6 @@ LIBAVIF_LIBS
LIBAVIF_CFLAGS
USE_WIC
USE_STBIMAGE
-SDL2_CONFIG
SDL_LIBS
SDL_CFLAGS
SDL_VERSION
@@ -1028,9 +1027,6 @@ enable_webp_shared
enable_qoi
enable_tests
enable_installed_tests
-with_sdl_prefix
-with_sdl_exec_prefix
-enable_sdltest
'
ac_precious_vars='build_alias
host_alias
@@ -1731,7 +1727,6 @@ Optional Features:
--enable-tests build tests [default=no]
--enable-installed-tests
install tests [default=no]
- --disable-sdltest Do not try to compile and run a test SDL program
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1739,8 +1734,6 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sdl-prefix=PFX Prefix where SDL is installed (optional)
- --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
Some influential environment variables:
CC C compiler command
@@ -2086,49 +2079,6 @@ fi
as_fn_set_status $ac_retval
} # ac_fn_objc_try_compile
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
-# executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }
-then :
- ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: program exited with status $ac_status" >&5
- printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
ac_configure_args_raw=
for ac_arg
do
@@ -4713,13 +4663,13 @@ then :
else $as_nop
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4716: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4666: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4719: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4669: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4722: output\"" >&5)
+ (eval echo "\"\$as_me:4672: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5978,7 +5928,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5981 "configure"' > conftest.$ac_ext
+ echo '#line 5931 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7651,11 +7601,11 @@ else $as_nop
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7654: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7604: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7658: \$? = $ac_status" >&5
+ echo "$as_me:7608: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8001,11 +7951,11 @@ else $as_nop
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8004: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7954: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8008: \$? = $ac_status" >&5
+ echo "$as_me:7958: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8108,11 +8058,11 @@ else $as_nop
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8111: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8115: \$? = $ac_status" >&5
+ echo "$as_me:8065: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8164,11 +8114,11 @@ else $as_nop
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8167: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8117: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8171: \$? = $ac_status" >&5
+ echo "$as_me:8121: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10607,7 +10557,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10610 "configure"
+#line 10560 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10704,7 +10654,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10707 "configure"
+#line 10657 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13900,50 +13850,20 @@ fi
SDL_VERSION=2.0.9
-# Check whether --with-sdl-prefix was given.
-if test ${with_sdl_prefix+y}
-then :
- withval=$with_sdl_prefix; sdl_prefix="$withval"
-else $as_nop
- sdl_prefix=""
-fi
-
-
-# Check whether --with-sdl-exec-prefix was given.
-if test ${with_sdl_exec_prefix+y}
-then :
- withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
-else $as_nop
- sdl_exec_prefix=""
-fi
-
-# Check whether --enable-sdltest was given.
-if test ${enable_sdltest+y}
-then :
- enableval=$enable_sdltest;
-else $as_nop
- enable_sdltest=yes
-fi
-
-
- min_sdl_version=$SDL_VERSION
-
- if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
-
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl2 >= $min_sdl_version" >&5
-printf %s "checking for sdl2 >= $min_sdl_version... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl2 >= $SDL_VERSION" >&5
+printf %s "checking for sdl2 >= $SDL_VERSION... " >&6; }
if test -n "$SDL_CFLAGS"; then
pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$SDL_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl2 >= $SDL_VERSION") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $SDL_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13955,12 +13875,12 @@ if test -n "$SDL_LIBS"; then
pkg_cv_SDL_LIBS="$SDL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$SDL_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl2 >= $SDL_VERSION") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $SDL_VERSION" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13981,254 +13901,25 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= $min_sdl_version" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= $SDL_VERSION" 2>&1`
else
- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $min_sdl_version" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $SDL_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
- sdl_pc=no
+ as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- sdl_pc=no
+ as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
else
SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
SDL_LIBS=$pkg_cv_SDL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- sdl_pc=yes
-fi
- else
- sdl_pc=no
- if test x$sdl_exec_prefix != x ; then
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
- if test x${SDL2_CONFIG+set} != xset ; then
- SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
- fi
- fi
- fi
- if test "x$sdl_pc" = xyes ; then
- no_sdl=""
- SDL2_CONFIG="pkg-config sdl2"
- else
- as_save_PATH="$PATH"
- if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- # Extract the first word of "sdl2-config", so it can be a program name with args.
-set dummy sdl2-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SDL2_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $SDL2_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SDL2_CONFIG="$SDL2_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_SDL2_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SDL2_CONFIG" && ac_cv_path_SDL2_CONFIG="no"
- ;;
-esac
-fi
-SDL2_CONFIG=$ac_cv_path_SDL2_CONFIG
-if test -n "$SDL2_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL2_CONFIG" >&5
-printf "%s\n" "$SDL2_CONFIG" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
- PATH="$as_save_PATH"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
-printf %s "checking for SDL - version >= $min_sdl_version... " >&6; }
- no_sdl=""
-
- if test "$SDL2_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
- SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
-
- sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- rm -f conf.sdltest
- if test "$cross_compiling" = yes
-then :
- echo $ac_n "cross compiling; assumed OK... $ac_c"
-else $as_nop
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "SDL.h"
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- FILE *fp = fopen("conf.sdltest", "w");
-
- if (fp) fclose(fp);
-
- if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
- printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
-
-else $as_nop
- no_sdl=yes
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- fi
- fi
- if test "x$no_sdl" = x ; then
- :
- else
- if test "$SDL2_CONFIG" = "no" ; then
- echo "*** The sdl2-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL2_CONFIG environment variable to the"
- echo "*** full path to sdl2-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-
-int
-main (void)
-{
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
- 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"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else $as_nop
- echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
-
- fi
-
-
- rm -f conf.sdltest
-
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
diff --git a/configure.ac b/configure.ac
index c2584c0e..9e67d959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,10 +287,7 @@ AC_ARG_ENABLE([installed-tests],
dnl Check for SDL
SDL_VERSION=2.0.9
AC_SUBST(SDL_VERSION)
-AM_PATH_SDL2($SDL_VERSION,
- :,
- AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
-)
+PKG_CHECK_MODULES([SDL], [sdl2 >= $SDL_VERSION],, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
diff --git a/test/Makefile.in b/test/Makefile.in
index 84eb19c5..3f36f08a 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -103,8 +103,8 @@ am__aclocal_m4_deps = \
$(top_srcdir)/acinclude/ltsugar.m4 \
$(top_srcdir)/acinclude/ltversion.m4 \
$(top_srcdir)/acinclude/lt~obsolete.m4 \
- $(top_srcdir)/acinclude/pkg.m4 $(top_srcdir)/acinclude/sdl2.m4 \
- $(top_srcdir)/acinclude/tar.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/acinclude/pkg.m4 $(top_srcdir)/acinclude/tar.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_testexec_DATA_DIST) \
@@ -507,7 +507,6 @@ RANLIB = @RANLIB@
RC = @RC@
SDL2IMAGE_JPG_SAVE = @SDL2IMAGE_JPG_SAVE@
SDL2IMAGE_PNG_SAVE = @SDL2IMAGE_PNG_SAVE@
-SDL2_CONFIG = @SDL2_CONFIG@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_LIBS = @SDL_LIBS@
SDL_VERSION = @SDL_VERSION@