summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-21 19:52:49 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-21 19:52:49 +0000
commit3df547e2059b4416a266a0df9d41e47176a6061b (patch)
treec7be1380d67f3a25f1f418aa248af8e44c45112a /meta
parent37d5e5d924140a6a1200c09ec52034aae86198d3 (diff)
downloadpoky-3df547e2059b4416a266a0df9d41e47176a6061b.tar.gz
libsdl-sdk: Fix configure.in and use autotools do_configure, not a broken imitation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3846 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libsdl/files/configure_tweak.patch1167
-rw-r--r--meta/packages/libsdl/libsdl-sdk_1.2.11.bb14
2 files changed, 1169 insertions, 12 deletions
diff --git a/meta/packages/libsdl/files/configure_tweak.patch b/meta/packages/libsdl/files/configure_tweak.patch
new file mode 100644
index 0000000000..90a2888e57
--- /dev/null
+++ b/meta/packages/libsdl/files/configure_tweak.patch
@@ -0,0 +1,1167 @@
1Index: SDL-1.2.11/configure.in
2===================================================================
3--- SDL-1.2.11.orig/configure.in 2006-06-27 05:48:33.000000000 +0100
4+++ SDL-1.2.11/configure.in 2008-02-21 19:48:47.000000000 +0000
5@@ -40,13 +40,13 @@
6 AC_SUBST(LT_AGE)
7
8 dnl Detect the canonical build and host environments
9-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
10+AC_CONFIG_AUX_DIR(./build-scripts)
11 AC_CANONICAL_HOST
12 AC_C_BIGENDIAN
13 if test x$ac_cv_c_bigendian = xyes; then
14- AC_DEFINE(SDL_BYTEORDER, 4321)
15+ AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order")
16 else
17- AC_DEFINE(SDL_BYTEORDER, 1234)
18+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order")
19 fi
20
21 dnl Set up the compiler and linker flags
22@@ -107,7 +107,7 @@
23 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
24 , enable_libc=yes)
25 if test x$enable_libc = xyes; then
26- AC_DEFINE(HAVE_LIBC)
27+ AC_DEFINE(HAVE_LIBC,1,"")
28
29 dnl Check for C library headers
30 AC_HEADER_STDC
31@@ -118,7 +118,7 @@
32 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
33 AC_CHECK_TYPE(int64_t)
34 if test x$ac_cv_type_int64_t = xyes; then
35- AC_DEFINE(SDL_HAS_64BIT_TYPE)
36+ AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"")
37 fi
38 have_inttypes=yes
39 fi
40@@ -127,11 +127,11 @@
41 AC_FUNC_ALLOCA
42 AC_FUNC_MEMCMP
43 if test x$ac_cv_func_memcmp_working = xyes; then
44- AC_DEFINE(HAVE_MEMCMP)
45+ AC_DEFINE(HAVE_MEMCMP,1,"")
46 fi
47 AC_FUNC_STRTOD
48 if test x$ac_cv_func_strtod = xyes; then
49- AC_DEFINE(HAVE_STRTOD)
50+ AC_DEFINE(HAVE_STRTOD,1,"")
51 fi
52 AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep)
53
54@@ -146,40 +146,40 @@
55 AC_CHECK_SIZEOF(long, 4)
56 AC_CHECK_SIZEOF(long long, 8)
57 if test x$ac_cv_sizeof_char = x1; then
58- AC_DEFINE(int8_t, signed char)
59- AC_DEFINE(uint8_t, unsigned char)
60+ AC_DEFINE(int8_t, signed char,"")
61+ AC_DEFINE(uint8_t, unsigned char,"")
62 fi
63 if test x$ac_cv_sizeof_short = x2; then
64- AC_DEFINE(int16_t, signed short)
65- AC_DEFINE(uint16_t, unsigned short)
66+ AC_DEFINE(int16_t, signed short,"")
67+ AC_DEFINE(uint16_t, unsigned short,"")
68 else
69 if test x$ac_cv_sizeof_int = x2; then
70- AC_DEFINE(int16_t, signed int)
71- AC_DEFINE(uint16_t, unsigned int)
72+ AC_DEFINE(int16_t, signed int,"")
73+ AC_DEFINE(uint16_t, unsigned int,"")
74 fi
75 fi
76 if test x$ac_cv_sizeof_int = x4; then
77- AC_DEFINE(int32_t, signed int)
78- AC_DEFINE(uint32_t, unsigned int)
79+ AC_DEFINE(int32_t, signed int,"")
80+ AC_DEFINE(uint32_t, unsigned int,"")
81 else
82 if test x$ac_cv_sizeof_long = x4; then
83- AC_DEFINE(int32_t, signed long)
84- AC_DEFINE(uint32_t, unsigned long)
85+ AC_DEFINE(int32_t, signed long,"")
86+ AC_DEFINE(uint32_t, unsigned long,"")
87 fi
88 fi
89 if test x$ac_cv_sizeof_long = x8; then
90- AC_DEFINE(int64_t, signed long)
91- AC_DEFINE(uint64_t, unsigned long)
92- AC_DEFINE(SDL_HAS_64BIT_TYPE)
93+ AC_DEFINE(int64_t, signed long,"")
94+ AC_DEFINE(uint64_t, unsigned long,"")
95+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
96 else
97 if test x$ac_cv_sizeof_long_long = x8; then
98- AC_DEFINE(int64_t, signed long long)
99- AC_DEFINE(uint64_t, unsigned long long)
100- AC_DEFINE(SDL_HAS_64BIT_TYPE)
101+ AC_DEFINE(int64_t, signed long long,"")
102+ AC_DEFINE(uint64_t, unsigned long long,"")
103+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
104 fi
105 fi
106- AC_DEFINE(size_t, unsigned int)
107- AC_DEFINE(uintptr_t, unsigned long)
108+ AC_DEFINE(size_t, unsigned int,"")
109+ AC_DEFINE(uintptr_t, unsigned long,"")
110 fi
111
112 # Standard C sources
113@@ -201,67 +201,67 @@
114 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
115 , enable_audio=yes)
116 if test x$enable_audio != xyes; then
117- AC_DEFINE(SDL_AUDIO_DISABLED)
118+ AC_DEFINE(SDL_AUDIO_DISABLED,1,"")
119 fi
120 AC_ARG_ENABLE(video,
121 AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]),
122 , enable_video=yes)
123 if test x$enable_video != xyes; then
124- AC_DEFINE(SDL_VIDEO_DISABLED)
125+ AC_DEFINE(SDL_VIDEO_DISABLED,1,"")
126 fi
127 AC_ARG_ENABLE(events,
128 AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]),
129 , enable_events=yes)
130 if test x$enable_events != xyes; then
131- AC_DEFINE(SDL_EVENTS_DISABLED)
132+ AC_DEFINE(SDL_EVENTS_DISABLED,1,"")
133 fi
134 AC_ARG_ENABLE(joystick,
135 AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]),
136 , enable_joystick=yes)
137 if test x$enable_joystick != xyes; then
138- AC_DEFINE(SDL_JOYSTICK_DISABLED)
139+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
140 fi
141 AC_ARG_ENABLE(cdrom,
142 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
143 , enable_cdrom=yes)
144 if test x$enable_cdrom != xyes; then
145- AC_DEFINE(SDL_CDROM_DISABLED)
146+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
147 fi
148 AC_ARG_ENABLE(threads,
149 AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
150 , enable_threads=yes)
151 if test x$enable_threads != xyes; then
152- AC_DEFINE(SDL_THREADS_DISABLED)
153+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
154 fi
155 AC_ARG_ENABLE(timers,
156 AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]),
157 , enable_timers=yes)
158 if test x$enable_timers != xyes; then
159- AC_DEFINE(SDL_TIMERS_DISABLED)
160+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
161 fi
162 AC_ARG_ENABLE(file,
163 AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]),
164 , enable_file=yes)
165 if test x$enable_file != xyes; then
166- AC_DEFINE(SDL_FILE_DISABLED)
167+ AC_DEFINE(SDL_FILE_DISABLED,1,"")
168 fi
169 AC_ARG_ENABLE(loadso,
170 AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]),
171 , enable_loadso=yes)
172 if test x$enable_loadso != xyes; then
173- AC_DEFINE(SDL_LOADSO_DISABLED)
174+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
175 fi
176 AC_ARG_ENABLE(cpuinfo,
177 AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]),
178 , enable_cpuinfo=yes)
179 if test x$enable_cpuinfo != xyes; then
180- AC_DEFINE(SDL_CPUINFO_DISABLED)
181+ AC_DEFINE(SDL_CPUINFO_DISABLED,1,"")
182 fi
183 AC_ARG_ENABLE(assembly,
184 AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]),
185 , enable_assembly=yes)
186 if test x$enable_assembly = xyes; then
187- AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
188+ AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"")
189 fi
190
191 dnl See if the OSS audio interface is supported
192@@ -289,12 +289,12 @@
193 int arg = SNDCTL_DSP_SETFRAGMENT;
194 ],[
195 have_oss=yes
196- AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H)
197+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"")
198 ])
199 fi
200 AC_MSG_RESULT($have_oss)
201 if test x$have_oss = xyes; then
202- AC_DEFINE(SDL_AUDIO_DRIVER_OSS)
203+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"")
204 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
205 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
206 have_audio=yes
207@@ -314,45 +314,7 @@
208 AC_ARG_ENABLE(alsa,
209 AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
210 , enable_alsa=yes)
211- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
212- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)
213- # Restore all flags from before the ALSA detection runs
214- CFLAGS="$alsa_save_CFLAGS"
215- LDFLAGS="$alsa_save_LDFLAGS"
216- LIBS="$alsa_save_LIBS"
217- if test x$have_alsa = xyes; then
218- AC_ARG_ENABLE(alsa-shared,
219-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
220- , enable_alsa_shared=yes)
221- if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
222- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
223- ALSA_LIBS="-L/lib $ALSA_LIBS"
224- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
225- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
226- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
227- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
228- fi
229- fi
230- alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
231- alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
232- echo "-- $alsa_lib_spec -> $alsa_lib"
233-
234- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
235- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
236- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS"
237- if test x$have_loadso != xyes && \
238- test x$enable_alsa_shared = xyes; then
239- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
240- fi
241- if test x$have_loadso = xyes && \
242- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
243- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
244- else
245- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
246- fi
247- have_audio=yes
248- fi
249- fi
250+ enable_alsa=no
251 }
252
253 dnl Check whether we want to use IRIX 6.5+ native audio or not
254@@ -371,7 +333,7 @@
255 AC_MSG_RESULT($have_dmedia)
256 # Set up files for the audio library
257 if test x$have_dmedia = xyes; then
258- AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
259+ AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"")
260 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
261 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
262 have_audio=yes
263@@ -408,7 +370,7 @@
264 AC_MSG_RESULT($have_mme)
265 # Set up files for the audio library
266 if test x$have_mme = xyes; then
267- AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO)
268+ AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"")
269 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
270 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
271 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
272@@ -433,7 +395,7 @@
273 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
274 echo "-- $esd_lib_spec -> $esd_lib"
275
276- AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
277+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"")
278 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
279 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
280 if test x$have_loadso != xyes && \
281@@ -442,7 +404,7 @@
282 fi
283 if test x$have_loadso = xyes && \
284 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
285- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
286+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "")
287 else
288 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
289 fi
290@@ -485,7 +447,7 @@
291 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
292 echo "-- $arts_lib_spec -> $arts_lib"
293
294- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
295+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "")
296 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
297 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
298 if test x$have_loadso != xyes && \
299@@ -494,7 +456,7 @@
300 fi
301 if test x$have_loadso = xyes && \
302 test x$enable_arts_shared = xyes && test x$arts_lib != x; then
303- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
304+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"")
305 else
306 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
307 fi
308@@ -527,7 +489,7 @@
309 fi
310 AC_MSG_RESULT($have_nas)
311 if test x$have_nas = xyes; then
312- AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
313+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"")
314 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
315 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
316 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
317@@ -543,7 +505,7 @@
318 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
319 , enable_diskaudio=yes)
320 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
321- AC_DEFINE(SDL_AUDIO_DRIVER_DISK)
322+ AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"")
323 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
324 fi
325 }
326@@ -555,7 +517,7 @@
327 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
328 , enable_dummyaudio=yes)
329 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
330- AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY)
331+ AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"")
332 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
333 fi
334 }
335@@ -571,7 +533,7 @@
336 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
337 if test x$have_mint_falcon_hdr = xyes; then
338 mintaudio=yes
339- AC_DEFINE(SDL_AUDIO_DRIVER_MINT)
340+ AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"")
341 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
342 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
343 have_audio=yes
344@@ -602,7 +564,7 @@
345 AC_PATH_PROG(NASM, nasm)
346 fi
347 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
348- AC_DEFINE(SDL_HERMES_BLITTERS)
349+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
350 SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
351 if test x"$NASMFLAGS" = x; then
352 case $ARCH in
353@@ -713,9 +675,9 @@
354 CFLAGS="$save_CFLAGS"
355
356 if test x$have_gcc_altivec = xyes; then
357- AC_DEFINE(SDL_ALTIVEC_BLITTERS)
358+ AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"")
359 if test x$have_altivec_h_hdr = xyes; then
360- AC_DEFINE(HAVE_ALTIVEC_H)
361+ AC_DEFINE(HAVE_ALTIVEC_H,1,"")
362 fi
363 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
364 fi
365@@ -758,7 +720,7 @@
366
367 if test x$enable_ipod = xyes; then
368 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
369- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
370+ AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"")
371 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
372 fi
373 }
374@@ -792,7 +754,7 @@
375 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
376 fi
377
378- AC_DEFINE(SDL_VIDEO_DRIVER_NANOX)
379+ AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"")
380 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
381 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
382 have_video=yes
383@@ -881,7 +843,7 @@
384 CFLAGS="$CFLAGS $X_CFLAGS"
385 LDFLAGS="$LDFLAGS $X_LIBS"
386
387- AC_DEFINE(SDL_VIDEO_DRIVER_X11)
388+ AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"")
389 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
390 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
391
392@@ -903,8 +865,8 @@
393 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
394 echo "-- dynamic libX11 -> $x11_lib"
395 echo "-- dynamic libX11ext -> $x11ext_lib"
396- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
397- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
398+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","")
399+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","")
400 else
401 enable_x11_shared=no
402 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
403@@ -921,20 +883,20 @@
404 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
405 , enable_video_dga=yes)
406 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
407- AC_DEFINE(SDL_VIDEO_DRIVER_DGA)
408+ AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"")
409 SOURCES="$SOURCES $srcdir/src/video/dga/*.c"
410 fi
411 AC_ARG_ENABLE(video-x11-dgamouse,
412 AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]),
413 , enable_video_x11_dgamouse=yes)
414 if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then
415- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE)
416+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"")
417 fi
418 AC_ARG_ENABLE(video-x11-vm,
419 AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]),
420 , enable_video_x11_vm=yes)
421 if test x$enable_video_x11_vm = xyes; then
422- AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
423+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"")
424 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
425 fi
426 AC_ARG_ENABLE(video-x11-xv,
427@@ -948,14 +910,14 @@
428 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
429 , enable_video_x11_xinerama=yes)
430 if test x$enable_video_x11_xinerama = xyes; then
431- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
432+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"")
433 SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
434 fi
435 AC_ARG_ENABLE(video-x11-xme,
436 AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
437 , enable_video_x11_xme=yes)
438 if test x$enable_video_x11_xme = xyes; then
439- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)
440+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"")
441 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
442 fi
443 AC_ARG_ENABLE(video-x11-xrandr,
444@@ -972,8 +934,8 @@
445 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
446 echo "-- dynamic libXrender -> $xrender_lib"
447 echo "-- dynamic libXrandr -> $xrandr_lib"
448- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
449- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
450+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","")
451+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","")
452 definitely_enable_video_x11_xrandr=yes
453 else
454 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
455@@ -986,7 +948,7 @@
456 fi
457 fi
458 if test x$definitely_enable_video_x11_xrandr = xyes; then
459- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
460+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"")
461 fi
462 AC_ARG_ENABLE(video-x11-dpms,
463 AC_HELP_STRING([--enable-video-x11-dpms], [enable X11 DPMS extension [[default=yes]]]),
464@@ -998,7 +960,7 @@
465 [#include <X11/Xlib.h>
466 ])
467 if test x$have_dpms_h_hdr = xyes; then
468- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS)
469+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS,1,"")
470 fi
471 fi
472 fi
473@@ -1026,7 +988,7 @@
474 ])
475 AC_MSG_RESULT($video_photon)
476 if test x$video_photon = xyes; then
477- AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
478+ AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"")
479 SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
480 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
481 have_video=yes
482@@ -1040,7 +1002,7 @@
483 CheckBWINDOW()
484 {
485 if test x$enable_video = xyes; then
486- AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW)
487+ AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"")
488 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
489 have_video=yes
490 fi
491@@ -1063,7 +1025,7 @@
492 ])
493 AC_MSG_RESULT($have_carbon)
494 if test x$have_carbon = xyes; then
495- AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX)
496+ AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"")
497 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
498 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
499 have_video=yes
500@@ -1092,7 +1054,7 @@
501 AC_MSG_RESULT($have_cocoa)
502 CFLAGS="$save_CFLAGS"
503 if test x$have_cocoa = xyes; then
504- AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ)
505+ AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"")
506 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
507 have_video=yes
508 fi
509@@ -1118,7 +1080,7 @@
510 ])
511 AC_MSG_RESULT($video_fbcon)
512 if test x$video_fbcon = xyes; then
513- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
514+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"")
515 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
516 have_video=yes
517 fi
518@@ -1163,7 +1125,7 @@
519 fi
520
521 if test x$video_directfb = xyes; then
522- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
523+ AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"")
524 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
525 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
526 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
527@@ -1190,7 +1152,7 @@
528 ])
529 AC_MSG_RESULT($video_ps2gs)
530 if test x$video_ps2gs = xyes; then
531- AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS)
532+ AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"")
533 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
534 have_video=yes
535 fi
536@@ -1215,7 +1177,7 @@
537 ])
538 AC_MSG_RESULT($video_ggi)
539 if test x$video_ggi = xyes; then
540- AC_DEFINE(SDL_VIDEO_DRIVER_GGI)
541+ AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"")
542 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
543 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
544 have_video=yes
545@@ -1245,7 +1207,7 @@
546 ])
547 AC_MSG_RESULT($video_svga)
548 if test x$video_svga = xyes; then
549- AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB)
550+ AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"")
551 SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
552 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
553 have_video=yes
554@@ -1277,7 +1239,7 @@
555 ])
556 AC_MSG_RESULT($video_vgl)
557 if test x$video_vgl = xyes; then
558- AC_DEFINE(SDL_VIDEO_DRIVER_VGL)
559+ AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"")
560 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
561 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
562 have_video=yes
563@@ -1305,7 +1267,7 @@
564 ])
565 AC_MSG_RESULT($video_wscons)
566 if test x$video_wscons = xyes; then
567- AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS)
568+ AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"")
569 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
570 have_video=yes
571 fi
572@@ -1330,7 +1292,7 @@
573 ])
574 AC_MSG_RESULT($video_aalib)
575 if test x$video_aalib = xyes; then
576- AC_DEFINE(SDL_VIDEO_DRIVER_AALIB)
577+ AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"")
578 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
579 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
580 have_video=yes
581@@ -1360,7 +1322,7 @@
582 CXXFLAGS="$OLD_CXX"
583 AC_MSG_RESULT($video_qtopia)
584 if test x$video_qtopia = xyes; then
585- AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA)
586+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"")
587 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
588 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
589 EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
590@@ -1389,7 +1351,7 @@
591 ])
592 AC_MSG_RESULT($video_picogui)
593 if test x$video_picogui = xyes; then
594- AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI)
595+ AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"")
596 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
597 SDL_LIBS="$SDL_LIBS -lpgui"
598 have_video=yes
599@@ -1413,7 +1375,7 @@
600 video_xbios=no
601 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
602 video_xbios=yes
603- AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS)
604+ AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"")
605 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
606 have_video=yes
607 fi
608@@ -1431,7 +1393,7 @@
609 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
610 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
611 video_gem=yes
612- AC_DEFINE(SDL_VIDEO_DRIVER_GEM)
613+ AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"")
614 SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
615 SDL_LIBS="$SDL_LIBS -lgem"
616 have_video=yes
617@@ -1446,7 +1408,7 @@
618 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
619 , enable_video_dummy=yes)
620 if test x$enable_video_dummy = xyes; then
621- AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY)
622+ AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"")
623 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
624 have_video=yes
625 fi
626@@ -1472,8 +1434,8 @@
627 ])
628 AC_MSG_RESULT($video_opengl)
629 if test x$video_opengl = xyes; then
630- AC_DEFINE(SDL_VIDEO_OPENGL)
631- AC_DEFINE(SDL_VIDEO_OPENGL_GLX)
632+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
633+ AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"")
634 fi
635 fi
636 }
637@@ -1492,7 +1454,7 @@
638 ])
639 AC_MSG_RESULT($video_opengl)
640 if test x$video_opengl = xyes; then
641- AC_DEFINE(SDL_VIDEO_OPENGL)
642+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
643 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
644 fi
645 fi
646@@ -1502,8 +1464,8 @@
647 CheckWIN32GL()
648 {
649 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
650- AC_DEFINE(SDL_VIDEO_OPENGL)
651- AC_DEFINE(SDL_VIDEO_OPENGL_WGL)
652+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
653+ AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"")
654 fi
655 }
656
657@@ -1511,7 +1473,7 @@
658 CheckBeGL()
659 {
660 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
661- AC_DEFINE(SDL_VIDEO_OPENGL)
662+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
663 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
664 fi
665 }
666@@ -1520,7 +1482,7 @@
667 CheckMacGL()
668 {
669 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
670- AC_DEFINE(SDL_VIDEO_OPENGL)
671+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
672 case "$host" in
673 *-*-darwin*)
674 if test x$enable_video_cocoa = xyes; then
675@@ -1552,8 +1514,8 @@
676 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
677 OSMESA_LIBS=`$OSMESA_CONFIG --libs`
678 fi
679- AC_DEFINE(SDL_VIDEO_OPENGL)
680- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA)
681+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
682+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"")
683 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
684 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
685
686@@ -1563,7 +1525,7 @@
687 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
688 # Dynamic linking
689 if test "x$have_osmesa_hdr" = "xyes"; then
690- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC)
691+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"")
692 fi
693 fi
694 fi
695@@ -1590,7 +1552,7 @@
696 ])
697 AC_MSG_RESULT($use_input_events)
698 if test x$use_input_events = xyes; then
699- AC_DEFINE(SDL_INPUT_LINUXEV)
700+ AC_DEFINE(SDL_INPUT_LINUXEV,1,"")
701 fi
702 fi
703 }
704@@ -1612,7 +1574,7 @@
705 ])
706 AC_MSG_RESULT($enable_input_tslib)
707 if test x$enable_input_tslib = xyes; then
708- AC_DEFINE(SDL_INPUT_TSLIB)
709+ AC_DEFINE(SDL_INPUT_TSLIB,1,"")
710 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
711 fi
712 fi
713@@ -1635,7 +1597,7 @@
714 AC_MSG_CHECKING(pth)
715 AC_MSG_RESULT($use_pth)
716 if test "x$use_pth" = xyes; then
717- AC_DEFINE(SDL_THREAD_PTH)
718+ AC_DEFINE(SDL_THREAD_PTH,1,"")
719 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
720 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
721 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
722@@ -1741,7 +1703,7 @@
723
724 # Do futher testing if we have pthread support...
725 if test x$use_pthreads = xyes; then
726- AC_DEFINE(SDL_THREAD_PTHREAD)
727+ AC_DEFINE(SDL_THREAD_PTHREAD,1,"")
728 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
729 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
730 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
731@@ -1763,7 +1725,7 @@
732 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
733 ],[
734 has_recursive_mutexes=yes
735- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX)
736+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"")
737 ])
738 fi
739 if test x$has_recursive_mutexes = xno; then
740@@ -1774,7 +1736,7 @@
741 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
742 ],[
743 has_recursive_mutexes=yes
744- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP)
745+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"")
746 ])
747 fi
748 AC_MSG_RESULT($has_recursive_mutexes)
749@@ -1849,7 +1811,7 @@
750 fi
751
752 if test x$enable_video = xyes; then
753- AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB)
754+ AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"")
755 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
756 SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
757 have_video=yes
758@@ -1871,7 +1833,7 @@
759 have_directx=yes
760 fi
761 if test x$enable_video = xyes -a x$have_directx = xyes; then
762- AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
763+ AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"")
764 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
765 have_video=yes
766 fi
767@@ -1904,9 +1866,9 @@
768 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
769 AC_CHECK_LIB(dl, dlvsym, have_dlvsym=yes)
770 if test x$have_dlvsym = xyes; then
771- AC_DEFINE(HAVE_DLVSYM)
772+ AC_DEFINE(HAVE_DLVSYM,1,"")
773 fi
774- AC_DEFINE(SDL_LOADSO_DLOPEN)
775+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
776 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
777 have_loadso=yes
778 fi
779@@ -1923,7 +1885,7 @@
780 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
781 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
782 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
783- AC_DEFINE(SDL_LOADSO_LDG)
784+ AC_DEFINE(SDL_LOADSO_LDG,1,"")
785 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
786 SDL_LIBS="$SDL_LIBS -lldg -lgem"
787 have_loadso=yes
788@@ -2049,11 +2011,11 @@
789 have_machine_joystick=yes
790 ])
791 if test x$have_machine_joystick = xyes; then
792- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H)
793+ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"")
794 fi
795 AC_MSG_RESULT($have_machine_joystick)
796
797- AC_DEFINE(SDL_JOYSTICK_USBHID)
798+ AC_DEFINE(SDL_JOYSTICK_USBHID,1,"")
799 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
800 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
801 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
802@@ -2072,7 +2034,7 @@
803 if test x$enable_clock_gettime = xyes; then
804 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
805 if test x$have_clock_gettime = xyes; then
806- AC_DEFINE(HAVE_CLOCK_GETTIME)
807+ AC_DEFINE(HAVE_CLOCK_GETTIME,1,"")
808 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
809 fi
810 fi
811@@ -2103,7 +2065,7 @@
812 CheckIPod
813 # Set up files for the timer library
814 if test x$enable_timers = xyes; then
815- AC_DEFINE(SDL_TIMER_UNIX)
816+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
817 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
818 have_timers=yes
819 fi
820@@ -2166,17 +2128,17 @@
821 if test x$enable_audio = xyes; then
822 case $ARCH in
823 sysv5|solaris|hpux)
824- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
825+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
826 SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
827 have_audio=yes
828 ;;
829 netbsd|openbsd)
830- AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
831+ AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"")
832 SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
833 have_audio=yes
834 ;;
835 aix)
836- AC_DEFINE(SDL_AUDIO_DRIVER_PAUD)
837+ AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"")
838 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
839 have_audio=yes
840 ;;
841@@ -2186,7 +2148,7 @@
842 if test x$enable_joystick = xyes; then
843 case $ARCH in
844 linux)
845- AC_DEFINE(SDL_JOYSTICK_LINUX)
846+ AC_DEFINE(SDL_JOYSTICK_LINUX,1,"")
847 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
848 have_joystick=yes
849 ;;
850@@ -2196,32 +2158,32 @@
851 if test x$enable_cdrom = xyes; then
852 case $ARCH in
853 linux|solaris)
854- AC_DEFINE(SDL_CDROM_LINUX)
855+ AC_DEFINE(SDL_CDROM_LINUX,1,"")
856 SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c"
857 have_cdrom=yes
858 ;;
859 *freebsd*)
860- AC_DEFINE(SDL_CDROM_FREEBSD)
861+ AC_DEFINE(SDL_CDROM_FREEBSD,1,"")
862 SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
863 have_cdrom=yes
864 ;;
865 *openbsd*|*netbsd*)
866- AC_DEFINE(SDL_CDROM_OPENBSD)
867+ AC_DEFINE(SDL_CDROM_OPENBSD,1,"")
868 SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
869 have_cdrom=yes
870 ;;
871 bsdi)
872- AC_DEFINE(SDL_CDROM_BSDI)
873+ AC_DEFINE(SDL_CDROM_BSDI,1,"")
874 SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c"
875 have_cdrom=yes
876 ;;
877 aix)
878- AC_DEFINE(SDL_CDROM_AIX)
879+ AC_DEFINE(SDL_CDROM_AIX,1,"")
880 SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c"
881 have_cdrom=yes
882 ;;
883 osf)
884- AC_DEFINE(SDL_CDROM_OSF)
885+ AC_DEFINE(SDL_CDROM_OSF,1,"")
886 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
887 have_cdrom=yes
888 ;;
889@@ -2229,7 +2191,7 @@
890 fi
891 # Set up files for the thread library
892 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
893- AC_DEFINE(SDL_THREAD_SPROC)
894+ AC_DEFINE(SDL_THREAD_SPROC,1,"")
895 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
896 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
897 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
898@@ -2237,7 +2199,7 @@
899 fi
900 # Set up files for the timer library
901 if test x$enable_timers = xyes; then
902- AC_DEFINE(SDL_TIMER_UNIX)
903+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
904 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
905 have_timers=yes
906 fi
907@@ -2256,20 +2218,20 @@
908 CheckPTHREAD
909 # Set up files for the audio library
910 if test x$enable_audio = xyes; then
911- AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO)
912+ AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"")
913 SOURCES="$SOURCES $srcdir/src/audio/nto/*.c"
914 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
915 have_audio=yes
916 fi
917 # Set up files for the cdrom library
918 if test x$enable_cdrom = xyes; then
919- AC_DEFINE(SDL_CDROM_QNX)
920+ AC_DEFINE(SDL_CDROM_QNX,1,"")
921 SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c"
922 have_cdrom=yes
923 fi
924 # Set up files for the timer library
925 if test x$enable_timers = xyes; then
926- AC_DEFINE(SDL_TIMER_UNIX)
927+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
928 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
929 have_timers=yes
930 fi
931@@ -2294,29 +2256,29 @@
932 CheckNASM
933 # Set up files for the audio library
934 if test x$enable_audio = xyes; then
935- AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
936+ AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"")
937 SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
938 if test x$have_directx = xyes; then
939- AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
940+ AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"")
941 SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
942 fi
943 have_audio=yes
944 fi
945 # Set up files for the joystick library
946 if test x$enable_joystick = xyes; then
947- AC_DEFINE(SDL_JOYSTICK_WINMM)
948+ AC_DEFINE(SDL_JOYSTICK_WINMM,1,"")
949 SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
950 have_joystick=yes
951 fi
952 # Set up files for the cdrom library
953 if test x$enable_cdrom = xyes; then
954- AC_DEFINE(SDL_CDROM_WIN32)
955+ AC_DEFINE(SDL_CDROM_WIN32,1,"")
956 SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c"
957 have_cdrom=yes
958 fi
959 # Set up files for the thread library
960 if test x$enable_threads = xyes; then
961- AC_DEFINE(SDL_THREAD_WIN32)
962+ AC_DEFINE(SDL_THREAD_WIN32,1,"")
963 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
964 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
965 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
966@@ -2325,13 +2287,13 @@
967 fi
968 # Set up files for the timer library
969 if test x$enable_timers = xyes; then
970- AC_DEFINE(SDL_TIMER_WIN32)
971+ AC_DEFINE(SDL_TIMER_WIN32,1,"")
972 SOURCES="$SOURCES $srcdir/src/timer/win32/*.c"
973 have_timers=yes
974 fi
975 # Set up files for the shared object loading library
976 if test x$enable_loadso = xyes; then
977- AC_DEFINE(SDL_LOADSO_WIN32)
978+ AC_DEFINE(SDL_LOADSO_WIN32,1,"")
979 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
980 have_loadso=yes
981 fi
982@@ -2356,25 +2318,25 @@
983 CheckBeGL
984 # Set up files for the audio library
985 if test x$enable_audio = xyes; then
986- AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO)
987+ AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"")
988 SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
989 have_audio=yes
990 fi
991 # Set up files for the joystick library
992 if test x$enable_joystick = xyes; then
993- AC_DEFINE(SDL_JOYSTICK_BEOS)
994+ AC_DEFINE(SDL_JOYSTICK_BEOS,1,"")
995 SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
996 have_joystick=yes
997 fi
998 # Set up files for the cdrom library
999 if test x$enable_cdrom = xyes; then
1000- AC_DEFINE(SDL_CDROM_BEOS)
1001+ AC_DEFINE(SDL_CDROM_BEOS,1,"")
1002 SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc"
1003 have_cdrom=yes
1004 fi
1005 # Set up files for the thread library
1006 if test x$enable_threads = xyes; then
1007- AC_DEFINE(SDL_THREAD_BEOS)
1008+ AC_DEFINE(SDL_THREAD_BEOS,1,"")
1009 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
1010 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
1011 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
1012@@ -2382,13 +2344,13 @@
1013 fi
1014 # Set up files for the timer library
1015 if test x$enable_timers = xyes; then
1016- AC_DEFINE(SDL_TIMER_BEOS)
1017+ AC_DEFINE(SDL_TIMER_BEOS,1,"")
1018 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
1019 have_timers=yes
1020 fi
1021 # Set up files for the shared object loading library
1022 if test x$enable_loadso = xyes; then
1023- AC_DEFINE(SDL_LOADSO_BEOS)
1024+ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
1025 SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
1026 have_loadso=yes
1027 fi
1028@@ -2425,7 +2387,7 @@
1029 # Set up files for the shared object loading library
1030 # (this needs to be done before the dynamic X11 check)
1031 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
1032- AC_DEFINE(SDL_LOADSO_DLCOMPAT)
1033+ AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"")
1034 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
1035 have_loadso=yes
1036 fi
1037@@ -2443,28 +2405,28 @@
1038
1039 # Set up files for the audio library
1040 if test x$enable_audio = xyes; then
1041- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
1042+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"")
1043 SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
1044- AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR)
1045+ AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR,1,"")
1046 SOURCES="$SOURCES $srcdir/src/audio/macrom/*.c"
1047 have_audio=yes
1048 fi
1049 # Set up files for the joystick library
1050 if test x$enable_joystick = xyes; then
1051- AC_DEFINE(SDL_JOYSTICK_IOKIT)
1052+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"")
1053 SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
1054 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
1055 have_joystick=yes
1056 fi
1057 # Set up files for the cdrom library
1058 if test x$enable_cdrom = xyes; then
1059- AC_DEFINE(SDL_CDROM_MACOSX)
1060+ AC_DEFINE(SDL_CDROM_MACOSX,1,"")
1061 SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c"
1062 have_cdrom=yes
1063 fi
1064 # Set up files for the timer library
1065 if test x$enable_timers = xyes; then
1066- AC_DEFINE(SDL_TIMER_UNIX)
1067+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
1068 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1069 have_timers=yes
1070 fi
1071@@ -2500,30 +2462,30 @@
1072 # Set up files for the audio library
1073 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1074 if test x$enable_audio = xyes; then
1075- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
1076+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
1077 SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
1078 have_audio=yes
1079 fi
1080 fi
1081 # Set up files for the joystick library
1082 if test x$enable_joystick = xyes; then
1083- AC_DEFINE(SDL_JOYSTICK_MINT)
1084+ AC_DEFINE(SDL_JOYSTICK_MINT,1,"")
1085 SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c"
1086 have_joystick=yes
1087 fi
1088 # Set up files for the cdrom library
1089 if test x$enable_cdrom = xyes; then
1090- AC_DEFINE(SDL_CDROM_MINT)
1091+ AC_DEFINE(SDL_CDROM_MINT,1,"")
1092 SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c"
1093 have_cdrom=yes
1094 fi
1095 # Set up files for the timer library
1096 if test x$enable_timers = xyes; then
1097 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1098- AC_DEFINE(SDL_TIMER_UNIX)
1099+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
1100 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1101 else
1102- AC_DEFINE(SDL_TIMER_MINT)
1103+ AC_DEFINE(SDL_TIMER_MIN,1,""T)
1104 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
1105 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
1106 fi
1107@@ -2536,20 +2498,20 @@
1108 CheckPTHREAD
1109 # Set up files for the video library
1110 if test x$enable_video = xyes; then
1111- AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS)
1112+ AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"")
1113 SOURCES="$SOURCES $srcdir/src/video/riscos/*.c"
1114 SOURCES="$SOURCES $srcdir/src/video/riscos/*.S"
1115 have_video=yes
1116 fi
1117 # Set up files for the joystick library
1118 if test x$enable_joystick = xyes; then
1119- AC_DEFINE(SDL_JOYSTICK_RISCOS)
1120+ AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"")
1121 SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c"
1122 have_joystick=yes
1123 fi
1124 # Set up files for the timer library
1125 if test x$enable_timers = xyes; then
1126- AC_DEFINE(SDL_TIMER_RISCOS)
1127+ AC_DEFINE(SDL_TIMER_RISCOS,1,"")
1128 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
1129 have_timers=yes
1130 fi
1131@@ -2566,31 +2528,31 @@
1132 # Verify that we have all the platform specific files we need
1133 if test x$have_joystick != xyes; then
1134 if test x$enable_joystick = xyes; then
1135- AC_DEFINE(SDL_JOYSTICK_DISABLED)
1136+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
1137 fi
1138 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
1139 fi
1140 if test x$have_cdrom != xyes; then
1141 if test x$enable_cdrom = xyes; then
1142- AC_DEFINE(SDL_CDROM_DISABLED)
1143+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
1144 fi
1145 SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c"
1146 fi
1147 if test x$have_threads != xyes; then
1148 if test x$enable_threads = xyes; then
1149- AC_DEFINE(SDL_THREADS_DISABLED)
1150+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
1151 fi
1152 SOURCES="$SOURCES $srcdir/src/thread/generic/*.c"
1153 fi
1154 if test x$have_timers != xyes; then
1155 if test x$enable_timers = xyes; then
1156- AC_DEFINE(SDL_TIMERS_DISABLED)
1157+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
1158 fi
1159 SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
1160 fi
1161 if test x$have_loadso != xyes; then
1162 if test x$enable_loadso = xyes; then
1163- AC_DEFINE(SDL_LOADSO_DISABLED)
1164+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
1165 fi
1166 SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
1167 fi
diff --git a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
index 3dd27325b0..bcf012ef75 100644
--- a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
+++ b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
@@ -4,10 +4,11 @@ SECTION = "libs"
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5DEPENDS = "libx11-sdk libxext-sdk libxrandr-sdk libxrender-sdk" 5DEPENDS = "libx11-sdk libxext-sdk libxrandr-sdk libxrender-sdk"
6RDEPENDS = "libx11-sdk libxrandr-sdk libxrender-sdk libxext-sdk" 6RDEPENDS = "libx11-sdk libxrandr-sdk libxrender-sdk libxext-sdk"
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 9SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
10 file://acinclude.m4 \ 10 file://acinclude.m4 \
11 file://configure_tweak.patch;patch=1 \
11 file://kernel-asm-page.patch;patch=1 " 12 file://kernel-asm-page.patch;patch=1 "
12S = "${WORKDIR}/SDL-${PV}" 13S = "${WORKDIR}/SDL-${PV}"
13 14
@@ -24,17 +25,6 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
24 25
25PARALLEL_MAKE = "" 26PARALLEL_MAKE = ""
26 27
27do_configure() {
28 rm -f ${S}/acinclude.m4
29 cp ${WORKDIR}/acinclude.m4 ${S}/
30 gnu-configize
31 oe_runconf
32 cd ${S}
33 # prevent libtool from linking libs against libstdc++, libgcc, ...
34 cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
35 mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
36}
37
38do_stage() { 28do_stage() {
39 autotools_stage_all 29 autotools_stage_all
40 install -m 0644 ${S}/build/libSDLmain.a ${STAGING_LIBDIR} 30 install -m 0644 ${S}/build/libSDLmain.a ${STAGING_LIBDIR}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 23:47:52 +0000