Skip to content

Commit 09de464

Browse files
mywave82mywave82
committed
Replace SDL detection macro from EXULT to the the official ones.
1 parent ee8fe4e commit 09de464

File tree

3 files changed

+401
-139
lines changed

3 files changed

+401
-139
lines changed

‎configure.ac‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,28 @@ fi
174174
# SDL output
175175
if test ${enable_output_sdl:=yes} = yes; then
176176
AC_LANG_PUSH(C)
177-
EXULT_CHECK_SDL(
178-
AC_DEFINE(DRIVER_SDL,1,[Build SDL output])
179-
drivers=$drivers' sdl.$(OBJEXT)',
180-
enable_output_sdl=no
181-
AC_MSG_RESULT([*** SDL (libsdl) >= 1.2.0 not installed ***]))
177+
AM_PATH_SDL2(["2.0.0"],
178+
AC_DEFINE(HAVE_SDL_H, 1, [Define to 1 if you have the "SDL.h" header file])
179+
AC_DEFINE(DRIVER_SDL, 1, [Build SDL2 output])
180+
drivers=$drivers' sdl.$(OBJEXT)',
181+
try_sdl12=yes
182+
AC_MSG_RESULT([*** SDL libsdl2 >= 2.0.0 not installed ***])
183+
)
182184
AC_LANG_POP(C)
185+
186+
dnl we can not put AM_PATH_SDL directly into the ACTION-IF-NOT-FOUND of AM_PATH_SDL2
187+
dnl due to some m4 macro recursion causing a bad ./configure script to be generated
188+
if test ${try_sdl12:=no} = yes; then
189+
AC_LANG_PUSH(C)
190+
AM_PATH_SDL(["1.2.0"],
191+
AC_DEFINE(HAVE_SDL_H, 1, [Define to 1 if you have the "SDL.h" header file])
192+
AC_DEFINE(DRIVER_SDL, 1, [Build SDL1.x output])
193+
drivers=$drivers' sdl.$(OBJEXT)',
194+
enable_output_sdl=no
195+
AC_MSG_RESULT([*** SDL libsdl >= 1.2.0 not installed ***])
196+
)
197+
AC_LANG_POP(C)
198+
fi
183199
fi
184200

185201
# ALSA output
@@ -211,8 +227,3 @@ echo "QSA output (qsa): ${enable_output_qsa}"
211227
echo "SDL output (sdl): ${enable_output_sdl}"
212228
echo "ALSA output (alsa): ${enable_output_alsa}"
213229
echo "Libao output (ao): ${enable_output_ao}"
214-
215-
if test "x$exult_sdlok" = xyes; then
216-
echo ""
217-
echo "SDL version: `$SDL_CONFIG $sdl_args --version`"
218-
fi

