joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 10:48:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "SDL autoconfig"

Browse Source 
This reverts commit d8c27bdb80.
This commit is contained in:
Jonathan Campbell
2017-12-13 15:46:13 -08:00
parent d8c27bdb80
commit 2c43412d94
4 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -324,4 +324,3 @@ dosbox-x
Makefile Makefile
vs2015/sdl/include/SDL_config.h vs2015/sdl/include/SDL_config.h

4
acinclude.m4
View File

@@ -40,8 +40,6 @@ AC_ARG_ENABLE(sdl2, [ --enable-sdl2 Enable SDL 2.x],
fi fi
fi fi
AM_CONDITIONAL(C_SDL2, [ test -n "$SDL2_CFLAGS" ])
AC_SUBST(SDL2_CFLAGS) AC_SUBST(SDL2_CFLAGS)
AC_SUBST(SDL2_LIBS) AC_SUBST(SDL2_LIBS)
]) ])
@@ -73,8 +71,6 @@ AC_ARG_ENABLE(sdl, [ --enable-sdl Enable SDL 1.x],
AC_DEFINE(C_SDL1,1) AC_DEFINE(C_SDL1,1)
fi fi
AM_CONDITIONAL(C_SDL1, [ test -n "$SDL_CFLAGS" ])
AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS) AC_SUBST(SDL_LIBS)
]) ])

39
configure vendored
View File

@@ -631,12 +631,8 @@ C_MT32_FALSE
C_MT32_TRUE C_MT32_TRUE
SDL_LIBS SDL_LIBS
SDL_CFLAGS SDL_CFLAGS
C_SDL1_FALSE
C_SDL1_TRUE
SDL2_LIBS SDL2_LIBS
SDL2_CFLAGS SDL2_CFLAGS
C_SDL2_FALSE
C_SDL2_TRUE
SDL2_CONFIG SDL2_CONFIG
ALSA_LIBS ALSA_LIBS
ALSA_CFLAGS ALSA_CFLAGS
@@ -6870,15 +6866,6 @@ $as_echo_n "checking for SDL2 - version >= $min_sdl2_version... " >&6; }
fi fi
fi fi
if test -n "$SDL2_CFLAGS" ; then
C_SDL2_TRUE=
C_SDL2_FALSE='#'
else
C_SDL2_TRUE='#'
C_SDL2_FALSE=
fi
@@ -6928,15 +6915,6 @@ $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
fi fi
if test -n "$SDL_CFLAGS" ; then
C_SDL1_TRUE=
C_SDL1_FALSE='#'
else
C_SDL1_TRUE='#'
C_SDL1_FALSE=
fi
@@ -7954,14 +7932,6 @@ if test -z "${HAVE_WINDRES_TRUE}" && test -z "${HAVE_WINDRES_FALSE}"; then
as_fn_error $? "conditional \"HAVE_WINDRES\" was never defined. as_fn_error $? "conditional \"HAVE_WINDRES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${C_SDL2_TRUE}" && test -z "${C_SDL2_FALSE}"; then
as_fn_error $? "conditional \"C_SDL2\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${C_SDL1_TRUE}" && test -z "${C_SDL1_FALSE}"; then
as_fn_error $? "conditional \"C_SDL1\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${C_MT32_TRUE}" && test -z "${C_MT32_FALSE}"; then if test -z "${C_MT32_TRUE}" && test -z "${C_MT32_FALSE}"; then
as_fn_error $? "conditional \"C_MT32\" was never defined. as_fn_error $? "conditional \"C_MT32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -9312,12 +9282,3 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi fi
# need to configure SDL
if test -z "$SDL2_LIBS"; then
if test -n "$SDL_LIBS"; then
export dir="`pwd`/vs2015/sdl"
(cd "$dir" && mkdir -p linux-host) || exit 1
(cd "$dir" && (ac_cv_lib_iconv_libiconv_open=no ac_cv_func_iconv=no ac_cv_header_iconv_h=no ./configure --enable-static --disable-shared "--prefix=$dir/linux-host")) || exit 1
fi
fi

9
configure.ac
View File

@@ -653,12 +653,3 @@ include/Makefile
]) ])
AC_OUTPUT AC_OUTPUT
# need to configure SDL
if test -z "$SDL2_LIBS"; then
if test -n "$SDL_LIBS"; then
export dir="`pwd`/vs2015/sdl"
(cd "$dir" && mkdir -p linux-host) || exit 1
(cd "$dir" && (ac_cv_lib_iconv_libiconv_open=no ac_cv_func_iconv=no ac_cv_header_iconv_h=no ./configure --enable-static --disable-shared "--prefix=$dir/linux-host")) || exit 1
fi
fi