import clean BK tree at cset 1.3670

15 files changed, 8574 insertions, 0 deletions

diff --git a/packages/frodo/.mtn2git_empty b/packages/frodo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/frodo/.mtn2git_empty
diff --git a/packages/frodo/frodo-4.1b/.mtn2git_empty b/packages/frodo/frodo-4.1b/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/frodo/frodo-4.1b/.mtn2git_empty
diff --git a/packages/frodo/frodo-4.1b/Frodo.png b/packages/frodo/frodo-4.1b/Frodo.png
index e69de29bb2..e346195b84 100644
--- a/packages/frodo/frodo-4.1b/Frodo.png
+++ b/packages/frodo/frodo-4.1b/Frodo.png
diff --git a/packages/frodo/frodo-4.1b/conffiles b/packages/frodo/frodo-4.1b/conffiles
index e69de29bb2..c9a83ab7a0 100644
--- a/packages/frodo/frodo-4.1b/conffiles
+++ b/packages/frodo/frodo-4.1b/conffiles
@@ -0,0 +1 @@
+/home/root/.frodorc
diff --git a/packages/frodo/frodo-4.1b/frodo-joystick-4state.diff b/packages/frodo/frodo-4.1b/frodo-joystick-4state.diff
index e69de29bb2..3234736d8b 100644
--- a/packages/frodo/frodo-4.1b/frodo-joystick-4state.diff
+++ b/packages/frodo/frodo-4.1b/frodo-joystick-4state.diff
@@ -0,0 +1,77 @@
+diff -u Src/C64_Qtopia.i Src/C64_Qtopia.i
+--- Src/C64_Qtopia.i	2004-07-11 09:28:05.000000000 +0200
++++ Src/C64_Qtopia.i	2004-07-11 09:30:20.000000000 +0200
+@@ -246,10 +246,16 @@
+ 	}
+ 
+ 	// Joystick keyboard emulation
+-	if (TheDisplay->NumLock())
++	if (TheDisplay->NumLock() == 1)
+ 		TheCIA1->Joystick1 &= joykey;
+ 	else
++	if (TheDisplay->NumLock() == 2)
+ 		TheCIA1->Joystick2 &= joykey;
++	else
++	if (TheDisplay->NumLock() == 3) {
++		TheCIA1->Joystick1 &= joykey;
++		TheCIA1->Joystick2 &= joykey;
++	}
+ 
+ 	// Count TOD clocks
+ 	TheCIA1->CountTOD();
+diff -u Src/Display.h Src/Display.h
+--- Src/Display.h	2002-01-02 22:31:34.000000000 +0100
++++ Src/Display.h	2004-07-11 09:30:43.000000000 +0200
+@@ -59,7 +59,7 @@
+ #else
+ 	void PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joystick);
+ #endif
+-	bool NumLock(void);
++	int NumLock(void);
+ 	void InitColors(uint8 *colors);
+ 	void NewPrefs(Prefs *prefs);
+ 
+diff -u Src/Display_QtopiaSDL.i Src/Display_QtopiaSDL.i
+--- Src/Display_QtopiaSDL.i	2004-07-11 09:28:06.000000000 +0200
++++ Src/Display_QtopiaSDL.i	2004-07-11 09:31:47.000000000 +0200
+@@ -17,7 +17,7 @@
+ // Display surface
+ static SDL_Surface *screen = NULL;
+ 
+-// Mode of Joystick emulation. 0 = none, 1 = Joyport 1, 2 = Joyport 2
++// Mode of Joystick emulation. 0 = none, 1 = Joyport 1, 2 = Joyport 2, 3 = both
+ static short joy_emu = 0;
+ 
+ // Keyboard
+@@ -210,6 +210,8 @@
+ 		draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "1", black, fill_gray);
+ 	else if (joy_emu == 2)
+ 		draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "2", black, fill_gray);
++	else if (joy_emu == 3)
++		draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "3", black, fill_gray);
+ 	draw_string(screen, 24, (screen->h - 17) + 4, speedometer_string, black, fill_gray);
+ 
+ 	// Update display
+@@ -500,7 +502,7 @@
+ //				fprintf(stderr, "SDL-Key: %d\n", event.key.keysym.sym);
+ 				if (tab_pressed && event.key.keysym.sym == SDLK_j)
+ 				{
+-					if (joy_emu < 2)
++					if (joy_emu < 3)
+ 						joy_emu++;
+ 					else
+ 						joy_emu = 0;
+@@ -573,11 +575,9 @@
+  *  Check if NumLock is down (for switching the joystick keyboard emulation)
+  */
+ 
+-bool C64Display::NumLock(void)
++int C64Display::NumLock(void)
+ {
+-	if (joy_emu == 2)
+-		return true;
+-	return false;
++	return joy_emu;
+ }
+ 
+ 
diff --git a/packages/frodo/frodo-4.1b/frodo-qte.diff b/packages/frodo/frodo-4.1b/frodo-qte.diff
index e69de29bb2..c00001da99 100644
--- a/packages/frodo/frodo-4.1b/frodo-qte.diff
+++ b/packages/frodo/frodo-4.1b/frodo-qte.diff
@@ -0,0 +1,8171 @@
+diff -urN Src/C64.cpp Src/C64.cpp
+--- Src/C64.cpp	2002-01-02 22:18:46.000000000 +0100
++++ Src/C64.cpp	2002-11-21 17:07:04.000000000 +0100
+@@ -600,7 +600,7 @@
+ #ifndef FRODO_SC
+ 			long vicptr;	// File offset of VIC data
+ #endif
+-
++ 
+ 			while (c != 10)
+ 				c = fgetc(f);	// Shouldn't be necessary
+ 			if (fgetc(f) != 0) {
+@@ -698,7 +698,11 @@
+ #endif
+ 
+ #ifdef __unix
+-#include "C64_x.i"
++# ifdef QTOPIA
++#  include "C64_Qtopia.i"
++# else
++#  include "C64_x.i"
++# endif
+ #endif
+ 
+ #ifdef __mac__
+diff -urN Src/C64.h Src/C64.h
+--- Src/C64.h	2002-01-02 22:15:10.000000000 +0100
++++ Src/C64.h	2002-11-21 17:07:02.000000000 +0100
+@@ -22,7 +22,6 @@
+ #include "ROlib.h"
+ #endif
+ 
+-
+ // false: Frodo, true: FrodoSC
+ extern bool IsFrodoSC;
+ 
+@@ -142,6 +141,14 @@
+ 	CmdPipe *gui;
+ #endif
+ 
++#ifdef QTOPIA
++private:
++	static CmdPipe *staticGUI;
++public:
++	static void StartGUI();
++	static void StopGUI();
++#endif
++
+ #ifdef WIN32
+ private:
+ 	void CheckTimerChange();
+diff -urN Src/C64_Qtopia.i Src/C64_Qtopia.i
+--- Src/C64_Qtopia.i	1970-01-01 01:00:00.000000000 +0100
++++ Src/C64_Qtopia.i	2002-11-21 17:07:04.000000000 +0100
+@@ -0,0 +1,459 @@
++/*
++ *  C64_Qtopia.i - Put the pieces together, X specific stuff
++ *
++ *  Frodo (C) 1994-1997,2002 Christian Bauer
++ *  Unix stuff by Bernd Schmidt/Lutz Vieweg
++ *  Qtopia changes (against C64_x.i) from Bernd Lachner
++ */
++
++#include "main.h"
++
++
++static struct timeval tv_start;
++
++#ifndef HAVE_USLEEP
++/*
++ *  NAME:
++ *      usleep     -- This is the precision timer for Test Set
++ *                    Automation. It uses the select(2) system
++ *                    call to delay for the desired number of
++ *                    micro-seconds. This call returns ZERO
++ *                    (which is usually ignored) on successful
++ *                    completion, -1 otherwise.
++ *
++ *  ALGORITHM:
++ *      1) We range check the passed in microseconds and log a
++ *         warning message if appropriate. We then return without
++ *         delay, flagging an error.
++ *      2) Load the Seconds and micro-seconds portion of the
++ *         interval timer structure.
++ *      3) Call select(2) with no file descriptors set, just the
++ *         timer, this results in either delaying the proper
++ *         ammount of time or being interupted early by a signal.
++ *
++ *  HISTORY:
++ *      Added when the need for a subsecond timer was evident.
++ *
++ *  AUTHOR:
++ *      Michael J. Dyer                   Telephone:   AT&T 414.647.4044
++ *      General Electric Medical Systems        GE DialComm  8 *767.4044
++ *      P.O. Box 414  Mail Stop 12-27         Sect'y   AT&T 414.647.4584
++ *      Milwaukee, Wisconsin  USA 53201                      8 *767.4584
++ *      internet:  mike@sherlock.med.ge.com     GEMS WIZARD e-mail: DYER
++ */
++
++#include <unistd.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <errno.h>
++#include <time.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <sys/types.h>
++
++int usleep(unsigned long int microSeconds)
++{
++        unsigned int            Seconds, uSec;
++        int                     nfds, readfds, writefds, exceptfds;
++        struct  timeval         Timer;
++
++        nfds = readfds = writefds = exceptfds = 0;
++
++        if( (microSeconds == (unsigned long) 0)
++                || microSeconds > (unsigned long) 4000000 )
++        {
++                errno = ERANGE;         /* value out of range */
++                perror( "usleep time out of range ( 0 -> 4000000 ) " );
++                return -1;
++        }
++
++        Seconds = microSeconds / (unsigned long) 1000000;
++        uSec    = microSeconds % (unsigned long) 1000000;
++
++        Timer.tv_sec            = Seconds;
++        Timer.tv_usec           = uSec;
++
++        if( select( nfds, &readfds, &writefds, &exceptfds, &Timer ) < 0 )
++        {
++                perror( "usleep (select) failed" );
++                return -1;
++        }
++
++        return 0;
++}
++#endif
++
++CmdPipe *C64::staticGUI = 0;
++
++/*
++ * Static StartGUI method to start gui before SDL initilization
++ */
++
++void C64::StartGUI()
++{
++	// we need to create a potential GUI subprocess here, because we don't want
++	// it to inherit file-descriptors (such as for the audio-device and alike..)
++	if (!staticGUI)
++	{
++		// try to start up FrodoGUI.
++		staticGUI = new CmdPipe("frodogui", "");
++		if (staticGUI)
++		{
++			if (staticGUI->fail)
++			{
++				delete staticGUI;
++				staticGUI = 0;
++			}
++		}
++		// wait until the GUI process responds (if it does...)
++		if (staticGUI)
++		{
++			if (5 != staticGUI->ewrite("ping\n",5))
++			{
++				delete staticGUI;
++				staticGUI = 0;
++			}
++			else
++			{
++				char c;
++				fd_set set;
++				FD_ZERO(&set);
++				FD_SET(staticGUI->get_read_fd(), &set);
++ 				struct timeval tv;
++				tv.tv_usec = 0;
++				tv.tv_sec = 5;
++				if (select(FD_SETSIZE, &set, NULL, NULL, &tv) <= 0)
++				{
++					delete staticGUI;
++					staticGUI = 0;
++				}
++				else
++				{
++					if (1 != staticGUI->eread(&c, 1))
++					{
++						delete staticGUI;
++						staticGUI = 0;
++					}
++					else
++					{
++						if (c != 'o')
++						{
++							delete staticGUI;
++							staticGUI = 0;
++						}
++					}
++				}
++			}
++		}
++	}
++}
++
++/*
++ * Static StopGUI method 
++ */
++
++void C64::StopGUI()
++{
++	if (staticGUI)
++	{
++		staticGUI->ewrite("quit\n",5);
++		delete staticGUI;
++	}
++}
++
++/*
++ *  Constructor, system-dependent things
++ */
++
++void C64::c64_ctor1(void)
++{
++	// Initialize joystick variables
++	joyfd[0] = joyfd[1] = -1;
++	joy_minx = joy_miny = 32767;
++	joy_maxx = joy_maxy = -32768;
++
++	gui = staticGUI;
++}
++
++void C64::c64_ctor2(void)
++{
++#ifndef  __svgalib__
++   if (!gui) {
++   	fprintf(stderr,"Alas, master, no preferences window will be available.\n"
++   	               "If you wish to see one, make sure the 'wish' interpreter\n"
++   	               "(Tk version >= 4.1) is installed in your path.\n"
++   	               "You can still use Frodo, though. Use F10 to quit, \n"
++   	               "F11 to cause an NMI and F12 to reset the C64.\n"
++   	               "You can change the preferences by editing ~/.frodorc\n");
++   }
++#endif // SVGAlib
++
++	gettimeofday(&tv_start, NULL);
++}
++
++
++/*
++ *  Destructor, system-dependent things
++ */
++
++void C64::c64_dtor(void)
++{
++}
++
++
++/*
++ *  Start main emulation thread
++ */
++
++void C64::Run(void)
++{
++	// Reset chips
++	TheCPU->Reset();
++	TheSID->Reset();
++	TheCIA1->Reset();
++	TheCIA2->Reset();
++	TheCPU1541->Reset();
++
++	// Patch kernal IEC routines
++	orig_kernal_1d84 = Kernal[0x1d84];
++	orig_kernal_1d85 = Kernal[0x1d85];
++	PatchKernal(ThePrefs.FastReset, ThePrefs.Emul1541Proc);
++
++	quit_thyself = false;
++	thread_func();
++}
++
++
++/*
++ *  Vertical blank: Poll keyboard and joysticks, update window
++ */
++
++void C64::VBlank(bool draw_frame)
++{
++	// Poll keyboard
++	TheDisplay->PollKeyboard(TheCIA1->KeyMatrix, TheCIA1->RevMatrix, &joykey);
++	if (TheDisplay->quit_requested)
++		quit_thyself = true;
++
++	// Poll joysticks
++	TheCIA1->Joystick1 = poll_joystick(0);
++	TheCIA1->Joystick2 = poll_joystick(1);
++
++	if (ThePrefs.JoystickSwap) {
++		uint8 tmp = TheCIA1->Joystick1;
++		TheCIA1->Joystick1 = TheCIA1->Joystick2;
++		TheCIA1->Joystick2 = tmp;
++	}
++
++	// Joystick keyboard emulation
++	if (TheDisplay->NumLock())
++		TheCIA1->Joystick1 &= joykey;
++	else
++		TheCIA1->Joystick2 &= joykey;
++
++	// Count TOD clocks
++	TheCIA1->CountTOD();
++	TheCIA2->CountTOD();
++
++	// Update window if needed
++	if (draw_frame) {
++    	TheDisplay->Update();
++
++		// Calculate time between VBlanks, display speedometer
++		struct timeval tv;
++		gettimeofday(&tv, NULL);
++		if ((tv.tv_usec -= tv_start.tv_usec) < 0) {
++			tv.tv_usec += 1000000;
++			tv.tv_sec -= 1;
++		}
++		tv.tv_sec -= tv_start.tv_sec;
++		double elapsed_time = (double)tv.tv_sec * 1000000 + tv.tv_usec;
++		speed_index = 20000 / (elapsed_time + 1) * ThePrefs.SkipFrames * 100;
++
++		// Limit speed to 100% if desired
++		if ((speed_index > 100) && ThePrefs.LimitSpeed) {
++			usleep((unsigned long)(ThePrefs.SkipFrames * 20000 - elapsed_time));
++			speed_index = 100;
++		}
++
++		gettimeofday(&tv_start, NULL);
++
++		TheDisplay->Speedometer((int)speed_index);
++	}
++}
++
++
++/*
++ *  Open/close joystick drivers given old and new state of
++ *  joystick preferences
++ */
++
++void C64::open_close_joysticks(bool oldjoy1, bool oldjoy2, bool newjoy1, bool newjoy2)
++{
++#ifdef HAVE_LINUX_JOYSTICK_H
++	if (oldjoy1 != newjoy1) {
++		joy_minx = joy_miny = 32767;	// Reset calibration
++		joy_maxx = joy_maxy = -32768;
++		if (newjoy1) {
++			joyfd[0] = open("/dev/js0", O_RDONLY);
++			if (joyfd[0] < 0)
++				fprintf(stderr, "Couldn't open joystick 1\n");
++		} else {
++			close(joyfd[0]);
++			joyfd[0] = -1;
++		}
++	}
++
++	if (oldjoy2 != newjoy2) {
++		joy_minx = joy_miny = 32767;	// Reset calibration
++		joy_maxx = joy_maxy = -32768;
++		if (newjoy2) {
++			joyfd[1] = open("/dev/js1", O_RDONLY);
++			if (joyfd[1] < 0)
++				fprintf(stderr, "Couldn't open joystick 2\n");
++		} else {
++			close(joyfd[1]);
++			joyfd[1] = -1;
++		}
++	}
++#endif
++}
++
++
++/*
++ *  Poll joystick port, return CIA mask
++ */
++
++uint8 C64::poll_joystick(int port)
++{
++#ifdef HAVE_LINUX_JOYSTICK_H
++	JS_DATA_TYPE js;
++	uint8 j = 0xff;
++
++	if (joyfd[port] >= 0) {
++		if (read(joyfd[port], &js, JS_RETURN) == JS_RETURN) {
++			if (js.x > joy_maxx)
++				joy_maxx = js.x;
++			if (js.x < joy_minx)
++				joy_minx = js.x;
++			if (js.y > joy_maxy)
++				joy_maxy = js.y;
++			if (js.y < joy_miny)
++				joy_miny = js.y;
++
++			if (joy_maxx-joy_minx < 100 || joy_maxy-joy_miny < 100)
++				return 0xff;
++
++			if (js.x < (joy_minx + (joy_maxx-joy_minx)/3))
++				j &= 0xfb;							// Left
++			else if (js.x > (joy_minx + 2*(joy_maxx-joy_minx)/3))
++				j &= 0xf7;							// Right
++
++			if (js.y < (joy_miny + (joy_maxy-joy_miny)/3))
++				j &= 0xfe;							// Up
++			else if (js.y > (joy_miny + 2*(joy_maxy-joy_miny)/3))
++				j &= 0xfd;							// Down
++
++			if (js.buttons & 1)
++				j &= 0xef;							// Button
++		}
++	}
++	return j;
++#else
++	return 0xff;
++#endif
++}
++
++
++/*
++ * The emulation's main loop
++ */
++
++void C64::thread_func(void)
++{
++	int linecnt = 0;
++
++#ifdef FRODO_SC
++	while (!quit_thyself) {
++
++		// The order of calls is important here
++		if (TheVIC->EmulateCycle())
++			TheSID->EmulateLine();
++		TheCIA1->CheckIRQs();
++		TheCIA2->CheckIRQs();
++		TheCIA1->EmulateCycle();
++		TheCIA2->EmulateCycle();
++		TheCPU->EmulateCycle();
++
++		if (ThePrefs.Emul1541Proc) {
++			TheCPU1541->CountVIATimers(1);
++			if (!TheCPU1541->Idle)
++				TheCPU1541->EmulateCycle();
++		}
++		CycleCounter++;
++#else
++	while (!quit_thyself) {
++
++		// The order of calls is important here
++		int cycles = TheVIC->EmulateLine();
++		TheSID->EmulateLine();
++#if !PRECISE_CIA_CYCLES
++		TheCIA1->EmulateLine(ThePrefs.CIACycles);
++		TheCIA2->EmulateLine(ThePrefs.CIACycles);
++#endif
++
++		if (ThePrefs.Emul1541Proc) {
++			int cycles_1541 = ThePrefs.FloppyCycles;
++			TheCPU1541->CountVIATimers(cycles_1541);
++
++			if (!TheCPU1541->Idle) {
++				// 1541 processor active, alternately execute
++				//  6502 and 6510 instructions until both have
++				//  used up their cycles
++				while (cycles >= 0 || cycles_1541 >= 0)
++					if (cycles > cycles_1541)
++						cycles -= TheCPU->EmulateLine(1);
++					else
++						cycles_1541 -= TheCPU1541->EmulateLine(1);
++			} else
++				TheCPU->EmulateLine(cycles);
++		} else
++			// 1541 processor disabled, only emulate 6510
++			TheCPU->EmulateLine(cycles);
++#endif
++		linecnt++;
++#if !defined(__svgalib__)
++		if ((linecnt & 0xfff) == 0 && gui) {
++
++			// check for command from GUI process
++		// fprintf(stderr,":");
++			while (gui->probe()) {
++				char c;
++				if (gui->eread(&c, 1) != 1) {
++					delete gui;
++					gui = 0;
++					fprintf(stderr,"Oops, GUI process died...\n");
++				} else {
++               // fprintf(stderr,"%c",c);
++					switch (c) {
++						case 'q':
++							quit_thyself = true;
++							break;
++						case 'r':
++							Reset();
++							break;
++						case 'p':{
++							Prefs *np = Frodo::reload_prefs();
++							NewPrefs(np);
++							ThePrefs = *np;
++							break;
++						}
++						default:
++							break;
++					}
++				}
++			}
++		}
++#endif
++	}
++}
+diff -urN Src/configarm Src/configarm
+--- Src/configarm	1970-01-01 01:00:00.000000000 +0100
++++ Src/configarm	2002-11-21 17:07:02.000000000 +0100
+@@ -0,0 +1,2 @@
++configure --host=i386-linux --x-includes=/opt/Qtopia/sharp/include/ --x-libraries=/opt/Qtopia/sharp/lib/ --with-sdl-prefix=/opt/Qtopia/sharp/ --enable-qtopia
++
+diff -urN Src/configure Src/configure
+--- Src/configure	2002-01-02 17:44:11.000000000 +0100
++++ Src/configure	2002-11-21 17:07:03.000000000 +0100
+@@ -1,24 +1,18 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.52d.
++# Generated by GNU Autoconf 2.53.
+ #
+-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
++# 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.
+ 
+-# 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
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
+ 
+-# 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"
+ 
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+@@ -32,8 +26,165 @@
+   set -o posix
+ fi
+ 
++# NLS nuisances.
++# Support unset when possible.
++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
++    { $as_unset LANG || test "${LANG+set}" != set; } ||
++      { LANG=C; export LANG; }
++(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
++    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
++      { LC_ALL=C; export LC_ALL; }
++(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
++    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
++      { LC_TIME=C; export LC_TIME; }
++(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
++    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
++      { LC_CTYPE=C; export LC_CTYPE; }
++(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
++    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
++      { LANGUAGE=C; export LANGUAGE; }
++(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
++    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
++      { LC_COLLATE=C; export LC_COLLATE; }
++(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
++    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
++      { LC_NUMERIC=C; export LC_NUMERIC; }
++(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
++    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
++      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++
+ # Name of the executable.
+-as_me=`echo "$0" |sed 's,.*[\\/],,'`
++as_me=`(basename "$0") 2>/dev/null ||
++$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" >conftest.sh
++  echo  "exit 0"   >>conftest.sh
++  chmod +x conftest.sh
++  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conftest.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
++	     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
+@@ -61,22 +212,12 @@
+ 
+ as_executable_p="test -f"
+ 
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
++# 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"
+ 
+-# NLS nuisances.
+-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+@@ -85,7 +226,8 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
++$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -100,7 +242,8 @@
+ ac_default_prefix=/usr/local
+ cross_compiling=no
+ subdirs=
+-MFLAGS= MAKEFLAGS=
++MFLAGS=
++MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Maximum number of lines to put in a shell here document.
+@@ -108,6 +251,13 @@
+ # 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="VIC.cpp"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+@@ -146,6 +296,7 @@
+ # include <unistd.h>
+ #endif"
+ 
++
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
+@@ -184,13 +335,6 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
+-# Identity of this package.
+-PACKAGE_NAME=
+-PACKAGE_TARNAME=
+-PACKAGE_VERSION=
+-PACKAGE_STRING=
+-PACKAGE_BUGREPORT=
+-
+ ac_prev=
+ for ac_option
+ do
+@@ -323,7 +467,7 @@
+     with_fp=no ;;
+ 
+   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c)
++  | --no-cr | --no-c | -n)
+     no_create=yes ;;
+ 
+   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+@@ -502,7 +646,7 @@
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+@@ -514,18 +658,19 @@
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+ # used to hold the argument of --host etc.
++# FIXME: To remove some day.
+ build=$build_alias
+ host=$host_alias
+ target=$target_alias
+ 
+-# FIXME: should be removed in autoconf 3.0.
++# FIXME: To remove some day.
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+@@ -541,13 +686,23 @@
+ 
+ test "$silent" = yes && exec 6>/dev/null
+ 
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+   # Try the directory containing this script, then its parent.
+-  ac_prog=$0
+-  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
+-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$0" : 'X\(//\)[^/]' \| \
++         X"$0" : 'X\(//\)$' \| \
++         X"$0" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$0" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
+   srcdir=$ac_confdir
+   if test ! -r $srcdir/$ac_unique_file; then
+     srcdir=..
+@@ -680,6 +835,7 @@
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-sdltest       Do not try to compile and run a test SDL program
++  --enable-qtopia         Make a Qtopia Version (Sharp Zaurus) of Frodo
+   --enable-kbd-lang-de    Use german keyboard layout
+   --enable-kbd-lang-us    Use american keyboard layout
+ 
+@@ -711,11 +867,13 @@
+   # If there are subdirs, report their specific --help.
+   ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    cd $ac_dir
+-    if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\./,,'`
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+@@ -735,7 +893,14 @@
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
++# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
++# absolute.
++ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
++ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
++    cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+     if test -f $ac_srcdir/configure.gnu; then
+       echo
+@@ -758,7 +923,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ 
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
++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.
+@@ -771,7 +936,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.52d.  Invocation command line was
++generated by GNU Autoconf 2.53.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -799,18 +964,28 @@
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+-PATH = $PATH
+-
+ _ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
+ } >&5
+ 
+ cat >&5 <<_ACEOF
++
++
+ ## ----------- ##
+ ## Core tests. ##
+ ## ----------- ##
+ 
+ _ACEOF
+ 
++
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
+ # Also quote any args containing shell meta-characters.
+@@ -820,15 +995,17 @@
+ do
+   case $ac_arg in
+   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c) ;;
++  | --no-cr | --no-c | -n ) continue ;;
+   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    continue ;;
+   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+-    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-    ac_sep=" " ;;
+-  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+-     ac_sep=" " ;;
++    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++  esac
++  case " $ac_configure_args " in
++    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++       ac_sep=" " ;;
+   esac
+   # Get rid of the leading space.
+ done
+@@ -878,7 +1055,8 @@
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
++  rm -f core core.* *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+ for ac_signal in 1 2 13 15; do
+@@ -891,6 +1069,33 @@
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+ echo >confdefs.h
+ 
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+@@ -902,7 +1107,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:905: loading site script $ac_site_file" >&5
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -913,7 +1118,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:916: loading cache $cache_file" >&5
++    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -921,7 +1126,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:924: creating cache $cache_file" >&5
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -937,42 +1142,42 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:940: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:944: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:950: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:952:   former value:  $ac_old_val" >&5
++        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:954:   current value: $ac_new_val" >&5
++        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+   esac
+-  # Pass precious variables to config.status.  It doesn't matter if
+-  # we pass some twice (in addition to the command line arguments).
++  # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+-      ac_configure_args="$ac_configure_args '$ac_arg'"
+-      ;;
+-    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+-       ;;
++      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+     esac
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:973: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:975: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -983,26 +1188,25 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-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
+-echo "#! $SHELL" >conftest.sh
+-echo  "exit 0"   >>conftest.sh
+-chmod +x conftest.sh
+-if { (echo "$as_me:995: PATH=\".;.\"; conftest.sh") >&5
+-  (PATH=".;."; conftest.sh) 2>&5
+-  ac_status=$?
+-  echo "$as_me:998: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_path_separator=';'
+-else
+-  ac_path_separator=:
+-fi
+-PATH_SEPARATOR="$ac_path_separator"
+-rm -f conftest.sh
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -1012,7 +1216,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1015: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1020,25 +1224,28 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1030: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1038: result: $CC" >&5
++  echo "$as_me:$LINENO: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1041: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1047,7 +1254,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1050: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1055,25 +1262,28 @@
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1065: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1073: result: $ac_ct_CC" >&5
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1076: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1086,7 +1296,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1089: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1094,25 +1304,28 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1104: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1112: result: $CC" >&5
++  echo "$as_me:$LINENO: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1115: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1121,7 +1334,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1124: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1129,25 +1342,28 @@
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1139: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1147: result: $ac_ct_CC" >&5
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1150: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1160,7 +1376,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1163: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1169,19 +1385,22 @@
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   ac_prog_rejected=no
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-  ac_prog_rejected=yes
+-  continue
+-fi
+-ac_cv_prog_CC="cc"
+-echo "$as_me:1183: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -1193,7 +1412,7 @@
+     # However, it has the same basename, so the bogon will be chosen
+     # first if we set CC to just the basename; use the full file name.
+     shift
+-    set dummy "$ac_dir/$ac_word" ${1+"$@"}
++    set dummy "$as_dir/$ac_word" ${1+"$@"}
+     shift
+     ac_cv_prog_CC="$@"
+   fi
+@@ -1202,10 +1421,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1205: result: $CC" >&5
++  echo "$as_me:$LINENO: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1208: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1216,7 +1435,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:1219: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1224,25 +1443,28 @@
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1234: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1242: result: $CC" >&5
++  echo "$as_me:$LINENO: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1245: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1255,7 +1477,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1258: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1263,25 +1485,28 @@
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1273: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1281: result: $ac_ct_CC" >&5
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1284: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1293,32 +1518,33 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1296: error: no acceptable cc found in \$PATH" >&5
+-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1301:" \
++echo "$as_me:$LINENO:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1304: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1307: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1309: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1312: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1314: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1317: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1321 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1340,18 +1566,22 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1343: checking for C compiler default output" >&5
++echo "$as_me:$LINENO: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1346: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1349: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+ # resort.
+-for ac_file in `ls a.exe conftest.exe 2>/dev/null;
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
+                 ls a.out conftest 2>/dev/null;
+                 ls a.* conftest.* 2>/dev/null`; do
+   case $ac_file in
+@@ -1369,34 +1599,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1372: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1378: result: $ac_file" >&5
++echo "$as_me:$LINENO: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1383: checking whether the C compiler works" >&5
++echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1392: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1399: error: cannot run C compiled programs.
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1404,24 +1634,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1407: result: yes" >&5
++echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1414: checking whether we are cross compiling" >&5
++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1416: result: $cross_compiling" >&5
++echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1419: checking for executable suffix" >&5
+-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1421: \"$ac_link\"") >&5
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1424: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1437,25 +1667,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1440: error: cannot compute EXEEXT: cannot compile and link" >&5
+-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1446: result: $ac_cv_exeext" >&5
++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1452: checking for object suffix" >&5
+-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1458 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1473,10 +1703,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1476: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1479: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -1488,24 +1718,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1491: error: cannot compute OBJEXT: cannot compile" >&5
+-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1498: result: $ac_cv_objext" >&5
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1502: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1508 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1526,16 +1756,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1529: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1532: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1535: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1538: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1547,19 +1777,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1550: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1556: checking whether $CC accepts -g" >&5
++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1562 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1577,16 +1807,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1580: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1583: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1586: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1589: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1596,7 +1826,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1599: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1623,16 +1853,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1626: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1629: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1632: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1635: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1644,7 +1874,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1647 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1663,16 +1893,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1666: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1669: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1672: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1675: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -1682,7 +1912,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1685 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ #ifdef F77_DUMMY_MAIN
+@@ -1700,16 +1930,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1703: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1706: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1709: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1712: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -1746,7 +1976,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:1749: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1754,25 +1984,28 @@
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1764: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:1772: result: $CXX" >&5
++  echo "$as_me:$LINENO: result: $CXX" >&5
+ echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$as_me:1775: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1785,7 +2018,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1788: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1793,25 +2026,28 @@
+   if test -n "$ac_ct_CXX"; then
+   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+ else
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_CXX="$ac_prog"
+-echo "$as_me:1803: found $ac_dir/$ac_word" >&5
+-break
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:1811: result: $ac_ct_CXX" >&5
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+ echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+-  echo "$as_me:1814: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1822,33 +2058,34 @@
+   CXX=$ac_ct_CXX
+ fi
+ 
++
+ # Provide some information about the compiler.
+-echo "$as_me:1826:" \
++echo "$as_me:$LINENO:" \
+      "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1829: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1832: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1834: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1837: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1839: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1842: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+-echo "$as_me:1845: checking whether we are using the GNU C++ compiler" >&5
++echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1851 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1869,16 +2106,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1875: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1881: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1890,19 +2127,19 @@
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1893: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="-g"
+-echo "$as_me:1899: checking whether $CXX accepts -g" >&5
++echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+ echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1905 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -1920,16 +2157,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1923: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1926: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1929: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1932: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+@@ -1939,7 +2176,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1942: result: $ac_cv_prog_cxx_g" >&5
++echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -1966,7 +2203,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1969 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1985,16 +2222,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1991: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1994: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1997: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -2004,7 +2241,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2007 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ #ifdef F77_DUMMY_MAIN
+@@ -2022,16 +2259,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2025: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2028: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2034: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -2058,7 +2295,7 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:2061: checking how to run the C preprocessor" >&5
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2079,18 +2316,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2082 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2087: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2093: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2113,17 +2350,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2116 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2120: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2126: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2160,7 +2397,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:2163: result: $CPP" >&5
++echo "$as_me:$LINENO: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -2170,18 +2407,18 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2173 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:2178: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2184: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2204,17 +2441,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2207 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2211: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2217: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2242,7 +2479,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2245: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2253,7 +2490,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:2256: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -2273,15 +2510,16 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:2276: result: yes" >&5
++  echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:2280: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
++
+ if [ x"$GXX" = "xyes" ]; then
+   CFLAGS="-O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
+ fi
+@@ -2294,10 +2532,13 @@
+   HPUX_REV=`echo $UNAME_RELEASE | sed -e 's/^.*.0B*//' -e 's/\..*$//'`
+ fi
+ 
+-echo "$as_me:2297: checking for AIX" >&5
++
++
++
++echo "$as_me:$LINENO: checking for AIX" >&5
+ echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2300 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #ifdef _AIX
+   yes
+@@ -2306,44 +2547,130 @@
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+-  echo "$as_me:2309: result: yes" >&5
++  echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ cat >>confdefs.h <<\_ACEOF
+ #define _ALL_SOURCE 1
+ _ACEOF
+ 
+ else
+-  echo "$as_me:2316: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ rm -f conftest*
+ 
+-echo "$as_me:2321: checking for POSIXized ISC" >&5
+-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
+-if test -d /etc/conf/kconfig.d &&
+-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+-then
+-  echo "$as_me:2326: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-  ISC=yes # If later tests want to check for ISC.
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define _POSIX_SOURCE 1
++echo "$as_me:$LINENO: checking for library containing strerror" >&5
++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
++if test "${ac_cv_search_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_strerror=no
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_strerror="none required"
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_search_strerror" = no; then
++  for ac_lib in cposix; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
+ 
+-  if test "$GCC" = yes; then
+-    CC="$CC -posix"
+-  else
+-    CC="$CC -Xp"
+-  fi
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_strerror="-l$ac_lib"
++break
+ else
+-  echo "$as_me:2340: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-  ISC=
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++echo "${ECHO_T}$ac_cv_search_strerror" >&6
++if test "$ac_cv_search_strerror" != no; then
++  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
++
++fi
++
+ 
+ HAVE_BEBOX=no
+-echo "$as_me:2346: checking for OpenLibrary in -lamiga" >&5
++echo "$as_me:$LINENO: checking for OpenLibrary in -lamiga" >&5
+ echo $ECHO_N "checking for OpenLibrary in -lamiga... $ECHO_C" >&6
+ if test "${ac_cv_lib_amiga_OpenLibrary+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2351,7 +2678,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lamiga  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2354 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -2376,16 +2703,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2379: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2382: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2385: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2388: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_amiga_OpenLibrary=yes
+ else
+@@ -2396,7 +2723,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:2399: result: $ac_cv_lib_amiga_OpenLibrary" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_amiga_OpenLibrary" >&5
+ echo "${ECHO_T}$ac_cv_lib_amiga_OpenLibrary" >&6
+ if test $ac_cv_lib_amiga_OpenLibrary = yes; then
+   HAVE_AMIGA_LIB=yes
+@@ -2404,7 +2731,7 @@
+   HAVE_AMIGA_LIB=no
+ fi
+ 
+-echo "$as_me:2407: checking for vga_setmode in -lvga" >&5
++echo "$as_me:$LINENO: checking for vga_setmode in -lvga" >&5
+ echo $ECHO_N "checking for vga_setmode in -lvga... $ECHO_C" >&6
+ if test "${ac_cv_lib_vga_vga_setmode+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2412,7 +2739,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lvga  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2415 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -2437,16 +2764,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2440: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2443: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2446: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2449: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_vga_vga_setmode=yes
+ else
+@@ -2457,7 +2784,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:2460: result: $ac_cv_lib_vga_vga_setmode" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_vga_vga_setmode" >&5
+ echo "${ECHO_T}$ac_cv_lib_vga_vga_setmode" >&6
+ if test $ac_cv_lib_vga_vga_setmode = yes; then
+   HAVE_SVGA_LIB=yes
+@@ -2465,6 +2792,7 @@
+   HAVE_SVGA_LIB=no
+ fi
+ 
++
+ # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
+ if test "${with_sdl_prefix+set}" = set; then
+   withval="$with_sdl_prefix"
+@@ -2503,7 +2831,7 @@
+ 
+   # Extract the first word of "sdl-config", so it can be a program name with args.
+ set dummy sdl-config; ac_word=$2
+-echo "$as_me:2506: checking for $ac_word" >&5
++echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2513,16 +2841,18 @@
+   ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
+   ;;
+   *)
+-  ac_save_IFS=$IFS; IFS=$ac_path_separator
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  if $as_executable_p "$ac_dir/$ac_word"; then
+-   ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:2523: found $ac_dir/$ac_word" >&5
+-   break
+-fi
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
+@@ -2532,15 +2862,15 @@
+ SDL_CONFIG=$ac_cv_path_SDL_CONFIG
+ 
+ if test -n "$SDL_CONFIG"; then
+-  echo "$as_me:2535: result: $SDL_CONFIG" >&5
++  echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
+ echo "${ECHO_T}$SDL_CONFIG" >&6
+ else
+-  echo "$as_me:2538: result: no" >&5
++  echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   min_sdl_version=1.2.0
+-  echo "$as_me:2543: checking for SDL - version >= $min_sdl_version" >&5
++  echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
+ echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
+   no_sdl=""
+   if test "$SDL_CONFIG" = "no" ; then
+@@ -2565,7 +2895,7 @@
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2568 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -2624,23 +2954,25 @@
+     }
+ }
+ 
++
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:2629: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2632: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:2634: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2637: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
+ no_sdl=yes
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -2650,11 +2982,11 @@
+      fi
+   fi
+   if test "x$no_sdl" = x ; then
+-     echo "$as_me:2653: result: yes" >&5
++     echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+      HAVE_SDL=yes
+   else
+-     echo "$as_me:2657: result: no" >&5
++     echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+      if test "$SDL_CONFIG" = "no" ; then
+        echo "*** The sdl-config script installed by SDL could not be found"
+@@ -2669,7 +3001,7 @@
+           CFLAGS="$CFLAGS $SDL_CFLAGS"
+           LIBS="$LIBS $SDL_LIBS"
+           cat >conftest.$ac_ext <<_ACEOF
+-#line 2672 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -2690,16 +3022,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2693: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2696: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2699: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2702: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding SDL or finding the wrong"
+@@ -2728,11 +3060,14 @@
+      HAVE_SDL=no
+   fi
+ 
++
+   rm -f conf.sdltest
+ 
+-echo "$as_me:2733: checking for X" >&5
++
++echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
++
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+   withval="$with_x"
+@@ -2827,17 +3162,17 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2830 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:2834: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:2840: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2870,7 +3205,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2873 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ #ifdef F77_DUMMY_MAIN
+@@ -2888,16 +3223,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2891: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2894: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2897: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2900: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -2935,7 +3270,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:2938: result: $have_x" >&5
++  echo "$as_me:$LINENO: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -2945,7 +3280,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:2948: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -2969,11 +3304,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:2972: checking whether -R must be followed by a space" >&5
++      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+-#line 2976 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -2991,16 +3326,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2994: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2997: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3003: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -3010,13 +3345,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:3013: result: no" >&5
++	echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3019 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -3034,16 +3369,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3037: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3040: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3046: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -3053,11 +3388,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:3056: result: yes" >&5
++	  echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:3060: result: neither works" >&5
++	  echo "$as_me:$LINENO: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -3077,7 +3412,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 3080 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3102,22 +3437,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3105: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3108: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3111: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3114: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:3120: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3125,7 +3460,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3128 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3150,16 +3485,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3153: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3156: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3159: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3162: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -3170,14 +3505,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3173: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:3180: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3185,7 +3520,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3188 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3210,16 +3545,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3216: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3219: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3222: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -3230,7 +3565,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3233: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -3249,13 +3584,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:3252: checking for gethostbyname" >&5
++    echo "$as_me:$LINENO: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3258 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -3292,16 +3627,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3295: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3298: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3301: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3304: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -3311,11 +3646,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3314: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:3318: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3323,7 +3658,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3326 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3348,16 +3683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3351: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3354: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3357: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3360: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -3368,14 +3703,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3371: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:3378: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3383,7 +3718,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3386 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3408,16 +3743,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3411: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3414: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3417: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3420: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -3428,7 +3763,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3431: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -3444,13 +3779,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:3447: checking for connect" >&5
++    echo "$as_me:$LINENO: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3453 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -3487,16 +3822,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3490: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3493: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3496: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3499: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -3506,11 +3841,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3509: result: $ac_cv_func_connect" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:3513: checking for connect in -lsocket" >&5
++      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3518,7 +3853,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3521 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3543,16 +3878,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3546: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3549: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3552: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3555: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -3563,7 +3898,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3566: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -3572,13 +3907,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:3575: checking for remove" >&5
++    echo "$as_me:$LINENO: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3581 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -3615,16 +3950,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3621: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3627: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -3634,11 +3969,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3637: result: $ac_cv_func_remove" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:3641: checking for remove in -lposix" >&5
++      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3646,7 +3981,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3649 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3671,16 +4006,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3674: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3677: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3680: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3683: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -3691,7 +4026,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3694: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -3700,13 +4035,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:3703: checking for shmat" >&5
++    echo "$as_me:$LINENO: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3709 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -3743,16 +4078,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3746: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3749: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3752: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3755: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -3762,11 +4097,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:3765: result: $ac_cv_func_shmat" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:3769: checking for shmat in -lipc" >&5
++      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3774,7 +4109,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3777 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3799,16 +4134,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3802: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3805: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3808: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3811: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -3819,7 +4154,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3822: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -3837,7 +4172,7 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:3840: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3845,7 +4180,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3848 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3870,16 +4205,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3873: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:3876: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:3879: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3882: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -3890,7 +4225,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:3893: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -3902,16 +4237,22 @@
+ 
+ ac_config_headers="$ac_config_headers sysconfig.h"
+ 
++
++
++
++
++
++
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:3908: checking for $ac_hdr that defines DIR" >&5
++echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3914 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -3932,16 +4273,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3935: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3938: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3941: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3944: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -3951,7 +4292,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3954: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -3964,15 +4305,15 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:3967: checking for opendir in -ldir" >&5
+-echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
+-if test "${ac_cv_lib_dir_opendir+set}" = set; then
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldir  $LIBS"
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3975 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3997,42 +4338,91 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4000: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4003: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4006: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4009: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_dir_opendir=yes
++  ac_cv_search_opendir="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_cv_lib_dir_opendir=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in dir; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
+ fi
+-echo "$as_me:4020: result: $ac_cv_lib_dir_opendir" >&5
+-echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
+-if test $ac_cv_lib_dir_opendir = yes; then
+-  LIBS="$LIBS -ldir"
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++
+ fi
+ 
+ else
+-  echo "$as_me:4027: checking for opendir in -lx" >&5
+-echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
+-if test "${ac_cv_lib_x_opendir+set}" = set; then
++  echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++if test "${ac_cv_search_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lx  $LIBS"
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4035 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4057,41 +4447,90 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4060: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4063: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4066: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4069: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_x_opendir=yes
++  ac_cv_search_opendir="none required"
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_cv_lib_x_opendir=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++if test "$ac_cv_search_opendir" = no; then
++  for ac_lib in x; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char opendir ();
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++opendir ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_opendir="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++  done
+ fi
+-echo "$as_me:4080: result: $ac_cv_lib_x_opendir" >&5
+-echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
+-if test $ac_cv_lib_x_opendir = yes; then
+-  LIBS="$LIBS -lx"
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6
++if test "$ac_cv_search_opendir" != no; then
++  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++
+ fi
+ 
+ fi
+ 
+-echo "$as_me:4088: checking for ANSI C header files" >&5
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4094 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -4099,13 +4538,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:4102: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:4108: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4127,7 +4566,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 <<_ACEOF
+-#line 4130 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -4145,7 +4584,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 <<_ACEOF
+-#line 4148 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -4166,7 +4605,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4169 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -4192,28 +4631,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4198: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4200: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4203: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ fi
+-echo "$as_me:4216: result: $ac_cv_header_stdc" >&5
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -4225,33 +4665,41 @@
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ 
++
++
++
++
++
++
++
++
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                   inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:4232: checking for $ac_header" >&5
++echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4238 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ 
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4245: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4248: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4251: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4254: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+@@ -4261,7 +4709,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4264: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -4272,38 +4720,48 @@
+ 
+ done
+ 
++
++
++
++
++
++
++
++
++
++
+ for ac_header in unistd.h fcntl.h sys/time.h sys/types.h utime.h string.h strings.h values.h ncurses.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:4279: checking for $ac_header" >&5
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:4284: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:4288: checking $ac_header usability" >&5
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4291 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4297: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4300: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4303: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4306: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_header_compiler=yes
+ else
+@@ -4312,24 +4770,24 @@
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:4315: result: $ac_header_compiler" >&5
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:4319: checking $ac_header presence" >&5
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4322 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:4326: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:4332: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4347,32 +4805,32 @@
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:4350: result: $ac_header_preproc" >&5
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:4356: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:4358: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+   no:yes )
+-    { echo "$as_me:4361: WARNING: $ac_header: present but cannot be compiled." >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+-    { echo "$as_me:4363: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:4365: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+ esac
+-echo "$as_me:4368: checking for $ac_header" >&5
++echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=$ac_header_preproc"
+ fi
+-echo "$as_me:4375: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ 
+ fi
+@@ -4385,38 +4843,46 @@
+ 
+ done
+ 
++
++
++
++
++
++
++
++
+ for ac_header in sys/vfs.h sys/mount.h sys/select.h sys/param.h sys/statfs.h sys/statvfs.h sys/stat.h linux/joystick.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:4392: checking for $ac_header" >&5
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:4397: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:4401: checking $ac_header usability" >&5
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4404 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4410: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4413: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4416: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4419: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_header_compiler=yes
+ else
+@@ -4425,24 +4891,24 @@
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:4428: result: $ac_header_compiler" >&5
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:4432: checking $ac_header presence" >&5
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4435 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:4439: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   egrep -v '^ *\+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:4445: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4460,32 +4926,32 @@
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:4463: result: $ac_header_preproc" >&5
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:4469: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:4471: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+   no:yes )
+-    { echo "$as_me:4474: WARNING: $ac_header: present but cannot be compiled." >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled." >&2;}
+-    { echo "$as_me:4476: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:4478: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+ esac
+-echo "$as_me:4481: checking for $ac_header" >&5
++echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=$ac_header_preproc"
+ fi
+-echo "$as_me:4488: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ 
+ fi
+@@ -4498,13 +4964,14 @@
+ 
+ done
+ 
+-echo "$as_me:4501: checking for char" >&5
++
++echo "$as_me:$LINENO: checking for char" >&5
+ echo $ECHO_N "checking for char... $ECHO_C" >&6
+ if test "${ac_cv_type_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4507 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4525,16 +4992,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4528: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4531: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4534: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4537: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_char=yes
+ else
+@@ -4544,19 +5011,23 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4547: result: $ac_cv_type_char" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+ echo "${ECHO_T}$ac_cv_type_char" >&6
+ 
+-echo "$as_me:4550: checking size of char" >&5
++echo "$as_me:$LINENO: checking size of char" >&5
+ echo $ECHO_N "checking size of char... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4559 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4568,27 +5039,29 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (char)) >= 0)]
++static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4577: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4580: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4586: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4591 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4600,38 +5073,77 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4609: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4612: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4615: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4618: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
++ac_lo=`expr $ac_mid + 1`
++                    if test $ac_lo -le $ac_mid; then
++                      ac_lo= ac_hi=
++                      break
++                    fi
++                    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=-1 ac_mid=-1
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++$ac_includes_default
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4634 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4643,38 +5155,51 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4652: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4655: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4658: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4661: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
++ac_hi=`expr '(' $ac_mid ')' - 1`
++                       if test $ac_mid -le $ac_hi; then
++                         ac_lo= ac_hi=
++                         break
++                       fi
++                       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo= ac_hi=
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4677 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4686,42 +5211,53 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4695: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4698: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4701: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4704: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+-ac_cv_sizeof_char=$ac_lo
++case $ac_lo in
++?*) ac_cv_sizeof_char=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5
++echo "$as_me: error: cannot compute sizeof (char), 77" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4717: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4722 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++long longval () { return (long) (sizeof (char)); }
++unsigned long ulongval () { return (long) (sizeof (char)); }
++#include <stdio.h>
++#include <stdlib.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -4731,31 +5267,50 @@
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.val", "w");
+-if (!f)
+-  exit (1);
+-fprintf (f, "%d", (sizeof (char)));
+-fclose (f);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (char))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4744: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4747: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4752: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_char=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5
++echo "$as_me: error: cannot compute sizeof (char), 77" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -4765,19 +5320,20 @@
+   ac_cv_sizeof_char=0
+ fi
+ fi
+-echo "$as_me:4768: result: $ac_cv_sizeof_char" >&5
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR $ac_cv_sizeof_char
+ _ACEOF
+ 
+-echo "$as_me:4774: checking for short" >&5
++
++echo "$as_me:$LINENO: checking for short" >&5
+ echo $ECHO_N "checking for short... $ECHO_C" >&6
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4780 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4798,16 +5354,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4801: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4804: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4807: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4810: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_short=yes
+ else
+@@ -4817,19 +5373,23 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4820: result: $ac_cv_type_short" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6
+ 
+-echo "$as_me:4823: checking size of short" >&5
++echo "$as_me:$LINENO: checking size of short" >&5
+ echo $ECHO_N "checking size of short... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_short" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4832 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4841,27 +5401,29 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (short)) >= 0)]
++static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4850: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4853: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4859: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4864 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4873,38 +5435,77 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4882: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4885: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4888: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4891: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
++ac_lo=`expr $ac_mid + 1`
++                    if test $ac_lo -le $ac_mid; then
++                      ac_lo= ac_hi=
++                      break
++                    fi
++                    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=-1 ac_mid=-1
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++$ac_includes_default
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 4907 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4916,38 +5517,51 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (short)) >= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4925: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4928: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4931: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4934: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
++ac_hi=`expr '(' $ac_mid ')' - 1`
++                       if test $ac_mid -le $ac_hi; then
++                         ac_lo= ac_hi=
++                         break
++                       fi
++                       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo= ac_hi=
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4950 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -4959,42 +5573,53 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4968: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4971: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4974: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4977: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+-ac_cv_sizeof_short=$ac_lo
++case $ac_lo in
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
++echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:4990: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4995 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++long longval () { return (long) (sizeof (short)); }
++unsigned long ulongval () { return (long) (sizeof (short)); }
++#include <stdio.h>
++#include <stdlib.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -5004,31 +5629,50 @@
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.val", "w");
+-if (!f)
+-  exit (1);
+-fprintf (f, "%d", (sizeof (short)));
+-fclose (f);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (short))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5017: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5020: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5025: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_short=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
++echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -5038,19 +5682,20 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:5041: result: $ac_cv_sizeof_short" >&5
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-echo "$as_me:5047: checking for int" >&5
++
++echo "$as_me:$LINENO: checking for int" >&5
+ echo $ECHO_N "checking for int... $ECHO_C" >&6
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5053 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5071,16 +5716,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5074: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5077: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5083: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_int=yes
+ else
+@@ -5090,19 +5735,23 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5093: result: $ac_cv_type_int" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6
+ 
+-echo "$as_me:5096: checking size of int" >&5
++echo "$as_me:$LINENO: checking size of int" >&5
+ echo $ECHO_N "checking size of int... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5105 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5114,27 +5763,77 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
++static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5123: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5126: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5129: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5132: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5137 "configure"
++#line $LINENO "configure"
++#include "confdefs.h"
++$ac_includes_default
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo=`expr $ac_mid + 1`
++                    if test $ac_lo -le $ac_mid; then
++                      ac_lo= ac_hi=
++                      break
++                    fi
++                    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5146,38 +5845,29 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5155: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5158: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5161: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5164: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_hi=-1 ac_mid=-1
++  ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5180 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5189,38 +5879,51 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5198: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5201: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5204: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5207: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
++ac_hi=`expr '(' $ac_mid ')' - 1`
++                       if test $ac_mid -le $ac_hi; then
++                         ac_lo= ac_hi=
++                         break
++                       fi
++                       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo= ac_hi=
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5223 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5232,42 +5935,53 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5241: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5244: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5247: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5250: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+-ac_cv_sizeof_int=$ac_lo
++case $ac_lo in
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
++echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:5263: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5268 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++long longval () { return (long) (sizeof (int)); }
++unsigned long ulongval () { return (long) (sizeof (int)); }
++#include <stdio.h>
++#include <stdlib.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -5277,31 +5991,50 @@
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.val", "w");
+-if (!f)
+-  exit (1);
+-fprintf (f, "%d", (sizeof (int)));
+-fclose (f);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5290: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5293: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5295: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5298: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_int=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
++echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -5311,19 +6044,20 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:5314: result: $ac_cv_sizeof_int" >&5
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-echo "$as_me:5320: checking for long" >&5
++
++echo "$as_me:$LINENO: checking for long" >&5
+ echo $ECHO_N "checking for long... $ECHO_C" >&6
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5326 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5344,16 +6078,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5347: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5350: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5353: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5356: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_long=yes
+ else
+@@ -5363,19 +6097,23 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5366: result: $ac_cv_type_long" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6
+ 
+-echo "$as_me:5369: checking size of long" >&5
++echo "$as_me:$LINENO: checking size of long" >&5
+ echo $ECHO_N "checking size of long... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5378 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5387,27 +6125,29 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5396: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5399: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5405: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5410 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5419,38 +6159,77 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5431: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5434: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5437: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
++ac_lo=`expr $ac_mid + 1`
++                    if test $ac_lo -le $ac_mid; then
++                      ac_lo= ac_hi=
++                      break
++                    fi
++                    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=-1 ac_mid=-1
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++$ac_includes_default
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5453 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5462,38 +6241,51 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5471: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5474: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5477: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5480: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
++ac_hi=`expr '(' $ac_mid ')' - 1`
++                       if test $ac_mid -le $ac_hi; then
++                         ac_lo= ac_hi=
++                         break
++                       fi
++                       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo= ac_hi=
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5496 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5505,42 +6297,53 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5517: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5520: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5523: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+-ac_cv_sizeof_long=$ac_lo
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
++echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:5536: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5541 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++#include <stdio.h>
++#include <stdlib.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -5550,31 +6353,50 @@
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.val", "w");
+-if (!f)
+-  exit (1);
+-fprintf (f, "%d", (sizeof (long)));
+-fclose (f);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5563: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5566: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5571: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
++echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -5584,19 +6406,20 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:5587: result: $ac_cv_sizeof_long" >&5
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-echo "$as_me:5593: checking for long long" >&5
++
++echo "$as_me:$LINENO: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5599 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5617,16 +6440,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5623: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5629: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_long_long=yes
+ else
+@@ -5636,19 +6459,23 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5639: result: $ac_cv_type_long_long" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ 
+-echo "$as_me:5642: checking size of long long" >&5
++echo "$as_me:$LINENO: checking size of long long" >&5
+ echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+ if test "${ac_cv_sizeof_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5651 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5660,27 +6487,29 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long long)) >= 0)]
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5669: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5672: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5675: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5678: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5683 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5692,38 +6521,77 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5704: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5710: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
++ac_lo=`expr $ac_mid + 1`
++                    if test $ac_lo -le $ac_mid; then
++                      ac_lo= ac_hi=
++                      break
++                    fi
++                    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=-1 ac_mid=-1
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++$ac_includes_default
++#ifdef F77_DUMMY_MAIN
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++#endif
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 5726 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5735,38 +6603,51 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long long)) >= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5744: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5747: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5750: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5753: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
++ac_hi=`expr '(' $ac_mid ')' - 1`
++                       if test $ac_mid -le $ac_hi; then
++                         ac_lo= ac_hi=
++                         break
++                       fi
++                       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   done
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_lo= ac_hi=
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5769 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -5778,42 +6659,53 @@
+ int
+ main ()
+ {
+-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
++test_array [0] = 0
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5787: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5790: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5793: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5796: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_lo=`expr $ac_mid + 1`
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+-ac_cv_sizeof_long_long=$ac_lo
++case $ac_lo in
++?*) ac_cv_sizeof_long_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5
++echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:5809: error: cannot run test program while cross compiling" >&5
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5814 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
++long longval () { return (long) (sizeof (long long)); }
++unsigned long ulongval () { return (long) (sizeof (long long)); }
++#include <stdio.h>
++#include <stdlib.h>
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -5823,31 +6715,50 @@
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.val", "w");
+-if (!f)
+-  exit (1);
+-fprintf (f, "%d", (sizeof (long long)));
+-fclose (f);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5836: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5839: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5841: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5844: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long_long=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5
++echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -5857,13 +6768,15 @@
+   ac_cv_sizeof_long_long=0
+ fi
+ fi
+-echo "$as_me:5860: result: $ac_cv_sizeof_long_long" >&5
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+ _ACEOF
+ 
+-echo "$as_me:5866: checking for $CC option to accept ANSI C" >&5
++
++
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5871,7 +6784,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5874 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -5926,16 +6839,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5929: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5932: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5938: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -5952,21 +6865,21 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:5955: result: none needed" >&5
++    echo "$as_me:$LINENO: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:5958: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+ 
+-echo "$as_me:5963: checking for an ANSI C-conforming const" >&5
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5969 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -6030,16 +6943,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6033: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6036: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6039: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6042: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -6049,7 +6962,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6052: result: $ac_cv_c_const" >&5
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -6059,7 +6972,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6062: checking for inline" >&5
++echo "$as_me:$LINENO: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6067,7 +6980,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6070 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ static $ac_kw int static_foo () {return 0; }
+@@ -6076,16 +6989,16 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6079: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6082: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6085: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6088: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -6096,7 +7009,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6099: result: $ac_cv_c_inline" >&5
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -6111,13 +7024,13 @@
+  ;;
+ esac
+ 
+-echo "$as_me:6114: checking for mode_t" >&5
++echo "$as_me:$LINENO: checking for mode_t" >&5
+ echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+ if test "${ac_cv_type_mode_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6120 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -6138,16 +7051,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6141: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6144: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6150: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_mode_t=yes
+ else
+@@ -6157,7 +7070,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6160: result: $ac_cv_type_mode_t" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+ echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+ if test $ac_cv_type_mode_t = yes; then
+   :
+@@ -6169,13 +7082,13 @@
+ 
+ fi
+ 
+-echo "$as_me:6172: checking for off_t" >&5
++echo "$as_me:$LINENO: checking for off_t" >&5
+ echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+ if test "${ac_cv_type_off_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6178 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -6196,16 +7109,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6199: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6202: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6205: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6208: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_off_t=yes
+ else
+@@ -6215,7 +7128,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6218: result: $ac_cv_type_off_t" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+ echo "${ECHO_T}$ac_cv_type_off_t" >&6
+ if test $ac_cv_type_off_t = yes; then
+   :
+@@ -6227,13 +7140,13 @@
+ 
+ fi
+ 
+-echo "$as_me:6230: checking for pid_t" >&5
++echo "$as_me:$LINENO: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6236 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -6254,16 +7167,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6257: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6260: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6266: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_pid_t=yes
+ else
+@@ -6273,7 +7186,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6276: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -6285,13 +7198,13 @@
+ 
+ fi
+ 
+-echo "$as_me:6288: checking for struct stat.st_blocks" >&5
++echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
+ echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
+ if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6294 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -6311,16 +7224,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6314: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6317: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6320: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6323: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_member_struct_stat_st_blocks=yes
+ else
+@@ -6330,7 +7243,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6333: result: $ac_cv_member_struct_stat_st_blocks" >&5
++echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
+ echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
+ if test $ac_cv_member_struct_stat_st_blocks = yes; then
+ 
+@@ -6338,6 +7251,7 @@
+ #define HAVE_STRUCT_STAT_ST_BLOCKS 1
+ _ACEOF
+ 
++
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ST_BLOCKS 1
+ _ACEOF
+@@ -6346,13 +7260,14 @@
+   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
+ fi
+ 
+-echo "$as_me:6349: checking whether time.h and sys/time.h may both be included" >&5
++
++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6355 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -6374,16 +7289,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6380: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6383: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6386: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -6393,7 +7308,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6396: result: $ac_cv_header_time" >&5
++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -6403,13 +7318,13 @@
+ 
+ fi
+ 
+-echo "$as_me:6406: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+ echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6412 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -6429,16 +7344,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6432: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6435: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6441: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_struct_tm=time.h
+ else
+@@ -6448,7 +7363,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6451: result: $ac_cv_struct_tm" >&5
++echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+ echo "${ECHO_T}$ac_cv_struct_tm" >&6
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+@@ -6458,15 +7373,16 @@
+ 
+ fi
+ 
++
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    echo "$as_me:6462: checking whether $CC needs -traditional" >&5
++    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6469 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+@@ -6479,9 +7395,10 @@
+ fi
+ rm -f conftest*
+ 
++
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 6484 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+@@ -6494,14 +7411,14 @@
+ 
+   fi
+ fi
+-echo "$as_me:6497: result: $ac_cv_prog_gcc_traditional" >&5
++echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+-echo "$as_me:6504: checking for working memcmp" >&5
++echo "$as_me:$LINENO: checking for working memcmp" >&5
+ echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
+ if test "${ac_cv_func_memcmp_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6510,7 +7427,7 @@
+   ac_cv_func_memcmp_working=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6513 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -6552,37 +7469,38 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6555: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6558: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6560: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6563: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memcmp_working=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
+ ac_cv_func_memcmp_working=no
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:6575: result: $ac_cv_func_memcmp_working" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+ echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
+ test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ 
+-echo "$as_me:6579: checking return type of signal handlers" >&5
++echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6585 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -6610,16 +7528,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6616: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6619: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6622: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signal=void
+ else
+@@ -6629,14 +7547,15 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6632: result: $ac_cv_type_signal" >&5
++echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
+ 
+-echo "$as_me:6639: checking whether utime accepts a null argument" >&5
++
++echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
+ echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
+ if test "${ac_cv_func_utime_null+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6647,7 +7566,7 @@
+   ac_cv_func_utime_null=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6650 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ #ifdef F77_DUMMY_MAIN
+@@ -6670,28 +7589,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6673: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6676: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6678: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6681: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_utime_null=yes
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
++( exit $ac_status )
+ ac_cv_func_utime_null=no
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f core core.* *.core
+ fi
+-echo "$as_me:6694: result: $ac_cv_func_utime_null" >&5
++echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
+ echo "${ECHO_T}$ac_cv_func_utime_null" >&6
+ if test $ac_cv_func_utime_null = yes; then
+ 
+@@ -6702,16 +7622,25 @@
+ fi
+ rm -f conftest.data
+ 
++
++
++
++
++
++
++
++
++
+ for ac_func in gettimeofday sigaction mkdir rmdir select strerror strstr statfs usleep
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:6708: checking for $ac_func" >&5
++echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6714 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6748,16 +7677,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6751: \"$ac_link\"") >&5
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6754: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6757: \"$ac_try\"") >&5
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6760: \$? = $ac_status" >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -6767,7 +7696,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6770: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+@@ -6777,6 +7706,14 @@
+ fi
+ done
+ 
++
++QTOPIA=no
++# Check whether --enable-qtopia or --disable-qtopia was given.
++if test "${enable_qtopia+set}" = set; then
++  enableval="$enable_qtopia"
++  QTOPIA=yes
++fi;
++
+ KBD_LANG=0
+ # Check whether --enable-kbd-lang-de or --disable-kbd-lang-de was given.
+ if test "${enable_kbd_lang_de+set}" = set; then
+@@ -6789,44 +7726,48 @@
+   KBD_LANG=0
+ fi;
+ 
+-echo "$as_me:6792: checking which target to use" >&5
++echo "$as_me:$LINENO: checking which target to use" >&5
+ echo $ECHO_N "checking which target to use... $ECHO_C" >&6
+ if [ x"$HAVE_BEBOX" = "xyes" ]; then
+-  echo "$as_me:6795: result: BeBox" >&5
++  echo "$as_me:$LINENO: result: BeBox" >&5
+ echo "${ECHO_T}BeBox" >&6
+   TARGET=be
+ elif [ x"$HAVE_AMIGA_LIB" = "xyes" ]; then
+-  echo "$as_me:6799: result: AmigaOS" >&5
++  echo "$as_me:$LINENO: result: AmigaOS" >&5
+ echo "${ECHO_T}AmigaOS" >&6
+   TARGET=amigaos
+ elif [ x"$no_x" = "xyes" ]; then
+   if [ x"$HAVE_SVGA_LIB" = "xyes" ]; then
+-    echo "$as_me:6804: result: SVGAlib" >&5
++    echo "$as_me:$LINENO: result: SVGAlib" >&5
+ echo "${ECHO_T}SVGAlib" >&6
+     TARGET=svgalib
+     CFLAGS="$CFLAGS -D__svgalib__"
+     LIBS="$LIBS -lvga"
+   else
+-    echo "$as_me:6810: result: Ummm..." >&5
++    echo "$as_me:$LINENO: result: Ummm..." >&5
+ echo "${ECHO_T}Ummm..." >&6
+-    { { echo "$as_me:6812: error: Neither X nor SVGAlib found, don't know what target to use." >&5
++    { { echo "$as_me:$LINENO: error: Neither X nor SVGAlib found, don't know what target to use." >&5
+ echo "$as_me: error: Neither X nor SVGAlib found, don't know what target to use." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+ elif [ x"$HAVE_SDL" = "xyes" ]; then
+-  echo "$as_me:6817: result: SDL" >&5
++  echo "$as_me:$LINENO: result: SDL" >&5
+ echo "${ECHO_T}SDL" >&6
+   TARGET=sdl
+   CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL"
+   LIBS="$LIBS $SDL_LIBS"
++  if [ x"$QTOPIA" = "xyes" ]; then
++    CFLAGS="$CFLAGS -DQTOPIA"
++  fi
+ else
+-  echo "$as_me:6823: result: X Window System" >&5
++  echo "$as_me:$LINENO: result: X Window System" >&5
+ echo "${ECHO_T}X Window System" >&6
+   TARGET=x11
+   CFLAGS="$CFLAGS $X_CFLAGS -I$ac_cv_x_include"
+   LIBS="$LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ fi
+ 
++
+ HAVEGCC27=n
+ HAVEI386=n
+ 
+@@ -6889,6 +7830,12 @@
+ 
+ CC=$CXX
+ 
++
++
++
++
++
++
+ ac_config_files="$ac_config_files Makefile"
+ 
+ cat >confcache <<\_ACEOF
+@@ -6967,14 +7914,15 @@
+ 
+ DEFS=-DHAVE_CONFIG_H
+ 
++
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:6973: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+-# Generated automatically by $as_me.
++# Generated by $as_me.
+ # Run this file to recreate the current configuration.
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in config.log if it exists.
+@@ -6997,8 +7945,167 @@
+   set -o posix
+ fi
+ 
++# NLS nuisances.
++# Support unset when possible.
++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
++    { $as_unset LANG || test "${LANG+set}" != set; } ||
++      { LANG=C; export LANG; }
++(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
++    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
++      { LC_ALL=C; export LC_ALL; }
++(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
++    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
++      { LC_TIME=C; export LC_TIME; }
++(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
++    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
++      { LC_CTYPE=C; export LC_CTYPE; }
++(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
++    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
++      { LANGUAGE=C; export LANGUAGE; }
++(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
++    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
++      { LC_COLLATE=C; export LC_COLLATE; }
++(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
++    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
++      { LC_NUMERIC=C; export LC_NUMERIC; }
++(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
++    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
++      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++
+ # Name of the executable.
+-as_me=`echo "$0" |sed 's,.*[\\/],,'`
++as_me=`(basename "$0") 2>/dev/null ||
++$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" >conftest.sh
++  echo  "exit 0"   >>conftest.sh
++  chmod +x conftest.sh
++  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conftest.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:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++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
++	     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:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++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
+@@ -7026,22 +8133,12 @@
+ 
+ as_executable_p="test -f"
+ 
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
++# 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"
+ 
+-# NLS nuisances.
+-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+@@ -7050,7 +8147,7 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
++$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+ 
+ exec 6>&1
+ 
+@@ -7061,19 +8158,19 @@
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running \$as_me. ##
++## Running $as_me. ##
+ _ASBOX
+ } >&5
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.52d.  Invocation command line was
++generated by GNU Autoconf 2.53.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+-  $ $@
++  $ $0 $@
+ 
+ _CSEOF
+ echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+@@ -7126,7 +8223,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.52d,
++configured by $0, generated by GNU Autoconf 2.53,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -7169,7 +8266,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:7172: error: ambiguous option: $1
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -7188,7 +8285,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:7191: error: unrecognized option: $1
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -7202,6 +8299,10 @@
+ 
+ _ACEOF
+ 
++
++
++
++
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_config_target in $ac_config_targets
+ do
+@@ -7209,7 +8310,7 @@
+   # Handling of arguments.
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "sysconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS sysconfig.h" ;;
+-  *) { { echo "$as_me:7212: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -7261,6 +8362,12 @@
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+ s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s,@exec_prefix@,$exec_prefix,;t t
+ s,@prefix@,$prefix,;t t
+ s,@program_transform_name@,$program_transform_name,;t t
+@@ -7276,19 +8383,13 @@
+ s,@oldincludedir@,$oldincludedir,;t t
+ s,@infodir@,$infodir,;t t
+ s,@mandir@,$mandir,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s,@build_alias@,$build_alias,;t t
+ s,@host_alias@,$host_alias,;t t
+ s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
+ s,@ECHO_C@,$ECHO_C,;t t
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@DEFS@,$DEFS,;t t
+ s,@LIBS@,$LIBS,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+@@ -7372,7 +8473,8 @@
+   esac
+ 
+   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_file" : 'X\(//\)[^/]' \| \
+          X"$ac_file" : 'X\(//\)$' \| \
+          X"$ac_file" : 'X\(/\)' \| \
+@@ -7396,17 +8498,19 @@
+       as_incr_dir=$as_incr_dir/$as_mkdir_dir
+       test -d "$as_incr_dir" ||
+         mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:7399: error: cannot create \"$ac_dir\"" >&5
++	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+ echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+    { (exit 1); exit 1; }; }
+     ;;
+   esac
+ done; }
+ 
+-  if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\./,,'`
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+@@ -7426,17 +8530,30 @@
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
++# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
++# absolute.
++ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
++ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:7431: creating $ac_file" >&5
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated automatically by config.status.  */
+-  configure_input="Generated automatically from `echo $ac_file_in |
+-                                                 sed 's,.*/,,'` by configure."
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++                                     sed 's,.*/,,'` by configure."
+ 
+   # First look for the input files in the build tree, otherwise in the
+   # src tree.
+@@ -7446,7 +8563,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:7449: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -7459,7 +8576,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:7462: error: cannot find input file: $f" >&5
++           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -7475,7 +8592,13 @@
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ s,@configure_input@,$configure_input,;t t
+ s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
+ s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+ " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+   rm -f $tmp/stdin
+   if test x"$ac_file" != x-; then
+@@ -7519,7 +8642,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:7522: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -7530,7 +8653,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:7533: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -7543,7 +8666,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:7546: error: cannot find input file: $f" >&5
++           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -7573,7 +8696,7 @@
+ s,[\\$`],\\&,g
+ t clear
+ : clear
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\(\([^ 	(][^ 	(]*\)([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
++s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+ t end
+ s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+ : end
+@@ -7650,20 +8773,21 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated automatically by config.status.  */
++  #    /* config.h.  Generated by config.status.  */
+   if test x"$ac_file" = x-; then
+-    echo "/* Generated automatically by configure.  */" >$tmp/config.h
++    echo "/* Generated by configure.  */" >$tmp/config.h
+   else
+-    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+   fi
+   cat $tmp/in >>$tmp/config.h
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+-      { echo "$as_me:7663: $ac_file is unchanged" >&5
++      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_file" : 'X\(//\)[^/]' \| \
+          X"$ac_file" : 'X\(//\)$' \| \
+          X"$ac_file" : 'X\(/\)' \| \
+@@ -7687,7 +8811,7 @@
+       as_incr_dir=$as_incr_dir/$as_mkdir_dir
+       test -d "$as_incr_dir" ||
+         mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:7690: error: cannot create \"$ac_dir\"" >&5
++	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+ echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+    { (exit 1); exit 1; }; }
+     ;;
+@@ -7711,6 +8835,7 @@
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+ # Unfortunately, on DOS this fails, as config.log is still kept open
+@@ -7729,5 +8854,6 @@
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
+ 
++
+ echo
+ echo "Configuration done. Now type \"make\"."
+diff -urN Src/configure.in Src/configure.in
+--- Src/configure.in	2002-01-02 17:43:53.000000000 +0100
++++ Src/configure.in	2002-11-21 17:07:04.000000000 +0100
+@@ -63,6 +63,9 @@
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS(gettimeofday sigaction mkdir rmdir select strerror strstr statfs usleep)
+ 
++QTOPIA=no
++AC_ARG_ENABLE(qtopia,[  --enable-qtopia         Make a Qtopia Version (Sharp Zaurus) of Frodo],[QTOPIA=yes],[])
++
+ KBD_LANG=0
+ AC_ARG_ENABLE(kbd-lang-de,[  --enable-kbd-lang-de    Use german keyboard layout],[KBD_LANG=1],[])
+ AC_ARG_ENABLE(kbd-lang-us,[  --enable-kbd-lang-us    Use american keyboard layout],[KBD_LANG=0],[])
+@@ -89,6 +92,9 @@
+   TARGET=sdl
+   CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL"
+   LIBS="$LIBS $SDL_LIBS"
++  if [[ x"$QTOPIA" = "xyes" ]]; then
++    CFLAGS="$CFLAGS -DQTOPIA"
++  fi
+ else
+   AC_MSG_RESULT([X Window System])
+   TARGET=x11
+@@ -96,7 +102,7 @@
+   LIBS="$LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+ fi
+ 
+-dnl Find out some things about the system 
++dnl Find out some things about the system
+ dnl  - whether we have GCC 2.7 or better.
+ dnl  - what CPU we have (to use some assembly hacks on the x86)
+ 
+@@ -161,7 +167,7 @@
+ fi
+ 
+ CC=$CXX
+- 
++
+ AC_SUBST(TARGET)
+ AC_SUBST(SET_MAKE)
+ AC_SUBST(top_srcdir)
+diff -urN Src/Display.cpp Src/Display.cpp
+--- Src/Display.cpp	2002-01-02 22:19:10.000000000 +0100
++++ Src/Display.cpp	2002-11-21 17:07:04.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ 
+ // LED states
+-enum {
++enum { 
+ 	LED_OFF,		// LED off
+ 	LED_ON,			// LED on (green)
+ 	LED_ERROR_ON,	// LED blinking (red), currently on
+@@ -28,7 +28,7 @@
+ const uint8 palette_red[16] = {
+ 	0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x80, 0xff, 0x40, 0x80, 0x80, 0x80, 0xc0
+ };
+-
++   
+ const uint8 palette_green[16] = {
+ 	0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x80, 0x40, 0x80, 0x40, 0x80, 0xff, 0x80, 0xc0
+ };
+@@ -73,7 +73,11 @@
+ #elif defined(AMIGA)
+ #include "Display_Amiga.i"
+ #elif defined(HAVE_SDL)
+-#include "Display_SDL.i"
++# ifdef QTOPIA
++#  include "Display_QtopiaSDL.i"
++# else
++#  include "Display_SDL.i"
++# endif
+ #elif defined(__unix)
+ # ifdef __svgalib__
+ #  include "Display_svga.i"
+diff -urN Src/Display_QtopiaSDL.i Src/Display_QtopiaSDL.i
+--- Src/Display_QtopiaSDL.i	1970-01-01 01:00:00.000000000 +0100
++++ Src/Display_QtopiaSDL.i	2003-04-03 19:10:35.000000000 +0200
+@@ -0,0 +1,619 @@
++/*
++ *  Display_QtopiaSDL.i - C64 graphics display, emulator window handling,
++ *                        SDL specific stuff
++ *
++ *  Frodo (C) 1994-1997,2002 Christian Bauer
++ *  Qtopia changes (against Display_SDL.i) from Bernd Lachner
++ */
++
++#include "C64.h"
++#include "SAM.h"
++#include "Version.h"
++
++#define QWS
++#include <SDL.h>
++
++
++// Display surface
++static SDL_Surface *screen = NULL;
++
++// Mode of Joystick emulation. 0 = none, 1 = Joyport 1, 2 = Joyport 2
++static short joy_emu = 0;
++
++// Keyboard
++static bool tab_pressed = false;
++
++// For LED error blinking
++static C64Display *c64_disp;
++static struct sigaction pulse_sa;
++static itimerval pulse_tv;
++
++// Colors for speedometer/drive LEDs
++enum 
++{
++	black = 0,
++	white = 1,
++	fill_gray = 16,
++	shine_gray = 17,
++	shadow_gray = 18,
++	red = 19,
++	green = 20,
++	PALETTE_SIZE = 21
++};
++
++/*
++  C64 keyboard matrix:
++
++    Bit 7   6   5   4   3   2   1   0
++  0    CUD  F5  F3  F1  F7 CLR RET DEL
++  1    SHL  E   S   Z   4   A   W   3
++  2     X   T   F   C   6   D   R   5
++  3     V   U   H   B   8   G   Y   7
++  4     N   O   K   M   0   J   I   9
++  5     ,   @   :   .   -   L   P   +
++  6     /   ^   =  SHR HOM  ;   *   £
++  7    R/S  Q   C= SPC  2  CTL  <-  1
++*/
++
++#define MATRIX(a,b) (((a) << 3) | (b))
++
++
++/*
++ *  Open windo'
++  'ß9087654	12q3w4eruiopü+#*/
++
++char *buffer;
++
++int init_graphics(void)
++{
++	// Init SDL
++	fprintf(stderr, "Init SDL\n");
++	if (SDL_Init(SDL_INIT_VIDEO) < 0) 
++	{
++		fprintf(stderr, "Couldn't initialize SDL (%s)\n", SDL_GetError());
++		return 0;
++	}
++
++	buffer = new char[DISPLAY_X*DISPLAY_Y];
++	// Open window
++	SDL_WM_SetCaption(VERSION_STRING, "Frodo");
++	screen = SDL_SetVideoMode(320, 240, 8, SDL_DOUBLEBUF);
++	if (screen == NULL)
++	{
++		fprintf(stderr, "SDL Couldn't set video mode to %d x %d\n", DISPLAY_X, DISPLAY_Y+17);
++	}
++	else
++	{
++		fprintf(stderr, "SDL Set video mode to %d x %d\n", DISPLAY_X, DISPLAY_Y+17);
++	}
++	return 1;
++}
++
++
++
++/*
++ *  Display constructor
++ */
++
++C64Display::C64Display(C64 *the_c64) : TheC64(the_c64)
++{
++	quit_requested = false;
++	speedometer_string[0] = 0;
++
++	// LEDs off
++	for (int i=0; i<4; i++)
++		led_state[i] = old_led_state[i] = LED_OFF;
++
++	// Start timer for LED error blinking
++	c64_disp = this;
++	pulse_sa.sa_handler = (void (*)(int))pulse_handler;
++	pulse_sa.sa_flags = 0;
++	sigemptyset(&pulse_sa.sa_mask);
++	sigaction(SIGALRM, &pulse_sa, NULL);
++	pulse_tv.it_interval.tv_sec = 0;
++	pulse_tv.it_interval.tv_usec = 400000;
++	pulse_tv.it_value.tv_sec = 0;
++	pulse_tv.it_value.tv_usec = 400000;
++	setitimer(ITIMER_REAL, &pulse_tv, NULL);
++}
++
++
++/*
++ *  Display destructor
++ */
++
++C64Display::~C64Display()
++{
++	SDL_Quit();
++	delete[] buffer;
++}
++
++
++/*
++ *  Prefs may have changed
++ */
++
++void C64Display::NewPrefs(Prefs *prefs)
++{
++}
++
++
++/*
++ *  Redraw bitmap
++ */
++
++void C64Display::Update(void)
++{
++	if (screen == NULL)
++		return;
++	int iOffsetX = (DISPLAY_X - screen->w) / 2;
++	int iOffsetY = (DISPLAY_Y - screen->h) / 2;
++	for (int j=0; j < screen->h - 17; j++)
++	{
++		memcpy(static_cast<char*>(screen->pixels)+screen->w*j, buffer+iOffsetX+DISPLAY_X*(j+iOffsetY), screen->w);
++	}
++	// Draw speedometer/LEDs
++	SDL_Rect r = {0, (screen->h - 17), DISPLAY_X, 15};
++	SDL_FillRect(screen, &r, fill_gray);
++	r.w = DISPLAY_X; r.h = 1;
++	SDL_FillRect(screen, &r, shine_gray);
++	r.y = (screen->h - 17) + 14;
++	SDL_FillRect(screen, &r, shadow_gray);
++	r.w = 16;
++	for (int i=2; i<5; i++) 
++	{
++		r.x = DISPLAY_X * i/5 - 24; r.y = (screen->h - 17) + 4;
++		SDL_FillRect(screen, &r, shadow_gray);
++		r.y = (screen->h - 17) + 10;
++		SDL_FillRect(screen, &r, shine_gray);
++	}
++	r.y = (screen->h - 17); r.w = 1; r.h = 15;
++	for (int i=0; i<4; i++) 
++	{
++		r.x = DISPLAY_X * i / 5;
++		SDL_FillRect(screen, &r, shine_gray);
++		r.x = DISPLAY_X * (i+1) / 5 - 1;
++		SDL_FillRect(screen, &r, shadow_gray);
++	}
++	r.y = (screen->h - 17) + 4; r.h = 7;
++	for (int i=2; i<5; i++)
++	{
++		r.x = DISPLAY_X * i/5 - 24;
++		SDL_FillRect(screen, &r, shadow_gray);
++		r.x = DISPLAY_X * i/5 - 9;
++		SDL_FillRect(screen, &r, shine_gray);
++	}
++	r.y = (screen->h - 17) + 5; r.w = 14; r.h = 5;
++	for (int i=0; i<3; i++) 
++	{
++		r.x = DISPLAY_X * (i+2) / 5 - 23;
++		int c;
++		switch (led_state[i]) 
++		{
++			case LED_ON:
++				c = green;
++				break;
++			case LED_ERROR_ON:
++				c = red;
++				break;
++			default:
++				c = black;
++				break;
++		}
++		SDL_FillRect(screen, &r, c);
++	}
++
++	draw_string(screen, DISPLAY_X * 1/5 + 8, (screen->h - 17) + 4, "D\x12 8", black, fill_gray);
++	draw_string(screen, DISPLAY_X * 2/5 + 8, (screen->h - 17) + 4, "D\x12 9", black, fill_gray);
++	draw_string(screen, DISPLAY_X * 3/5 + 8, (screen->h - 17) + 4, "D\x12 10", black, fill_gray);
++	if (joy_emu == 1)
++		draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "1", black, fill_gray);
++	else if (joy_emu == 2)
++		draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "2", black, fill_gray);
++	draw_string(screen, 24, (screen->h - 17) + 4, speedometer_string, black, fill_gray);
++
++	// Update display
++	SDL_Flip(screen);
++}
++
++
++/*
++ *  Draw string into surface using the C64 ROM font
++ */
++
++void C64Display::draw_string(SDL_Surface *s, int x, int y, const char *str, uint8 front_color, uint8 back_color)
++{
++	uint8 *pb = (uint8 *)s->pixels + s->pitch*y + x;
++	char c;
++	while ((c = *str++) != 0) 
++	{
++		uint8 *q = TheC64->Char + c*8 + 0x800;
++		uint8 *p = pb;
++		for (int y=0; y<8; y++) 
++		{
++			uint8 v = *q++;
++			p[0] = (v & 0x80) ? front_color : back_color;
++			p[1] = (v & 0x40) ? front_color : back_color;
++			p[2] = (v & 0x20) ? front_color : back_color;
++			p[3] = (v & 0x10) ? front_color : back_color;
++			p[4] = (v & 0x08) ? front_color : back_color;
++			p[5] = (v & 0x04) ? front_color : back_color;
++			p[6] = (v & 0x02) ? front_color : back_color;
++			p[7] = (v & 0x01) ? front_color : back_color;
++			p += s->pitch;
++		}
++		pb += 8;
++	}
++}
++
++
++/*
++ *  LED error blink
++ */
++
++void C64Display::pulse_handler(...)
++{
++	for (int i=0; i<4; i++)
++		switch (c64_disp->led_state[i]) 
++		{
++			case LED_ERROR_ON:
++				c64_disp->led_state[i] = LED_ERROR_OFF;
++				break;
++			case LED_ERROR_OFF:
++				c64_disp->led_state[i] = LED_ERROR_ON;
++				break;
++		}
++}
++
++
++/*
++ *  Draw speedometer
++ */
++
++void C64Display::Speedometer(int speed)
++{
++	static int delay = 0;
++
++	if (delay >= 20)
++	{
++		delay = 0;
++		sprintf(speedometer_string, "%d%%", speed);
++	} 
++	else
++		delay++;
++}
++
++
++/*
++ *  Return pointer to bitmap data
++ */
++
++uint8 *C64Display::BitmapBase(void)
++{
++	//return (uint8 *)screen->pixels;
++	return (uint8 *)buffer;
++}
++
++
++/*
++ *  Return number of bytes per row
++ */
++
++int C64Display::BitmapXMod(void)
++{
++	//return screen->pitch;
++	return DISPLAY_X;
++}
++
++
++/*
++ *  Poll the keyboard
++ */
++
++static void translate_key(SDLKey key, bool key_up, uint8 *key_matrix, uint8 *rev_matrix, uint8 *joystick)
++{
++	int c64_key = -1;
++	if (tab_pressed)
++	{
++		// Function and run/stop key emulation on Zaurus keyboard
++		switch (key)
++		{
++			case SDLK_q: c64_key = MATRIX(0,4); break;
++			case SDLK_w: c64_key = MATRIX(0,4) | 0x80; break;
++			case SDLK_e: c64_key = MATRIX(0,5); break;
++			case SDLK_r: c64_key = MATRIX(0,5) | 0x80; break;
++			case SDLK_t: c64_key = MATRIX(0,6); break;
++			case SDLK_z: c64_key = MATRIX(0,6) | 0x80; break;
++			case SDLK_u: c64_key = MATRIX(0,3); break;
++			case SDLK_i: c64_key = MATRIX(0,3) | 0x80; break;
++			case SDLK_o: c64_key = MATRIX(7,7); break;
++		}
++	}
++	else
++	{
++		switch (key)
++		{
++			case SDLK_a: c64_key = MATRIX(1,2); break;
++			case SDLK_b: c64_key = MATRIX(3,4); break;
++			case SDLK_c: c64_key = MATRIX(2,4); break;
++			case SDLK_d: c64_key = MATRIX(2,2); break;
++			case SDLK_e: c64_key = MATRIX(1,6); break;
++			case SDLK_f: c64_key = MATRIX(2,5); break;
++			case SDLK_g: c64_key = MATRIX(3,2); break;
++			case SDLK_h: c64_key = MATRIX(3,5); break;
++			case SDLK_i: c64_key = MATRIX(4,1); break;
++			case SDLK_j: c64_key = MATRIX(4,2); break;
++			case SDLK_k: c64_key = MATRIX(4,5); break;
++			case SDLK_l: c64_key = MATRIX(5,2); break;
++			case SDLK_m: c64_key = MATRIX(4,4); break;
++			case SDLK_n: c64_key = MATRIX(4,7); break;
++			case SDLK_o: c64_key = MATRIX(4,6); break;
++			case SDLK_p: c64_key = MATRIX(5,1); break;
++			case SDLK_q: c64_key = MATRIX(7,6); break;
++			case SDLK_r: c64_key = MATRIX(2,1); break;
++			case SDLK_s: c64_key = MATRIX(1,5); break;
++			case SDLK_t: c64_key = MATRIX(2,6); break;
++			case SDLK_u: c64_key = MATRIX(3,6); break;
++			case SDLK_v: c64_key = MATRIX(3,7); break;
++			case SDLK_w: c64_key = MATRIX(1,1); break;
++			case SDLK_x: c64_key = MATRIX(2,7); break;
++			case SDLK_y: c64_key = MATRIX(3,1); break;
++			case SDLK_z: c64_key = MATRIX(1,4); break;
++
++			case SDLK_0: c64_key = MATRIX(4,3); break;
++			case SDLK_1: c64_key = MATRIX(7,0); break;
++			case SDLK_2: c64_key = MATRIX(7,3); break;
++			case SDLK_3: c64_key = MATRIX(1,0); break;
++			case SDLK_4: c64_key = MATRIX(1,3); break;
++			case SDLK_5: c64_key = MATRIX(2,0); break;
++			case SDLK_6: c64_key = MATRIX(2,3); break;
++			case SDLK_7: c64_key = MATRIX(3,0); break;
++			case SDLK_8: c64_key = MATRIX(3,3); break;
++			case SDLK_9: c64_key = MATRIX(4,0); break;
++
++			case SDLK_SPACE: c64_key = MATRIX(7,4); break;
++			case SDLK_BACKQUOTE: c64_key = MATRIX(7,1); break;
++			case SDLK_BACKSLASH: c64_key = MATRIX(6,6); break;
++			case SDLK_COMMA: c64_key = MATRIX(5,7); break;
++			case SDLK_PERIOD: c64_key = MATRIX(5,4); break;
++			case SDLK_MINUS: c64_key = MATRIX(5,0); break;
++			case SDLK_EQUALS: c64_key = MATRIX(5,3); break;
++			case SDLK_LEFTBRACKET: c64_key = MATRIX(5,6); break;
++			case SDLK_RIGHTBRACKET: c64_key = MATRIX(6,1); break;
++			case SDLK_SEMICOLON: c64_key = MATRIX(5,5); break;
++			case SDLK_QUOTE: c64_key = MATRIX(6,2); break;
++			case SDLK_SLASH: c64_key = MATRIX(6,7); break;
++
++			case SDLK_ESCAPE: c64_key = MATRIX(7,7); break;
++			case SDLK_RETURN: c64_key = MATRIX(0,1); break;
++			case SDLK_BACKSPACE: case SDLK_DELETE: c64_key = MATRIX(0,0); break;
++			case SDLK_INSERT: c64_key = MATRIX(6,3); break;
++			case SDLK_HOME: c64_key = MATRIX(6,3); break;
++			case SDLK_END: c64_key = MATRIX(6,0); break;
++			case SDLK_PAGEUP: c64_key = MATRIX(6,0); break;
++			case SDLK_PAGEDOWN: c64_key = MATRIX(6,5); break;
++
++			case SDLK_LCTRL: c64_key = MATRIX(7,2); break;
++			case SDLK_RCTRL: c64_key = MATRIX(7,5); break;
++			case SDLK_LSHIFT: c64_key = MATRIX(1,7); break;
++			case SDLK_RSHIFT: c64_key = MATRIX(6,4); break;
++			case SDLK_LALT: case SDLK_LMETA: c64_key = MATRIX(7,5); break;
++			case SDLK_RALT: case SDLK_RMETA: c64_key = MATRIX(7,5); break;
++
++			case SDLK_UP: c64_key = MATRIX(0,7)| 0x80; break;
++			case SDLK_DOWN: c64_key = MATRIX(0,7); break;
++			case SDLK_LEFT: c64_key = MATRIX(0,2) | 0x80; break;
++			case SDLK_RIGHT: c64_key = MATRIX(0,2); break;
++
++			case SDLK_F1: c64_key = MATRIX(0,4); break;
++			case SDLK_F2: c64_key = MATRIX(0,4) | 0x80; break;
++			case SDLK_F3: c64_key = MATRIX(0,5); break;
++			case SDLK_F4: c64_key = MATRIX(0,5) | 0x80; break;
++			case SDLK_F5: c64_key = MATRIX(0,6); break;
++			case SDLK_F6: c64_key = MATRIX(0,6) | 0x80; break;
++			case SDLK_F7: c64_key = MATRIX(0,3); break;
++			case SDLK_F8: c64_key = MATRIX(0,3) | 0x80; break;
++
++			case SDLK_KP0: case SDLK_KP5: c64_key = 0x10 | 0x40; break;
++			case SDLK_KP1: c64_key = 0x06 | 0x40; break;
++			case SDLK_KP2: c64_key = 0x02 | 0x40; break;
++			case SDLK_KP3: c64_key = 0x0a | 0x40; break;
++			case SDLK_KP4: c64_key = 0x04 | 0x40; break;
++			case SDLK_KP6: c64_key = 0x08 | 0x40; break;
++			case SDLK_KP7: c64_key = 0x05 | 0x40; break;
++			case SDLK_KP8: c64_key = 0x01 | 0x40; break;
++			case SDLK_KP9: c64_key = 0x09 | 0x40; break;
++
++			case SDLK_KP_DIVIDE: c64_key = MATRIX(6,7); break;
++			case SDLK_KP_ENTER: c64_key = MATRIX(0,1); break;
++
++			// Support for Zaurus/Qtopia
++			case SDLK_QUOTEDBL: c64_key = MATRIX(7,3) | 0x80; break;
++			case SDLK_ASTERISK: c64_key = MATRIX(6,1); break;
++			case SDLK_DOLLAR: c64_key = MATRIX(1,3) | 0x80; break;
++			case SDLK_COLON: c64_key = MATRIX(5,5); break;
++			case SDLK_AT: c64_key = MATRIX(5,6); break;
++		}
++	}
++	if (c64_key < 0)
++		return;
++
++	// Zaurus/Qtopia joystick emulation
++	if (joy_emu != 0)
++	{
++		switch (key)
++		{
++			case SDLK_SPACE: c64_key = 0x10 | 0x40; break;
++			case SDLK_UP: c64_key = 0x01 | 0x40; break;
++			case SDLK_DOWN: c64_key = 0x02 | 0x40; break;
++			case SDLK_LEFT: c64_key =  0x04 | 0x40; break;
++			case SDLK_RIGHT: c64_key = 0x08 | 0x40; break;
++		}
++	}
++
++	// Handle joystick emulation
++	if (c64_key & 0x40) 
++	{
++		c64_key &= 0x1f;
++		if (key_up)
++			*joystick |= c64_key;
++		else
++			*joystick &= ~c64_key;
++		return;
++	}
++
++	// Handle other keys
++	bool shifted = c64_key & 0x80;
++	int c64_byte = (c64_key >> 3) & 7;
++	int c64_bit = c64_key & 7;
++	if (key_up) 
++	{
++		if (shifted) 
++		{
++			key_matrix[6] |= 0x10;
++			rev_matrix[4] |= 0x40;
++		}
++		key_matrix[c64_byte] |= (1 << c64_bit);
++		rev_matrix[c64_bit] |= (1 << c64_byte);
++	} 
++	else 
++	{
++		if (shifted)
++		{
++			key_matrix[6] &= 0xef;
++			rev_matrix[4] &= 0xbf;
++		}
++		key_matrix[c64_byte] &= ~(1 << c64_bit);
++		rev_matrix[c64_bit] &= ~(1 << c64_byte);
++	}
++}
++
++void C64Display::PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joystick)
++{
++	SDL_Event event;
++	while (SDL_PollEvent(&event))
++	{
++		switch (event.type)
++		{
++			// Key pressed
++			case SDL_KEYDOWN:
++//				fprintf(stderr, "SDL-Key: %d\n", event.key.keysym.sym);
++				if (tab_pressed && event.key.keysym.sym == SDLK_j)
++				{
++					if (joy_emu < 2)
++						joy_emu++;
++					else
++						joy_emu = 0;
++				}
++				if (tab_pressed && event.key.keysym.sym == SDLK_p)
++				{
++					//  NMI (Restore)
++					TheC64->NMI();
++				}
++				else
++				{
++					switch (event.key.keysym.sym)
++					{
++						case SDLK_TAB:
++							tab_pressed = true;
++							break;
++
++						case SDLK_F9:	// F9: Invoke SAM
++							SAM(TheC64);
++							break;
++
++						case SDLK_F11:	// F10: Quit
++							// Iconify not implemented in Qtopia SDL yet. Quit instead show gui.
++							//SDL_WM_IconifyWindow();
++							quit_requested = true;
++							break;
++
++						case SDLK_F12:	// F12: Reset
++							TheC64->Reset();
++							break;
++
++						case SDLK_KP_PLUS:	// '+' on keypad: Increase SkipFrames
++							ThePrefs.SkipFrames++;
++							break;
++
++						case SDLK_KP_MINUS:	// '-' on keypad: Decrease SkipFrames
++							if (ThePrefs.SkipFrames > 1)
++								ThePrefs.SkipFrames--;
++							break;
++
++						case SDLK_KP_MULTIPLY:	// '*' on keypad: Toggle speed limiter
++							ThePrefs.LimitSpeed = !ThePrefs.LimitSpeed;
++							break;
++
++						default:
++							translate_key(event.key.keysym.sym, false, key_matrix, rev_matrix, joystick);
++							break;
++					}
++				}
++				break;
++
++			// Key released
++			case SDL_KEYUP:
++				if (event.key.keysym.sym == SDLK_TAB)
++					tab_pressed = false;
++				else
++					translate_key(event.key.keysym.sym, true, key_matrix, rev_matrix, joystick);
++				break;
++
++			// Quit Frodo
++			case SDL_QUIT:
++				quit_requested = true;
++				break;
++		}
++	}
++}
++
++
++/*
++ *  Check if NumLock is down (for switching the joystick keyboard emulation)
++ */
++
++bool C64Display::NumLock(void)
++{
++	if (joy_emu == 2)
++		return true;
++	return false;
++}
++
++
++/*
++ *  Allocate C64 colors
++ */
++
++void C64Display::InitColors(uint8 *colors)
++{
++	SDL_Color palette[PALETTE_SIZE];
++	for (int i=0; i<16; i++)
++	{
++		palette[i].r = palette_red[i];
++		palette[i].g = palette_green[i];
++		palette[i].b = palette_blue[i];
++	}
++	palette[fill_gray].r = palette[fill_gray].g = palette[fill_gray].b = 0xd0;
++	palette[shine_gray].r = palette[shine_gray].g = palette[shine_gray].b = 0xf0;
++	palette[shadow_gray].r = palette[shadow_gray].g = palette[shadow_gray].b = 0x80;
++	palette[red].r = 0xf0;
++	palette[red].g = palette[red].b = 0;
++	palette[green].g = 0xf0;
++	palette[green].r = palette[green].b = 0;
++	SDL_SetColors(screen, palette, 0, PALETTE_SIZE);
++
++	for (int i=0; i<256; i++)
++		colors[i] = i & 0x0f;
++}
++
++
++/*
++ *  Show a requester (error message)
++ */
++
++long int ShowRequester(char *a,char *b,char *)
++{
++	printf("%s: %s\n", a, b);
++	return 1;
++}
+diff -urN Src/main.cpp Src/main.cpp
+--- Src/main.cpp	2002-01-02 22:19:06.000000000 +0100
++++ Src/main.cpp	2002-11-21 17:07:04.000000000 +0100
+@@ -4,6 +4,8 @@
+  *  Frodo (C) 1994-1997,2002 Christian Bauer
+  */
+ 
++ extern "C" int main(int argc, char *argv[]);
++
+ #include "sysdeps.h"
+ 
+ #include "main.h"
+@@ -13,6 +15,7 @@
+ #include "SAM.h"
+ 
+ 
++
+ // Global variables
+ char AppDirPath[1024];	// Path of application directory
+ 
+@@ -61,7 +64,7 @@
+ 		fclose(file);
+ 	} else {
+ 		ShowRequester("Can't find 'Kernal ROM'.", "Quit");
+-		return false;
++ 		return false;
+ 	}
+ 
+ 	// Load Char ROM
+@@ -102,7 +105,11 @@
+ #endif
+ 
+ #ifdef __unix
+-#include "main_x.i"
++# ifdef QTOPIA
++#  include "main_Qtopia.i"
++# else
++#  include "main_x.i"
++# endif
+ #endif
+ 
+ #ifdef __mac__
+@@ -120,3 +127,4 @@
+ #ifdef __PSXOS__
+ #include "main_PSX.i"
+ #endif
++  
+diff -urN Src/main_Qtopia.i Src/main_Qtopia.i
+--- Src/main_Qtopia.i	1970-01-01 01:00:00.000000000 +0100
++++ Src/main_Qtopia.i	2002-11-21 17:07:04.000000000 +0100
+@@ -0,0 +1,101 @@
++/*
++ *  main_Qtopia.i - Main program, X specific stuff
++ *
++ *  Frodo (C) 1994-1997,2002 Christian Bauer
++ *  Qtopia changes (against main_x.i) from Bernd Lachner
++ */
++
++#include "Version.h"
++
++ extern "C" int main(int argc, char *argv[]);
++extern int init_graphics(void);
++
++
++// Global variables
++char Frodo::prefs_path[256] = "";
++
++
++/*
++ *  Create application object and start it
++ */
++
++int main(int argc, char *argv[])
++{
++	Frodo *the_app;
++
++	timeval tv;
++	gettimeofday(&tv, NULL);
++	srand(tv.tv_usec);
++
++	printf("%s by Christian Bauer\n", VERSION_STRING);
++//	Disabled because switching eumlator <-> gui with current SDl not possible
++//	C64::StartGUI();
++
++	if (!init_graphics())
++		return 0;
++	fflush(stdout);
++
++	the_app = new Frodo();
++	the_app->ArgvReceived(argc, argv);
++	the_app->ReadyToRun();
++	delete the_app;
++
++//	C64::StopGUI();
++	return 0;
++}
++
++
++/*
++ *  Constructor: Initialize member variables
++ */
++
++Frodo::Frodo()
++{
++	TheC64 = NULL;
++}
++
++
++/*
++ *  Process command line arguments
++ */
++
++void Frodo::ArgvReceived(int argc, char **argv)
++{
++	if (argc == 2)
++		strncpy(prefs_path, argv[1], 255);
++}
++
++
++/*
++ *  Arguments processed, run emulation
++ */
++
++void Frodo::ReadyToRun(void)
++{
++	getcwd(AppDirPath, 256);
++
++	// Load preferences
++	if (!prefs_path[0]) {
++		char *home = getenv("HOME");
++		if (home != NULL && strlen(home) < 240) {
++			strncpy(prefs_path, home, 200);
++			strcat(prefs_path, "/");
++		}
++		strcat(prefs_path, ".frodorc");
++	}
++	ThePrefs.Load(prefs_path);
++
++	// Create and start C64
++	TheC64 = new C64;
++	if (load_rom_files())
++		TheC64->Run();
++	delete TheC64;
++}
++
++
++Prefs *Frodo::reload_prefs(void)
++{
++	static Prefs newprefs;
++	newprefs.Load(prefs_path);
++	return &newprefs;
++}
+diff -urN Src/setarmenv Src/setarmenv
+--- Src/setarmenv	1970-01-01 01:00:00.000000000 +0100
++++ Src/setarmenv	2002-11-21 17:07:03.000000000 +0100
+@@ -0,0 +1,5 @@
++export CXX=arm-linux-g++
++export CC=arm-linux-gcc
++export LD=arm-linux-ld
++export LDFLAGS="-L/opt/Qtopia/sharp/lib/ -L/opt/Embedix/tools/arm-linux/lib"
++export CPPFLAGS="-DQTOPIA"
diff --git a/packages/frodo/frodo-4.1b/frodo.desktop b/packages/frodo/frodo-4.1b/frodo.desktop
index e69de29bb2..4179396a52 100644
--- a/packages/frodo/frodo-4.1b/frodo.desktop
+++ b/packages/frodo/frodo-4.1b/frodo.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment=C64 emulator Frodo.
+Exec=Frodo
+Icon=Frodo
+Type=Application
+Name=Frodo
diff --git a/packages/frodo/frodo-4.1b/frodorc b/packages/frodo/frodo-4.1b/frodorc
index e69de29bb2..41492fd0aa 100644
--- a/packages/frodo/frodo-4.1b/frodorc
+++ b/packages/frodo/frodo-4.1b/frodorc
@@ -0,0 +1,26 @@
+NormalCycles = 63
+BadLineCycles = 23
+CIACycles = 63
+FloppyCycles = 64
+SkipFrames = 4
+DriveType8 = DIR
+DrivePath8 = /home/root/Documents
+DriveType9 = D64
+DrivePath9 = 
+DriveType10 = D64
+DrivePath10 = 
+DriveType11 = D64
+DrivePath11 = 
+SIDType = NONE
+SpritesOn = TRUE
+SpriteCollisions = TRUE
+Joystick1On = FALSE
+Joystick2On = TRUE
+JoystickSwap = FALSE
+LimitSpeed = FALSE
+FastReset = FALSE
+CIAIRQHack = FALSE
+MapSlash = TRUE
+Emul1541Proc = FALSE
+ShowOptions = TRUE
+SIDFilters = TRUE
diff --git a/packages/frodo/frodo-4.2/.mtn2git_empty b/packages/frodo/frodo-4.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/frodo/frodo-4.2/.mtn2git_empty
diff --git a/packages/frodo/frodo-4.2/Frodo.png b/packages/frodo/frodo-4.2/Frodo.png
index e69de29bb2..e346195b84 100644
--- a/packages/frodo/frodo-4.2/Frodo.png
+++ b/packages/frodo/frodo-4.2/Frodo.png
diff --git a/packages/frodo/frodo-4.2/configure.patch b/packages/frodo/frodo-4.2/configure.patch
index e69de29bb2..1fc26f4119 100644
--- a/packages/frodo/frodo-4.2/configure.patch
+++ b/packages/frodo/frodo-4.2/configure.patch
@@ -0,0 +1,51 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Src/configure.ac~configure	2004-01-13 20:52:49.000000000 +0100
++++ Src/configure.ac	2004-01-21 01:08:08.000000000 +0100
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(main.cpp)
+ AC_PREREQ(2.52)
+ AC_CONFIG_HEADER(sysconfig.h)
+-
++AM_INIT_AUTOMAKE(Frodo, 4.2, [Christian.Bauer@uni-mainz.de], Frodo)
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -24,10 +24,6 @@
+ AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no)
+ AM_PATH_SDL(1.2.0, HAVE_SDL=yes, HAVE_SDL=no)
+ HAVE_GLADE=no
+-PKG_CHECK_MODULES(GLADE, libglade-2.0 libgnomeui-2.0 >= 1.110.0, HAVE_GLADE=yes)
+-if [[ $HAVE_GLADE = yes ]]; then
+-  AC_DEFINE(HAVE_GLADE, 1, [Glade support is enabled])
+-fi
+ 
+ AC_PATH_XTRA
+ 
+--- Src/Makefile.in~configure	2004-01-13 20:52:48.000000000 +0100
++++ Src/Makefile.in	2004-01-21 01:10:56.000000000 +0100
+@@ -16,10 +16,10 @@
+ DESTDIR =
+ 
+ CXX = @CXX@
+-CFLAGS = @CFLAGS@ @GLADE_CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@
++CFLAGS = @CFLAGS@ -I./ -DKBD_LANG=@KBD_LANG@
+ DEFS = @DEFS@ -DDATADIR=\"$(datadir)/frodo/\" -DBINDIR=\"$(bindir)/\"
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@ @GLADE_LIBS@
++LIBS = @LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -54,7 +54,7 @@
+ 	$(INSTALL_PROGRAM) FrodoSC $(DESTDIR)$(bindir)/FrodoSC
+ 	$(INSTALL_PROGRAM) Frodo_GUI.tcl $(DESTDIR)$(bindir)/Frodo_GUI.tcl
+ 	$(INSTALL_DATA) ../Kernal\ ROM $(DESTDIR)$(datadir)/frodo/Kernal\ ROM
+-	$(INSTALL_DATA) glade/Frodo.glade $(DESTDIR)$(datadir)/frodo/Frodo.glade
++	#$(INSTALL_DATA) glade/Frodo.glade $(DESTDIR)$(datadir)/frodo/Frodo.glade
+ 
+ installdirs:
+ 	$(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/frodo
diff --git a/packages/frodo/frodo-4.2/frodo.desktop b/packages/frodo/frodo-4.2/frodo.desktop
index e69de29bb2..4179396a52 100644
--- a/packages/frodo/frodo-4.2/frodo.desktop
+++ b/packages/frodo/frodo-4.2/frodo.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment=C64 emulator Frodo.
+Exec=Frodo
+Icon=Frodo
+Type=Application
+Name=Frodo
diff --git a/packages/frodo/frodo-4.2/frodorc b/packages/frodo/frodo-4.2/frodorc
index e69de29bb2..41492fd0aa 100644
--- a/packages/frodo/frodo-4.2/frodorc
+++ b/packages/frodo/frodo-4.2/frodorc
@@ -0,0 +1,26 @@
+NormalCycles = 63
+BadLineCycles = 23
+CIACycles = 63
+FloppyCycles = 64
+SkipFrames = 4
+DriveType8 = DIR
+DrivePath8 = /home/root/Documents
+DriveType9 = D64
+DrivePath9 = 
+DriveType10 = D64
+DrivePath10 = 
+DriveType11 = D64
+DrivePath11 = 
+SIDType = NONE
+SpritesOn = TRUE
+SpriteCollisions = TRUE
+Joystick1On = FALSE
+Joystick2On = TRUE
+JoystickSwap = FALSE
+LimitSpeed = FALSE
+FastReset = FALSE
+CIAIRQHack = FALSE
+MapSlash = TRUE
+Emul1541Proc = FALSE
+ShowOptions = TRUE
+SIDFilters = TRUE
diff --git a/packages/frodo/frodo-4.2/m4.patch b/packages/frodo/frodo-4.2/m4.patch
index e69de29bb2..e7918156e2 100644
--- a/packages/frodo/frodo-4.2/m4.patch
+++ b/packages/frodo/frodo-4.2/m4.patch
@@ -0,0 +1,183 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ Src/m4/sdl.m4	2004-01-21 00:43:55.000000000 +0100
+@@ -0,0 +1,175 @@
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl
++AC_DEFUN(AM_PATH_SDL,
++[dnl 
++dnl Get the cflags and libraries from the sdl-config script
++dnl
++AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
++            sdl_prefix="$withval", sdl_prefix="")
++AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
++            sdl_exec_prefix="$withval", sdl_exec_prefix="")
++AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
++		    , enable_sdltest=yes)
++
++  if test x$sdl_exec_prefix != x ; then
++     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++     fi
++  fi
++  if test x$sdl_prefix != x ; then
++     sdl_args="$sdl_args --prefix=$sdl_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_prefix/bin/sdl-config
++     fi
++  fi
++
++  AC_REQUIRE([AC_CANONICAL_TARGET])
++  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
++  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
++  min_sdl_version=ifelse([$1], ,0.11.0,$1)
++  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
++  no_sdl=""
++  if test "$SDL_CONFIG" = "no" ; then
++    no_sdl=yes
++  else
++    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
++    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
++
++    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_sdltest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $SDL_CFLAGS"
++      LIBS="$LIBS $SDL_LIBS"
++dnl
++dnl Now check if the installed SDL is sufficiently new. (Also sanity
++dnl checks the results of sdl-config to some extent
++dnl
++      rm -f conf.sdltest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "SDL.h"
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main (int argc, char *argv[])
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  /* This hangs on some systems (?)
++  system ("touch conf.sdltest");
++  */
++  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_sdl_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_sdl_version");
++     exit(1);
++   }
++
++   if (($sdl_major_version > major) ||
++      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
++      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
++      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
++      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_sdl" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$SDL_CONFIG" = "no" ; then
++       echo "*** The sdl-config script installed by SDL could not be found"
++       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the SDL_CONFIG environment variable to the"
++       echo "*** full path to sdl-config."
++     else
++       if test -f conf.sdltest ; then
++        :
++       else
++          echo "*** Could not run SDL test program, checking why..."
++          CFLAGS="$CFLAGS $SDL_CFLAGS"
++          LIBS="$LIBS $SDL_LIBS"
++          AC_TRY_LINK([
++#include <stdio.h>
++#include "SDL.h"
++
++int main(int argc, char *argv[])
++{ return 0; }
++#undef  main
++#define main K_and_R_C_main
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding SDL or finding the wrong"
++          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
++          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
++          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     SDL_CFLAGS=""
++     SDL_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(SDL_CFLAGS)
++  AC_SUBST(SDL_LIBS)
++  rm -f conf.sdltest
++])
diff --git a/packages/frodo/frodo-4.2/no-pref-editor.patch b/packages/frodo/frodo-4.2/no-pref-editor.patch
index e69de29bb2..b5f09ab48b 100644
--- a/packages/frodo/frodo-4.2/no-pref-editor.patch
+++ b/packages/frodo/frodo-4.2/no-pref-editor.patch
@@ -0,0 +1,27 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Src/main_x.h~no-pref-editor	2004-01-14 18:24:19.000000000 +0100
++++ Src/main_x.h	2004-01-21 01:24:56.000000000 +0100
+@@ -101,15 +101,18 @@
+ 	}
+ 	ThePrefs.Load(prefs_path);
+ 
++#ifdef HAVE_GLADE
+ 	// Show preferences editor
+ 	if (ThePrefs.ShowEditor(true, prefs_path)) {
+-
++#endif
+ 		// Create and start C64
+ 		TheC64 = new C64;
+ 		load_rom_files();
+ 		TheC64->Run();
+ 		delete TheC64;
++#ifdef HAVE_GLADE
+ 	}
++#endif
+ }
+ 
+