mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-22 19:25:33 +00:00
Fixed configure script.
The Haiku patch would define some HAVE_* things to /**/ instead of 1, breaking the build for various things.
This commit is contained in:
Ryan C. Gordon
parent
619ab7a22d
commit
3f7f65a36d
31
configure
vendored
31
configure
vendored
|
|
@ -745,6 +745,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -916,6 +917,7 @@ datadir='${datarootdir}'
|
|||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE}'
|
||||
|
|
@ -1168,6 +1170,15 @@ do
|
|||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
|
|
@ -1305,7 +1316,7 @@ fi
|
|||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
|
|
@ -1458,6 +1469,7 @@ Fine tuning of the installation directories:
|
|||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
|
|
@ -16745,7 +16757,7 @@ done
|
|||
"
|
||||
if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes; then :
|
||||
|
||||
$as_echo "#define HAVE_SA_SIGACTION /**/" >>confdefs.h
|
||||
$as_echo "#define HAVE_SA_SIGACTION 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -19305,9 +19317,11 @@ main ()
|
|||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_NACL 1" >>confdefs.h
|
||||
|
||||
$as_echo "#define SDL_AUDIO_DRIVER_NACL 1" >>confdefs.h
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_NACL 1" >>confdefs.h
|
||||
|
||||
|
||||
$as_echo "#define SDL_AUDIO_DRIVER_NACL 1" >>confdefs.h
|
||||
|
||||
|
||||
$as_echo "#define HAVE_POW 1" >>confdefs.h
|
||||
|
|
@ -20175,7 +20189,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
|||
|
||||
have_const_param_XextAddDisplay=yes
|
||||
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY /**/" >>confdefs.h
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
|
|
@ -20210,7 +20224,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
|||
|
||||
have_XGenericEvent=yes
|
||||
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS /**/" >>confdefs.h
|
||||
$as_echo "#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
|
|
@ -22283,7 +22297,7 @@ if ac_fn_c_try_link "$LINENO"; then :
|
|||
|
||||
have_sem_timedwait=yes
|
||||
|
||||
$as_echo "#define HAVE_SEM_TIMEDWAIT /**/" >>confdefs.h
|
||||
$as_echo "#define HAVE_SEM_TIMEDWAIT 1" >>confdefs.h
|
||||
|
||||
|
||||
fi
|
||||
|
|
@ -23864,7 +23878,8 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
|
|||
|
||||
# Set up files for the timer library
|
||||
if test x$enable_timers = xyes; then
|
||||
$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
|
||||
|
||||
$as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
|
||||
|
||||
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
|
||||
have_timers=yes
|
||||
|
|
|
|||
14
configure.in
14
configure.in
|
|
@ -276,7 +276,7 @@ if test x$enable_libc = xyes; then
|
|||
AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -liconv"])
|
||||
AC_CHECK_FUNCS(iconv)
|
||||
|
||||
AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE([HAVE_SA_SIGACTION], [], [Description])], ,[#include <signal.h>])
|
||||
AC_CHECK_MEMBER(struct sigaction.sa_sigaction,[AC_DEFINE([HAVE_SA_SIGACTION], 1, [Description])], ,[#include <signal.h>])
|
||||
fi
|
||||
|
||||
dnl AC_CHECK_SIZEOF(void*)
|
||||
|
|
@ -1479,8 +1479,8 @@ CheckNativeClient()
|
|||
#endif
|
||||
],[
|
||||
],[
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_NACL)
|
||||
AC_DEFINE(SDL_AUDIO_DRIVER_NACL)
|
||||
AC_DEFINE(SDL_VIDEO_DRIVER_NACL, 1, [ ])
|
||||
AC_DEFINE(SDL_AUDIO_DRIVER_NACL, 1, [ ])
|
||||
AC_DEFINE(HAVE_POW, 1, [ ])
|
||||
AC_DEFINE(HAVE_OPENGLES2, 1, [ ])
|
||||
AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
|
||||
|
|
@ -1619,7 +1619,7 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma
|
|||
],[
|
||||
],[
|
||||
have_const_param_XextAddDisplay=yes
|
||||
AC_DEFINE([SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY], [], [Description])
|
||||
AC_DEFINE([SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY], 1, [ ])
|
||||
])
|
||||
AC_MSG_RESULT($have_const_param_XextAddDisplay)
|
||||
|
||||
|
|
@ -1637,7 +1637,7 @@ XGetEventData(display, cookie);
|
|||
XFreeEventData(display, cookie);
|
||||
],[
|
||||
have_XGenericEvent=yes
|
||||
AC_DEFINE([SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS], [], [Description])
|
||||
AC_DEFINE([SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS], 1, [ ])
|
||||
])
|
||||
AC_MSG_RESULT($have_XGenericEvent)
|
||||
|
||||
|
|
@ -2605,7 +2605,7 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
|
|||
sem_timedwait(NULL, NULL);
|
||||
],[
|
||||
have_sem_timedwait=yes
|
||||
AC_DEFINE([HAVE_SEM_TIMEDWAIT], [], [Description])
|
||||
AC_DEFINE([HAVE_SEM_TIMEDWAIT], 1, [ ])
|
||||
])
|
||||
AC_MSG_RESULT($have_sem_timedwait)
|
||||
fi
|
||||
|
|
@ -3502,7 +3502,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
|
|||
|
||||
# Set up files for the timer library
|
||||
if test x$enable_timers = xyes; then
|
||||
AC_DEFINE(SDL_TIMER_UNIX)
|
||||
AC_DEFINE(SDL_TIMER_UNIX, 1, [ ])
|
||||
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
|
||||
have_timers=yes
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue