diff -urN links-2.1pre14/acconfig.h links-2.1pre14-sdl/acconfig.h
--- links-2.1pre14/acconfig.h	2003-04-30 10:41:24.000000000 +0200
+++ links-2.1pre14-sdl/acconfig.h	2004-04-30 12:41:35.000000000 +0200
@@ -86,6 +86,9 @@
 #undef GRDRV_X
 
 /* */
+#undef GRDRV_SDL
+
+/* */
 #undef GRDRV_ATHEOS
 
 /* */
diff -urN links-2.1pre14/config.h.in links-2.1pre14-sdl/config.h.in
--- links-2.1pre14/config.h.in	2003-11-10 20:25:46.000000000 +0100
+++ links-2.1pre14-sdl/config.h.in	2004-05-02 16:38:58.301685736 +0200
@@ -403,6 +403,9 @@
 #undef GRDRV_FB
 
 /* */
+#undef GRDRV_SDL
+
+/* */
 #undef GRDRV_DIRECTFB
 
 /* */
diff -urN links-2.1pre14/configure links-2.1pre14-sdl/configure
--- links-2.1pre14/configure	2003-11-10 20:24:20.000000000 +0100
+++ links-2.1pre14-sdl/configure	2004-05-02 16:37:37.108257606 +0200
@@ -32,6 +32,8 @@
 ac_help="$ac_help
   --without-directfb      compile without DirectFB graphics driver"
 ac_help="$ac_help
+  --without-sdl      compile without SDL graphics driver"
+ac_help="$ac_help
   --without-pmshell       compile without PMShell graphics driver"
 ac_help="$ac_help
   --without-atheos        compile without Atheos graphics driver"
@@ -579,7 +581,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:583: checking for a BSD compatible install" >&5
+echo "configure:585: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -632,7 +634,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:636: checking whether build environment is sane" >&5
+echo "configure:638: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -689,7 +691,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:693: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:695: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -735,7 +737,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:739: checking for working aclocal" >&5
+echo "configure:741: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -748,7 +750,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:752: checking for working autoconf" >&5
+echo "configure:754: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -761,7 +763,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:765: checking for working automake" >&5
+echo "configure:767: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -774,7 +776,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:778: checking for working autoheader" >&5
+echo "configure:780: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -787,7 +789,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:791: checking for working makeinfo" >&5
+echo "configure:793: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -814,7 +816,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:818: checking for $ac_word" >&5
+echo "configure:820: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -844,7 +846,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:848: checking for $ac_word" >&5
+echo "configure:850: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -895,7 +897,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:899: checking for $ac_word" >&5
+echo "configure:901: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -927,7 +929,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:931: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -938,12 +940,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 942 "configure"
+#line 944 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -969,12 +971,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:978: checking whether we are using GNU C" >&5
+echo "configure:980: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -983,7 +985,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1002,7 +1004,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1006: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1008: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1042,12 +1044,12 @@
 #AC_CHECK_LIB(fl,main,AC_DEFINE(JS) LIBS="$LIBS -lfl",AC_MSG_WARN(You don't have libfl; you won't be able to run javascript))
 
 echo $ac_n "checking for EMX""... $ac_c" 1>&6
-echo "configure:1046: checking for EMX" >&5
+echo "configure:1048: checking for EMX" >&5
 if eval "test \"`echo '$''{'ac_cv_have_emx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1051 "configure"
+#line 1053 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1056,7 +1058,7 @@
 	#endif 
 ; return 0; }
 EOF
-if { (eval echo configure:1060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_emx=yes
 else
@@ -1073,12 +1075,12 @@
 test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
 
 echo $ac_n "checking for typeof""... $ac_c" 1>&6
-echo "configure:1077: checking for typeof" >&5
+echo "configure:1079: checking for typeof" >&5
 if eval "test \"`echo '$''{'ac_cv_have_typeof'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1082 "configure"
+#line 1084 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1086,7 +1088,7 @@
 	typeof(a) b;
 ; return 0; }
 EOF
-if { (eval echo configure:1090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_typeof=yes
 else
@@ -1106,19 +1108,19 @@
 
 
 echo $ac_n "checking for long long""... $ac_c" 1>&6
-echo "configure:1110: checking for long long" >&5
+echo "configure:1112: checking for long long" >&5
 if eval "test \"`echo '$''{'ac_cv_have_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1115 "configure"
+#line 1117 "configure"
 #include "confdefs.h"
 
 int main() {
 unsigned long long a; 
 ; return 0; }
 EOF
-if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_long_long=yes
 else
@@ -1142,12 +1144,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1146: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1148: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1151 "configure"
+#line 1153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1155,7 +1157,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1180,7 +1182,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1184: checking for opendir in -ldir" >&5
+echo "configure:1186: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1188,7 +1190,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1192 "configure"
+#line 1194 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1199,7 +1201,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1221,7 +1223,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1225: checking for opendir in -lx" >&5
+echo "configure:1227: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1229,7 +1231,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1233 "configure"
+#line 1235 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1240,7 +1242,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1263,7 +1265,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1267: checking how to run the C preprocessor" >&5
+echo "configure:1269: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1278,13 +1280,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1282 "configure"
+#line 1284 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1295,13 +1297,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1299 "configure"
+#line 1301 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1312,13 +1314,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1316 "configure"
+#line 1318 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1343,12 +1345,12 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1347: checking for ANSI C header files" >&5
+echo "configure:1349: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1352 "configure"
+#line 1354 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1356,7 +1358,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1373,7 +1375,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1377 "configure"
+#line 1379 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1391,7 +1393,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1395 "configure"
+#line 1397 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1412,7 +1414,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1416 "configure"
+#line 1418 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1423,7 +1425,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1447,12 +1449,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1451: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1453: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1456 "configure"
+#line 1458 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1468,7 +1470,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -1492,17 +1494,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1496: checking for $ac_hdr" >&5
+echo "configure:1498: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1501 "configure"
+#line 1503 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1532,17 +1534,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1536: checking for $ac_hdr" >&5
+echo "configure:1538: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1541 "configure"
+#line 1543 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1572,17 +1574,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1576: checking for $ac_hdr" >&5
+echo "configure:1578: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1583 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1612,17 +1614,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1616: checking for $ac_hdr" >&5
+echo "configure:1618: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1621 "configure"
+#line 1623 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1652,17 +1654,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1656: checking for $ac_hdr" >&5
+echo "configure:1658: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1661 "configure"
+#line 1663 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1692,17 +1694,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1696: checking for $ac_hdr" >&5
+echo "configure:1698: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1701 "configure"
+#line 1703 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1732,17 +1734,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1736: checking for $ac_hdr" >&5
+echo "configure:1738: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1741 "configure"
+#line 1743 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1772,17 +1774,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1776: checking for $ac_hdr" >&5
+echo "configure:1778: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1781 "configure"
+#line 1783 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1812,17 +1814,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1816: checking for $ac_hdr" >&5
+echo "configure:1818: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1821 "configure"
+#line 1823 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1852,17 +1854,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1856: checking for $ac_hdr" >&5
+echo "configure:1858: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+#line 1863 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1892,17 +1894,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1896: checking for $ac_hdr" >&5
+echo "configure:1898: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1901 "configure"
+#line 1903 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1932,17 +1934,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1936: checking for $ac_hdr" >&5
+echo "configure:1938: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1941 "configure"
+#line 1943 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1972,17 +1974,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1976: checking for $ac_hdr" >&5
+echo "configure:1978: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1981 "configure"
+#line 1983 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2012,17 +2014,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2016: checking for $ac_hdr" >&5
+echo "configure:2018: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2021 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2052,17 +2054,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2056: checking for $ac_hdr" >&5
+echo "configure:2058: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2061 "configure"
+#line 2063 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2090,12 +2092,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2094: checking for working const" >&5
+echo "configure:2096: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2099 "configure"
+#line 2101 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2144,7 +2146,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2165,21 +2167,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2169: checking for inline" >&5
+echo "configure:2171: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2176 "configure"
+#line 2178 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2205,12 +2207,12 @@
 esac
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2209: checking for size_t" >&5
+echo "configure:2211: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2214 "configure"
+#line 2216 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2238,12 +2240,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2242: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2244: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2247 "configure"
+#line 2249 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2252,7 +2254,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2273,12 +2275,12 @@
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2277: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2279: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2282 "configure"
+#line 2284 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -2286,7 +2288,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -2316,7 +2318,7 @@
 fi
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2320: checking size of short" >&5
+echo "configure:2322: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2324,7 +2326,7 @@
   ac_cv_sizeof_short="$default_short"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2328 "configure"
+#line 2330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2335,7 +2337,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -2355,7 +2357,7 @@
 
 
 echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
-echo "configure:2359: checking size of unsigned short" >&5
+echo "configure:2361: checking size of unsigned short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2363,7 +2365,7 @@
   ac_cv_sizeof_unsigned_short="$default_short"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2367 "configure"
+#line 2369 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2374,7 +2376,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_short=`cat conftestval`
 else
@@ -2394,7 +2396,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2398: checking size of int" >&5
+echo "configure:2400: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2402,7 +2404,7 @@
   ac_cv_sizeof_int="$default_int"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2406 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2413,7 +2415,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -2433,7 +2435,7 @@
 
 
 echo $ac_n "checking size of unsigned""... $ac_c" 1>&6
-echo "configure:2437: checking size of unsigned" >&5
+echo "configure:2439: checking size of unsigned" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2441,7 +2443,7 @@
   ac_cv_sizeof_unsigned="$default_int"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+#line 2447 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2452,7 +2454,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned=`cat conftestval`
 else
@@ -2472,7 +2474,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2476: checking size of long" >&5
+echo "configure:2478: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2480,7 +2482,7 @@
   ac_cv_sizeof_long="$default_int"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2484 "configure"
+#line 2486 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2491,7 +2493,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -2511,7 +2513,7 @@
 
 
 echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
-echo "configure:2515: checking size of unsigned long" >&5
+echo "configure:2517: checking size of unsigned long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2519,7 +2521,7 @@
   ac_cv_sizeof_unsigned_long="$default_int"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2523 "configure"
+#line 2525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2530,7 +2532,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_unsigned_long=`cat conftestval`
 else
@@ -2550,7 +2552,7 @@
 
 
 echo $ac_n "checking for big endian""... $ac_c" 1>&6
-echo "configure:2554: checking for big endian" >&5
+echo "configure:2556: checking for big endian" >&5
 if eval "test \"`echo '$''{'ac_cv_big_endian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2558,7 +2560,7 @@
   ac_cv_big_endian=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2562 "configure"
+#line 2564 "configure"
 #include "confdefs.h"
 
 	long l;
@@ -2570,7 +2572,7 @@
 	}
 	
 EOF
-if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_big_endian=yes
 else
@@ -2587,7 +2589,7 @@
 
 echo "$ac_t""$ac_cv_big_endian" 1>&6
 echo $ac_n "checking for little endian""... $ac_c" 1>&6
-echo "configure:2591: checking for little endian" >&5
+echo "configure:2593: checking for little endian" >&5
 if eval "test \"`echo '$''{'ac_cv_little_endian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,7 +2597,7 @@
   ac_cv_little_endian="$ac_cv_have_emx"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2601 "configure"
 #include "confdefs.h"
 
 	long l;
@@ -2607,7 +2609,7 @@
 	}
 	
 EOF
-if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_little_endian=yes
 else
@@ -2639,13 +2641,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2643: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2645: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+#line 2651 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -2663,7 +2665,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2667 "configure"
+#line 2669 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -2685,7 +2687,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2689: checking for 8-bit clean memcmp" >&5
+echo "configure:2691: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2693,7 +2695,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
+#line 2699 "configure"
 #include "confdefs.h"
 
 main()
@@ -2703,7 +2705,7 @@
 }
 
 EOF
-if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2721,12 +2723,12 @@
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2725: checking return type of signal handlers" >&5
+echo "configure:2727: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2730 "configure"
+#line 2732 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2743,7 +2745,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2762,12 +2764,12 @@
 
 
 echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:2766: checking for strftime" >&5
+echo "configure:2768: checking for strftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2771 "configure"
+#line 2773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strftime(); below.  */
@@ -2790,7 +2792,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_strftime=yes"
 else
@@ -2812,7 +2814,7 @@
   echo "$ac_t""no" 1>&6
 # strftime is in -lintl on SCO UNIX.
 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:2816: checking for strftime in -lintl" >&5
+echo "configure:2818: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2820,7 +2822,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2824 "configure"
+#line 2826 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2831,7 +2833,7 @@
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2858,12 +2860,12 @@
 fi
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2862: checking for vprintf" >&5
+echo "configure:2864: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+#line 2869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2886,7 +2888,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2910,12 +2912,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2914: checking for _doprnt" >&5
+echo "configure:2916: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2919 "configure"
+#line 2921 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2938,7 +2940,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2965,12 +2967,12 @@
 for ac_func in calloc
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2969: checking for $ac_func" >&5
+echo "configure:2971: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2974 "configure"
+#line 2976 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2993,7 +2995,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3020,12 +3022,12 @@
 for ac_func in snprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3024: checking for $ac_func" >&5
+echo "configure:3026: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3029 "configure"
+#line 3031 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3048,7 +3050,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3075,12 +3077,12 @@
 for ac_func in gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3079: checking for $ac_func" >&5
+echo "configure:3081: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3084 "configure"
+#line 3086 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3103,7 +3105,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3130,12 +3132,12 @@
 for ac_func in getpid setpgid getpgid setpgrp getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3134: checking for $ac_func" >&5
+echo "configure:3136: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3139 "configure"
+#line 3141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3158,7 +3160,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3185,12 +3187,12 @@
 for ac_func in popen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3189: checking for $ac_func" >&5
+echo "configure:3191: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3196 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3213,7 +3215,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3240,12 +3242,12 @@
 for ac_func in uname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3244: checking for $ac_func" >&5
+echo "configure:3246: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3249 "configure"
+#line 3251 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3268,7 +3270,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3295,12 +3297,12 @@
 for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3299: checking for $ac_func" >&5
+echo "configure:3301: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3304 "configure"
+#line 3306 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3323,7 +3325,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3350,12 +3352,12 @@
 for ac_func in setlocale
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3354: checking for $ac_func" >&5
+echo "configure:3356: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3359 "configure"
+#line 3361 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3378,7 +3380,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3405,12 +3407,12 @@
 for ac_func in nl_langinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3409: checking for $ac_func" >&5
+echo "configure:3411: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3414 "configure"
+#line 3416 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3433,7 +3435,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3459,19 +3461,19 @@
 
 
 echo $ac_n "checking for sigsetjmp/siglongjmp""... $ac_c" 1>&6
-echo "configure:3463: checking for sigsetjmp/siglongjmp" >&5
+echo "configure:3465: checking for sigsetjmp/siglongjmp" >&5
 if eval "test \"`echo '$''{'ac_cv_have_sigsetjmp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3468 "configure"
+#line 3470 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);
 ; return 0; }
 EOF
-if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_sigsetjmp=yes
 else
@@ -3493,7 +3495,7 @@
 fi
 
 echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:3497: checking for atan in -lm" >&5
+echo "configure:3499: checking for atan in -lm" >&5
 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3501,7 +3503,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3505 "configure"
+#line 3507 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3512,7 +3514,7 @@
 atan()
 ; return 0; }
 EOF
-if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3541,12 +3543,12 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3545: checking for socket" >&5
+echo "configure:3547: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3550 "configure"
+#line 3552 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -3569,7 +3571,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -3591,7 +3593,7 @@
 
 if test "$cf_result" = no; then
 	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3595: checking for socket in -lsocket" >&5
+echo "configure:3597: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3599,7 +3601,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3603 "configure"
+#line 3605 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3610,7 +3612,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3639,12 +3641,12 @@
 
 fi
 echo $ac_n "checking for setsockopt""... $ac_c" 1>&6
-echo "configure:3643: checking for setsockopt" >&5
+echo "configure:3645: checking for setsockopt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3648 "configure"
+#line 3650 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setsockopt(); below.  */
@@ -3667,7 +3669,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_setsockopt=yes"
 else
@@ -3689,7 +3691,7 @@
 
 if test "$cf_result" = no; then
 	echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
-echo "configure:3693: checking for setsockopt in -lsocket" >&5
+echo "configure:3695: checking for setsockopt in -lsocket" >&5
 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3697,7 +3699,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3701 "configure"
+#line 3703 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3708,7 +3710,7 @@
 setsockopt()
 ; return 0; }
 EOF
-if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3741,12 +3743,12 @@
 #AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
 #AC_MSG_RESULT($cf_result)
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3745: checking for gethostbyname" >&5
+echo "configure:3747: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3750 "configure"
+#line 3752 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -3769,7 +3771,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -3791,7 +3793,7 @@
 
 if test "$cf_result" = no; then
 	echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6
-echo "configure:3795: checking for gethostbyname in -lsocket" >&5
+echo "configure:3797: checking for gethostbyname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3799,7 +3801,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3803 "configure"
+#line 3805 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3810,7 +3812,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3833,7 +3835,7 @@
 
 	if test "$cf_result" = no; then
 		echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3837: checking for gethostbyname in -lnsl" >&5
+echo "configure:3839: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3841,7 +3843,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3845 "configure"
+#line 3847 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3852,7 +3854,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3885,12 +3887,12 @@
 fi
 
 echo $ac_n "checking for herror""... $ac_c" 1>&6
-echo "configure:3889: checking for herror" >&5
+echo "configure:3891: checking for herror" >&5
 if eval "test \"`echo '$''{'ac_cv_func_herror'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3894 "configure"
+#line 3896 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char herror(); below.  */
@@ -3913,7 +3915,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_herror=yes"
 else
@@ -3936,12 +3938,12 @@
 fi
 
 echo $ac_n "checking for cfmakeraw""... $ac_c" 1>&6
-echo "configure:3940: checking for cfmakeraw" >&5
+echo "configure:3942: checking for cfmakeraw" >&5
 if eval "test \"`echo '$''{'ac_cv_func_cfmakeraw'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3945 "configure"
+#line 3947 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char cfmakeraw(); below.  */
@@ -3964,7 +3966,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_cfmakeraw=yes"
 else
@@ -3990,12 +3992,12 @@
 for ac_func in cygwin_conv_to_full_win32_path
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3994: checking for $ac_func" >&5
+echo "configure:3996: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3999 "configure"
+#line 4001 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4018,7 +4020,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4044,7 +4046,7 @@
 
 
 echo $ac_n "checking if you want to enable javascript""... $ac_c" 1>&6
-echo "configure:4048: checking if you want to enable javascript" >&5
+echo "configure:4050: checking if you want to enable javascript" >&5
 # Check whether --enable-javascript or --disable-javascript was given.
 if test "${enable_javascript+set}" = set; then
   enableval="$enable_javascript"
@@ -4074,7 +4076,7 @@
 
 
 echo $ac_n "checking if you want to use graphics""... $ac_c" 1>&6
-echo "configure:4078: checking if you want to use graphics" >&5
+echo "configure:4080: checking if you want to use graphics" >&5
 # Check whether --enable-graphics or --disable-graphics was given.
 if test "${enable_graphics+set}" = set; then
   enableval="$enable_graphics"
@@ -4086,7 +4088,7 @@
 echo "$ac_t""$cf_use_graphics" 1>&6
 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:4090: checking for Gpm_Open in -lgpm" >&5
+echo "configure:4092: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4094,7 +4096,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4098 "configure"
+#line 4100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4105,7 +4107,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4137,17 +4139,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4141: checking for $ac_hdr" >&5
+echo "configure:4143: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4146 "configure"
+#line 4148 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4177,21 +4179,21 @@
 if test "$cf_have_gpm_lib" = yes && test "$cf_have_gpm_includes" = yes ; then cf_have_gpm=yes ; else cf_have_gpm=no; fi
 
 echo $ac_n "checking for OS/2 threads""... $ac_c" 1>&6
-echo "configure:4181: checking for OS/2 threads" >&5
+echo "configure:4183: checking for OS/2 threads" >&5
 if eval "test \"`echo '$''{'ac_cv_have_beginthread'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   CFLAGS_X="$CFLAGS"
 	CFLAGS="$CFLAGS -Zmt"
 	cat > conftest.$ac_ext <<EOF
-#line 4188 "configure"
+#line 4190 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
 _beginthread(NULL, NULL, 0, NULL)
 ; return 0; }
 EOF
-if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_beginthread=yes
 else
@@ -4226,17 +4228,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4230: checking for $ac_hdr" >&5
+echo "configure:4232: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4235 "configure"
+#line 4237 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4265,12 +4267,12 @@
 for ac_func in spawn_thread
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4269: checking for $ac_func" >&5
+echo "configure:4271: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4274 "configure"
+#line 4276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4293,7 +4295,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4320,12 +4322,12 @@
 for ac_func in resume_thread
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4324: checking for $ac_func" >&5
+echo "configure:4326: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4329 "configure"
+#line 4331 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4348,7 +4350,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4374,12 +4376,12 @@
 
 
 echo $ac_n "checking for MouOpen""... $ac_c" 1>&6
-echo "configure:4378: checking for MouOpen" >&5
+echo "configure:4380: checking for MouOpen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_MouOpen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4383 "configure"
+#line 4385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char MouOpen(); below.  */
@@ -4402,7 +4404,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_MouOpen=yes"
 else
@@ -4425,12 +4427,12 @@
 fi
 
 echo $ac_n "checking for _read_kbd""... $ac_c" 1>&6
-echo "configure:4429: checking for _read_kbd" >&5
+echo "configure:4431: checking for _read_kbd" >&5
 if eval "test \"`echo '$''{'ac_cv_func__read_kbd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4434 "configure"
+#line 4436 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _read_kbd(); below.  */
@@ -4453,7 +4455,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__read_kbd=yes"
 else
@@ -4477,7 +4479,7 @@
 
 
 echo $ac_n "checking for XFree for OS/2""... $ac_c" 1>&6
-echo "configure:4481: checking for XFree for OS/2" >&5
+echo "configure:4483: checking for XFree for OS/2" >&5
 if eval "test \"`echo '$''{'ac_cv_have_x2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4488,14 +4490,14 @@
 		CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
 		LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
 		cat > conftest.$ac_ext <<EOF
-#line 4492 "configure"
+#line 4494 "configure"
 #include "confdefs.h"
 #include <pty.h>
 int main() {
 struct winsize win;ptioctl(1, TIOCGWINSZ, &win)
 ; return 0; }
 EOF
-if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_x2=xf86_gcc
 else
@@ -4508,14 +4510,14 @@
 		if test "$ac_cv_have_x2" = no; then
 			LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
 			cat > conftest.$ac_ext <<EOF
-#line 4512 "configure"
+#line 4514 "configure"
 #include "confdefs.h"
 #include <pty.h>
 int main() {
 struct winsize win;ptioctl(1, TIOCGWINSZ, &win)
 ; return 0; }
 EOF
-if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_x2=xf86
 else
@@ -4543,7 +4545,7 @@
 fi
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4547: checking for dlopen in -ldl" >&5
+echo "configure:4549: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4551,7 +4553,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4555 "configure"
+#line 4557 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4562,7 +4564,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4598,7 +4600,7 @@
 fi
 
 echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6
-echo "configure:4602: checking for OpenSSL" >&5
+echo "configure:4604: checking for OpenSSL" >&5
 CPPFLAGS_X="$CPPFLAGS"
 LIBS_X="$LIBS"
 cf_result=no
@@ -4612,14 +4614,14 @@
 				LIBS="-lssl -lcrypto $LIBS_X"
 			fi
 			cat > conftest.$ac_ext <<EOF
-#line 4616 "configure"
+#line 4618 "configure"
 #include "confdefs.h"
 #include <openssl/ssl.h>
 int main() {
 OpenSSL_add_all_algorithms()
 ; return 0; }
 EOF
-if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -4631,14 +4633,14 @@
 rm -f conftest*
 			if test "$cf_result" != yes; then
 				cat > conftest.$ac_ext <<EOF
-#line 4635 "configure"
+#line 4637 "configure"
 #include "confdefs.h"
 #include <openssl/ssl.h>
 int main() {
 SSLeay_add_ssl_algorithms()
 ; return 0; }
 EOF
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -4681,7 +4683,7 @@
 #	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 #	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:4685: checking for inflate in -lz" >&5
+echo "configure:4687: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4689,7 +4691,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4693 "configure"
+#line 4695 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4700,7 +4702,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:4704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4731,17 +4733,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4735: checking for $ac_hdr" >&5
+echo "configure:4737: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4740 "configure"
+#line 4742 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4768,7 +4770,7 @@
 done
 
 	echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6
-echo "configure:4772: checking for png_create_info_struct in -lpng" >&5
+echo "configure:4774: checking for png_create_info_struct in -lpng" >&5
 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4776,7 +4778,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4780 "configure"
+#line 4782 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4787,7 +4789,7 @@
 png_create_info_struct()
 ; return 0; }
 EOF
-if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4821,12 +4823,12 @@
 	for ac_func in png_set_rgb_to_gray
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4825: checking for $ac_func" >&5
+echo "configure:4827: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4830 "configure"
+#line 4832 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4849,7 +4851,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4875,12 +4877,12 @@
 
 
 	echo $ac_n "checking if you can include both setjmp.h and png.h""... $ac_c" 1>&6
-echo "configure:4879: checking if you can include both setjmp.h and png.h" >&5
+echo "configure:4881: checking if you can include both setjmp.h and png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_include_setjmp_png'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4884 "configure"
+#line 4886 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 		#include <png.h>
@@ -4888,7 +4890,7 @@
 jmp_buf bla;
 ; return 0; }
 EOF
