encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed up configure so it doesn't reference input/evdev anymore

This commit is contained in:
Sam Lantinga 2013-11-16 12:04:00 -08:00
parent 4e1ee55739
commit 8acec42a06
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure vendored
View File

@ -15950,19 +15950,35 @@ $as_echo "$have_gcc_mmd_mt" >&6; }
fi fi
fi fi
# Actually this doesn't work on OpenBSD { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker option --no-undefined" >&5
#AC_MSG_CHECKING(for linker option --no-undefined) $as_echo_n "checking for linker option --no-undefined... " >&6; }
#have_no_undefined=no have_no_undefined=no
#save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"
#LDFLAGS="$LDFLAGS -Wl,--no-undefined" LDFLAGS="$LDFLAGS -Wl,--no-undefined"
#AC_TRY_LINK([ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#],[ /* end confdefs.h. */
#],[
#have_no_undefined=yes
#EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--no-undefined" int
#]) main ()
#LDFLAGS="$save_LDFLAGS" {
#AC_MSG_RESULT($have_no_undefined)
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
have_no_undefined=yes
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--no-undefined"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_no_undefined" >&5
$as_echo "$have_no_undefined" >&6; }
# Check whether --enable-libc was given. # Check whether --enable-libc was given.
if test "${enable_libc+set}" = set; then : if test "${enable_libc+set}" = set; then :
@ -22218,10 +22234,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c" SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c"
fi fi
# Set up files for evdev input
if test x$use_input_events = xyes; then
SOURCES="$SOURCES $srcdir/src/input/evdev/*.c"
fi
;; ;;
*-*-cygwin* | *-*-mingw32*) *-*-cygwin* | *-*-mingw32*)
ARCH=win32 ARCH=win32

4
configure.in
View File

@ -2499,10 +2499,6 @@ case "$host" in
if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then if test x$enable_libudev = xyes && test x$have_libudev_h_hdr = xyes; then
SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c" SOURCES="$SOURCES $srcdir/src/core/linux/SDL_udev.c"
fi fi
# Set up files for evdev input
if test x$use_input_events = xyes; then
SOURCES="$SOURCES $srcdir/src/input/evdev/*.c"
fi
;; ;;
*-*-cygwin* | *-*-mingw32*) *-*-cygwin* | *-*-mingw32*)
ARCH=win32 ARCH=win32