12 files changed, 136 insertions, 21775 deletions
diff --git a/packages/links/files/cookies-save-0.96.patch b/packages/links/files/cookies-save-0.96.patch
new file mode 100644
index 0000000000..a1e35c01ca
--- /dev/null
+++ b/packages/links/files/cookies-save-0.96.patch
@@ -0,0 +1,106 @@
+diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c
+--- links-0.96/cookies.c	Mon Sep  3 07:19:37 2001
++++ links-0.96+cookies-save/cookies.c	Mon Sep  3 07:18:42 2001
+@@ -276,15 +276,99 @@
+ 
+ void init_cookies(void)
+ {
+-	/* !!! FIXME: read cookies */
++	unsigned char in_buffer[MAX_STR_LEN];
++	unsigned char *cookfile, *p, *q;
++	FILE *fp;
++
++	/* must be called after init_home */
++	if (! links_home) return;
++	
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "r");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	while (fgets(in_buffer, MAX_STR_LEN, fp)) {
++		struct cookie *cookie;
++		
++		if (!(cookie = mem_alloc(sizeof(struct cookie)))) return;
++		memset(cookie, 0, sizeof(struct cookie));
++		
++		q = in_buffer; p = strchr(in_buffer, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->name = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->value = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->server = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->path = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->domain = stracpy(q);
++		
++		q = p; p = strchr(p, ' ');
++		if (p == NULL) goto inv;
++		*p++ = '\0';
++		cookie->expires = atoi(q);
++		
++		cookie->secure = atoi(p);
++		
++		cookie->id = cookie_id++;
++
++		accept_cookie(cookie);
++
++		continue;
++
++inv:
++		free_cookie(cookie);
++		free(cookie);
++	}
++	fclose(fp);
+ }
+ 
+ void cleanup_cookies(void)
+ {
+ 	struct cookie *c;
++	unsigned char *cookfile;
++	FILE *fp;
++	
+ 	free_list(c_domains);
+-	/* !!! FIXME: save cookies */
+-	foreach (c, cookies) free_cookie(c);
++
++	cookfile = stracpy(links_home);
++	if (! cookfile) return;
++	add_to_strn(&cookfile, "cookies");
++
++	fp = fopen(cookfile, "w");
++	mem_free(cookfile);
++	if (fp == NULL) return;
++	
++	foreach (c, cookies) {
++		if (c->expires && ! cookie_expired(c))
++			fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
++			    c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
++			    c->domain?c->domain:(unsigned char *)"", c->expires, c->secure);
++
++		free_cookie(c);
++	}
++
++	fclose(fp);
++	
+ 	free_list(cookies);
+ }
+ 
diff --git a/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch b/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
new file mode 100644
index 0000000000..0d3b407e2a
--- /dev/null
+++ b/packages/links/files/links-2.1pre17-fix-segfault-on-loading-cookies.patch
@@ -0,0 +1,20 @@
+--- links-2.1pre17/cookies.c.pix	2005-05-15 23:05:10.000000000 +0800
++++ links-2.1pre17/cookies.c	2005-05-15 23:17:21.000000000 +0800
+@@ -41,7 +41,7 @@
+ 
+ void free_cookie(struct cookie *c)
+ {
+-	mem_free(c->name);
++	if (c->value) mem_free(c->name);
+ 	if (c->value) mem_free(c->value);
+ 	if (c->server) mem_free(c->server);
+ 	if (c->path) mem_free(c->path);
+@@ -355,7 +355,7 @@
+ 
+ inv:
+ 		free_cookie(cookie);
+-		free(cookie);
++		mem_free(cookie);
+ 	}
+ 	fclose(fp);
+ }
diff --git a/packages/links/links-2.1pre12/.mtn2git_empty b/packages/links/links-2.1pre12/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/links/links-2.1pre12/.mtn2git_empty
+++ /dev/null
diff --git a/packages/links/links-2.1pre12/configure.patch b/packages/links/links-2.1pre12/configure.patch
deleted file mode 100644
index 0425843f60..0000000000
--- a/packages/links/links-2.1pre12/configure.patch
+++ /dev/null
@@ -1,21443 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- links-2.1pre12/configure.in~configure
-+++ links-2.1pre12/configure.in
-@@ -3,7 +3,8 @@
- #          Martin 'PerM' Pergel
- # This file is a part of the Links program, released under GPL.
- 
--AC_INIT(main.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([main.c])
- 
- AM_INIT_AUTOMAKE(links, 2.1pre12)
- 
-@@ -13,12 +14,12 @@
- AUTOHEADER="./missing autoheader"
- image_formats="GIF PNG XBM"
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- dnl Checks for programs.
- AC_PROG_CC
- 
--#AC_PROG_CXX
-+AC_PROG_CXX
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
-@@ -27,20 +28,20 @@
- #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))
- 
- AC_CACHE_CHECK([for EMX], ac_cv_have_emx,
--	AC_TRY_COMPILE(, [#ifndef __EMX__
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#ifndef __EMX__
- 	kill me!
--	#endif ], ac_cv_have_emx=yes, ac_cv_have_emx=no)
-+	#endif ]])],[ac_cv_have_emx=yes],[ac_cv_have_emx=no])
- )
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g" | sed "s/-Zbin-files//g"`
- 
- AC_CACHE_CHECK([for typeof], ac_cv_have_typeof,
--	AC_TRY_COMPILE(, [int a;
--	typeof(a) b;], ac_cv_have_typeof=yes, ac_cv_have_typeof=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a;
-+	typeof(a) b;]])],[ac_cv_have_typeof=yes],[ac_cv_have_typeof=no])
- 	)
- test "$ac_cv_have_typeof" = yes && AC_DEFINE(HAVE_TYPEOF)
- 
- AC_CACHE_CHECK([for long long], ac_cv_have_long_long,
--	AC_TRY_COMPILE(, [unsigned long long a; ], ac_cv_have_long_long=yes, ac_cv_have_long_long=no)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[unsigned long long a; ]])],[ac_cv_have_long_long=yes],[ac_cv_have_long_long=no])
- )
- test "$ac_cv_have_long_long" = yes && AC_DEFINE(HAVE_LONG_LONG)
- 
-@@ -87,7 +88,7 @@
- AC_CHECK_SIZEOF(long, "$default_int")
- AC_CHECK_SIZEOF(unsigned long, "$default_int")
- AC_CACHE_CHECK([for big endian], ac_cv_big_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -95,10 +96,10 @@
- 		l = 0x12345678L;
- 		return !(c[[sizeof(long) - 1]] == 0x78 && c[[sizeof(long) - 2]] == 0x56 && c[[sizeof(long) - 3]] == 0x34 && c[[sizeof(long) - 4]] == 0x12);
- 	}
--	], ac_cv_big_endian=yes, ac_cv_big_endian=no, ac_cv_big_endian=no)
-+	]])],[ac_cv_big_endian=yes],[ac_cv_big_endian=no],[ac_cv_big_endian=no])
- )
- AC_CACHE_CHECK([for little endian], ac_cv_little_endian,
--	AC_TRY_RUN([
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	long l;
- 	char *c = (char *)&l;
- 	int main()
-@@ -106,9 +107,12 @@
- 		l = 0x12345678L;
- 		return !(c[[0]] == 0x78 && c[[1]] == 0x56 && c[[2]] == 0x34 && c[[3]] == 0x12);
- 	}
--	], ac_cv_little_endian=yes, ac_cv_little_endian=no, ac_cv_little_endian="$ac_cv_have_emx")
-+	]])],[ac_cv_little_endian=yes],[ac_cv_little_endian=no],[ac_cv_little_endian="$ac_cv_have_emx"])
- )
- 
-+AC_DEFUN([AC_BIG_ENDIAN],[],[])
-+AC_DEFUN([AC_LITTLE_ENDIAN],[],[])
-+
- if test "$ac_cv_big_endian" = yes; then
- 	AC_DEFINE(AC_BIG_ENDIAN)
- else if test "$ac_cv_little_endian" = yes; then
-@@ -122,19 +126,19 @@
- AC_TYPE_SIGNAL
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
--AC_HAVE_FUNCS(calloc)
--AC_HAVE_FUNCS(snprintf)
--AC_HAVE_FUNCS(gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod)
--AC_HAVE_FUNCS(getpid setpgid getpgid setpgrp getpgrp)
--AC_HAVE_FUNCS(popen)
--AC_HAVE_FUNCS(uname)
--AC_HAVE_FUNCS(strptime)
--AC_HAVE_FUNCS(setlocale)
--AC_HAVE_FUNCS(nl_langinfo)
--dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
-+AC_CHECK_FUNCS([calloc])
-+AC_CHECK_FUNCS([snprintf])
-+AC_CHECK_FUNCS([gettimeofday mkdir select strcspn strerror strstr strtol strtoul alarm chmod])
-+AC_CHECK_FUNCS([getpid setpgid getpgid setpgrp getpgrp])
-+AC_CHECK_FUNCS([popen])
-+AC_CHECK_FUNCS([uname])
-+AC_CHECK_FUNCS([strptime])
-+AC_CHECK_FUNCS([setlocale])
-+AC_CHECK_FUNCS([nl_langinfo])
-+dnl AC_CHECK_FUNCS([sigsetjmp siglongjmp])
- 
- AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
--	AC_TRY_LINK([#include <setjmp.h>], [sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);], ac_cv_have_sigsetjmp=yes, ac_cv_have_sigsetjmp=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]], [[sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2);]])],[ac_cv_have_sigsetjmp=yes],[ac_cv_have_sigsetjmp=no])
- )
- if test "$ac_cv_have_sigsetjmp" = yes; then
- 	AC_DEFINE(HAVE_SIGSETJMP)
-@@ -153,7 +157,7 @@
- fi
- 
- #AC_MSG_CHECKING([for gethostbyname])
--#AC_TRY_LINK([#include <netdb.h>], [gethostbyname("")], cf_result=yes, cf_result=no)
-+#AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[gethostbyname("")]])],[cf_result=yes],[cf_result=no])
- #AC_MSG_RESULT($cf_result)
- AC_CHECK_FUNC(gethostbyname, cf_result=yes, cf_result=no)
- if test "$cf_result" = no; then
-@@ -168,7 +172,7 @@
- AC_CHECK_FUNC(herror, AC_DEFINE(HAVE_HERROR))
- AC_CHECK_FUNC(cfmakeraw, AC_DEFINE(HAVE_CFMAKERAW))
- 
--AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path)
-+AC_CHECK_FUNCS([cygwin_conv_to_full_win32_path])
- 
- AC_MSG_CHECKING([if you want to enable javascript])
- AC_ARG_ENABLE(javascript, [  --enable-javascript     use javascript interpreter], cf_use_javascript=yes, cf_use_javascript=no)
-@@ -192,7 +196,7 @@
- AC_CACHE_CHECK([for OS/2 threads], ac_cv_have_beginthread,
- 	CFLAGS_X="$CFLAGS"
- 	CFLAGS="$CFLAGS -Zmt"
--	AC_TRY_LINK([#include <stdlib.h>], [_beginthread(NULL, NULL, 0, NULL)], ac_cv_have_beginthread=yes, ac_cv_have_beginthread=no)
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]], [[_beginthread(NULL, NULL, 0, NULL)]])],[ac_cv_have_beginthread=yes],[ac_cv_have_beginthread=no])
- 	CFLAGS="$CFLAGS_X"
- )
- if test "$ac_cv_have_beginthread" = yes; then
-@@ -209,8 +213,8 @@
- fi
- #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE))
- AC_CHECK_HEADERS(atheos/threads.h)
--AC_HAVE_FUNCS(spawn_thread)
--AC_HAVE_FUNCS(resume_thread)
-+AC_CHECK_FUNCS([spawn_thread])
-+AC_CHECK_FUNCS([resume_thread])
- 
- AC_CHECK_FUNC(MouOpen, AC_DEFINE(HAVE_MOUOPEN))
- AC_CHECK_FUNC(_read_kbd, AC_DEFINE(HAVE_READ_KBD))
-@@ -222,10 +226,10 @@
- 	if test -n "$X11ROOT"; then
- 		CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include"
- 		LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc"
--		AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86_gcc, ac_cv_have_x2=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86_gcc],[ac_cv_have_x2=no])
- 		if test "$ac_cv_have_x2" = no; then
- 			LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86"
--			AC_TRY_LINK([#include <pty.h>], [struct winsize win;ptioctl(1, TIOCGWINSZ, &win)], ac_cv_have_x2=xf86, ac_cv_have_x2=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pty.h>]], [[struct winsize win;ptioctl(1, TIOCGWINSZ, &win)]])],[ac_cv_have_x2=xf86],[ac_cv_have_x2=no])
- 		fi
- 	fi
- 	CPPFLAGS="$CPPFLAGS_X"
-@@ -254,9 +258,9 @@
- 			else
- 				LIBS="-lssl -lcrypto $LIBS_X"
- 			fi
--			AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[OpenSSL_add_all_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			if test "$cf_result" != yes; then
--				AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
-+				AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[SSLeay_add_ssl_algorithms()]])],[cf_result=yes],[cf_result=no])
- 			fi
- 		fi
- 	done
-@@ -287,14 +291,14 @@
- 	AC_CHECK_HEADERS(png.h libpng/png.h)
- 	AC_CHECK_LIB(png, png_create_info_struct)
- 	if test "$ac_cv_header_png_h" != yes && test "$ac_cv_header_libpng_png_h" != yes || test "$ac_cv_lib_png_png_create_info_struct" != yes; then
--		AC_ERROR([You need libpng to compile Links in graphics mode])
-+		AC_MSG_ERROR([You need libpng to compile Links in graphics mode])
- 	fi
- 
--	AC_HAVE_FUNCS(png_set_rgb_to_gray)
-+	AC_CHECK_FUNCS([png_set_rgb_to_gray])
- 
- 	AC_CACHE_CHECK(if you can include both setjmp.h and png.h, ac_cv_include_setjmp_png,
--		AC_TRY_COMPILE([#include <setjmp.h>
--		#include <png.h>], [jmp_buf bla;], ac_cv_include_setjmp_png=yes, ac_cv_include_setjmp_png=no)
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>
-+		#include <png.h>]], [[jmp_buf bla;]])],[ac_cv_include_setjmp_png=yes],[ac_cv_include_setjmp_png=no])
- 	)
- 
- 	if test "$ac_cv_include_setjmp_png" != yes; then
-@@ -338,7 +342,7 @@
- 	AC_CACHE_CHECK([for svgalib], ac_cv_have_svgalib,
- 		LIBS_X="$LIBS"
- 		LIBS="$LIBS -lvga"
--		AC_TRY_LINK([#include <vga.h>], [vga_setmode(0)], ac_cv_have_svgalib=yes, ac_cv_have_svgalib=no)
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <vga.h>]], [[vga_setmode(0)]])],[ac_cv_have_svgalib=yes],[ac_cv_have_svgalib=no])
- 		LIBS="$LIBS_X"
- 	)
- 
-@@ -351,9 +355,9 @@
- 
- dnl		braine, tohle jsem predelal
- dnl 	AC_CACHE_CHECK([for framebuffer], ac_cv_have_fb,
--dnl 		AC_TRY_RUN([#include <stdio.h>
-+dnl 		AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
- dnl 		#include <fcntl.h>
--dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}], ac_cv_have_fb=yes, ac_cv_have_fb=no, ac_cv_have_fb=no)
-+dnl 		main(){return open("/dev/fb",O_RDWR)==-1;}]])],[ac_cv_have_fb=yes],[ac_cv_have_fb=no],[ac_cv_have_fb=no])
- dnl 	)
- 	
- if test "$disable_fb" != yes ; then
-@@ -406,14 +410,12 @@
- 
- if test "$disable_pmshell" != yes ; then
- 	AC_CACHE_CHECK([for pmshell], ac_cv_have_pmshell,
--		AC_TRY_LINK([#define INCL_WIN
-+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define INCL_WIN
- 			#define INCL_GPI
- 			#include <os2.h>
--			#include <sys/fmutex.h>],
--			[_fmutex mutex;
-+			#include <sys/fmutex.h>]], [[_fmutex mutex;
- 			WinDrawText(NULLHANDLE, -1, NULL, NULL, 0, 0, 0),
--			GpiSetPel(NULLHANDLE, NULL)],
--		ac_cv_have_pmshell=yes, ac_cv_have_pmshell=no)
-+			GpiSetPel(NULLHANDLE, NULL)]])],[ac_cv_have_pmshell=yes],[ac_cv_have_pmshell=no])
- 	)
- 			
- 	if test "$ac_cv_have_pmshell" = yes; then
-@@ -463,7 +465,8 @@
- test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe"
- test "$ac_cv_have_emx" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"`
- 
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- echo "---------------------------------------------------------"
- echo "Configuration results:"
-@@ -485,5 +488,5 @@
- #rm Makefile.tmp
- 
- #if test -z "$AWK"; then
--#	AC_WARN([awk not found. You won't be able to rebuild code page table.]);
-+#	AC_MSG_WARN([awk not found. You won't be able to rebuild code page table.]);
- #fi
---- links-2.1pre12/configure~configure
-+++ links-2.1pre12/configure
-@@ -1,52 +1,324 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13 
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.57.
- #
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
- 
--# Defaults:
--ac_help=
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+  set -o posix
-+fi
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    $as_unset $as_var
-+  fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)$' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\/\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-+  # Find who we are.  Look in the path if we contain no path at all
-+  # relative or not.
-+  case $0 in
-+    *[\\/]* ) as_myself=$0 ;;
-+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+       ;;
-+  esac
-+  # We did not find ourselves, most probably we were run as `sh COMMAND'
-+  # in which case we are not to be found in the path.
-+  if test "x$as_myself" = x; then
-+    as_myself=$0
-+  fi
-+  if test ! -f "$as_myself"; then
-+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+   { (exit 1); exit 1; }; }
-+  fi
-+  case $CONFIG_SHELL in
-+  '')
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for as_base in sh bash ksh sh5; do
-+	 case $as_dir in
-+	 /*)
-+	   if ("$as_dir/$as_base" -c '
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+	     CONFIG_SHELL=$as_dir/$as_base
-+	     export CONFIG_SHELL
-+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+	   fi;;
-+	 esac
-+       done
-+done
-+;;
-+  esac
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line before each line; the second 'sed' does the real
-+  # work.  The second script uses 'N' to pair each line-number line
-+  # with the numbered line, and appends trailing '-' during
-+  # substitution so that $LINENO is not a special case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-+  sed '=' <$as_myself |
-+    sed '
-+      N
-+      s,$,-,
-+      : loop
-+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      t loop
-+      s,-$,,
-+      s,^['$as_cr_digits']*\n,,
-+    ' >$as_me.lineno &&
-+  chmod +x $as_me.lineno ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensible to this).
-+  . ./$as_me.lineno
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+  *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T='	' ;;
-+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  # We could just check for DJGPP; but this test a) works b) is more generic
-+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+  if test -f conf$$.exe; then
-+    # Don't use ln at all; we don't have any links
-+    as_ln_s='cp -p'
-+  else
-+    as_ln_s='ln -s'
-+  fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+  as_ln_s=ln
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" 	$as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+exec 6>&1
-+
-+#
-+# Initializations.
-+#
- ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_help="$ac_help
--  --enable-javascript     use javascript interpreter"
--ac_help="$ac_help
--  --with-libfl            use libfl"
--ac_help="$ac_help
--  --enable-graphics       use graphics"
--ac_help="$ac_help
--  --with-ssl(=directory)  enable SSL support"
--ac_help="$ac_help
--  --without-libjpeg	  compile without JPEG support"
--ac_help="$ac_help
--  --without-libtiff       compile without TIFF support"
--ac_help="$ac_help
--  --without-svgalib       compile without svgalib graphics driver"
--ac_help="$ac_help
--  --without-x             compile without X Window System graphics driver"
--ac_help="$ac_help
--  --without-fb            compile without Linux Framebuffer graphics driver"
--ac_help="$ac_help
--  --without-directfb      compile without DirectFB graphics driver"
--ac_help="$ac_help
--  --without-pmshell       compile without PMShell graphics driver"
--ac_help="$ac_help
--  --without-atheos        compile without Atheos graphics driver"
--ac_help="$ac_help
--  --with-x                use the X Window System"
-+ac_config_libobj_dir=.
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete.  It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="main.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+#  include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP LIBOBJS DIRECTFB_CONFIG ATHEOS_GR_TRUE ATHEOS_GR_FALSE LTLIBOBJS'
-+ac_subst_files=''
- 
- # Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
- # The variables have the same names as the options, with
- # dashes changed to underlines.
--build=NONE
--cache_file=./config.cache
-+cache_file=/dev/null
- exec_prefix=NONE
--host=NONE
- no_create=
--nonopt=NONE
- no_recursion=
- prefix=NONE
- program_prefix=NONE
-@@ -55,10 +327,15 @@
- silent=
- site=
- srcdir=
--target=NONE
- verbose=
- x_includes=NONE
- x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
-@@ -72,17 +349,9 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
--# Initialize some other variables.
--subdirs=
--MFLAGS= MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
--# Maximum number of lines to put in a shell here document.
--ac_max_here_lines=12
--
- ac_prev=
- for ac_option
- do
--
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
-     eval "$ac_prev=\$ac_option"
-@@ -90,59 +359,59 @@
-     continue
-   fi
- 
--  case "$ac_option" in
--  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
--  *) ac_optarg= ;;
--  esac
-+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case "$ac_option" in
-+  case $ac_option in
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
--    bindir="$ac_optarg" ;;
-+    bindir=$ac_optarg ;;
- 
-   -build | --build | --buil | --bui | --bu)
--    ac_prev=build ;;
-+    ac_prev=build_alias ;;
-   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
--    build="$ac_optarg" ;;
-+    build_alias=$ac_optarg ;;
- 
-   -cache-file | --cache-file | --cache-fil | --cache-fi \
-   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-     ac_prev=cache_file ;;
-   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
--    cache_file="$ac_optarg" ;;
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
- 
-   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-     ac_prev=datadir ;;
-   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-   | --da=*)
--    datadir="$ac_optarg" ;;
-+    datadir=$ac_optarg ;;
- 
-   -disable-* | --disable-*)
--    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
--      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
--    fi
--    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
--    eval "enable_${ac_feature}=no" ;;
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    eval "enable_$ac_feature=no" ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
--      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
--    fi
--    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
--    case "$ac_option" in
--      *=*) ;;
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    case $ac_option in
-+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-       *) ac_optarg=yes ;;
-     esac
--    eval "enable_${ac_feature}='$ac_optarg'" ;;
-+    eval "enable_$ac_feature='$ac_optarg'" ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -151,95 +420,47 @@
-   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-   | --exec=* | --exe=* | --ex=*)
--    exec_prefix="$ac_optarg" ;;
-+    exec_prefix=$ac_optarg ;;
- 
-   -gas | --gas | --ga | --g)
-     # Obsolete; use --with-gas.
-     with_gas=yes ;;
- 
--  -help | --help | --hel | --he)
--    # Omit some internal or obsolete options to make the list less imposing.
--    # This message is too long to be a string in the A/UX 3.1 sh.
--    cat << EOF
--Usage: configure [options] [host]
--Options: [defaults in brackets after descriptions]
--Configuration:
--  --cache-file=FILE       cache test results in FILE
--  --help                  print this message
--  --no-create             do not create output files
--  --quiet, --silent       do not print \`checking...' messages
--  --version               print the version of autoconf that created configure
--Directory and file names:
--  --prefix=PREFIX         install architecture-independent files in PREFIX
--                          [$ac_default_prefix]
--  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--                          [same as prefix]
--  --bindir=DIR            user executables in DIR [EPREFIX/bin]
--  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
--  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
--  --datadir=DIR           read-only architecture-independent data in DIR
--                          [PREFIX/share]
--  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
--  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
--                          [PREFIX/com]
--  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
--  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
--  --includedir=DIR        C header files in DIR [PREFIX/include]
--  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
--  --infodir=DIR           info documentation in DIR [PREFIX/info]
--  --mandir=DIR            man documentation in DIR [PREFIX/man]
--  --srcdir=DIR            find the sources in DIR [configure dir or ..]
--  --program-prefix=PREFIX prepend PREFIX to installed program names
--  --program-suffix=SUFFIX append SUFFIX to installed program names
--  --program-transform-name=PROGRAM
--                          run sed PROGRAM on installed program names
--EOF
--    cat << EOF
--Host type:
--  --build=BUILD           configure for building on BUILD [BUILD=HOST]
--  --host=HOST             configure for HOST [guessed]
--  --target=TARGET         configure for TARGET [TARGET=HOST]
--Features and packages:
--  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
--  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
--  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
--  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --x-includes=DIR        X include files are in DIR
--  --x-libraries=DIR       X library files are in DIR
--EOF
--    if test -n "$ac_help"; then
--      echo "--enable and --with options recognized:$ac_help"
--    fi
--    exit 0 ;;
-+  -help | --help | --hel | --he | -h)
-+    ac_ini