‎m4/sdl.m4‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
# Configure paths for SDL
2+
# Sam Lantinga 9/21/99
3+
# stolen from Manish Singh
4+
# stolen back from Frank Belew
5+
# stolen from Manish Singh
6+
# Shamelessly stolen from Owen Taylor
7+
8+
# serial 2
9+
10+
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
11+
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
12+
dnl
13+
AC_DEFUN([AM_PATH_SDL],
14+
[dnl
15+
dnl Get the cflags and libraries from the sdl-config script
16+
dnl
17+
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
18+
sdl_prefix="$withval", sdl_prefix="")
19+
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
20+
sdl_exec_prefix="$withval", sdl_exec_prefix="")
21+
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
22+
, enable_sdltest=yes)
23+
24+
min_sdl_version=ifelse([$1], ,1.2.0,$1)
25+
26+
if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
27+
PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version],
28+
[sdl_pc=yes],
29+
[sdl_pc=no])
30+
else
31+
sdl_pc=no
32+
if test x$sdl_exec_prefix != x ; then
33+
sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
34+
if test x${SDL_CONFIG+set} != xset ; then
35+
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
36+
fi
37+
fi
38+
if test x$sdl_prefix != x ; then
39+
sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
40+
if test x${SDL_CONFIG+set} != xset ; then
41+
SDL_CONFIG=$sdl_prefix/bin/sdl-config
42+
fi
43+
fi
44+
fi
45+
46+
if test "x$sdl_pc" = xyes ; then
47+
no_sdl=""
48+
SDL_CONFIG="pkg-config sdl"
49+
else
50+
as_save_PATH="$PATH"
51+
if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
52+
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
53+
fi
54+
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
55+
PATH="$as_save_PATH"
56+
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
57+
no_sdl=""
58+
59+
if test "$SDL_CONFIG" = "no" ; then
60+
no_sdl=yes
61+
else
62+
SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
63+
SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
64+
65+
sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
66+
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
67+
sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
68+
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
69+
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
70+
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
71+
if test "x$enable_sdltest" = "xyes" ; then
72+
ac_save_CFLAGS="$CFLAGS"
73+
ac_save_CXXFLAGS="$CXXFLAGS"
74+
ac_save_LIBS="$LIBS"
75+
CFLAGS="$CFLAGS $SDL_CFLAGS"
76+
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
77+
LIBS="$LIBS $SDL_LIBS"
78+
dnl
79+
dnl Now check if the installed SDL is sufficiently new. (Also sanity
80+
dnl checks the results of sdl-config to some extent
81+
dnl
82+
rm -f conf.sdltest
83+
AC_RUN_IFELSE([AC_LANG_SOURCE([[
84+
#include <stdio.h>
85+
#include <stdlib.h>
86+
#include "SDL.h"
87+
88+
int main (int argc, char *argv[])
89+
{
90+
int major, minor, micro;
91+
FILE *fp = fopen("conf.sdltest", "w");
92+
93+
if (fp) fclose(fp);
94+
95+
if (sscanf("$min_sdl_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
96+
printf("%s, bad version string\n", "$min_sdl_version");
97+
exit(1);
98+
}
99+
100+
if (($sdl_major_version > major) ||
101+
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
102+
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
103+
{
104+
return 0;
105+
}
106+
else
107+
{
108+
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
109+
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
110+
printf("*** best to upgrade to the required version.\n");
111+
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
112+
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
113+
printf("*** config.cache before re-running configure\n");
114+
return 1;
115+
}
116+
}
117+
118+
]])], [], [no_sdl=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
119+
CFLAGS="$ac_save_CFLAGS"
120+
CXXFLAGS="$ac_save_CXXFLAGS"
121+
LIBS="$ac_save_LIBS"
122+
fi
123+
fi
124+
if test "x$no_sdl" = x ; then
125+
AC_MSG_RESULT(yes)
126+
else
127+
AC_MSG_RESULT(no)
128+
fi
129+
fi
130+
if test "x$no_sdl" = x ; then
131+
ifelse([$2], , :, [$2])
132+
else
133+
if test "$SDL_CONFIG" = "no" ; then
134+
echo "*** The sdl-config script installed by SDL could not be found"
135+
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
136+
echo "*** your path, or set the SDL_CONFIG environment variable to the"
137+
echo "*** full path to sdl-config."
138+
else
139+
if test -f conf.sdltest ; then
140+
:
141+
else
142+
echo "*** Could not run SDL test program, checking why..."
143+
CFLAGS="$CFLAGS $SDL_CFLAGS"
144+
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
145+
LIBS="$LIBS $SDL_LIBS"
146+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
147+
#include <stdio.h>
148+
#include "SDL.h"
149+
150+
int main(int argc, char *argv[])
151+
{ return 0; }
152+
#undef main
153+
#define main K_and_R_C_main
154+
]], [[ return 0; ]])],
155+
[ echo "*** The test program compiled, but did not run. This usually means"
156+
echo "*** that the run-time linker is not finding SDL or finding the wrong"
157+
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
158+
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
159+
echo "*** to the installed location Also, make sure you have run ldconfig if that"
160+
echo "*** is required on your system"
161+
echo "***"
162+
echo "*** If you have an old version installed, it is best to remove it, although"
163+
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
164+
[ echo "*** The test program failed to compile or link. See the file config.log for the"
165+
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
166+
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
167+
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
168+
CFLAGS="$ac_save_CFLAGS"
169+
CXXFLAGS="$ac_save_CXXFLAGS"
170+
LIBS="$ac_save_LIBS"
171+
fi
172+
fi
173+
SDL_CFLAGS=""
174+
SDL_LIBS=""
175+
ifelse([$3], , :, [$3])
176+
fi
177+
AC_SUBST(SDL_CFLAGS)
178+
AC_SUBST(SDL_LIBS)
179+
rm -f conf.sdltest
180+
])

0 commit comments

Comments
 (0)