From 707e2cc25904bd4ea7ca94f45632e02d7dbee14c Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 29 Jan 2022 14:10:02 +0300
Subject: [PATCH] misc configury updates.
---
configure | 268 +++++++++++++++------------------------------------
configure.ac | 198 ++++++++++++-------------------------
2 files changed, 137 insertions(+), 329 deletions(-)
diff --git a/configure b/configure
index 5fa1010b..04a8a571 100755
--- a/configure
+++ b/configure
@@ -999,6 +999,7 @@ enable_pth
enable_pthreads
enable_pthread_sem
enable_stdio_redirect
+enable_video_grop
enable_video_fslib
enable_directx
enable_gapi
@@ -1734,6 +1735,7 @@ Optional Features:
--enable-pthreads use POSIX threads for multi-threading [default=yes]
--enable-pthread-sem use pthread semaphores [default=yes]
--enable-stdio-redirect Redirect STDIO to files on Win32 [default=yes]
+ --enable-video-grop use the new OS/2 gRop video driver [default=yes]
--enable-video-fslib use the old OS/2 FSLib video driver [default=no]
--enable-directx use DirectX for Win32 audio/video [default=yes]
--enable-gapi use GAPI for WinCE video [default=no]
@@ -4832,13 +4834,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4835: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4837: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4838: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4840: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4841: output\"" >&5)
+ (eval echo "\"\$as_me:4843: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6051,7 +6053,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6054 "configure"' > conftest.$ac_ext
+ echo '#line 6056 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7609,11 +7611,11 @@ else
-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:7612: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7614: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7616: \$? = $ac_status" >&5
+ echo "$as_me:7618: \$? = $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.
@@ -7958,11 +7960,11 @@ else
-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:7961: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7965: \$? = $ac_status" >&5
+ echo "$as_me:7967: \$? = $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.
@@ -8063,11 +8065,11 @@ else
-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:8066: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8068: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8070: \$? = $ac_status" >&5
+ echo "$as_me:8072: \$? = $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
@@ -8118,11 +8120,11 @@ else
-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:8121: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8123: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8125: \$? = $ac_status" >&5
+ echo "$as_me:8127: \$? = $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
@@ -10561,7 +10563,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10564 "configure"
+#line 10566 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10657,7 +10659,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10660 "configure"
+#line 10662 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14106,11 +14108,11 @@ else
-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:14109: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14111: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14113: \$? = $ac_status" >&5
+ echo "$as_me:14115: \$? = $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.
@@ -14205,11 +14207,11 @@ else
-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:14208: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14210: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14212: \$? = $ac_status" >&5
+ echo "$as_me:14214: \$? = $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
@@ -14257,11 +14259,11 @@ else
-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:14260: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14262: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14264: \$? = $ac_status" >&5
+ echo "$as_me:14266: \$? = $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
@@ -16324,7 +16326,6 @@ int
main ()
{
-
;
return 0;
}
@@ -16829,9 +16830,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_oss=yes
-
+ have_oss=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -17154,9 +17153,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_dmedia=yes
-
+ have_dmedia=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dmedia" >&5
@@ -17205,9 +17202,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_mme=yes
-
+ have_mme=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
@@ -17789,9 +17784,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- audio_arts=yes
-
+ audio_arts=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
@@ -18193,7 +18186,6 @@ int
main ()
{
-
;
return 0;
}
@@ -18222,15 +18214,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_gcc_altivec=yes
-
+ have_gcc_altivec=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_altivec" >&5
@@ -18278,20 +18267,16 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_gcc_altivec=yes
-
+ have_gcc_altivec=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_altivec" >&5
$as_echo "$have_gcc_altivec" >&6; }
-
CFLAGS="$save_CFLAGS"
if test x$have_gcc_altivec = xyes; then
@@ -18422,15 +18407,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_gcc_fvisibility=yes
-
+ have_gcc_fvisibility=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_fvisibility" >&5
@@ -18452,22 +18434,17 @@ $as_echo_n "checking for GCC -Wall option... " >&6; }
CFLAGS="$save_CFLAGS -Wall"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
- int x = 0;
-
+int x = 0;
int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_gcc_Wall=yes
-
+ have_gcc_Wall=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_Wall" >&5
@@ -19604,7 +19581,6 @@ int
main ()
{
-
;
return 0;
}
@@ -19655,9 +19631,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_photon=yes
-
+ video_photon=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_photon" >&5
@@ -19706,15 +19680,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_carbon=yes
-
+ have_carbon=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_carbon" >&5
@@ -19753,15 +19724,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_cocoa=yes
-
+ have_cocoa=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_cocoa" >&5
@@ -19812,15 +19780,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_fbcon=yes
-
+ video_fbcon=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_fbcon" >&5
@@ -19977,15 +19942,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_ps2gs=yes
-
+ video_ps2gs=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_ps2gs" >&5
@@ -20023,15 +19985,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_ps3=yes
-
+ video_ps3=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_ps3" >&5
@@ -20070,15 +20029,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_ggi=yes
-
+ video_ggi=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_ggi" >&5
@@ -20126,9 +20082,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_svga=yes
-
+ video_svga=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_svga" >&5
@@ -20178,9 +20132,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_vgl=yes
-
+ video_vgl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_vgl" >&5
@@ -20226,9 +20178,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_wscons=yes
-
+ video_wscons=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_wscons" >&5
@@ -20265,15 +20215,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_aalib=yes
-
+ video_aalib=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_aalib" >&5
@@ -20355,15 +20302,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_caca=yes
-
+ video_caca=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
@@ -20411,15 +20355,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
-
- video_qtopia=yes
-
+ video_qtopia=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$OLD_CXX"
@@ -20467,15 +20408,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_picogui=yes
-
+ video_picogui=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_picogui" >&5
@@ -20625,15 +20563,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_opengl=yes
-
+ video_opengl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengl" >&5
@@ -20662,15 +20597,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- video_opengl=yes
-
+ video_opengl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $video_opengl" >&5
@@ -20890,9 +20822,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- use_input_events=yes
-
+ use_input_events=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_events" >&5
@@ -20926,15 +20856,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- enable_input_tslib=yes
-
+ enable_input_tslib=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_input_tslib" >&5
@@ -21135,9 +21062,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-
- use_pthreads=yes
-
+ use_pthreads=yes
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -21238,15 +21163,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_pthread_sem=yes
-
+ have_pthread_sem=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread_sem" >&5
@@ -21328,15 +21250,12 @@ int
main ()
{
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_win32_gcc=yes
-
+ have_win32_gcc=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_win32_gcc" >&5
@@ -21433,6 +21352,13 @@ $as_echo "$have_os2_gcc" >&6; }
" "$LINENO" 5
fi
+ # Check whether --enable-video-grop was given.
+if test "${enable_video_grop+set}" = set; then :
+ enableval=$enable_video_grop;
+else
+ enable_video_grop=yes
+fi
+
# Check whether --enable-video-fslib was given.
if test "${enable_video_fslib+set}" = set; then :
enableval=$enable_video_fslib;
@@ -21525,9 +21451,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_dlopen=yes
-
+ have_dlopen=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dlopen" >&5
@@ -21612,50 +21536,19 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lltdl" >&5
-$as_echo_n "checking for dlopen in -lltdl... " >&6; }
-if ${ac_cv_lib_ltdl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lltdl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ltdl_dlopen=yes
-else
- ac_cv_lib_ltdl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_dlopen" >&5
-$as_echo "$ac_cv_lib_ltdl_dlopen" >&6; }
-if test "x$ac_cv_lib_ltdl_dlopen" = xyes; then :
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"
+ have_dlopen=no
fi
-fi
fi
+ if test x$have_dlopen = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed finding libdl, dlopen disabled" >&5
+$as_echo "$as_me: WARNING: Failed finding libdl, dlopen disabled" >&2;}
+ fi
+ fi
+
+ if test x$have_dlopen = xyes; then
$as_echo "#define SDL_LOADSO_DLOPEN 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
@@ -21885,9 +21778,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_usbhid=yes
-
+ have_usbhid=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_usbhid" >&5
@@ -21931,9 +21822,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_usbhid_ucr_data=yes
-
+ have_usbhid_ucr_data=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$have_usbhid_ucr_data = xyes; then
@@ -21979,9 +21868,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_usbhid_new=yes
-
+ have_usbhid_new=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$have_usbhid_new = xyes; then
@@ -22009,9 +21896,7 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
-
- have_machine_joystick=yes
-
+ have_machine_joystick=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$have_machine_joystick = xyes; then
@@ -22709,14 +22594,17 @@ case "$host" in
# Set up files for the video library
if test x$enable_video = xyes; then
- $as_echo "#define SDL_VIDEO_DRIVER_OS2GROP 1" >>confdefs.h
+ if test x$enable_video_grop = xyes; then
+ $as_echo "#define SDL_VIDEO_DRIVER_OS2GROP 1" >>confdefs.h
- SOURCES="$SOURCES $srcdir/src/video/os2grop/*.c"
- have_video=yes
+ SOURCES="$SOURCES $srcdir/src/video/os2grop/*.c"
+ have_video=yes
+ fi
if test x$enable_video_fslib = xyes; then
$as_echo "#define SDL_VIDEO_DRIVER_OS2FS 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/video/os2fslib/*.c"
+ have_video=yes
fi
fi
# Set up files for the audio library
diff --git a/configure.ac b/configure.ac
index b187e516..a654c1bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,8 +176,7 @@ dnl Checks for library functions.
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/mman.h>
- ],[
- ],[
+ ],, [
AC_DEFINE(HAVE_MPROTECT)
]),
)
@@ -329,16 +328,14 @@ CheckOSS()
#include <sys/soundcard.h>
],[
int arg = SNDCTL_DSP_SETFRAGMENT;
- ],[
- have_oss=yes
- ])
+ ], [have_oss=yes])
fi
if test x$have_oss != xyes; then
AC_TRY_COMPILE([
#include <soundcard.h>
],[
int arg = SNDCTL_DSP_SETFRAGMENT;
- ],[
+ ], [
have_oss=yes
AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H)
])
@@ -406,9 +403,7 @@ CheckDMEDIA()
#include <dmedia/audio.h>
],[
ALport audio_port;
- ],[
- have_dmedia=yes
- ])
+ ], [have_dmedia=yes])
AC_MSG_RESULT($have_dmedia)
if test x$have_dmedia = xyes; then
@@ -442,9 +437,7 @@ dnl Make sure we are running on an Tru64 UNIX
#include <mme_api.h>
],[
HWAVEOUT sound;
- ],[
- have_mme=yes
- ])
+ ], [have_mme=yes])
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($have_mme)
@@ -582,9 +575,7 @@ CheckARTSC()
#include <artsc.h>
],[
arts_stream_t stream;
- ],[
- audio_arts=yes
- ])
+ ], [audio_arts=yes])
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($audio_arts)
if test x$audio_arts = xyes; then
@@ -819,8 +810,7 @@ CheckAltivec()
vector unsigned int vzero() {
return vec_splat_u32(0);
}
- ],[
- ],[
+ ],, [
have_gcc_altivec=yes
have_altivec_h_hdr=yes
])
@@ -832,10 +822,7 @@ CheckAltivec()
vector unsigned int vzero() {
return vec_splat_u32(0);
}
- ],[
- ],[
- have_gcc_altivec=yes
- ])
+ ],, [have_gcc_altivec=yes])
AC_MSG_RESULT($have_gcc_altivec)
fi
CFLAGS="$save_CFLAGS"
@@ -868,12 +855,8 @@ dnl -faltivec doesn't need altivec.h and actually emits a warning if included
vector unsigned int vzero() {
return vec_splat_u32(0);
}
- ],[
- ],[
- have_gcc_altivec=yes
- ])
+ ],, [have_gcc_altivec=yes])
AC_MSG_RESULT($have_gcc_altivec)
-
CFLAGS="$save_CFLAGS"
if test x$have_gcc_altivec = xyes; then
@@ -972,10 +955,7 @@ CheckVisibilityHidden()
#if !defined(__GNUC__) || __GNUC__ < 4
#error SDL only uses visibility attributes in GCC 4 or newer
#endif
- ],[
- ],[
- have_gcc_fvisibility=yes
- ])
+ ],, [have_gcc_fvisibility=yes])
AC_MSG_RESULT($have_gcc_fvisibility)
CFLAGS="$save_CFLAGS"
@@ -992,12 +972,7 @@ CheckWarnAll()
save_CFLAGS="$CFLAGS"
CFLAGS="$save_CFLAGS -Wall"
- AC_TRY_COMPILE([
- int x = 0;
- ],[
- ],[
- have_gcc_Wall=yes
- ])
+ AC_TRY_COMPILE([int x = 0;],, [have_gcc_Wall=yes])
AC_MSG_RESULT($have_gcc_Wall)
CFLAGS="$save_CFLAGS"
@@ -1247,8 +1222,7 @@ CheckX11()
AC_TRY_COMPILE([
#include <X11/Xlibint.h>
extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
- ],[
- ],[
+ ],, [
have_const_param_xdata32=yes
AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
])
@@ -1273,9 +1247,7 @@ CheckPHOTON()
#include <photon/PdDirect.h>
],[
PgDisplaySettings_t *visual;
- ],[
- video_photon=yes
- ])
+ ], [video_photon=yes])
AC_MSG_RESULT($video_photon)
if test x$video_photon = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
@@ -1309,10 +1281,7 @@ CheckCARBON()
have_carbon=no
AC_TRY_COMPILE([
#include <Carbon/Carbon.h>
- ],[
- ],[
- have_carbon=yes
- ])
+ ],, [have_carbon=yes])
AC_MSG_RESULT($have_carbon)
if test x$have_carbon = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX)
@@ -1337,10 +1306,7 @@ dnl work around that we don't have Objective-C support in autoconf
have_cocoa=no
AC_TRY_COMPILE([
#import <Cocoa/Cocoa.h>
- ],[
- ],[
- have_cocoa=yes
- ])
+ ],, [have_cocoa=yes])
AC_MSG_RESULT($have_cocoa)
CFLAGS="$save_CFLAGS"
if test x$have_cocoa = xyes; then
@@ -1365,10 +1331,7 @@ CheckFBCON()
#include <linux/fb.h>
#include <linux/kd.h>
#include <linux/keyboard.h>
- ],[
- ],[
- video_fbcon=yes
- ])
+ ],, [video_fbcon=yes])
AC_MSG_RESULT($video_fbcon)
if test x$video_fbcon = xyes; then
AC_CHECK_FUNCS(getpagesize)
@@ -1419,10 +1382,7 @@ CheckPS2GS()
AC_TRY_COMPILE([
#include <linux/ps2/dev.h>
#include <linux/ps2/gs.h>
- ],[
- ],[
- video_ps2gs=yes
- ])
+ ],, [video_ps2gs=yes])
AC_MSG_RESULT($video_ps2gs)
if test x$video_ps2gs = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS)
@@ -1445,10 +1405,7 @@ CheckPS3()
#include <linux/fb.h>
#include <asm/ps3fb.h>
#include <libspe2.h>
- ],[
- ],[
- video_ps3=yes
- ])
+ ],, [video_ps3=yes])
AC_MSG_RESULT($video_ps3)
if test x$video_ps3 = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_PS3)
@@ -1472,10 +1429,7 @@ CheckGGI()
AC_TRY_COMPILE([
#include <ggi/ggi.h>
#include <ggi/gii.h>
- ],[
- ],[
- video_ggi=yes
- ])
+ ],, [video_ggi=yes])
AC_MSG_RESULT($video_ggi)
if test x$video_ggi = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_GGI)
@@ -1503,9 +1457,7 @@ CheckSVGA()
if ( SCANCODE_RIGHTWIN && SCANCODE_LEFTWIN ) {
exit(0);
}
- ],[
- video_svga=yes
- ])
+ ], [video_svga=yes])
AC_MSG_RESULT($video_svga)
if test x$video_svga = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB)
@@ -1535,9 +1487,7 @@ CheckVGL()
bitmap.Type = VIDBUF32;
bitmap.PixelBytes = 4;
exit(bitmap.Bitmap);
- ],[
- video_vgl=yes
- ])
+ ], [video_vgl=yes])
AC_MSG_RESULT($video_vgl)
if test x$video_vgl = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_VGL)
@@ -1563,9 +1513,7 @@ CheckWscons()
#include <dev/wscons/wsdisplay_usl_io.h>
],[
int wsmode = WSDISPLAYIO_MODE_DUMBFB;
- ],[
- video_wscons=yes
- ])
+ ], [video_wscons=yes])
AC_MSG_RESULT($video_wscons)
if test x$video_wscons = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS)
@@ -1587,10 +1535,7 @@ CheckAAlib()
video_aalib=no
AC_TRY_COMPILE([
#include <aalib.h>
- ],[
- ],[
- video_aalib=yes
- ])
+ ],, [video_aalib=yes])
AC_MSG_RESULT($video_aalib)
if test x$video_aalib = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_AALIB)
@@ -1617,10 +1562,7 @@ CheckCaca()
save_CFLAGS="$CFLAGS"
AC_TRY_COMPILE([
#include <caca.h>
- ],[
- ],[
- video_caca=yes
- ])
+ ],, [video_caca=yes])
CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($video_caca)
if test x$video_caca = xyes; then
@@ -1648,10 +1590,7 @@ CheckQtopia()
CXXFLAGS="$QTOPIA_FLAGS"
AC_TRY_COMPILE([
#include <qpe/qpeapplication.h>
- ],[
- ],[
- video_qtopia=yes
- ])
+ ],, [video_qtopia=yes])
CXXFLAGS="$OLD_CXX"
AC_MSG_RESULT($video_qtopia)
if test x$video_qtopia = xyes; then
@@ -1679,10 +1618,7 @@ CheckPicoGUI()
video_picogui=no
AC_TRY_COMPILE([
#include <picogui.h>
- ],[
- ],[
- video_picogui=yes
- ])
+ ],, [video_picogui=yes])
AC_MSG_RESULT($video_picogui)
if test x$video_picogui = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI)
@@ -1763,10 +1699,7 @@ CheckOpenGLX11()
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
- ],[
- ],[
- video_opengl=yes
- ])
+ ],, [video_opengl=yes])
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL)
@@ -1783,10 +1716,7 @@ CheckOpenGLQNX()
video_opengl=no
AC_TRY_COMPILE([
#include <GL/gl.h>
- ],[
- ],[
- video_opengl=yes
- ])
+ ],, [video_opengl=yes])
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL)
@@ -1889,9 +1819,7 @@ dnl Check for Linux 2.4 unified input event interface support
#ifndef EVIOCGNAME
#error EVIOCGNAME() ioctl not available
#endif
- ],[
- use_input_events=yes
- ])
+ ], [use_input_events=yes])
AC_MSG_RESULT($use_input_events)
if test x$use_input_events = xyes; then
AC_DEFINE(SDL_INPUT_LINUXEV)
@@ -1910,10 +1838,7 @@ CheckTslib()
enable_input_tslib=no
AC_TRY_COMPILE([
#include "tslib.h"
- ],[
- ],[
- enable_input_tslib=yes
- ])
+ ],, [enable_input_tslib=yes])
AC_MSG_RESULT($enable_input_tslib)
if test x$enable_input_tslib = xyes; then
AC_DEFINE(SDL_INPUT_TSLIB)
@@ -2047,9 +1972,7 @@ dnl This is used on Linux for glibc binary compatibility (Doh!)
],[
pthread_attr_t type;
pthread_attr_init(&type);
- ],[
- use_pthreads=yes
- ])
+ ], [use_pthreads=yes])
AC_MSG_RESULT($use_pthreads)
# Restore the compiler flags and libraries
CFLAGS="$ac_save_cflags"; LIBS="$ac_save_libs"
@@ -2077,7 +2000,7 @@ dnl This is used on Linux for glibc binary compatibility (Doh!)
],[
pthread_mutexattr_t attr;
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- ],[
+ ], [
has_recursive_mutexes=yes
AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX)
])
@@ -2089,7 +2012,7 @@ dnl This is used on Linux for glibc binary compatibility (Doh!)
],[
pthread_mutexattr_t attr;
pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- ],[
+ ], [
has_recursive_mutexes=yes
AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP)
])
@@ -2103,10 +2026,7 @@ dnl This is
(Patch may be truncated, please check the link at the top of this post.)