cdrom=mp3 by default

This commit is contained in:
kichikuou
2018-12-29 14:14:59 +09:00
parent 3fc72bc61e
commit 08cf326c89
3 changed files with 38 additions and 46 deletions
-3
View File
@@ -141,9 +141,6 @@
/* Define if libdlloader will be built on this platform */
#undef HAVE_LIBDLLOADER
/* Define to 1 if you have the <libgen.h> header file. */
#undef HAVE_LIBGEN_H
/* Define to 1 if you have the <linux/joystick.h> header file. */
#undef HAVE_LINUX_JOYSTICK_H
Vendored
+19 -27
View File
@@ -15427,18 +15427,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
for ac_header in libgen.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default"
if test "x$ac_cv_header_libgen_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGEN_H 1
_ACEOF
fi
done
if test "$no_x" = yes; then
@@ -16922,7 +16910,7 @@ else
fi
test "x$enable_cdrom" = xyes -a enable_cdrom=default
test "x$enable_cdrom" = xyes && enable_cdrom=default
if test "x$enable_cdrom" != xno; then
for i in `echo $enable_cdrom | sed 's/,/ /g'`; do
@@ -16934,21 +16922,25 @@ if test "x$enable_cdrom" != xno; then
fi
if test "x$enable_cdrom" = xdefault; then
case "$target" in
*-*-linux*|*-*-solaris*)
enable_cd_linux=yes
;;
*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
enable_cd_bsd=yes
;;
*-dec-*)
enable_cd_mp3=yes
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No --enable-cdrom=default cdrom for $target" >&5
if test "x$is_emscripten" != xyes && test "x$have_sdl" = xyes; then
enable_cd_mp3=yes
else
case "$target" in
*-*-linux*|*-*-solaris*)
enable_cd_linux=yes
;;
*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
enable_cd_bsd=yes
;;
*-dec-*)
enable_cd_mp3=yes
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No --enable-cdrom=default cdrom for $target" >&5
$as_echo "$as_me: WARNING: No --enable-cdrom=default cdrom for $target" >&2;}
;;
esac
;;
esac
fi
fi
SRC_CDROM=
+19 -16
View File
@@ -92,7 +92,6 @@ dnl AC_TYPE_SIZE_T
dnl AC_HEADER_TIME
dnl AC_STRUCT_TM
AC_C_BIGENDIAN
AC_CHECK_HEADERS(libgen.h)
dnl
@@ -221,7 +220,7 @@ AC_ARG_ENABLE(cdrom,
[ enable_cdrom=yes])
dnl yes -> default
test "x$enable_cdrom" = xyes -a enable_cdrom=default
test "x$enable_cdrom" = xyes && enable_cdrom=default
if test "x$enable_cdrom" != xno; then
for i in `echo $enable_cdrom | sed 's/,/ /g'`; do
@@ -233,20 +232,24 @@ if test "x$enable_cdrom" != xno; then
fi
if test "x$enable_cdrom" = xdefault; then
case "$target" in
*-*-linux*|*-*-solaris*)
enable_cd_linux=yes
;;
*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
enable_cd_bsd=yes
;;
*-dec-*)
enable_cd_mp3=yes
;;
*)
AC_MSG_WARN(No --enable-cdrom=default cdrom for $target)
;;
esac
if test "x$is_emscripten" != xyes && test "x$have_sdl" = xyes; then
enable_cd_mp3=yes
else
case "$target" in
*-*-linux*|*-*-solaris*)
enable_cd_linux=yes
;;
*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
enable_cd_bsd=yes
;;
*-dec-*)
enable_cd_mp3=yes
;;
*)
AC_MSG_WARN(No --enable-cdrom=default cdrom for $target)
;;
esac
fi
fi
SRC_CDROM=