-if { (eval echo configure:4892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_include_setjmp_png=yes
 else
@@ -4922,17 +4924,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4926: checking for $ac_hdr" >&5
+echo "configure:4928: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4931 "configure"
+#line 4933 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4959,7 +4961,7 @@
 done
 
 	echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:4963: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:4965: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4967,7 +4969,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4971 "configure"
+#line 4973 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4978,7 +4980,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:4982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5027,17 +5029,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5031: checking for $ac_hdr" >&5
+echo "configure:5033: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5036 "configure"
+#line 5038 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5064,7 +5066,7 @@
 done
 
 	echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:5068: checking for TIFFOpen in -ltiff" >&5
+echo "configure:5070: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5072,7 +5074,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5076 "configure"
+#line 5078 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5083,7 +5085,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:5087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5144,6 +5146,12 @@
   if test "$withval" = no; then disable_directfb=yes; else disable_directfb=no; fi
 fi
 
+# Check whether --with-sdl or --without-sdl was given.
+if test "${with_sdl+set}" = set; then
+  withval="$with_sdl"
+  if test "$withval" = no; then disable_sdl=yes; else disable_sdl=no; fi
+fi
+
 # Check whether --with-pmshell or --without-pmshell was given.
 if test "${with_pmshell+set}" = set; then
   withval="$with_pmshell"
@@ -5161,21 +5169,21 @@
 
 if test "$disable_svgalib" != yes ; then
 	echo $ac_n "checking for svgalib""... $ac_c" 1>&6
-echo "configure:5165: checking for svgalib" >&5
+echo "configure:5173: checking for svgalib" >&5
 if eval "test \"`echo '$''{'ac_cv_have_svgalib'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   LIBS_X="$LIBS"
 		LIBS="$LIBS -lvga"
 		cat > conftest.$ac_ext <<EOF
-#line 5172 "configure"
+#line 5180 "configure"
 #include "confdefs.h"
 #include <vga.h>
 int main() {
 vga_setmode(0)
 ; return 0; }
 EOF
-if { (eval echo configure:5179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_svgalib=yes
 else
@@ -5207,17 +5215,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5211: checking for $ac_hdr" >&5
+echo "configure:5219: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5216 "configure"
+#line 5224 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5247,17 +5255,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5251: checking for $ac_hdr" >&5
+echo "configure:5259: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5256 "configure"
+#line 5264 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5287,17 +5295,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5291: checking for $ac_hdr" >&5
+echo "configure:5299: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5296 "configure"
+#line 5304 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5327,17 +5335,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5331: checking for $ac_hdr" >&5
+echo "configure:5339: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5336 "configure"
+#line 5344 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5376,7 +5384,7 @@
 	# Extract the first word of "directfb-config", so it can be a program name with args.
 set dummy directfb-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5380: checking for $ac_word" >&5
+echo "configure:5388: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DIRECTFB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5411,7 +5419,7 @@
 
 	if test "$DIRECTFB_CONFIG" != "no"; then
 	        echo $ac_n "checking for DirectFB >= 0.9.17""... $ac_c" 1>&6
-echo "configure:5415: checking for DirectFB >= 0.9.17" >&5
+echo "configure:5423: checking for DirectFB >= 0.9.17" >&5
         	directfb_version=`$DIRECTFB_CONFIG --version`
 		if expr $directfb_version \>= 0.9.17 >/dev/null; then
 			echo "$ac_t""yes" 1>&6
@@ -5430,12 +5438,74 @@
 	fi
 fi
 
+#check sdl
+if test "$disable_sdl" != yes ; then
+	# Extract the first word of "sdl-config", so it can be a program name with args.
+set dummy sdl-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:5447: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$SDL_CONFIG" in
+  /*)
+  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
+  ;;
+esac
+fi
+SDL_CONFIG="$ac_cv_path_SDL_CONFIG"
+if test -n "$SDL_CONFIG"; then
+  echo "$ac_t""$SDL_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	if test "$SDL_CONFIG" != "no"; then
+	        echo $ac_n "checking for SDL >= 1.2.0""... $ac_c" 1>&6
+echo "configure:5482: checking for SDL >= 1.2.0" >&5
+        	sdl_version=`$SDL_CONFIG --version`
+		if expr $sdl_version \>= 1.2.0 >/dev/null; then
+			echo "$ac_t""yes" 1>&6
+			SDL_CFLAGS=`$SDL_CONFIG --cflags`
+			SDL_LIBS=`$SDL_CONFIG --libs`
+	           	cat >> confdefs.h <<\EOF
+#define GRDRV_SDL 1
+EOF
+
+        	   	drivers="$drivers SDL"
+			CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+			LIBS="$LIBS $SDL_LIBS"
+		else
+			echo "$ac_t""no" 1>&6
+		fi
+	fi
+fi
+
+
+
+
 	# If we find X, set shell vars x_includes and x_libraries to the
 # paths, otherwise set no_x=yes.
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5439: checking for X" >&5
+echo "configure:5509: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5497,12 +5567,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5501 "configure"
+#line 5571 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5571,14 +5641,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5575 "configure"
+#line 5645 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5676,7 +5746,7 @@
 		drivers="$drivers X"
 	elif test "$ac_cv_have_x2" != no; then
 		echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5680: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5750: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5684,7 +5754,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5688 "configure"
+#line 5758 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5695,7 +5765,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5726,17 +5796,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5730: checking for $ac_hdr" >&5
+echo "configure:5800: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5735 "configure"
+#line 5805 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5774,12 +5844,12 @@
 
 if test "$disable_pmshell" != yes ; then
 	echo $ac_n "checking for pmshell""... $ac_c" 1>&6
-echo "configure:5778: checking for pmshell" >&5
+echo "configure:5848: checking for pmshell" >&5
 if eval "test \"`echo '$''{'ac_cv_have_pmshell'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5783 "configure"
+#line 5853 "configure"
 #include "confdefs.h"
 #define INCL_WIN
 			#define INCL_GPI
@@ -5791,7 +5861,7 @@
 			GpiSetPel(NULLHANDLE, NULL)
 ; return 0; }
 EOF
-if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_pmshell=yes
 else
@@ -5822,17 +5892,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5826: checking for $ac_hdr" >&5
+echo "configure:5896: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5831 "configure"
+#line 5901 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5862,17 +5932,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5866: checking for $ac_hdr" >&5
+echo "configure:5936: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5871 "configure"
+#line 5941 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5902,17 +5972,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5906: checking for $ac_hdr" >&5
+echo "configure:5976: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5911 "configure"
+#line 5981 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5942,17 +6012,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5946: checking for $ac_hdr" >&5
+echo "configure:6016: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 6021 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5982,17 +6052,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5986: checking for $ac_hdr" >&5
+echo "configure:6056: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5991 "configure"
+#line 6061 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6022,17 +6092,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6026: checking for $ac_hdr" >&5
+echo "configure:6096: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6031 "configure"
+#line 6101 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6068,7 +6138,7 @@
 	   test "$ac_cv_header_util_locker_h" = yes &&
 	   test "$ac_cv_header_util_application_h" = yes; then
 		echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
-echo "configure:6072: checking for main in -lstdc++" >&5
+echo "configure:6142: checking for main in -lstdc++" >&5
 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6076,14 +6146,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lstdc++  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6080 "configure"
+#line 6150 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6111,7 +6181,7 @@
 fi
 
 		echo $ac_n "checking for main in -latheos""... $ac_c" 1>&6
-echo "configure:6115: checking for main in -latheos" >&5
+echo "configure:6185: checking for main in -latheos" >&5
 ac_lib_var=`echo atheos'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6119,14 +6189,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-latheos  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6123 "configure"
+#line 6193 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6159,7 +6229,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6163: checking for $ac_word" >&5
+echo "configure:6233: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6191,7 +6261,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6195: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:6265: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -6202,12 +6272,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 6206 "configure"
+#line 6276 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -6233,12 +6303,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:6237: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:6307: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:6242: checking whether we are using GNU C++" >&5
+echo "configure:6312: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6247,7 +6317,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -6266,7 +6336,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:6270: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:6340: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6473,6 +6543,7 @@
 s%@CPP@%$CPP%g
 s%@LIBOBJS@%$LIBOBJS%g
 s%@DIRECTFB_CONFIG@%$DIRECTFB_CONFIG%g
+s%@SDL_CONFIG@%$SDL_CONFIG%g
 s%@CXX@%$CXX%g
 s%@ATHEOS_GR_TRUE@%$ATHEOS_GR_TRUE%g
 s%@ATHEOS_GR_FALSE@%$ATHEOS_GR_FALSE%g
diff -urN links-2.1pre14/configure.in links-2.1pre14-sdl/configure.in
--- links-2.1pre14/configure.in	2003-11-10 20:24:01.000000000 +0100
+++ links-2.1pre14-sdl/configure.in	2004-05-02 16:36:14.376284023 +0200
@@ -329,6 +329,7 @@
 AC_ARG_WITH(x, [  --without-x             compile without X Window System graphics driver],[if test "$withval" = no; then disable_x=yes; else disable_x=no; fi])
 AC_ARG_WITH(fb, [  --without-fb            compile without Linux Framebuffer graphics driver],[if test "$withval" = no; then disable_fb=yes; else disable_fb=no; fi])
 AC_ARG_WITH(directfb, [  --without-directfb      compile without DirectFB graphics driver],[if test "$withval" = no; then disable_directfb=yes; else disable_directfb=no; fi])
+AC_ARG_WITH(sdl, [  --without-sdl      compile without SDL graphics driver],[if test "$withval" = no; then disable_sdl=yes; else disable_sdl=no; fi])
 AC_ARG_WITH(pmshell, [  --without-pmshell       compile without PMShell graphics driver],[if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi])
 AC_ARG_WITH(atheos, [  --without-atheos        compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi])
 
@@ -386,6 +387,29 @@
 	fi
 fi
 
+#check sdl
+if test "$disable_sdl" != yes ; then
+	AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+	if test "$SDL_CONFIG" != "no"; then
+	        AC_MSG_CHECKING(for SDL >= 1.2.0)
+        	sdl_version=`$SDL_CONFIG --version`
+		if expr $sdl_version \>= 1.2.0 >/dev/null; then
+			AC_MSG_RESULT(yes)
+			SDL_CFLAGS=`$SDL_CONFIG --cflags`
+			SDL_LIBS=`$SDL_CONFIG --libs`
+	           	AC_DEFINE(GRDRV_SDL)
+        	   	drivers="$drivers SDL"
+			CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+			LIBS="$LIBS $SDL_LIBS"
+		else
+			AC_MSG_RESULT(no)
+		fi
+	fi
+fi
+
+
+
+
 	AC_PATH_X
 
 	if test "$have_x" = yes; then
diff -urN links-2.1pre14/drivers.c links-2.1pre14-sdl/drivers.c
--- links-2.1pre14/drivers.c	2003-09-09 21:35:51.000000000 +0200
+++ links-2.1pre14-sdl/drivers.c	2004-04-19 15:49:05.000000000 +0200
@@ -31,6 +31,9 @@
 #ifdef GRDRV_ATHEOS
 extern struct graphics_driver atheos_driver;
 #endif
+#ifdef GRDRV_SDL
+extern struct graphics_driver sdl_driver;
+#endif
 
 struct graphics_driver *graphics_drivers[] = {
 #ifdef GRDRV_PMSHELL
@@ -51,6 +54,9 @@
 #ifdef GRDRV_FB
 	&fb_driver,
 #endif
+#ifdef GRDRV_SDL
+	&sdl_driver,
+#endif
 	NULL
 };
 
diff -urN links-2.1pre14/.kdbgrc.links links-2.1pre14-sdl/.kdbgrc.links
--- links-2.1pre14/.kdbgrc.links	1970-01-01 01:00:00.000000000 +0100
+++ links-2.1pre14-sdl/.kdbgrc.links	2004-04-20 17:56:46.000000000 +0200
@@ -0,0 +1,18 @@
+[Breakpoint 0]
+Enabled=true
+File=/home/sam/devel-my/app-links/links-2.1pre14/sdl.c
+Line=346
+Temporary=false
+
+[General]
+DebuggerCmdStr=
+DriverName=GDB
+FileVersion=1
+OptionsSelected=
+ProgramArgs=-g -driver sdl
+TTYLevel=7
+WorkingDirectory=
+
+[Memory]
+ColumnWidths=80,0
+NumExprs=0
diff -urN links-2.1pre14/Makefile.am links-2.1pre14-sdl/Makefile.am
--- links-2.1pre14/Makefile.am	2003-10-27 22:55:43.000000000 +0100
+++ links-2.1pre14-sdl/Makefile.am	2004-05-02 16:38:15.138450998 +0200
@@ -13,7 +13,7 @@
 else
 endif
 
-links_SOURCES=af_unix.c auth.c beos.c bfu.c bookmarks.c builtin.c cache.c charsets.c connect.c context.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c ipret.c javascr.c javascript.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c md5.c md5hl.c menu.c memory.c ns.c objreq.c os_dep.c pmshell.c png.c pomocny.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c win32.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc arrow.inc md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h bits.h
+links_SOURCES=af_unix.c auth.c beos.c bfu.c bookmarks.c builtin.c cache.c charsets.c connect.c context.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c ipret.c javascr.c javascript.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c md5.c md5hl.c menu.c memory.c ns.c objreq.c os_dep.c pmshell.c png.c pomocny.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c win32.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc arrow.inc md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h bits.h sdl.c
 
 dist-hook:
 #remove the symlinka:
@@ -29,6 +29,7 @@
 	cat $(srcdir)/INSTALL >> $(distdir)/INSTALL
 	tar c $(distdir) | bzip2 -9 > links-$(VERSION).tar.bz2
 
+CFLAGS=
 CXXFLAGS=@CXXFLAGS@
 
 atheos.o: atheos.cpp
diff -urN links-2.1pre14/Makefile.in links-2.1pre14-sdl/Makefile.in
--- links-2.1pre14/Makefile.in	2003-11-10 20:25:46.000000000 +0100
+++ links-2.1pre14-sdl/Makefile.in	2004-05-02 16:38:57.073582661 +0200
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -75,12 +75,13 @@
 
 @ATHEOS_GR_TRUE@links_LDADD = atheos.o
 
-links_SOURCES = af_unix.c auth.c beos.c bfu.c bookmarks.c builtin.c cache.c charsets.c connect.c context.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c ipret.c javascr.c javascript.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c md5.c md5hl.c menu.c memory.c ns.c objreq.c os_dep.c pmshell.c png.c pomocny.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c win32.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc arrow.inc md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h bits.h
+links_SOURCES = af_unix.c auth.c beos.c bfu.c bookmarks.c builtin.c cache.c charsets.c connect.c context.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c ipret.c javascr.c javascript.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c md5.c md5hl.c menu.c memory.c ns.c objreq.c os_dep.c pmshell.c png.c pomocny.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c win32.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc arrow.inc md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h bits.h sdl.c
 
-CXXFLAGS = @CXXFLAGS@
+CFLAGS = `sdl-config --cflags`
+CXXFLAGS = @CXXFLAGS@ `sdl-config --cflags`
 
 datadir = $(prefix)/@DATADIRNAME@
-LIBS = @LIBS@
+LIBS = @LIBS@ `sdl-config --libs` -lSDL_gfx
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -100,10 +101,9 @@
 lru.o mailto.o main.o md5.o md5hl.o menu.o memory.o ns.o objreq.o \
 os_dep.o pmshell.o png.o pomocny.o sched.o select.o session.o smb.o \
 svgalib.o terminal.o tiff.o types.o url.o view.o view_gr.o win32.o x.o \
-xbm.o
+xbm.o sdl.o
 @ATHEOS_GR_TRUE@links_DEPENDENCIES =  atheos.o
 links_LDFLAGS = 
-CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -119,8 +119,24 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/af_unix.P .deps/auth.P .deps/beos.P .deps/bfu.P \
+.deps/bookmarks.P .deps/builtin.P .deps/cache.P .deps/charsets.P \
+.deps/connect.P .deps/context.P .deps/cookies.P .deps/default.P \
+.deps/dip.P .deps/directfb.P .deps/dither.P .deps/dns.P .deps/drivers.P \
+.deps/error.P .deps/file.P .deps/finger.P .deps/font_include.P \
+.deps/framebuffer.P .deps/ftp.P .deps/gif.P .deps/html.P \
+.deps/html_gr.P .deps/html_r.P .deps/html_tbl.P .deps/http.P \
+.deps/https.P .deps/img.P .deps/imgcache.P .deps/ipret.P \
+.deps/javascr.P .deps/javascript.P .deps/jpeg.P .deps/jsint.P \
+.deps/kbd.P .deps/language.P .deps/links_icon.P .deps/listedit.P \
+.deps/lru.P .deps/mailto.P .deps/main.P .deps/md5.P .deps/md5hl.P \
+.deps/memory.P .deps/menu.P .deps/ns.P .deps/objreq.P .deps/os_dep.P \
+.deps/pmshell.P .deps/png.P .deps/pomocny.P .deps/sched.P .deps/sdl.P \
+.deps/select.P .deps/session.P .deps/smb.P .deps/svgalib.P \
+.deps/terminal.P .deps/tiff.P .deps/types.P .deps/url.P .deps/view.P \
+.deps/view_gr.P .deps/win32.P .deps/x.P .deps/xbm.P
 SOURCES = $(links_SOURCES)
 OBJECTS = $(links_OBJECTS)
 
@@ -128,9 +144,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -195,9 +211,6 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -324,6 +337,11 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	$(mkinstalldirs) $(distdir)/Unicode $(distdir)/doc/links_cal \
 	   $(distdir)/graphics \
 	   $(distdir)/graphics/font/century_school-bold-roman-serif-vari \
@@ -336,7 +354,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -344,142 +362,38 @@
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-af_unix.o: af_unix.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-auth.o: auth.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-beos.o: beos.c
-bfu.o: bfu.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-bookmarks.o: bookmarks.c links.h cfg.h config.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h
-builtin.o: builtin.c cfg.h config.h struct.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h typy.h builtin_keys.h builtin.h \
-	ipret.h ns.h md5.h
-cache.o: cache.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-charsets.o: charsets.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h codepage.inc uni_7b.inc entity.inc
-connect.o: connect.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-context.o: context.c cfg.h config.h struct.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h tree.h typy.h ipret.h builtin.h \
-	ns.h
-cookies.o: cookies.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-default.o: default.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-dip.o: dip.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-directfb.o: directfb.c cfg.h config.h
-dither.o: dither.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-dns.o: dns.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-drivers.o: drivers.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-error.o: error.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-file.o: file.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-finger.o: finger.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-font_include.o: font_include.c cfg.h config.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h
-framebuffer.o: framebuffer.c cfg.h config.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h arrow.inc
-ftp.o: ftp.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-gif.o: gif.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-html.o: html.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-html_gr.o: html_gr.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-html_r.o: html_r.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-html_tbl.o: html_tbl.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-http.o: http.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-https.o: https.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-img.o: img.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-imgcache.o: imgcache.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-ipret.o: ipret.c cfg.h config.h struct.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h tree.h typy.h ipret.h ns.h \
-	builtin.h builtin_keys.h
-javascr.o: javascr.c cfg.h config.h tree.h struct.h links.h os_dep.h \
-	os_depx.h setup.h language.h codepage.h ipret.h javascript.h
-javascript.o: javascript.c cfg.h config.h struct.h links.h os_dep.h \
-	os_depx.h setup.h language.h codepage.h tree.h ns.h
-jpeg.o: jpeg.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-jsint.o: jsint.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h struct.h ipret.h
-kbd.o: kbd.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-language.o: language.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h language.inc
-links_icon.o: links_icon.c cfg.h config.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h
-listedit.o: listedit.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-lru.o: lru.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-mailto.o: mailto.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-main.o: main.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-md5.o: md5.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h md5.h
-md5hl.o: md5hl.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h md5.h
-memory.o: memory.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-menu.o: menu.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-ns.o: ns.c cfg.h config.h struct.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h typy.h ns.h ipret.h builtin_keys.h
-objreq.o: objreq.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-os_dep.o: os_dep.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-pmshell.o: pmshell.c cfg.h config.h
-png.o: png.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-pomocny.o: pomocny.c cfg.h config.h struct.h links.h os_dep.h os_depx.h \
-	setup.h language.h codepage.h
-sched.o: sched.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-select.o: select.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-session.o: session.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-smb.o: smb.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-svgalib.o: svgalib.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h bits.h arrow.inc
-terminal.o: terminal.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-tiff.o: tiff.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h bits.h
-types.o: types.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-url.o: url.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-view.o: view.c links.h cfg.h config.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-view_gr.o: view_gr.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
-win32.o: win32.c
-x.o: x.c cfg.h config.h links.h os_dep.h os_depx.h setup.h language.h \
-	codepage.h
-xbm.o: xbm.c cfg.h config.h links.h os_dep.h os_depx.h setup.h \
-	language.h codepage.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -520,25 +434,27 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -551,8 +467,9 @@
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile install-man1 uninstall-man1 install-man \
 uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck all-recursive-am install-exec-am \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck all-recursive-am install-exec-am \
 install-exec install-data-am install-data install-am install \
 uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
diff -urN links-2.1pre14/sdl.c links-2.1pre14-sdl/sdl.c
--- links-2.1pre14/sdl.c	1970-01-01 01:00:00.000000000 +0100
+++ links-2.1pre14-sdl/sdl.c	2004-05-02 16:44:59.207786480 +0200
@@ -0,0 +1,851 @@
+/*sdl.c
+	-- SDL graphic driver for Links (version 0.1.2)
+
+    Copyright (C) 2004	Samuel Behan <sam(at)frida(dot)fri(dot)utc(dot)sk>
+
+    This driver is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This driver is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    ---
+    I've wrote this driver just as a proof of concept for using SDL library. I wanted
+    to use something easy, so i've decided for the world's best web browser :)
+
+    TODO & BUGS:
+	- keyboard input system doesn't handles all characters, because sdl ignores any
+		system mappings and provides something like `raw keyboard access'
+	- *_strip functions are possibly bad implemented, actualy i don't understand what
+		they should do, or better i'm too lazy to find it out :)
+	- video initialization is static only, nor parametrized !!!
+	- BUGBUG: aa-lib nor caca lib, dont display nicely - they actualy display nothing ;(
+			This needs to be fixed, becase links over aa-lib as that what i've been
+			dreaming of [ try set env SDL_VIDEODRIVER="aalib" ]
+	* resize does not works (fixed)
+	? sdl_set_title should possibly convert passed strings
+	...and many more, not found yet :)
+*/
+
+
+#include "cfg.h"
+
+//#define GRDRV_SDL
+#ifdef GRDRV_SDL
+
+#ifdef TEXT
+#undef TEXT
+#endif
+
+#include "links.h"
+#include <signal.h>
+//#include "arrow.inc"
+
+/*sdl inclusions*/
+#include <SDL.h>
+#include <SDL_gfxPrimitives.h>
+
+
+/* helper tools */
+//FIXME: enabled debug mode
+#undef DEBUG
+#ifdef DEBUG
+#include <assert.h>
+#define S_ASSERT(code)	assert((code))
+#define S_ON_DEBUG(code)	code
+#define S_ON_DEBUG_TRACE(str)	fprintf(stderr, "[%s:%s:%d] %s\n", __FILE__, __PRETTY_FUNCTION__, __LINE__, str);
+#else
+#define S_ASSERT(code)
+#define S_ON_DEBUG(code)
+#define S_ON_DEBUG_TRACE(str)
+#endif
+
+//internal types
+typedef unsigned char 		u_char_t;
+typedef unsigned short int	u_short_t;
+struct graphics_driver sdl_driver;
+
+//keysyms
+#include "sdl_data.inc"
+
+static struct t_sdl_driver_data {
+	u_char_t	*video_drv;		//used video driver name
+	SDL_VideoInfo	*video_info;		//video informations
+	SDL_Cursor	*cursor;		//cursor
+	int		event_timer;		//event timer id
+	struct {
+		long  int	flags;		//video flags
+		short int	width;
+		short int	height;
+		short int	depth;
+	} video;
+} sdl_data = {
+	NULL,
+	NULL,
+	NULL,
+	0,
+	{ 0, 0, 0, 0 },
+};
+#define sdl_VIDEO_WIDTH		sdl_DATA.video.width
+#define sdl_VIDEO_HEIGHT	sdl_DATA.video.height
+#define sdl_VIDEO_DEPTH		sdl_DATA.video.depth
+#define sdl_VIDEO_FLAGS		sdl_DATA.video.flags
+
+/* DRIVER DATA HELPERS */ 
+#define sdl_DATA		sdl_data
+#define sdl_DATA_FREE()		if(sdl_DATA.video_drv != NULL)	mem_free(sdl_DATA.video_drv);	\
+				if(sdl_DATA.video_info != NULL)	mem_free(sdl_DATA.video_info);
+struct t_sdl_device_data {
+	SDL_Surface 		*p_surf;		//primary surface
+	struct graphics_device	*g_dev;			//draphic device
+//	SDL_Rect		u_rect;			//update rectangle
+	short			u_pending;		//update pending
+};
+#define sdl_SURFACE(ptr)	(ptr)->p_surf
+#define sdl_GD(ptr)		(ptr)->g_dev
+#define sdl_URECT(ptr)		(ptr)->u_rect
+#define sdl_UPENDING(ptr)	(ptr)->u_pending
+
+/* HELPER FUNCTIONS */
+#define sdl_COLOR(col)			(((col) << 2) | 0x00)
+
+#define sdl_SETUP_TIMER(dev)		\
+		sdl_DATA.event_timer	= install_timer(20, sdl_catch_event, (dev))
+#define sdl_KILL_TIMER()		\
+		kill_timer(sdl_DATA.event_timer)
+
+//event catch helpers
+#define sdl_CATCH_EVENTS_NUM	3
+#define sdl_MOUSE_STATE(var_in, var_out, def)	\
+		if(var_in == SDL_BUTTON(SDL_BUTTON_LEFT))			\
+			var_out	|= B_LEFT;					\
+		else if(var_in == SDL_BUTTON(SDL_BUTTON_RIGHT))			\
+			var_out	|= B_RIGHT;					\
+		else if(var_in == SDL_BUTTON(SDL_BUTTON_MIDDLE))		\
+			var_out	|= B_MIDDLE;					\
+		else if(var_in == SDL_BUTTON(SDL_BUTTON_WHEELUP))		\
+			var_out	|= B_WHEELUP;					\
+		else if(var_in == SDL_BUTTON(SDL_BUTTON_WHEELDOWN))		\
+			var_out	|= B_WHEELDOWN;					\
+		else	var_out	= (def);
+
+
+
+//tha event handler
+static void sdl_catch_event(void *data)
+{
+    register int i = 0, ev_num	= 0;
+    register struct t_sdl_device_data *dev	= NULL;
+    SDL_Event events[sdl_CATCH_EVENTS_NUM];
+    u_short_t	fl	= 0;
+    //speedup (BUGGY, not thread safe !!!)
+    static u_short_t o_x = 0, o_y = 0, o_fl = 0;
+  
+
+    SDL_PumpEvents();
+    ev_num	= SDL_PeepEvents(events, sdl_CATCH_EVENTS_NUM, SDL_GETEVENT, SDL_ALLEVENTS);
+//    S_ON_DEBUG(fprintf(stderr, "event: received %d\n", ev_num); );
+    S_ASSERT(ev_num != -1);
+    //get dev data
+    dev		= (struct t_sdl_device_data *) data;
+    for(i = 0; i < ev_num; i++)
+    {
+#define event events[i]
+	switch (event.type)
+	{
+//	    case SDL_ACTIVEEVENT:
+	    //mouse motion
+            case SDL_MOUSEMOTION:
+		//mose btn state
+	        S_ON_DEBUG_TRACE("event: mouse motion");
+		fl	= B_DRAG;
+		sdl_MOUSE_STATE(event.motion.state, fl, B_MOVE);
+		//save som calls (SDL generates many similar events)
+		if(event.motion.x == o_x && event.motion.y == o_y && fl == o_fl)
+			break;
+		//call handler
+		sdl_GD(dev)->mouse_handler(sdl_GD(dev), event.motion.x, event.motion.y, fl);
+		o_x	= event.motion.x;
+		o_y	= event.motion.y;
+		o_fl	= fl;
+                break;
+	    //mouse click
+	    case SDL_MOUSEBUTTONUP:
+            case SDL_MOUSEBUTTONDOWN:
+		if(event.type == SDL_MOUSEBUTTONDOWN)
+			fl	= B_DOWN;
+		else
+			fl	= B_UP;
+	        S_ON_DEBUG_TRACE("event: mouse click");
+//		sdl_MOUSE_STATE(event.button.state, fl, fl);
+		sdl_GD(dev)->mouse_handler(sdl_GD(dev), event.button.x, event.button.y, fl);
+		break;
+	    //keyboard
+	    case SDL_KEYUP:
+	        S_ON_DEBUG_TRACE("event: key up");
+		break;
+            case SDL_KEYDOWN:
+	       {	//translate
+			int		k	= 0;
+			int		key	= 0;
+
+			//////////////////////////
+			//FIXME: needs rework !!!
+			//	-- sdl works at low-level ignoring any system keymappings
+			//	i've no idea how to do it (easily):(
+			//////////////////////////
+
+			S_ON_DEBUG_TRACE("event: key down");
+			while(sdl_keysyms[k].sym != event.key.keysym.sym && sdl_keysyms[k].sym != SDLK_LAST)
+				k++;
+			S_ASSERT(sdl_keysyms[k].sym != SDLK_LAST);
+			//FIXME: hope nobody changes enumeration values in SDL libs
+			if(sdl_keysyms[k].sym >= SDLK_NUMLOCK && sdl_keysyms[k].sym <= SDLK_COMPOSE) 
+				break;	//aka ignore modifiers
+			//find modifiers
+			fl	= 0;
+			if(event.key.keysym.mod & KMOD_SHIFT)
+				fl	|=	KBD_SHIFT;
+			if(event.key.keysym.mod & KMOD_ALT)
+				fl	|=	KBD_ALT;
+			if(event.key.keysym.mod & KMOD_CTRL)
+				fl	|=	KBD_CTRL;
+			//key re-map
+			key	= sdl_keysyms[k].key;
+			//upper letters fix (not handled directly by SDL)
+			if(key >= 97 && key <= 122 && fl & KBD_SHIFT)
+			{	key	-= 32;
+				fl	&= ~KBD_SHIFT;	}
+			//find modifiers
+			fl	= 0;
+			if(event.key.keysym.mod & KMOD_SHIFT)
+				fl	|=	KBD_SHIFT;
+			if(event.key.keysym.mod & KMOD_ALT)
+				fl	|=	KBD_ALT;
+			if(event.key.keysym.mod & KMOD_CTRL)
+				fl	|=	KBD_CTRL;
+			//send keyb
+			S_ON_DEBUG(fprintf(stderr, "KEY(%d) = %c&%d\n", k, key, fl););
+			if(fl & KBD_CTRL && sdl_keysyms[k].sym == SDLK_c)
+				sdl_GD(dev)->keyboard_handler(sdl_GD(dev), KBD_CTRL_C, 0);
+			else
+				sdl_GD(dev)->keyboard_handler(sdl_GD(dev), key, fl);
+                }break;
+	    case SDL_VIDEORESIZE:
+		//new dims
+		sdl_GD(dev)->size.x2	= event.resize.w;
+		sdl_GD(dev)->size.y2	= event.resize.h;
+		sdl_driver.x		= event.resize.w;
+		sdl_driver.y		= event.resize.h;
+		//resize
+		//S_ON_DEBUG(fprintf(stderr, "RESIZE(%dx%d)\n", event.resize.w, event.resize.h));
+		//info resize
+		sdl_GD(dev)->resize_handler(sdl_GD(dev));
+		break;
+//	    case SDL_VIDEOEXPOSE:
+            case SDL_QUIT:
+                sdl_GD(dev)->keyboard_handler(sdl_GD(dev), KBD_CLOSE, 0);
+                break;
+	    default:
+		//printf("Unhandled event: %d !\n", event.type);
+		break;
+	}
+   }
+#undef event
+   sdl_SETUP_TIMER((void *)dev);
+   return;
+}
+
+static inline void sdl_update_sc(void *data)
+{
+	struct t_sdl_device_data	*dev	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+	//assing struct
+	if(data == NULL)
+		return;
+	dev	= (struct t_sdl_device_data *)data;
+
+	//check if update neccesary
+	if(!sdl_UPENDING(dev))
+		return;
+	//do update screen
+//	SDL_UpdateRect(sdl_SURFACE(dev), sdl_URECT(dev).x, sdl_URECT(dev).y, sdl_URECT(dev).w, sdl_URECT(dev).h);
+	SDL_UpdateRect(sdl_SURFACE(dev), 0, 0, 0, 0);
+	//remove pending flag
+	sdl_UPENDING(dev)	= 0;
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+
+//quite stuppit function
+#define sdl_NORM_UPDATE	0
+#define sdl_FULL_UPDATE 1
+static inline void sdl_register_update(struct t_sdl_device_data *dev, int x, int y, int w, int h, int opt)
+{
+	S_ON_DEBUG_TRACE("in");
+	sdl_UPENDING(dev)	= 1;
+	register_bottom_half(sdl_update_sc, dev);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//partialy stolen from documentation :)
+static inline void sdl_putpixel(SDL_Surface *s, int x, int y, unsigned long pixel)
+{
+     Uint8 *p;
+
+     //check our clip
+     if(!((s->clip_rect.x < x && (s->clip_rect.x + s->clip_rect.w) > x) 
+			&& (s->clip_rect.y < y && (s->clip_rect.y + s->clip_rect.h) > y)))
+	return;
+     //our sanity (fight int overflow :)
+     pixel &= (1<<(s->format->BytesPerPixel)) - 1; 
+     //our point
+     p = (Uint8 *)s->pixels + y * s->pitch + x * s->format->BytesPerPixel;
+     switch(s->format->BytesPerPixel) {
+     case 1:
+         *p = pixel;
+         break;
+     case 2:
+         *(Uint16 *)p = pixel;
+         break;
+
+     case 3:
+         if(SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+             p[0] = (pixel >> 16) & 0xff;
+             p[1] = (pixel >> 8) & 0xff;
+             p[2] = pixel & 0xff;
+         } else {
+             p[0] = pixel & 0xff;
+             p[1] = (pixel >> 8) & 0xff;
+             p[2] = (pixel >> 16) & 0xff;
+         }
+         break;
+     case 4:
+         *(Uint32 *)p = pixel;
+         break;
+     }
+     return;
+}
+
+
+/* DRIVER FUNCTIONS */
+
+//init driver
+u_char_t *sdl_init_driver(u_char_t *param, u_char_t *display)
+{
+	S_ON_DEBUG_TRACE("in");
+	//init sdl video
+	if(SDL_Init(SDL_INIT_VIDEO) != 0)
+		return stracpy(SDL_GetError());
+	
+	//fetch current video hw informations
+	sdl_DATA.video_info		= (SDL_VideoInfo *) mem_alloc(sizeof(SDL_VideoInfo));
+	S_ASSERT(sdl_DATA.video_info != NULL);
+	memcpy(sdl_DATA.video_info, SDL_GetVideoInfo(), (sizeof(SDL_VideoInfo)));
+	//fetch driver name
+	sdl_DATA.video_drv		= (char *)mem_alloc(sizeof(char) * 11);
+	S_ASSERT(sdl_DATA.video_drv != NULL);
+	SDL_VideoDriverName(sdl_DATA.video_drv, 11);
+
+	//SDL_VideoModeOk()
+
+	//setup mode
+	sdl_VIDEO_FLAGS		|= SDL_HWSURFACE | SDL_HWPALETTE | SDL_RLEACCEL | SDL_RESIZABLE;
+	sdl_VIDEO_WIDTH		= 1000;
+	sdl_VIDEO_HEIGHT	= 710;
+	sdl_VIDEO_DEPTH		= sdl_DATA.video_info->vfmt->BitsPerPixel;
+
+	//set driv config
+	sdl_driver.x		= sdl_VIDEO_WIDTH;
+	sdl_driver.y		= sdl_VIDEO_HEIGHT;
+	sdl_driver.depth	= ((sdl_DATA.video_info->vfmt->BytesPerPixel & 0x7) |
+                           ((sdl_DATA.video_info->vfmt->BitsPerPixel & 0x1F) << 3));
+
+	//create cursor :) (need nice one)
+#ifdef sdl_HAVE_CURSOR
+	if(sdl_DATA.cursor == NULL)
+	{
+		//sdl_DATA.cursor	= SDL_CreateCursor((void *)arrow, (void *)arrow, 32, 32, 0, 0);
+		S_ASSERT(sdl_DATA.cursor != NULL);
+	}
+#endif
+	//key repeat
+	SDL_EnableUNICODE(1);
+	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+
+	S_ON_DEBUG(fprintf(stderr, "VIDEO(%s): %dx%dx%d [%d]\n", sdl_DATA.video_drv,
+						sdl_VIDEO_WIDTH, sdl_VIDEO_HEIGHT, sdl_VIDEO_DEPTH, sdl_driver.depth));
+	return NULL;
+}
+
+//shutdown driver
+void sdl_shutdown_driver()
+{
+	S_ON_DEBUG_TRACE("in");
+	sdl_KILL_TIMER();
+	sdl_DATA_FREE();
+	SDL_Quit();
+	return;
+}
+
+//create new graph device
+struct graphics_device *sdl_init_device()
+{
+	struct graphics_device *dev	= NULL;
+	struct t_sdl_device_data *data	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	//device data
+	data			= (struct t_sdl_device_data *) mem_alloc(sizeof(struct t_sdl_device_data));
+	S_ASSERT(data != NULL);
+	memset(data, 0, sizeof(struct t_sdl_device_data));
+
+	//init video mode
+	sdl_SURFACE(data)	= SDL_SetVideoMode(sdl_VIDEO_WIDTH, sdl_VIDEO_HEIGHT, sdl_VIDEO_DEPTH, 
+							sdl_VIDEO_FLAGS);
+	if(sdl_SURFACE(data) == NULL)
+		return NULL;
+	SDL_SetAlpha(sdl_SURFACE(data), SDL_SRCALPHA, 0xff);
+
+	//FIXME: here we shoulde re-update video info by calling SDL_VideoInfo() again
+
+	//alloc gd
+	dev	= (struct graphics_device *) mem_alloc(sizeof(struct graphics_device));
+	S_ASSERT(dev != NULL);
+
+	//setup gdS
+	dev->size.x1		= 0;
+	dev->size.y1		= 0;
+	dev->size.x2		= sdl_VIDEO_WIDTH;
+	dev->size.y2		= sdl_VIDEO_HEIGHT;
+	dev->clip		= dev->size;
+
+	//driver 
+	sdl_driver.flags	|= GD_NEED_CODEPAGE;
+	sdl_GD(data)		= dev;
+
+	//driver
+	dev->drv		= &sdl_driver;
+	dev->driver_data	= (void *) data;
+	dev->user_data		= NULL;
+
+	//set my cursor
+	if(sdl_DATA.cursor != NULL)
+		SDL_SetCursor(sdl_DATA.cursor);
+
+	//init timer
+	if(sdl_DATA.event_timer == 0)
+		sdl_SETUP_TIMER((void *)data);
+	S_ON_DEBUG_TRACE("out");
+	return dev;
+}
+
+//destroy device
+void sdl_shutdown_device(struct graphics_device *drv)
+{
+	struct t_sdl_device_data *dev	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+	dev			= (struct t_sdl_device_data *) drv->driver_data;
+	S_ASSERT(dev != NULL);
+	
+	//deinit video
+	SDL_FreeSurface(sdl_SURFACE(dev));
+	mem_free(dev);
+	drv->driver_data	= NULL;
+	mem_free(drv);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//get driver parameters
+u_char_t *sdl_get_driver_param()
+{
+	S_ON_DEBUG_TRACE("in");
+	S_ASSERT(0);
+	return NULL;
+}
+
+/* GRAPHICS */
+
+//create empty bitmap
+int sdl_get_empty_bitmap(struct bitmap *bmp)
+{
+	SDL_Surface	*s	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	//null
+	bmp->data	= bmp->flags	= bmp->user	= NULL;
+	bmp->skip	= 0;
+
+	//alloc surface
+	//FIXED: ignoring byteorder here (taking from video info)
+	s		= (void *)SDL_CreateRGBSurface(sdl_VIDEO_FLAGS, bmp->x, bmp->y, sdl_VIDEO_DEPTH,
+					sdl_DATA.video_info->vfmt->Rmask, sdl_DATA.video_info->vfmt->Gmask, 
+					sdl_DATA.video_info->vfmt->Bmask, sdl_DATA.video_info->vfmt->Amask);
+	S_ASSERT(s != NULL);
+
+	//copy data
+	bmp->data	= (void *)s->pixels;
+	bmp->skip	= s->pitch;
+	bmp->flags	= (void *)s;
+
+	//lock if required
+	if(SDL_MUSTLOCK(s))
+		SDL_LockSurface(s);
+	S_ON_DEBUG_TRACE("out");
+	return 0;
+}
+
+//create filled bitmap
+int sdl_get_filled_bitmap(struct bitmap *bmp, long color)
+{
+	S_ON_DEBUG_TRACE("in");
+	S_ASSERT(0);
+	return 0;
+}
+
+//register bitmap
+void sdl_register_bitmap(struct bitmap *bmp)
+{
+	SDL_Surface	*s	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	//unlock surface
+	s	= (SDL_Surface *)bmp->flags;
+	if(SDL_MUSTLOCK(s))
+		SDL_UnlockSurface(s);
+	//hide pixel mem
+	bmp->data	= NULL;
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+
+//prepare strip
+void *sdl_prepare_strip(struct bitmap *bmp, int top, int lines)
+{
+	SDL_Surface	*s	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	//unlock surface
+	s	= (SDL_Surface *)bmp->flags;
+	if(SDL_MUSTLOCK(s))
+		SDL_LockSurface(s);
+	S_ON_DEBUG_TRACE("out");
+	return (void *)s->pixels + top * s->pitch;
+}
+
+//commit strip
+void sdl_commit_strip(struct bitmap *bmp, int top, int lines)
+{
+	SDL_Surface	*s	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	//unlock surface
+	s	= (SDL_Surface *)bmp->flags;
+	if(SDL_MUSTLOCK(s))
+		SDL_UnlockSurface(s);
+	return;
+}
+
+//unregister bitmap
+void sdl_unregister_bitmap(struct bitmap *bmp)
+{
+	SDL_Surface	*s	= NULL;
+
+	S_ON_DEBUG_TRACE("in");
+
+	s		= (SDL_Surface *)bmp->flags;
+	S_ASSERT(s != 0);
+	//delete data
+	SDL_FreeSurface(s);
+	//null data
+	bmp->data	= NULL;
+	bmp->flags	= NULL;
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//draw bmp
+void sdl_draw_bitmap(struct graphics_device *drv, struct bitmap *bmp, int x, int y)
+{
+	SDL_Surface		 *s	= NULL;
+	struct t_sdl_device_data *dev	= NULL;
+	SDL_Rect	rect;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+	s	= (SDL_Surface *)bmp->flags;
+	memset(&rect, 0, sizeof(SDL_Rect));
+
+	//blit :)
+	rect.x	= x;
+	rect.y	= y;
+	SDL_BlitSurface(s, NULL, sdl_SURFACE(dev), &rect);
+	sdl_register_update(dev, rect.x, rect.y, rect.w, rect.h, 0);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//draw more bmps
+void sdl_draw_bitmaps(struct graphics_device *drv, struct bitmap **bmps, int n, int x, int y)
+{
+	int	i = 0;
+	struct t_sdl_device_data *dev	= NULL;
+	SDL_Rect rect;
+
+	S_ON_DEBUG_TRACE("in");
+	//check
+	if(n < 1)
+		return;
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+	memset(&rect, 0, sizeof(SDL_Rect));
+
+	//blit
+	rect.x	= x;
+	rect.y	= y;
+	for(i = 0; i < n; i++)
+	{	SDL_BlitSurface((SDL_Surface *)bmps[i]->flags, NULL, sdl_SURFACE(dev), &rect);
+		rect.x	+=	bmps[i]->x;	}
+	//FIXME: this should care about updating area, and possibly not update everythink
+	sdl_register_update(dev, 0, 0, 0, 0, sdl_FULL_UPDATE);
+	return;
+}
+
+//get color
+long sdl_get_color(int rgb)
+{
+//	S_ON_DEBUG_TRACE("in");
+	//FIXME: not sure this is ok :)
+	return SDL_MapRGB(sdl_DATA.video_info->vfmt, ((rgb >> 16) & 0xff), ((rgb >> 8) & 0xff), ((rgb) & 0xff));
+//	return rgb;	
+}
+
+//fill some area
+void sdl_fill_area(struct graphics_device *drv, int x1, int y1, int x2, int y2, long color)
+{
+	struct t_sdl_device_data *dev = NULL;
+	SDL_Rect rect;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+
+
+	rect.x	= x1;
+	rect.y	= y1;
+	rect.w	= x2 - x1;
+	rect.h	= y2 - y1;
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_LockSurface(sdl_SURFACE(dev));
+	SDL_FillRect(sdl_SURFACE(dev), &rect, color);
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_UnlockSurface(sdl_SURFACE(dev));
+	sdl_register_update(dev, rect.x, rect.y, rect.w, rect.h, 0);
+//	sdl_register_update(dev, x1, y1, x2, y2, 0);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//draw horizontal line
+void sdl_draw_hline(struct graphics_device *drv, int left, int y, int right, long color)
+{
+	register int	i	= 0;
+	struct t_sdl_device_data *dev = NULL;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_LockSurface(sdl_SURFACE(dev));
+	for(i = left; i < right; i++)
+		sdl_putpixel(sdl_SURFACE(dev), i, y, color);
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_UnlockSurface(sdl_SURFACE(dev));
+	//FIXME: this should register area update instead of direct update
+	sdl_register_update(dev,  left, y, 1, right - left, 0);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//draw vertical line
+void sdl_draw_vline(struct graphics_device *drv, int x, int top, int bottom, long color)
+{
+	register int i = 0;
+	struct t_sdl_device_data *dev = NULL;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_LockSurface(sdl_SURFACE(dev));
+	for(i = top; i < bottom; i++)
+		sdl_putpixel(sdl_SURFACE(dev), x, i, color);
+	if(SDL_MUSTLOCK(sdl_SURFACE(dev)))
+		SDL_UnlockSurface(sdl_SURFACE(dev));
+	sdl_register_update(dev, x, top, bottom - top, 1, 0);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//horizontal scroll
+int sdl_hscroll(struct graphics_device *drv, struct rect_set **set, int sc)
+{
+	struct t_sdl_device_data *dev = NULL;
+	SDL_Rect rect1, rect2;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+
+	//rect1
+	rect1.x = drv->clip.x1;
+	rect1.y = drv->clip.y1;
+	rect1.w = drv->clip.x2 - rect1.x;
+	rect1.h = drv->clip.y2 - rect1.y;
+
+	//rect2
+	rect2.x = drv->clip.x1 + sc;
+	rect2.y = drv->clip.y1;
+	rect2.w = drv->clip.x2 - rect1.x;
+	rect2.h = drv->clip.y2 - rect1.y;
+
+	SDL_BlitSurface(sdl_SURFACE(dev), &rect1, sdl_SURFACE(dev), &rect2);
+	sdl_register_update(dev, rect1.x, rect1.y, rect1.w, rect1.h, 0);
+	S_ON_DEBUG_TRACE("out");
+	return 1;
+}
+
+//vertical scroll
+int sdl_vscroll(struct graphics_device *drv, struct rect_set **set, int sc)
+{
+	struct t_sdl_device_data *dev = NULL;
+	SDL_Rect rect1, rect2;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+
+	//rect1
+	rect1.x = drv->clip.x1;
+	rect1.y = drv->clip.y1;
+	rect1.w = drv->clip.x2 - rect1.x;
+	rect1.h = drv->clip.y2 - rect1.y;
+
+	//rect2
+	rect2.x = drv->clip.x1;
+	rect2.y = drv->clip.y1 + sc;
+	rect2.w = drv->clip.x2 - rect1.x;
+	rect2.h = drv->clip.y2 - rect1.y;
+
+	SDL_BlitSurface(sdl_SURFACE(dev), &rect1, sdl_SURFACE(dev), &rect2);
+	sdl_register_update(dev, rect1.x, rect1.y, rect1.w, rect1.h, 0);
+	S_ON_DEBUG_TRACE("out");
+	return 1;
+}
+
+//set cliping area
+void sdl_set_clip_area(struct graphics_device *drv, struct rect *r)
+{
+	struct t_sdl_device_data *dev = NULL;
+	SDL_Rect rect;
+
+	S_ON_DEBUG_TRACE("in");
+	//get ptr
+	dev	= (struct t_sdl_device_data *) drv->driver_data;
+	//set rect
+	rect.x	= r->x1;
+	rect.y	= r->y1;
+	rect.w	= r->x2 - r->x1;
+	rect.h	= r->y2 - r->y1;
+	//dev clipp
+	drv->clip	= *r;
+	//clipp
+	SDL_SetClipRect(sdl_SURFACE(dev), &rect);
+	S_ON_DEBUG_TRACE("out");
+	return;
+}
+
+//block dev
+/*
+int sdl_block(struct graphics_device *drv)
+{
+	S_ON_DEBUG_TRACE("in");
+	S_ASSERT(0);
+	return 0;
+}
+*/
+
+//unblock dev
+/*
+void sdl_unblock(struct graphics_device *drv)
+{
+	S_ON_DEBUG_TRACE("in");
+	S_ASSERT(0);
+	return;
+}
+*/
+
+//set window title (tittle utf-8 encoded !!!!)
+void sdl_set_title(struct graphics_device *drv, u_char_t *title)
+{
+	S_ON_DEBUG_TRACE("in");
+	SDL_WM_SetCaption(title, NULL);
+	return;
+}
+
+
+
+//driver definition data
+struct graphics_driver sdl_driver={
+	"sdl",
+	sdl_init_driver,
+	sdl_init_device,
+	sdl_shutdown_device,
+	sdl_shutdown_driver,
+	sdl_get_driver_param,
+	sdl_get_empty_bitmap,
+	sdl_get_filled_bitmap,
+	sdl_register_bitmap,
+	sdl_prepare_strip,
+	sdl_commit_strip,
+	sdl_unregister_bitmap,
+	sdl_draw_bitmap,
+	sdl_draw_bitmaps,
+	sdl_get_color,	/* sdl_get_color */
+	sdl_fill_area,
+	sdl_draw_hline,
+	sdl_draw_vline,
+	sdl_hscroll,
+	sdl_vscroll,
+	sdl_set_clip_area,
+	dummy_block,
+	dummy_unblock,
+	sdl_set_title,	/* set_title */
+	NULL, /* exec */
+	0,				/* depth (filled in sdl_init_driver function) */
+	0, 0,				/* size (in X is empty) */
+	0,				/* flags */
+	0,				/* codepage */
+	NULL				/* shell */
+};
+
+
+
+#endif /* GRDRV_SDL */
+
diff -urN links-2.1pre14/sdl_data.inc links-2.1pre14-sdl/sdl_data.inc
--- links-2.1pre14/sdl_data.inc	1970-01-01 01:00:00.000000000 +0100
+++ links-2.1pre14-sdl/sdl_data.inc	2004-04-25 18:57:10.000000000 +0200
@@ -0,0 +1,273 @@
+/**
+  sdl key syms
+*/
+
+
+#ifndef _SDL_KEYS_INC
+#define _SDL_KEYS_INC
+
+struct t_sdl_keysym
+{
+	unsigned short	sym;
+	int		key;	
+};
+
+//big mapping SDL->LINKS
+static struct t_sdl_keysym sdl_keysyms[] =
+{
+	{ SDLK_UNKNOWN		,0 },
+	{ SDLK_FIRST		,0 },
+	{ SDLK_BACKSPACE	,KBD_BS },
+	{ SDLK_TAB		,KBD_TAB },
+	{ SDLK_CLEAR		,12 },
+	{ SDLK_RETURN		,KBD_ENTER },
+	{ SDLK_PAUSE		,19 },
+	{ SDLK_ESCAPE		,KBD_ESC },
+	{ SDLK_SPACE		,32 },
+	{ SDLK_EXCLAIM		,33 },
+	{ SDLK_QUOTEDBL		,34 },
+	{ SDLK_HASH		,35 },
+	{ SDLK_DOLLAR		,36 },
+	{ SDLK_AMPERSAND		,38 },
+	{ SDLK_QUOTE		,39 },
+	{ SDLK_LEFTPAREN		,40 },
+	{ SDLK_RIGHTPAREN		,41 },
+	{ SDLK_ASTERISK		,42 },
+	{ SDLK_PLUS		,43 },
+	{ SDLK_COMMA		,44 },
+	{ SDLK_MINUS		,45 },
+	{ SDLK_PERIOD		,46 },
+	{ SDLK_SLASH		,47 },
+	{ SDLK_0			,48 },
+	{ SDLK_1			,49 },
+	{ SDLK_2			,50 },
+	{ SDLK_3			,51 },
+	{ SDLK_4			,52 },
+	{ SDLK_5			,53 },
+	{ SDLK_6			,54 },
+	{ SDLK_7			,55 },
+	{ SDLK_8			,56 },
+	{ SDLK_9			,57 },
+	{ SDLK_COLON		,58 },
+	{ SDLK_SEMICOLON		,59 },
+	{ SDLK_LESS		,60 },
+	{ SDLK_EQUALS		,61 },
+	{ SDLK_GREATER		,62 },
+	{ SDLK_QUESTION		,63 },
+	{ SDLK_AT			,64 },
+	/* 
+	   Skip uppercase letters
+	 */
+	{ SDLK_LEFTBRACKET	,91 },
+	{ SDLK_BACKSLASH		,92 },
+	{ SDLK_RIGHTBRACKET	,93 },
+	{ SDLK_CARET		,94 },
+	{ SDLK_UNDERSCORE		,95 },
+	{ SDLK_BACKQUOTE		,96 },
+	{ SDLK_a			,97 },
+	{ SDLK_b			,98 },
+	{ SDLK_c			,99 },
+	{ SDLK_d			,100 },
+	{ SDLK_e			,101 },
+	{ SDLK_f			,102 },
+	{ SDLK_g			,103 },
+	{ SDLK_h			,104 },
+	{ SDLK_i			,105 },
+	{ SDLK_j			,106 },
+	{ SDLK_k			,107 },
+	{ SDLK_l			,108 },
+	{ SDLK_m			,109 },
+	{ SDLK_n			,110 },
+	{ SDLK_o			,111 },
+	{ SDLK_p			,112 },
+	{ SDLK_q			,113 },
+	{ SDLK_r			,114 },
+	{ SDLK_s			,115 },
+	{ SDLK_t			,116 },
+	{ SDLK_u			,117 },
+	{ SDLK_v			,118 },
+	{ SDLK_w			,119 },
+	{ SDLK_x			,120 },
+	{ SDLK_y			,121 },
+	{ SDLK_z			,122 },
+	{ SDLK_DELETE		,127 },
+	/* End of ASCII mapped keysyms */
+
+	/* International keyboard syms */
+	{ SDLK_WORLD_0		,160 },		/* 0xA0 */
+	{ SDLK_WORLD_1		,161 },
+	{ SDLK_WORLD_2		,162 },
+	{ SDLK_WORLD_3		,163 },
+	{ SDLK_WORLD_4		,164 },
+	{ SDLK_WORLD_5		,165 },
+	{ SDLK_WORLD_6		,166 },
+	{ SDLK_WORLD_7		,167 },
+	{ SDLK_WORLD_8		,168 },
+	{ SDLK_WORLD_9		,169 },
+	{ SDLK_WORLD_10		,170 },
+	{ SDLK_WORLD_11		,171 },
+	{ SDLK_WORLD_12		,172 },
+	{ SDLK_WORLD_13		,173 },
+	{ SDLK_WORLD_14		,174 },
+	{ SDLK_WORLD_15		,175 },
+	{ SDLK_WORLD_16		,176 },
+	{ SDLK_WORLD_17		,177 },
+	{ SDLK_WORLD_18		,178 },
+	{ SDLK_WORLD_19		,179 },
+	{ SDLK_WORLD_20		,180 },
+	{ SDLK_WORLD_21		,181 },
+	{ SDLK_WORLD_22		,182 },
+	{ SDLK_WORLD_23		,183 },
+	{ SDLK_WORLD_24		,184 },
+	{ SDLK_WORLD_25		,185 },
+	{ SDLK_WORLD_26		,186 },
+	{ SDLK_WORLD_27		,187 },
+	{ SDLK_WORLD_28		,188 },
+	{ SDLK_WORLD_29		,189 },
+	{ SDLK_WORLD_30		,190 },
+	{ SDLK_WORLD_31		,191 },
+	{ SDLK_WORLD_32		,192 },
+	{ SDLK_WORLD_33		,193 },
+	{ SDLK_WORLD_34		,194 },
+	{ SDLK_WORLD_35		,195 },
+	{ SDLK_WORLD_36		,196 },
+	{ SDLK_WORLD_37		,197 },
+	{ SDLK_WORLD_38		,198 },
+	{ SDLK_WORLD_39		,199 },
+	{ SDLK_WORLD_40		,200 },
+	{ SDLK_WORLD_41		,201 },
+	{ SDLK_WORLD_42		,202 },
+	{ SDLK_WORLD_43		,203 },
+	{ SDLK_WORLD_44		,204 },
+	{ SDLK_WORLD_45		,205 },
+	{ SDLK_WORLD_46		,206 },
+	{ SDLK_WORLD_47		,207 },
+	{ SDLK_WORLD_48		,208 },
+	{ SDLK_WORLD_49		,209 },
+	{ SDLK_WORLD_50		,210 },
+	{ SDLK_WORLD_51		,211 },
+	{ SDLK_WORLD_52		,212 },
+	{ SDLK_WORLD_53		,213 },
+	{ SDLK_WORLD_54		,214 },
+	{ SDLK_WORLD_55		,215 },
+	{ SDLK_WORLD_56		,216 },
+	{ SDLK_WORLD_57		,217 },
+	{ SDLK_WORLD_58		,218 },
+	{ SDLK_WORLD_59		,219 },
+	{ SDLK_WORLD_60		,220 },
+	{ SDLK_WORLD_61		,221 },
+	{ SDLK_WORLD_62		,222 },
+	{ SDLK_WORLD_63		,223 },
+	{ SDLK_WORLD_64		,224 },
+	{ SDLK_WORLD_65		,225 },
+	{ SDLK_WORLD_66		,226 },
+	{ SDLK_WORLD_67		,227 },
+	{ SDLK_WORLD_68		,228 },
+	{ SDLK_WORLD_69		,229 },
+	{ SDLK_WORLD_70		,230 },
+	{ SDLK_WORLD_71		,231 },
+	{ SDLK_WORLD_72		,232 },
+	{ SDLK_WORLD_73		,233 },
+	{ SDLK_WORLD_74		,234 },
+	{ SDLK_WORLD_75		,235 },
+	{ SDLK_WORLD_76		,236 },
+	{ SDLK_WORLD_77		,237 },
+	{ SDLK_WORLD_78		,238 },
+	{ SDLK_WORLD_79		,239 },
+	{ SDLK_WORLD_80		,240 },
+	{ SDLK_WORLD_81		,241 },
+	{ SDLK_WORLD_82		,242 },
+	{ SDLK_WORLD_83		,243 },
+	{ SDLK_WORLD_84		,244 },
+	{ SDLK_WORLD_85		,245 },
+	{ SDLK_WORLD_86		,246 },
+	{ SDLK_WORLD_87		,247 },
+	{ SDLK_WORLD_88		,248 },
+	{ SDLK_WORLD_89		,249 },
+	{ SDLK_WORLD_90		,250 },
+	{ SDLK_WORLD_91		,251 },
+	{ SDLK_WORLD_92		,252 },
+	{ SDLK_WORLD_93		,253 },
+	{ SDLK_WORLD_94		,254 },
+	{ SDLK_WORLD_95		,255 },		/* 0xFF */
+
+	/* Numeric keypad */
+	{ SDLK_KP0		,256 },
+	{ SDLK_KP1		,257 },
+	{ SDLK_KP2		,258 },
+	{ SDLK_KP3		,259 },
+	{ SDLK_KP4		,260 },
+	{ SDLK_KP5		,261 },
+	{ SDLK_KP6		,262 },
+	{ SDLK_KP7		,263 },
+	{ SDLK_KP8		,264 },
+	{ SDLK_KP9		,265 },
+	{ SDLK_KP_PERIOD	,266 },
+	{ SDLK_KP_DIVIDE	,267 },
+	{ SDLK_KP_MULTIPLY	,268 },
+	{ SDLK_KP_MINUS		,269 },
+	{ SDLK_KP_PLUS		,270 },
+	{ SDLK_KP_ENTER		,KBD_ENTER },
+	{ SDLK_KP_EQUALS	,272 },
+
+	/* Arrows + Home/End pad */
+	{ SDLK_UP		,KBD_UP },
+	{ SDLK_DOWN		,KBD_DOWN },
+	{ SDLK_RIGHT		,KBD_RIGHT },
+	{ SDLK_LEFT		,KBD_LEFT },
+	{ SDLK_INSERT		,KBD_INS },
+	{ SDLK_HOME		,KBD_HOME },
+	{ SDLK_END		,KBD_END },
+	{ SDLK_PAGEUP		,KBD_PAGE_UP },
+	{ SDLK_PAGEDOWN		,KBD_PAGE_DOWN },
+
+	/* Function keys */
+	{ SDLK_F1		,KBD_F1 },
+	{ SDLK_F2		,KBD_F2 },
+	{ SDLK_F3		,KBD_F3 },
+	{ SDLK_F4		,KBD_F4 },
+	{ SDLK_F5		,KBD_F5 },
+	{ SDLK_F6		,KBD_F6 },
+	{ SDLK_F7		,KBD_F7 },
+	{ SDLK_F8		,KBD_F8 },
+	{ SDLK_F9		,KBD_F9 },
+	{ SDLK_F10		,KBD_F10 },
+	{ SDLK_F11		,KBD_F11 },
+	{ SDLK_F12		,KBD_F12 },
+	{ SDLK_F13		,294 },
+	{ SDLK_F14		,295 },
+	{ SDLK_F15		,296 },
+
+	/* Key state modifier keys */
+	{ SDLK_NUMLOCK		,300 },
+	{ SDLK_CAPSLOCK		,301 },
+	{ SDLK_SCROLLOCK		,302 },
+	{ SDLK_RSHIFT		,303 },
+	{ SDLK_LSHIFT		,304 },
+	{ SDLK_RCTRL		,305 },
+	{ SDLK_LCTRL		,306 },
+	{ SDLK_RALT		,307 },
+	{ SDLK_LALT		,308 },
+	{ SDLK_RMETA		,309 },
+	{ SDLK_LMETA		,310 },
+	{ SDLK_LSUPER		,311 },		/* Left "Windows" key */
+	{ SDLK_RSUPER		,312 },		/* Right "Windows" key */
+	{ SDLK_MODE		,313 },		/* "Alt Gr" key */
+	{ SDLK_COMPOSE		,314 },		/* Multi-key compose key */
+
+	/* Miscellaneous function keys */
+	{ SDLK_HELP		,315 },
+	{ SDLK_PRINT		,316 },
+	{ SDLK_SYSREQ		,317 },
+	{ SDLK_BREAK		,318 },
+	{ SDLK_MENU		,KBD_F9 },
+	{ SDLK_POWER		,320 },		/* Power Macintosh power key */
+	{ SDLK_EURO		,321 },		/* Some european keyboards */
+	{ SDLK_UNDO		,322 },		/* Atari keyboard has Undo */
+
+	/* Add any other keys here */
+
+	{ SDLK_LAST		,0  },
+};
+
+#endif