2000-03-06 22:16:57 +00:00
|
|
|
--- configure.orig Sat Mar 4 04:58:00 2000
|
2000-08-31 16:07:07 +00:00
|
|
|
+++ configure Thu Aug 31 18:43:39 2000
|
2000-03-06 22:16:57 +00:00
|
|
|
@@ -604,9 +604,9 @@
|
|
|
|
|
|
|
|
# libtool versioning
|
|
|
|
LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
|
|
|
|
-LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
|
|
|
|
+LT_CURRENT=$SDL_INTERFACE_AGE
|
|
|
|
LT_REVISION=$SDL_INTERFACE_AGE
|
|
|
|
-LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
|
|
|
|
+LT_AGE=$SDL_INTERFACE_AGE
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-08-31 16:07:07 +00:00
|
|
|
@@ -2142,7 +2142,7 @@
|
|
|
|
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
|
|
|
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
|
|
|
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
|
|
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $target \
|
|
|
|
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $target \
|
|
|
|
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
|
|
|
|
|
|
|
# Reload cache, that may have been modified by ltconfig
|
|
|
|
@@ -4279,8 +4279,6 @@
|
|
|
|
#include <vga.h>
|
|
|
|
#include <vgamouse.h>
|
|
|
|
#include <vgakeyboard.h>
|
|
|
|
- #include <linux/kd.h>
|
|
|
|
- #include <linux/keyboard.h>
|
|
|
|
|
|
|
|
int main() {
|
|
|
|
|
|
|
|
@@ -4324,7 +4322,7 @@
|
2000-01-24 04:57:17 +00:00
|
|
|
ac_save_libs="$LIBS"
|
|
|
|
case "$target" in
|
2000-02-10 01:41:52 +00:00
|
|
|
*-*-freebsd*)
|
|
|
|
- pthread_lib="-lc_r"
|
2000-04-20 09:24:28 +00:00
|
|
|
+ pthread_lib="-pthread"
|
2000-01-24 04:57:17 +00:00
|
|
|
;;
|
2000-02-10 01:41:52 +00:00
|
|
|
*-*-openbsd*)
|
|
|
|
pthread_lib="-lc_r"
|
2000-08-31 16:07:07 +00:00
|
|
|
@@ -4364,7 +4362,7 @@
|
2000-01-24 04:57:17 +00:00
|
|
|
echo "$ac_t""$use_pthreads" 1>&6
|
|
|
|
if test x$use_pthreads = xyes; then
|
|
|
|
CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
|
|
|
|
- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT"
|
2000-04-20 09:24:28 +00:00
|
|
|
+ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
2000-01-24 04:57:17 +00:00
|
|
|
SDL_LIBS="$SDL_LIBS $pthread_lib"
|
|
|
|
fi
|
|
|
|
fi
|
2000-08-31 16:07:07 +00:00
|
|
|
@@ -4953,8 +4951,10 @@
|
2000-01-24 04:57:17 +00:00
|
|
|
;;
|
|
|
|
*-*-freebsd*)
|
|
|
|
ARCH=freebsd
|
2000-03-06 22:16:57 +00:00
|
|
|
+ CheckNASM
|
2000-01-24 04:57:17 +00:00
|
|
|
CheckESD
|
|
|
|
CheckX11
|
2000-08-31 16:07:07 +00:00
|
|
|
+ CheckSVGA
|
2000-01-24 04:57:17 +00:00
|
|
|
CheckPTHREAD
|
2000-08-31 16:07:07 +00:00
|
|
|
# Set up files for the main() stub
|
|
|
|
|