summaryrefslogtreecommitdiff
path: root/devel/SDL
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-09-04 07:31:50 +0000
committerwiz <wiz@pkgsrc.org>2003-09-04 07:31:50 +0000
commit5783c343a7abf3bf32dc056de4812c1091e29687 (patch)
tree26dbaeda55d495982d3f96d69bde4183e13117aa /devel/SDL
parent77a7719c8d241a2ca9aec9e3ffc5eab72d227ba4 (diff)
downloadpkgsrc-5783c343a7abf3bf32dc056de4812c1091e29687.tar.gz
Replace configure patch with one generated by the same version of
autoconf as the original, reducing the size of the patch by 500k. Ok'd by drochner.
Diffstat (limited to 'devel/SDL')
-rw-r--r--devel/SDL/distinfo4
-rw-r--r--devel/SDL/patches/patch-am17062
2 files changed, 250 insertions, 16816 deletions
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 4d5c5aefe71..7ddc5e1e78b 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2003/09/03 19:30:51 drochner Exp $
+$NetBSD: distinfo,v 1.22 2003/09/04 07:31:50 wiz Exp $
SHA1 (SDL-1.2.6.tar.gz) = 6f64b79427ea279e5ae18ea07d9fe353fd138422
Size (SDL-1.2.6.tar.gz) = 2042700 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
SHA1 (patch-ag) = cd2fd8958b86e12c9d2786fe200c6ab44d8d40e1
SHA1 (patch-aj) = be3e6fdfc6b0f22df85b41445b980c60f5ceab5e
SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
-SHA1 (patch-am) = 1ce28a8fcc468bfc5d47c1af9e90b108df471a49
+SHA1 (patch-am) = 8f48a0d7603426116d84aa23ee758204dd3c4eab
SHA1 (patch-ap) = c477500c2540719c40253b30de1f389c8ed50334
SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 1d3d1e74d79..6b79fe6351c 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,7979 +1,17 @@
-$NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
+$NetBSD: patch-am,v 1.11 2003/09/04 07:31:51 wiz Exp $
---- configure.orig 2003-08-30 21:13:23.000000000 +0200
+--- configure.orig Sat Aug 30 21:13:23 2003
+++ configure
-@@ -1,154 +1,324 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.57.
- #
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); exit 1; }; }
-+
-+ # Don't try to exec as it changes $[0], causing all sort of problems
-+ # (the dirname of $[0] is not the place where we might find the
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
-+ # Exit status is that of the last command.
-+ exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-
--# Defaults:
--ac_help=
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+exec 6>&1
-+
-+#
-+# Initializations.
-+#
- ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_help="$ac_help
-- --enable-shared[=PKGS] build shared libraries [default=yes]"
--ac_help="$ac_help
-- --enable-static[=PKGS] build static libraries [default=yes]"
--ac_help="$ac_help
-- --enable-fast-install[=PKGS] optimize for fast installation [default=yes]"
--ac_help="$ac_help
-- --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
--ac_help="$ac_help
-- --disable-libtool-lock avoid locking (might break parallel builds)"
--ac_help="$ac_help
-- --enable-debug Disable aggressive optimizations [default=yes]"
--ac_help="$ac_help
-- --enable-strict-ansi Enable strict ANSI compliance build [default=no]"
--ac_help="$ac_help
-- --enable-audio Enable the audio subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-video Enable the video subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-events Enable the events subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-joystick Enable the joystick subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-cdrom Enable the cdrom subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-threads Enable the threading subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-timers Enable the timer subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-endian Enable the endian subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-file Enable the file subsystem [default=yes]"
--ac_help="$ac_help
-- --enable-oss support the OSS audio API [default=yes]"
--ac_help="$ac_help
-- --enable-alsa support the ALSA audio API [default=yes]"
--ac_help="$ac_help
-- --enable-esd support the Enlightened Sound Daemon [default=yes]"
--ac_help="$ac_help
-- --with-esd-prefix=PFX Prefix where ESD is installed (optional)"
--ac_help="$ac_help
-- --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
--ac_help="$ac_help
-- --disable-esdtest Do not try to compile and run a test ESD program"
--ac_help="$ac_help
-- --enable-esd-shared dynamically load ESD audio support [default=yes]"
--ac_help="$ac_help
-- --enable-arts support the Analog Real Time Synthesizer [default=yes]"
--ac_help="$ac_help
-- --enable-arts-shared dynamically load aRts audio support [default=yes]"
--ac_help="$ac_help
-- --enable-nas support the NAS audio API [default=yes]"
--ac_help="$ac_help
-- --enable-diskaudio support the disk writer audio driver [default=yes]"
--ac_help="$ac_help
-- --enable-mintaudio support Atari audio driver [default=yes]"
--ac_help="$ac_help
-- --enable-nasm use nasm assembly blitters on x86 [default=yes]"
--ac_help="$ac_help
-- --enable-video-nanox use nanox video driver [default=no]"
--ac_help="$ac_help
-- --enable-nanox-debug print debug messages [default=no]"
--ac_help="$ac_help
-- --enable-nanox-share-memory use share memory [default=no]"
--ac_help="$ac_help
-- --enable-nanox-direct-fb use direct framebuffer access [default=no]"
--ac_help="$ac_help
-- --enable-video-x11 use X11 video driver [default=yes]"
--ac_help="$ac_help
-- --with-x use the X Window System"
--ac_help="$ac_help
-- --enable-video-x11-vm use X11 VM extension for fullscreen [default=yes]"
--ac_help="$ac_help
-- --enable-dga allow use of X11 DGA code [default=yes]"
--ac_help="$ac_help
-- --enable-video-x11-dgamouse use X11 DGA for mouse events [default=yes]"
--ac_help="$ac_help
-- --enable-video-x11-xv use X11 XvImage extension for video [default=yes]"
--ac_help="$ac_help
-- --enable-video-x11-xinerama enable X11 Xinerama support [default=yes]"
--ac_help="$ac_help
-- --enable-video-x11-xme enable Xi Graphics XME for fullscreen [default=yes]"
--ac_help="$ac_help
-- --enable-video-dga use DGA 2.0 video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-photon use QNX Photon video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-fbcon use framebuffer console video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-directfb use DirectFB video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-ps2gs use PlayStation 2 GS video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-ggi use GGI video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-svga use SVGAlib video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-vgl use VGL video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-aalib use AAlib video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-xbios use Atari Xbios video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-gem use Atari Gem video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-dummy use dummy video driver [default=yes]"
--ac_help="$ac_help
-- --enable-video-opengl include OpenGL context creation [default=yes]"
--ac_help="$ac_help
-- --enable-input-events use Linux 2.4 unified input interface [default=yes]"
--ac_help="$ac_help
-- --enable-pth use GNU pth library for multi-threading [default=yes]"
--ac_help="$ac_help
-- --enable-pthreads use POSIX threads for multi-threading [default=yes]"
--ac_help="$ac_help
-- --enable-pthread-sem use pthread semaphores [default=yes]"
--ac_help="$ac_help
-- --enable-stdio-redirect Redirect STDIO to files on Win32 [default=yes]"
--ac_help="$ac_help
-- --enable-directx use DirectX for Win32 audio/video [default=yes]"
--ac_help="$ac_help
-- --enable-video-qtopia use Qtopia video driver [default=no]"
--ac_help="$ac_help
-- --enable-video-picogui use PicoGUI video driver [default=no]"
--ac_help="$ac_help
-- --enable-dlopen use dlopen for shared object loading [default=no]"
--ac_help="$ac_help
-- --enable-atari-ldg use Atari LDG for shared object loading [default=yes]"
-+ac_config_libobj_dir=.
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete. It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="README"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+# include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+# include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+# include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S LIBTOOL CXX CXXFLAGS ac_ct_CXX ALLOCA CPP EGREP ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
-+ac_subst_files=''
-
- # Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
- # The variables have the same names as the options, with
- # dashes changed to underlines.
--build=NONE
--cache_file=./config.cache
-+cache_file=/dev/null
- exec_prefix=NONE
--host=NONE
- no_create=
--nonopt=NONE
- no_recursion=
- prefix=NONE
- program_prefix=NONE
-@@ -157,10 +327,15 @@ program_transform_name=s,x,x,
- silent=
- site=
- srcdir=
--target=NONE
- verbose=
- x_includes=NONE
- x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
-@@ -174,17 +349,9 @@ oldincludedir='/usr/include'
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
--# Initialize some other variables.
--subdirs=
--MFLAGS= MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
--# Maximum number of lines to put in a shell here document.
--ac_max_here_lines=12
--
- ac_prev=
- for ac_option
- do
--
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
-@@ -192,59 +359,59 @@ do
- continue
- fi
-
-- case "$ac_option" in
-- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-- *) ac_optarg= ;;
-- esac
-+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case "$ac_option" in
-+ case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-- bindir="$ac_optarg" ;;
-+ bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
-- ac_prev=build ;;
-+ ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-- build="$ac_optarg" ;;
-+ build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-- cache_file="$ac_optarg" ;;
-+ cache_file=$ac_optarg ;;
-+
-+ --config-cache | -C)
-+ cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
-- datadir="$ac_optarg" ;;
-+ datadir=$ac_optarg ;;
-
- -disable-* | --disable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- eval "enable_${ac_feature}=no" ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
-- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-- fi
-- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "enable_${ac_feature}='$ac_optarg'" ;;
-+ eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -253,95 +420,47 @@ do
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
-- exec_prefix="$ac_optarg" ;;
-+ exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
-- -help | --help | --hel | --he)
-- # Omit some internal or obsolete options to make the list less imposing.
-- # This message is too long to be a string in the A/UX 3.1 sh.
-- cat << EOF
--Usage: configure [options] [host]
--Options: [defaults in brackets after descriptions]
--Configuration:
-- --cache-file=FILE cache test results in FILE
-- --help print this message
-- --no-create do not create output files
-- --quiet, --silent do not print \`checking...' messages
-- --version print the version of autoconf that created configure
--Directory and file names:
-- --prefix=PREFIX install architecture-independent files in PREFIX
-- [$ac_default_prefix]
-- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-- [same as prefix]
-- --bindir=DIR user executables in DIR [EPREFIX/bin]
-- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
-- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data in DIR
-- [PREFIX/share]
-- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
-- --sharedstatedir=DIR modifiable architecture-independent data in DIR
-- [PREFIX/com]
-- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
-- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
-- --includedir=DIR C header files in DIR [PREFIX/include]
-- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
-- --infodir=DIR info documentation in DIR [PREFIX/info]
-- --mandir=DIR man documentation in DIR [PREFIX/man]
-- --srcdir=DIR find the sources in DIR [configure dir or ..]
-- --program-prefix=PREFIX prepend PREFIX to installed program names
-- --program-suffix=SUFFIX append SUFFIX to installed program names
-- --program-transform-name=PROGRAM
-- run sed PROGRAM on installed program names
--EOF
-- cat << EOF
--Host type:
-- --build=BUILD configure for building on BUILD [BUILD=HOST]
-- --host=HOST configure for HOST [guessed]
-- --target=TARGET configure for TARGET [TARGET=HOST]
--Features and packages:
-- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-- --x-includes=DIR X include files are in DIR
-- --x-libraries=DIR X library files are in DIR
--EOF
-- if test -n "$ac_help"; then
-- echo "--enable and --with options recognized:$ac_help"
-- fi
-- exit 0 ;;
-+ -help | --help | --hel | --he | -h)
-+ ac_init_help=long ;;
-+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+ ac_init_help=recursive ;;
-+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+ ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
-- ac_prev=host ;;
-+ ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
-- host="$ac_optarg" ;;
-+ host_alias=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
-- includedir="$ac_optarg" ;;
-+ includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-- infodir="$ac_optarg" ;;
-+ infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
-- libdir="$ac_optarg" ;;
-+ libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
-- libexecdir="$ac_optarg" ;;
-+ libexecdir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
-@@ -350,19 +469,19 @@ EOF
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-- localstatedir="$ac_optarg" ;;
-+ localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-- mandir="$ac_optarg" ;;
-+ mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- 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 \
-@@ -376,26 +495,26 @@ EOF
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-- oldincludedir="$ac_optarg" ;;
-+ oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-- prefix="$ac_optarg" ;;
-+ prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-- program_prefix="$ac_optarg" ;;
-+ program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-- program_suffix="$ac_optarg" ;;
-+ program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
-@@ -412,7 +531,7 @@ EOF
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
-- program_transform_name="$ac_optarg" ;;
-+ program_transform_name=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
-@@ -422,7 +541,7 @@ EOF
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
-- sbindir="$ac_optarg" ;;
-+ sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -433,58 +552,57 @@ EOF
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
-- sharedstatedir="$ac_optarg" ;;
-+ sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
-- site="$ac_optarg" ;;
-+ site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-- srcdir="$ac_optarg" ;;
-+ srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-- sysconfdir="$ac_optarg" ;;
-+ sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
-- ac_prev=target ;;
-+ ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-- target="$ac_optarg" ;;
-+ target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
-- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.13"
-- exit 0 ;;
-+ -version | --version | --versio | --versi | --vers | -V)
-+ ac_init_version=: ;;
-
- -with-* | --with-*)
-- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case "$ac_option" in
-- *=*) ;;
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
-- eval "with_${ac_package}='$ac_optarg'" ;;
-+ eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
-- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
-- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-- fi
-- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- eval "with_${ac_package}=no" ;;
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -495,99 +613,110 @@ EOF
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-- x_includes="$ac_optarg" ;;
-+ x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-- x_libraries="$ac_optarg" ;;
-+ x_libraries=$ac_optarg ;;
-
-- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
- ;;
-
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-+ eval "$ac_envvar='$ac_optarg'"
-+ export $ac_envvar ;;
-+
- *)
-- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-- echo "configure: warning: $ac_option: invalid host type" 1>&2
-- fi
-- if test "x$nonopt" != xNONE; then
-- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-- fi
-- nonopt="$ac_option"
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
- done
-
- if test -n "$ac_prev"; then
-- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
--fi
--
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
--# File descriptor usage:
--# 0 standard input
--# 1 file creation
--# 2 errors and warnings
--# 3 some systems may open it to /dev/tty
--# 4 used on the Kubota Titan
--# 6 checking for... messages and results
--# 5 compiler messages saved in config.log
--if test "$silent" = yes; then
-- exec 6>/dev/null
--else
-- exec 6>&1
-+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
- fi
--exec 5>./config.log
-
--echo "\
--This file contains any messages produced by compilers while
--running configure, to aid debugging if configure makes a mistake.
--" 1>&5
-+# Be sure to have absolute paths.
-+for ac_var in exec_prefix prefix
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-
--# Strip out --no-create and --no-recursion so they do not pile up.
--# Also quote any args containing shell metacharacters.
--ac_configure_args=
--for ac_arg
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+ localstatedir libdir includedir oldincludedir infodir mandir
- do
-- case "$ac_arg" in
-- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c) ;;
-- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-+# 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: To remove some day.
-+if test "x$host_alias" != x; then
-+ if test "x$build_alias" = x; then
-+ cross_compiling=maybe
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
-+ elif test "x$build_alias" != "x$host_alias"; then
-+ cross_compiling=yes
-+ fi
-+fi
-
--# confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo > confdefs.h
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-
--# A filename unique to this package, relative to the directory that
--# configure is in, which we can look for to find out if srcdir is correct.
--ac_unique_file=README
-
- # 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=..
-@@ -597,13 +726,518 @@ else
- fi
- if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+ { (exit 1); exit 1; }; }
- else
-- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
- fi
- fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ { (exit 1); exit 1; }; }
-+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+ac_env_build_alias_set=${build_alias+set}
-+ac_env_build_alias_value=$build_alias
-+ac_cv_env_build_alias_set=${build_alias+set}
-+ac_cv_env_build_alias_value=$build_alias
-+ac_env_host_alias_set=${host_alias+set}
-+ac_env_host_alias_value=$host_alias
-+ac_cv_env_host_alias_set=${host_alias+set}
-+ac_cv_env_host_alias_value=$host_alias
-+ac_env_target_alias_set=${target_alias+set}
-+ac_env_target_alias_value=$target_alias
-+ac_cv_env_target_alias_set=${target_alias+set}
-+ac_cv_env_target_alias_value=$target_alias
-+ac_env_CC_set=${CC+set}
-+ac_env_CC_value=$CC
-+ac_cv_env_CC_set=${CC+set}
-+ac_cv_env_CC_value=$CC
-+ac_env_CFLAGS_set=${CFLAGS+set}
-+ac_env_CFLAGS_value=$CFLAGS
-+ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+ac_cv_env_CFLAGS_value=$CFLAGS
-+ac_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_env_LDFLAGS_value=$LDFLAGS
-+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_cv_env_LDFLAGS_value=$LDFLAGS
-+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_env_CPPFLAGS_value=$CPPFLAGS
-+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+ac_env_CXX_set=${CXX+set}
-+ac_env_CXX_value=$CXX
-+ac_cv_env_CXX_set=${CXX+set}
-+ac_cv_env_CXX_value=$CXX
-+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-+ac_env_CXXFLAGS_value=$CXXFLAGS
-+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-+ac_env_CPP_set=${CPP+set}
-+ac_env_CPP_value=$CPP
-+ac_cv_env_CPP_set=${CPP+set}
-+ac_cv_env_CPP_value=$CPP
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+ # Omit some internal or obsolete options to make the list less imposing.
-+ # This message is too long to be a string in the A/UX 3.1 sh.
-+ cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE. See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+ -h, --help display this help and exit
-+ --help=short display options specific to this package
-+ --help=recursive display the short help of all the included packages
-+ -V, --version display version information and exit
-+ -q, --quiet, --silent do not print \`checking...' messages
-+ --cache-file=FILE cache test results in FILE [disabled]
-+ -C, --config-cache alias for \`--cache-file=config.cache'
-+ -n, --no-create do not create output files
-+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
-+
-+_ACEOF
-+
-+ cat <<_ACEOF
-+Installation directories:
-+ --prefix=PREFIX install architecture-independent files in PREFIX
-+ [$ac_default_prefix]
-+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-+ [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --infodir=DIR info documentation [PREFIX/info]
-+ --mandir=DIR man documentation [PREFIX/man]
-+_ACEOF
-+
-+ cat <<\_ACEOF
-+
-+Program names:
-+ --program-prefix=PREFIX prepend PREFIX to installed program names
-+ --program-suffix=SUFFIX append SUFFIX to installed program names
-+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-+
-+X features:
-+ --x-includes=DIR X include files are in DIR
-+ --x-libraries=DIR X library files are in DIR
-+
-+System types:
-+ --build=BUILD configure for building on BUILD [guessed]
-+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
-+ --target=TARGET configure for building compilers for TARGET [HOST]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+ cat <<\_ACEOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-shared=PKGS build shared libraries default=yes
-+ --enable-static=PKGS build static libraries default=yes
-+ --enable-fast-install=PKGS optimize for fast installation default=yes
-+ --disable-libtool-lock avoid locking (might break parallel builds)
-+ --enable-debug Disable aggressive optimizations default=yes
-+ --enable-strict-ansi Enable strict ANSI compliance build default=no
-+ --enable-audio Enable the audio subsystem default=yes
-+ --enable-video Enable the video subsystem default=yes
-+ --enable-events Enable the events subsystem default=yes
-+ --enable-joystick Enable the joystick subsystem default=yes
-+ --enable-cdrom Enable the cdrom subsystem default=yes
-+ --enable-threads Enable the threading subsystem default=yes
-+ --enable-timers Enable the timer subsystem default=yes
-+ --enable-endian Enable the endian subsystem default=yes
-+ --enable-file Enable the file subsystem default=yes
-+ --enable-oss support the OSS audio API default=yes
-+ --enable-alsa support the ALSA audio API default=yes
-+ --enable-esd support the Enlightened Sound Daemon default=yes
-+ --disable-esdtest Do not try to compile and run a test ESD program
-+ --enable-esd-shared dynamically load ESD audio support default=yes
-+ --enable-arts support the Analog Real Time Synthesizer default=yes
-+ --enable-arts-shared dynamically load aRts audio support default=yes
-+ --enable-nas support the NAS audio API default=yes
-+ --enable-diskaudio support the disk writer audio driver default=yes
-+ --enable-mintaudio support Atari audio driver default=yes
-+ --enable-nasm use nasm assembly blitters on x86 default=yes
-+ --enable-video-nanox use nanox video driver default=no
-+ --enable-nanox-debug print debug messages default=no
-+ --enable-nanox-share-memory use share memory default=no
-+ --enable-nanox-direct-fb use direct framebuffer access default=no
-+ --enable-video-x11 use X11 video driver default=yes
-+ --enable-video-x11-vm use X11 VM extension for fullscreen default=yes
-+ --enable-dga allow use of X11 DGA code default=yes
-+ --enable-video-x11-dgamouse use X11 DGA for mouse events default=yes
-+ --enable-video-x11-xv use X11 XvImage extension for video default=yes
-+ --enable-video-x11-xinerama enable X11 Xinerama support default=yes
-+ --enable-video-x11-xme enable Xi Graphics XME for fullscreen default=yes
-+ --enable-video-dga use DGA 2.0 video driver default=yes
-+ --enable-video-photon use QNX Photon video driver default=yes
-+ --enable-video-fbcon use framebuffer console video driver default=yes
-+ --enable-video-directfb use DirectFB video driver default=no
-+ --enable-video-ps2gs use PlayStation 2 GS video driver default=yes
-+ --enable-video-ggi use GGI video driver default=no
-+ --enable-video-svga use SVGAlib video driver default=no
-+ --enable-video-vgl use VGL video driver default=no
-+ --enable-video-aalib use AAlib video driver default=no
-+ --enable-video-xbios use Atari Xbios video driver default=yes
-+ --enable-video-gem use Atari Gem video driver default=yes
-+ --enable-video-dummy use dummy video driver default=yes
-+ --enable-video-opengl include OpenGL context creation default=yes
-+ --enable-input-events use Linux 2.4 unified input interface default=yes
-+ --enable-pth use GNU pth library for multi-threading default=yes
-+ --enable-pthreads use POSIX threads for multi-threading default=yes
-+ --enable-pthread-sem use pthread semaphores default=yes
-+ --enable-stdio-redirect Redirect STDIO to files on Win32 default=yes
-+ --enable-directx use DirectX for Win32 audio/video default=yes
-+ --enable-video-qtopia use Qtopia video driver default=no
-+ --enable-video-picogui use PicoGUI video driver default=no
-+ --enable-dlopen use dlopen for shared object loading default=no
-+ --enable-atari-ldg use Atari LDG for shared object loading default=yes
-+
-+Optional Packages:
-+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-+ --with-gnu-ld assume the C compiler uses GNU ld default=no
-+ --with-esd-prefix=PFX Prefix where ESD is installed (optional)
-+ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)
-+ --with-x use the X Window System
-+
-+Some influential environment variables:
-+ CC C compiler command
-+ CFLAGS C compiler flags
-+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-+ nonstandard directory <lib dir>
-+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+ headers in a nonstandard directory <include dir>
-+ CXX C++ compiler command
-+ CXXFLAGS C++ compiler flags
-+ CPP C preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+ # 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
-+ 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'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ 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
-+ $SHELL $ac_srcdir/configure.gnu --help=recursive
-+ elif test -f $ac_srcdir/configure; then
-+ echo
-+ $SHELL $ac_srcdir/configure --help=recursive
-+ elif test -f $ac_srcdir/configure.ac ||
-+ test -f $ac_srcdir/configure.in; then
-+ echo
-+ $ac_configure --help
-+ else
-+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi
-+ cd $ac_popdir
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit 0
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+
-+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.
-+_ACEOF
-+ exit 0
-+fi
-+exec 5>config.log
-+cat >&5 <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.57. Invocation command line was
-+
-+ $ $0 $@
-+
-+_ACEOF
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-+
-+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-+
-+_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.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_sep=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+ for ac_arg
-+ do
-+ case $ac_arg in
-+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
-+ continue ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+ if test $ac_must_keep_next = true; then
-+ ac_must_keep_next=false # Got value, back to normal.
-+ else
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
-+ fi
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ # Get rid of the leading space.
-+ ac_sep=" "
-+ ;;
-+ esac
-+ done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log. We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Be sure not to use single quotes in there, as some shells,
-+# such as our DU 5.0 friend, will then `close' the trap.
-+trap 'exit_status=$?
-+ # Save into config.log some information that might help in debugging.
-+ {
-+ echo
-+
-+ cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+ echo
-+ # The following way of writing the cache mishandles newlines in values,
-+{
-+ (set) 2>&1 |
-+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ sed -n \
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ ;;
-+ *)
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+}
-+ echo
-+
-+ cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_vars
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+
-+ if test -n "$ac_subst_files"; then
-+ cat <<\_ASBOX
-+## ------------- ##
-+## Output files. ##
-+## ------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_files
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+ fi
-+
-+ if test -s confdefs.h; then
-+ cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+ echo
-+ sed "/^$/d" confdefs.h | sort
-+ echo
-+ fi
-+ test "$ac_signal" != 0 &&
-+ echo "$as_me: caught signal $ac_signal"
-+ echo "$as_me: exit $exit_status"
-+ } >&5
-+ 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
-+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# 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
- if test "x$prefix" != xNONE; then
-@@ -614,39 +1248,103 @@ if test -z "$CONFIG_SITE"; then
- fi
- for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
-- echo "loading site script $ac_site_file"
-+ { 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"
- fi
- done
-
- if test -r "$cache_file"; then
-- echo "loading cache $cache_file"
-- . $cache_file
-+ # 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:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
-+ esac
-+ fi
- else
-- echo "creating cache $cache_file"
-- > $cache_file
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+ >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in `(set) 2>&1 |
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+ eval ac_new_set=\$ac_env_${ac_var}_set
-+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-+ eval ac_new_val="\$ac_env_${ac_var}_value"
-+ case $ac_old_set,$ac_new_set in
-+ set,)
-+ { 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:$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:$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:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { 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.
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ 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:$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:$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
-
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--ac_exeext=
--ac_objext=o
--if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-- ac_n= ac_c='
--' ac_t=' '
-- else
-- ac_n=-n ac_c= ac_t=
-- fi
--else
-- ac_n= ac_c='\c' ac_t=
--fi
-+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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -695,105 +1393,104 @@ for ac_dir in $srcdir $srcdir/.. $srcdir
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-+ elif test -f $ac_dir/shtool; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
--fi
--ac_config_guess=$ac_aux_dir/config.guess
--ac_config_sub=$ac_aux_dir/config.sub
--ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-+# Make sure we can run config.sub.
-+$ac_config_sub sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+if test "${ac_cv_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_build_alias=$build_alias
-+test -z "$ac_cv_build_alias" &&
-+ ac_cv_build_alias=`$ac_config_guess`
-+test -z "$ac_cv_build_alias" &&
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { (exit 1); exit 1; }; }
-+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6
-+build=$ac_cv_build
-+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+
-+echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+if test "${ac_cv_host+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_host_alias=$host_alias
-+test -z "$ac_cv_host_alias" &&
-+ ac_cv_host_alias=$ac_cv_build_alias
-+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6
-+host=$ac_cv_host
-+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+
-+echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+if test "${ac_cv_target+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_target_alias=$target_alias
-+test "x$ac_cv_target_alias" = "x" &&
-+ ac_cv_target_alias=$ac_cv_host_alias
-+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6
-+target=$ac_cv_target
-+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
--# Do some error checking and defaulting for the host and target type.
--# The inputs are:
--# configure --host=HOST --target=TARGET --build=BUILD NONOPT
--#
--# The rules are:
--# 1. You are not allowed to specify --host, --target, and nonopt at the
--# same time.
--# 2. Host defaults to nonopt.
--# 3. If nonopt is not specified, then host defaults to the current host,
--# as determined by config.guess.
--# 4. Target and build default to nonopt.
--# 5. If nonopt is not specified, then target and build default to host.
-
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--case $host---$target---$nonopt in
--NONE---*---* | *---NONE---* | *---*---NONE) ;;
--*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
--esac
--
--
--# Make sure we can run config.sub.
--if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
--else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
--fi
--
--echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:736: checking host system type" >&5
--
--host_alias=$host
--case "$host_alias" in
--NONE)
-- case $nonopt in
-- NONE)
-- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-- fi ;;
-- *) host_alias=$nonopt ;;
-- esac ;;
--esac
--
--host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
--host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$host" 1>&6
--
--echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:757: checking target system type" >&5
--
--target_alias=$target
--case "$target_alias" in
--NONE)
-- case $nonopt in
-- NONE) target_alias=$host_alias ;;
-- *) target_alias=$nonopt ;;
-- esac ;;
--esac
--
--target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
--target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$target" 1>&6
--
--echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:775: checking build system type" >&5
--
--build_alias=$build
--case "$build_alias" in
--NONE)
-- case $nonopt in
-- NONE) build_alias=$host_alias ;;
-- *) build_alias=$nonopt ;;
-- esac ;;
--esac
--
--build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
--build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$build" 1>&6
--
--test "$host_alias" != "$target_alias" &&
-+test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
--
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -801,65 +1498,78 @@ test "$host_alias" != "$target_alias" &&
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:810: checking for a BSD compatible install" >&5
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
-- for ac_dir in $PATH; do
-- # Account for people who put trailing slashes in PATH elements.
-- case "$ac_dir/" in
-- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-- *)
-- # OSF1 and SCO ODT 3.0 have their own names for install.
-- # Don't use installbsd from OSF since it installs stuff as root
-- # by default.
-- for ac_prog in ginstall scoinst install; do
-- if test -f $ac_dir/$ac_prog; then
-- if test $ac_prog = install &&
-- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-- # AIX install. It has an incompatible calling convention.
-- :
-- else
-- ac_cv_path_install="$ac_dir/$ac_prog -c"
-- break 2
-- fi
-- fi
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+ ./ | .// | /cC/* | \
-+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ /usr/ucb/* ) ;;
-+ *)
-+ # OSF1 and SCO ODT 3.0 have their own names for install.
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if test $ac_prog = install &&
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # AIX install. It has an incompatible calling convention.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
- done
-- ;;
-- esac
-- done
-- IFS="$ac_save_IFS"
-+ done
-+ ;;
-+esac
-+done
-+
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-- INSTALL="$ac_cv_path_install"
-+ INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
-- INSTALL="$ac_install_sh"
-+ INSTALL=$ac_install_sh
- fi
- fi
--echo "$ac_t""$INSTALL" 1>&6
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:863: checking whether build environment is sane" >&5
-+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -881,8 +1591,11 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
-- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
--alias in your environment" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftestfile
-@@ -891,54 +1604,54 @@ then
- # Ok.
- :
- else
-- { echo "configure: error: newly created file is older than distributed files!
--Check your system clock" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- rm -f conftest*
--echo "$ac_t""yes" 1>&6
--if test "$program_transform_name" = s,x,x,; then
-- program_transform_name=
--else
-- # Double any \ or $. echo might interpret backslashes.
-- cat <<\EOF_SED > conftestsed
--s,\\,\\\\,g; s,\$,$$,g
--EOF_SED
-- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-- rm -f conftestsed
--fi
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- test "$program_prefix" != NONE &&
-- program_transform_name="s,^,${program_prefix},; $program_transform_name"
-+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
--
--# sed with no file args requires a program.
--test "$program_transform_name" = "" && program_transform_name="s,x,x,"
--
--echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:920: checking whether ${MAKE-make} sets \${MAKE}" >&5
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+# Double any \ or $. echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm conftest.sed
-+
-+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
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftestmake <<\EOF
-+ cat >conftest.make <<\_ACEOF
- all:
-- @echo 'ac_maketemp="${MAKE}"'
--EOF
-+ @echo 'ac_maketemp="$(MAKE)"'
-+_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
- fi
--rm -f conftestmake
-+rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -949,82 +1662,96 @@ PACKAGE=SDL
- VERSION=$SDL_VERSION
-
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--cat >> confdefs.h <<EOF
-+
-+cat >>confdefs.h <<_ACEOF
- #define PACKAGE "$PACKAGE"
--EOF
-+_ACEOF
-+
-
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define VERSION "$VERSION"
--EOF
-+_ACEOF
-
-
-
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:967: checking for working aclocal" >&5
-+echo "$as_me:$LINENO: checking for working aclocal" >&5
-+echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
- if (aclocal --version) < /dev/null > /dev/null 2>&1; then
- ACLOCAL=aclocal
-- echo "$ac_t""found" 1>&6
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
- ACLOCAL="$missing_dir/missing aclocal"
-- echo "$ac_t""missing" 1>&6
-+ echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
-
--echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:980: checking for working autoconf" >&5
-+echo "$as_me:$LINENO: checking for working autoconf" >&5
-+echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
- if (autoconf --version) < /dev/null > /dev/null 2>&1; then
- AUTOCONF=autoconf
-- echo "$ac_t""found" 1>&6
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
- AUTOCONF="$missing_dir/missing autoconf"
-- echo "$ac_t""missing" 1>&6
-+ echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
-
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:993: checking for working automake" >&5
-+echo "$as_me:$LINENO: checking for working automake" >&5
-+echo $ECHO_N "checking for working automake... $ECHO_C" >&6
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
- if (automake --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake
-- echo "$ac_t""found" 1>&6
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
- AUTOMAKE="$missing_dir/missing automake"
-- echo "$ac_t""missing" 1>&6
-+ echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
-
--echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:1006: checking for working autoheader" >&5
-+echo "$as_me:$LINENO: checking for working autoheader" >&5
-+echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
- if (autoheader --version) < /dev/null > /dev/null 2>&1; then
- AUTOHEADER=autoheader
-- echo "$ac_t""found" 1>&6
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
- AUTOHEADER="$missing_dir/missing autoheader"
-- echo "$ac_t""missing" 1>&6
-+ echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
-
--echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:1019: checking for working makeinfo" >&5
-+echo "$as_me:$LINENO: checking for working makeinfo" >&5
-+echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
- if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
- MAKEINFO=makeinfo
-- echo "$ac_t""found" 1>&6
-+ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
- else
- MAKEINFO="$missing_dir/missing makeinfo"
-- echo "$ac_t""missing" 1>&6
-+ echo "$as_me:$LINENO: result: missing" >&5
-+echo "${ECHO_T}missing" >&6
- fi
-
-
-@@ -1052,8 +1779,7 @@ no) enable_shared=no ;;
- esac
- else
- enable_shared=yes
--fi
--
-+fi;
- # Check whether --enable-static or --disable-static was given.
- if test "${enable_static+set}" = set; then
- enableval="$enable_static"
-@@ -1075,8 +1801,7 @@ no) enable_static=no ;;
- esac
- else
- enable_static=yes
--fi
--
-+fi;
- # Check whether --enable-fast-install or --disable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
- enableval="$enable_fast_install"
-@@ -1098,246 +1823,724 @@ no) enable_fast_install=no ;;
- esac
- else
- enable_fast_install=yes
--fi
--
--# Extract the first word of "ranlib", so it can be a program name with args.
--set dummy ranlib; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1107: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi;
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_RANLIB="ranlib"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+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_RANLIB="${ac_tool_prefix}ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
- fi
- fi
--RANLIB="$ac_cv_prog_RANLIB"
-+RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$ac_t""$RANLIB" 1>&6
-+ echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+ ac_ct_RANLIB=$RANLIB
-+ # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+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_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_RANLIB"; then
-+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+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_RANLIB="ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ RANLIB=$ac_ct_RANLIB
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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:$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
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--# Extract the first word of "gcc", so it can be a program name with args.
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1137: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+ 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:$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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="gcc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ 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:$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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+fi
- 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1167: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
-- if test $# -gt 0; then
-+ if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # 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" "$@"
-- shift
-- ac_cv_prog_CC="$@"
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
- fi
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test -z "$CC"; then
-- case "`uname -s`" in
-- *win32* | *WIN32*)
-- # Extract the first word of "cl", so it can be a program name with args.
--set dummy cl; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1218: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl
-+ 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:$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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="cl"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-- ;;
-- esac
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl
-+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:$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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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
-- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1250: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+ test -n "$ac_ct_CC" && break
-+done
-
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+ CC=$ac_ct_CC
-+fi
-
--cat > conftest.$ac_ext << EOF
-+fi
-+
-+
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-
--#line 1261 "configure"
--#include "confdefs.h"
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# 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:$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:$LINENO: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
-+ ac_status=$?
-+ 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.
-+
-+# 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=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * )
-+ break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--main(){return(0);}
--EOF
--if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- ac_cv_prog_cc_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cc_cross=no
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+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:$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:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cross_compiling=no
- else
-- ac_cv_prog_cc_cross=yes
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
- fi
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_prog_cc_works=no
- fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
-- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1292: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1297: checking whether we are using GNU C" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.c <<EOF
--#ifdef __GNUC__
-- yes;
--#endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-- ac_cv_prog_gcc=yes
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+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:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+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:$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
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
-+done
- else
-- ac_cv_prog_gcc=no
--fi
--fi
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+int
-+main ()
-+{
-
--if test $ac_cv_prog_gcc = yes; then
-- GCC=yes
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+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); }; then
-+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+ break;;
-+ esac
-+done
- else
-- GCC=
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_test_CFLAGS="${CFLAGS+set}"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
--echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1325: checking whether ${CC-cc} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ ;
-+ 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_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ 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_cv_prog_cc_g=yes
- else
-- ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_prog_cc_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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"
-+ CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
-@@ -1351,6 +2554,224 @@ else
- CFLAGS=
- fi
- fi
-+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
-+else
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ 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_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ 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
-+
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_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
-+ for ac_declaration in \
-+ ''\
-+ '#include <stdlib.h>' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-
- # Check whether --with-gnu-ld or --without-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
-@@ -1358,13 +2779,12 @@ if test "${with_gnu_ld+set}" = set; then
- test "$withval" = no || with_gnu_ld=yes
- else
- with_gnu_ld=no
--fi
--
-+fi;
- ac_prog=ld
--if test "$ac_cv_prog_gcc" = yes; then
-+if test "$ac_cv_c_compiler_gnu" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
-- echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
--echo "configure:1368: checking for ld used by GCC" >&5
-+ echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
- DELCR='tr -d \015'
- ac_prog=`($CC -print-prog-name=ld | $DELCR) 2>&5`
- case "$ac_prog" in
-@@ -1388,14 +2808,14 @@ echo "configure:1368: checking for ld us
- ;;
- esac
- elif test "$with_gnu_ld" = yes; then
-- echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:1393: checking for GNU ld" >&5
-+ echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
- else
-- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:1396: checking for non-GNU ld" >&5
-+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
- fi
--if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_LD+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-@@ -1421,15 +2841,19 @@ fi
-
- LD="$ac_cv_path_LD"
- if test -n "$LD"; then
-- echo "$ac_t""$LD" 1>&6
-+ echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
--test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
--echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
--echo "configure:1431: checking if the linker ($LD) is GNU ld" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+if test "${ac_cv_prog_gnu_ld+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -1438,14 +2862,14 @@ else
- ac_cv_prog_gnu_ld=no
- fi
- fi
--
--echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
-
-
--echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:1447: checking for BSD-compatible nm" >&5
--if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+if test "${ac_cv_path_NM+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test -n "$NM"; then
- # Let the user override the test.
-@@ -1476,34 +2900,20 @@ fi
- fi
-
- NM="$ac_cv_path_NM"
--echo "$ac_t""$NM" 1>&6
-+echo "$as_me:$LINENO: result: $NM" >&5
-+echo "${ECHO_T}$NM" >&6
-
--echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1483: checking whether ln -s works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- rm -f conftestdata
--if ln -s X conftestdata 2>/dev/null
--then
-- rm -f conftestdata
-- ac_cv_prog_LN_S="ln -s"
-+echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- else
-- ac_cv_prog_LN_S=ln
--fi
--fi
--LN_S="$ac_cv_prog_LN_S"
--if test "$ac_cv_prog_LN_S" = "ln -s"; then
-- echo "$ac_t""yes" 1>&6
--else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6
- fi
-
--if test $host != $build; then
-- ac_tool_prefix=${host_alias}-
--else
-- ac_tool_prefix=
--fi
-
-
- case "$target" in
-@@ -1516,16 +2926,15 @@ libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-+test "$ac_cv_c_compiler_gnu" = yes && libtool_flags="$libtool_flags --with-gcc"
- test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
--libtool_flags="$libtool_flags --enable-win32-dll"
-+
- # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
- enableval="$enable_libtool_lock"
-- :
--fi
-
-+fi;
- test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
- test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-@@ -1534,8 +2943,12 @@ test x"$silent" = xyes && libtool_flags=
- case "$lt_target" in
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 1538 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:1539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 2946 "configure"' > conftest.$ac_ext
-+ 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); }; then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- LD="${LD-ld} -32"
-@@ -1555,294 +2968,116 @@ case "$lt_target" in
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
-- echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:1560: checking whether the C compiler needs -belf" >&5
--if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 1565 "configure"
--#include "confdefs.h"
--
--int main() {
--
--; return 0; }
--EOF
--if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+if test "${lt_cv_cc_needs_belf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ 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
- lt_cv_cc_needs_belf=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- lt_cv_cc_needs_belf=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+lt_cv_cc_needs_belf=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--
--echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-+echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-
--*-*-cygwin* | *-*-mingw*)
-- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
--set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1595: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$DLLTOOL"; then
-- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--DLLTOOL="$ac_cv_prog_DLLTOOL"
--if test -n "$DLLTOOL"; then
-- echo "$ac_t""$DLLTOOL" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
--if test -z "$ac_cv_prog_DLLTOOL"; then
--if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "dlltool", so it can be a program name with args.
--set dummy dlltool; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1627: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$DLLTOOL"; then
-- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_DLLTOOL="dlltool"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
--fi
--fi
--DLLTOOL="$ac_cv_prog_DLLTOOL"
--if test -n "$DLLTOOL"; then
-- echo "$ac_t""$DLLTOOL" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--else
-- DLLTOOL="false"
--fi
--fi
--
-- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
--set dummy ${ac_tool_prefix}as; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1662: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$AS"; then
-- ac_cv_prog_AS="$AS" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_AS="${ac_tool_prefix}as"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--AS="$ac_cv_prog_AS"
--if test -n "$AS"; then
-- echo "$ac_t""$AS" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
--if test -z "$ac_cv_prog_AS"; then
--if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "as", so it can be a program name with args.
--set dummy as; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1694: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$AS"; then
-- ac_cv_prog_AS="$AS" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_AS="as"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
--fi
--fi
--AS="$ac_cv_prog_AS"
--if test -n "$AS"; then
-- echo "$ac_t""$AS" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--else
-- AS="false"
--fi
--fi
--
-- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
--set dummy ${ac_tool_prefix}objdump; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1729: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJDUMP"; then
-- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--OBJDUMP="$ac_cv_prog_OBJDUMP"
--if test -n "$OBJDUMP"; then
-- echo "$ac_t""$OBJDUMP" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--
--if test -z "$ac_cv_prog_OBJDUMP"; then
--if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "objdump", so it can be a program name with args.
--set dummy objdump; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1761: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$OBJDUMP"; then
-- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_OBJDUMP="objdump"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
--fi
--fi
--OBJDUMP="$ac_cv_prog_OBJDUMP"
--if test -n "$OBJDUMP"; then
-- echo "$ac_t""$OBJDUMP" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--else
-- OBJDUMP="false"
--fi
--fi
--
-- ;;
-
- esac
-
-
- # Save cache, so that ltconfig can load it
--cat > confcache <<\EOF
-+cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
--# scripts and configure runs. It is not useful on other systems.
--# If it contains results you don't want to keep, you may remove or edit it.
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems. If it contains results you don't
-+# want to keep, you may remove or edit it.
- #
--# By default, configure uses ./config.cache as the cache file,
--# creating it if it does not exist already. You can give configure
--# the --cache-file=FILE option to use a different cache file; that is
--# what configure does when it calls configure scripts in
--# subdirectories, so they share the cache.
--# Giving --cache-file=/dev/null disables caching, for debugging configure.
--# config.status only pays attention to the cache file if you give it the
--# --recheck option to rerun configure.
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
- #
--EOF
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
- # So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--(set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-- # `set' does not quote correctly, so add quotes (double-quote substitution
-- # turns \\\\ into \\, and sed turns \\ into \).
-- sed -n \
-- -e "s/'/'\\\\''/g" \
-- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-- ;;
-- *)
-- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-- ;;
-- esac >> confcache
--if cmp -s $cache_file confcache; then
-- :
--else
-+{
-+ (set) 2>&1 |
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ # `set' does not quote correctly, so add quotes (double-quote
-+ # substitution turns \\\\ into \\, and sed turns \\ into \).
-+ sed -n \
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} |
-+ sed '
-+ t clear
-+ : clear
-+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+ t end
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
-- echo "updating cache $cache_file"
-- cat confcache > $cache_file
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ cat confcache >$cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
- fi
- rm -f confcache
-
--
- # Actually configure libtool. ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-@@ -1850,15 +3085,26 @@ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
--|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
-+echo "$as_me: error: libtool configure failed" >&2;}
-+ { (exit 1); exit 1; }; }
-
- # Reload cache, that may have been modified by ltconfig
- if test -r "$cache_file"; then
-- echo "loading cache $cache_file"
-- . $cache_file
-+ # 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:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
-+ esac
-+ fi
- else
-- echo "creating cache $cache_file"
-- > $cache_file
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+ >$cache_file
- fi
-
-
-@@ -1872,241 +3118,469 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
- # clobbered by the next message.
- exec 5>>./config.log
-
--echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1877: checking whether ${MAKE-make} sets \${MAKE}" >&5
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+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
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftestmake <<\EOF
-+ cat >conftest.make <<\_ACEOF
- all:
-- @echo 'ac_maketemp="${MAKE}"'
--EOF
-+ @echo 'ac_maketemp="$(MAKE)"'
-+_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
- else
- eval ac_cv_prog_make_${ac_make}_set=no
- fi
--rm -f conftestmake
-+rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- SET_MAKE=
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
--# Extract the first word of "gcc", so it can be a program name with args.
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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:$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
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1906: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+ 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:$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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="gcc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
- fi
-+if test -z "$ac_cv_prog_CC"; then
-+ 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:$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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+fi
- 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1936: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
-- if test $# -gt 0; then
-+ if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # 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" "$@"
-- shift
-- ac_cv_prog_CC="$@"
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
- fi
- fi
- fi
--CC="$ac_cv_prog_CC"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
-- if test -z "$CC"; then
-- case "`uname -s`" in
-- *win32* | *WIN32*)
-- # Extract the first word of "cl", so it can be a program name with args.
--set dummy cl; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1987: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl
-+ 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:$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
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="cl"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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"
-+CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-- ;;
-- esac
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl
-+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:$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
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+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
-- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+done
-+done
-+
- fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$ac_ct_CC" && break
-+done
-
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2019: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+ CC=$ac_ct_CC
-+fi
-
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+fi
-
--cat > conftest.$ac_ext << EOF
-
--#line 2030 "configure"
--#include "confdefs.h"
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--main(){return(0);}
--EOF
--if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- ac_cv_prog_cc_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cc_cross=no
-- else
-- ac_cv_prog_cc_cross=yes
-- fi
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_prog_cc_works=no
--fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
-- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:2061: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:2066: checking whether we are using GNU C" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.c <<EOF
--#ifdef __GNUC__
-- yes;
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
- #endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-- ac_cv_prog_gcc=yes
--else
-- ac_cv_prog_gcc=no
--fi
--fi
-
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+ ;
-+ 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_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--if test $ac_cv_prog_gcc = yes; then
-- GCC=yes
--else
-- GCC=
--fi
-+int
-+main ()
-+{
-
--ac_test_CFLAGS="${CFLAGS+set}"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
--echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:2094: checking whether ${CC-cc} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+ ;
-+ 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_cv_prog_cc_g=yes
- else
-- ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_prog_cc_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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"
-+ CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
-@@ -2120,251 +3594,592 @@ else
- CFLAGS=
- fi
- fi
-+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
-+else
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ 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_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ 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
-+
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_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
-+ for ac_declaration in \
-+ ''\
-+ '#include <stdlib.h>' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:2126: checking for inline" >&5
--if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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:$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
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-- cat > conftest.$ac_ext <<EOF
--#line 2133 "configure"
--#include "confdefs.h"
--
--int main() {
--} $ac_kw foo() {
--; return 0; }
--EOF
--if { (eval echo configure:2140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
-+_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_cv_c_inline=$ac_kw; break
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- done
-
- fi
--
--echo "$ac_t""$ac_cv_c_inline" 1>&6
--case "$ac_cv_c_inline" in
-+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) ;;
-- no) cat >> confdefs.h <<\EOF
--#define inline
--EOF
-+ no)
-+cat >>confdefs.h <<\_ACEOF
-+#define inline
-+_ACEOF
- ;;
-- *) cat >> confdefs.h <<EOF
-+ *) cat >>confdefs.h <<_ACEOF
- #define inline $ac_cv_c_inline
--EOF
-+_ACEOF
- ;;
- esac
-
--echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:2166: checking for working const" >&5
--if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2171 "configure"
--#include "confdefs.h"
--
--int main() {
--
--/* Ultrix mips cc rejects this. */
--typedef int charset[2]; const charset x;
--/* SunOS 4.1.1 cc rejects this. */
--char const *const *ccp;
--char **p;
--/* NEC SVR4.0.2 mips cc rejects this. */
--struct point {int x, y;};
--static struct point const zero = {0,0};
--/* AIX XL C 1.02.0.0 rejects this.
-- It does not let you subtract one const X* pointer from another in an arm
-- of an if-expression whose if-part is not a constant expression */
--const char *g = "string";
--ccp = &g + (g ? g-g : 0);
--/* HPUX 7.0 cc rejects these. */
--++ccp;
--p = (char**) ccp;
--ccp = (char const *const *) p;
--{ /* SCO 3.2v4 cc rejects this. */
-- char *t;
-- char const *s = 0 ? (char *) 0 : (char const *) 0;
--
-- *t++ = 0;
--}
--{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-- int x[] = {25, 17};
-- const int *foo = &x[0];
-- ++foo;
--}
--{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-- typedef const int *iptr;
-- iptr p = 0;
-- ++p;
--}
--{ /* AIX XL C 1.02.0.0 rejects this saying
-- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-- struct s { int j; const int *ap[3]; };
-- struct s *b; b->j = 5;
--}
--{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-- const int foo = 10;
--}
--
--; return 0; }
--EOF
--if { (eval echo configure:2220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset x;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *ccp;
-+ char **p;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ ccp = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+ *t++ = 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ }
-+#endif
-+
-+ ;
-+ 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_cv_c_const=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_c_const=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_c_const=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--
--echo "$ac_t""$ac_cv_c_const" 1>&6
-+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
-- cat >> confdefs.h <<\EOF
--#define const
--EOF
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define const
-+_ACEOF
-
- fi
-
--for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
--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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2245: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+ 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:$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
- else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CXX="$ac_prog"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+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"
-+CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
-- echo "$ac_t""$CXX" 1>&6
-+ echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
--test -n "$CXX" && break
-+ test -n "$CXX" && break
-+ done
-+fi
-+if test -z "$CXX"; then
-+ ac_ct_CXX=$CXX
-+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+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:$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
-+else
-+ if test -n "$ac_ct_CXX"; then
-+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+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
--test -n "$CXX" || CXX="gcc"
-
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2277: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+ test -n "$ac_ct_CXX" && break
-+done
-+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
--ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
-+ CXX=$ac_ct_CXX
-+fi
-
--cat > conftest.$ac_ext << EOF
-
--#line 2288 "configure"
--#include "confdefs.h"
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--int main(){return(0);}
--EOF
--if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- ac_cv_prog_cxx_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cxx_cross=no
-- else
-- ac_cv_prog_cxx_cross=yes
-- fi
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_prog_cxx_works=no
--fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
--if test $ac_cv_prog_cxx_works = no; then
-- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:2319: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
--cross_compiling=$ac_cv_prog_cxx_cross
--
--echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:2324: checking whether we are using GNU C++" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.C <<EOF
--#ifdef __GNUC__
-- yes;
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
- #endif
--EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-- ac_cv_prog_gxx=yes
--else
-- ac_cv_prog_gxx=no
--fi
--fi
-
--echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-+ ;
-+ 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_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--if test $ac_cv_prog_gxx = yes; then
-- GXX=yes
--else
-- GXX=
--fi
-+int
-+main ()
-+{
-
--ac_test_CXXFLAGS="${CXXFLAGS+set}"
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS=
--echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
--echo "configure:2352: checking whether ${CXX-g++} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- echo 'void f(){}' > conftest.cc
--if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-+ ;
-+ 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_cv_prog_cxx_g=yes
- else
-- ac_cv_prog_cxx_g=no
--fi
--rm -f conftest*
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ac_cv_prog_cxx_g=no
- fi
--
--echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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"
-+ CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
-@@ -2378,6 +4193,100 @@ else
- CXXFLAGS=
- fi
- fi
-+for ac_declaration in \
-+ ''\
-+ '#include <stdlib.h>' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ 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
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -2386,187 +4295,392 @@ fi
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
- # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:2395: checking for a BSD compatible install" >&5
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
--if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
-- for ac_dir in $PATH; do
-- # Account for people who put trailing slashes in PATH elements.
-- case "$ac_dir/" in
-- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-- *)
-- # OSF1 and SCO ODT 3.0 have their own names for install.
-- # Don't use installbsd from OSF since it installs stuff as root
-- # by default.
-- for ac_prog in ginstall scoinst install; do
-- if test -f $ac_dir/$ac_prog; then
-- if test $ac_prog = install &&
-- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-- # AIX install. It has an incompatible calling convention.
-- :
-- else
-- ac_cv_path_install="$ac_dir/$ac_prog -c"
-- break 2
-- fi
-- fi
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+ ./ | .// | /cC/* | \
-+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ /usr/ucb/* ) ;;
-+ *)
-+ # OSF1 and SCO ODT 3.0 have their own names for install.
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if test $ac_prog = install &&
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # AIX install. It has an incompatible calling convention.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
- done
-- ;;
-- esac
-- done
-- IFS="$ac_save_IFS"
-+ done
-+ ;;
-+esac
-+done
-+
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
-- INSTALL="$ac_cv_path_install"
-+ INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
-- INSTALL="$ac_install_sh"
-+ INSTALL=$ac_install_sh
- fi
- fi
--echo "$ac_t""$INSTALL" 1>&6
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:2448: checking how to run the C preprocessor" >&5
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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:$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
- CPP=
- fi
- if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- # This must be in double quotes, not single quotes, because CPP may get
-- # substituted into the Makefile and "${CC-cc}" will confuse make.
-- CPP="${CC-cc} -E"
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp.
-- cat > conftest.$ac_ext <<EOF
--#line 2463 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- :
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP="${CC-cc} -E -traditional-cpp"
-- cat > conftest.$ac_ext <<EOF
--#line 2480 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- :
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP="${CC-cc} -nologo -E"
-- cat > conftest.$ac_ext <<EOF
--#line 2497 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- :
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP=/lib/cpp
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
- fi
--rm -f conftest*
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
- fi
--rm -f conftest*
-- ac_cv_prog_CPP="$CPP"
-+
-+ done
-+ ac_cv_prog_CPP=$CPP
-+
- fi
-- CPP="$ac_cv_prog_CPP"
-+ CPP=$ac_cv_prog_CPP
- else
-- ac_cv_prog_CPP="$CPP"
-+ ac_cv_prog_CPP=$CPP
- fi
--echo "$ac_t""$CPP" 1>&6
--
--# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
--# for constant arguments. Useless!
--echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:2530: checking for working alloca.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2535 "configure"
--#include "confdefs.h"
--#include <alloca.h>
--int main() {
--char *p = alloca(2 * sizeof(int));
--; return 0; }
--EOF
--if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- ac_cv_header_alloca_h=yes
-+echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # 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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_header_alloca_h=no
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
--if test $ac_cv_header_alloca_h = yes; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_ALLOCA_H 1
--EOF
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
--echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:2563: checking for alloca" >&5
--if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2568 "configure"
--#include "confdefs.h"
-+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
-
-+
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments. Useless!
-+echo "$as_me:$LINENO: checking for working alloca.h" >&5
-+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-+if test "${ac_cv_working_alloca_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+ ;
-+ 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_working_alloca_h=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_working_alloca_h=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-+if test $ac_cv_working_alloca_h = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_ALLOCA_H 1
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for alloca" >&5
-+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-+if test "${ac_cv_func_alloca_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #ifdef __GNUC__
- # define alloca __builtin_alloca
- #else
-@@ -2588,137 +4702,190 @@ char *alloca ();
- # endif
- #endif
-
--int main() {
--char *p = (char *) alloca(1);
--; return 0; }
--EOF
--if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+ ;
-+ 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_func_alloca_works=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_cv_func_alloca_works=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_alloca_works=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
--echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
- if test $ac_cv_func_alloca_works = yes; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_ALLOCA 1
--EOF
-
--fi
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_ALLOCA 1
-+_ACEOF
-
--if test $ac_cv_func_alloca_works = no; then
-+else
- # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-- # that cause trouble. Some versions do not even contain alloca or
-- # contain a buggy version. If you still want to use their alloca,
-- # use ar to extract alloca.o from them instead of compiling alloca.c.
-- ALLOCA=alloca.${ac_objext}
-- cat >> confdefs.h <<\EOF
-+# that cause trouble. Some versions do not even contain alloca or
-+# contain a buggy version. If you still want to use their alloca,
-+# use ar to extract alloca.o from them instead of compiling alloca.c.
-+
-+ALLOCA=alloca.$ac_objext
-+
-+cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
--EOF
-+_ACEOF
-
-
--echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:2628: checking whether alloca needs Cray hooks" >&5
--if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2633 "configure"
--#include "confdefs.h"
-+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-+if test "${ac_cv_os_cray+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
- #else
- wenotbecray
- #endif
-
--EOF
-+_ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "webecray" >/dev/null 2>&1; then
-- rm -rf conftest*
-+ $EGREP "webecray" >/dev/null 2>&1; then
- ac_cv_os_cray=yes
- else
-- rm -rf conftest*
- ac_cv_os_cray=no
- fi
- rm -f conftest*
-
- fi
--
--echo "$ac_t""$ac_cv_os_cray" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-+echo "${ECHO_T}$ac_cv_os_cray" >&6
- if test $ac_cv_os_cray = yes; then
--for ac_func in _getb67 GETB67 getb67; do
-- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2658: checking for $ac_func" >&5
--if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 2663 "configure"
--#include "confdefs.h"
-+ for ac_func in _getb67 GETB67 getb67; do
-+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func(); below. */
--#include <assert.h>
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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 $ac_func();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--$ac_func();
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ 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
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+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
-
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define CRAY_STACKSEG_END $ac_func
--EOF
-+_ACEOF
-
-- break
--else
-- echo "$ac_t""no" 1>&6
-+ break
- fi
-
--done
-+ done
- fi
-
--echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:2713: checking stack direction for C alloca" >&5
--if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-+if test "${ac_cv_c_stack_direction+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- if test "$cross_compiling" = yes; then
- ac_cv_c_stack_direction=0
- else
-- cat > conftest.$ac_ext <<EOF
--#line 2721 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+int
- find_stack_direction ()
- {
- static char *addr = 0;
-@@ -2731,29 +4898,43 @@ find_stack_direction ()
- else
- return (&dummy > addr) ? 1 : -1;
- }
-+
-+int
- main ()
- {
-- exit (find_stack_direction() < 0);
-+ exit (find_stack_direction () < 0);
- }
--EOF
--if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+_ACEOF
-+rm -f 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='./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_c_stack_direction=1
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- ac_cv_c_stack_direction=-1
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_c_stack_direction=-1
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-
--echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
--cat >> confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
--EOF
-+_ACEOF
-+
-
- fi
-
-@@ -2775,7 +4956,7 @@ fi
-
- case "$target" in
- alpha*-*-linux*)
-- if test x$ac_cv_prog_gcc = xyes; then
-+ if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"
- fi
- ;;
-@@ -2785,30 +4966,29 @@ esac
- # Check whether --enable-debug or --disable-debug was given.
- if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
-- :
-+
- else
- enable_debug=yes
--fi
--
-+fi;
- if test x$enable_debug != xyes; then
-- if test x$ac_cv_prog_gcc = xyes; then
-+ if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -fexpensive-optimizations"
- # Ack! This breaks the MMX YV12 conversion on gcc 2.95.2
- # CFLAGS="$CFLAGS -fomit-frame-pointer"
- fi
- case "$target" in
- i486-*-*)
-- if test x$ac_cv_prog_gcc = xyes; then
-+ if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -march=486"
- fi
- ;;
- i?86-*-*)
-- if test x$ac_cv_prog_gcc = xyes; then
-+ if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro"
- fi
- ;;
- *-*-osf*)
-- if test x$ac_cv_prog_gcc != xyes; then
-+ if test x$ac_cv_c_compiler_gnu != xyes; then
- CFLAGS="-g3 -fast -arch host"
- fi
- ;;
-@@ -2818,12 +4998,11 @@ fi
- # Check whether --enable-strict-ansi or --disable-strict-ansi was given.
- if test "${enable_strict_ansi+set}" = set; then
- enableval="$enable_strict_ansi"
-- :
-+
- else
- enable_strict_ansi=no
--fi
--
--if test x$ac_cv_prog_gcc = xyes; then
-+fi;
-+if test x$ac_cv_c_compiler_gnu = xyes; then
- CFLAGS="$CFLAGS -Wall"
- if test x$enable_strict_ansi = xyes; then
- CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE"
-@@ -2855,11 +5034,10 @@ SYSTEM_LIBS="$SYSTEM_LIBS $MATHLIB"
- # Check whether --enable-audio or --disable-audio was given.
- if test "${enable_audio+set}" = set; then
- enableval="$enable_audio"
-- :
-+
- else
- enable_audio=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS audio"
- SDL_EXTRALIBS="$SDL_EXTRALIBS audio/libaudio.la"
-@@ -2869,11 +5047,10 @@ fi
- # Check whether --enable-video or --disable-video was given.
- if test "${enable_video+set}" = set; then
- enableval="$enable_video"
-- :
-+
- else
- enable_video=yes
--fi
--
-+fi;
- if test x$enable_video = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS video"
- SDL_EXTRALIBS="$SDL_EXTRALIBS video/libvideo.la"
-@@ -2883,11 +5060,10 @@ fi
- # Check whether --enable-events or --disable-events was given.
- if test "${enable_events+set}" = set; then
- enableval="$enable_events"
-- :
-+
- else
- enable_events=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_events = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS events"
- SDL_EXTRALIBS="$SDL_EXTRALIBS events/libevents.la"
-@@ -2897,11 +5073,10 @@ fi
- # Check whether --enable-joystick or --disable-joystick was given.
- if test "${enable_joystick+set}" = set; then
- enableval="$enable_joystick"
-- :
-+
- else
- enable_joystick=yes
--fi
--
-+fi;
- if test x$enable_joystick = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS joystick"
- SDL_EXTRALIBS="$SDL_EXTRALIBS joystick/libjoystick.la"
-@@ -2911,11 +5086,10 @@ fi
- # Check whether --enable-cdrom or --disable-cdrom was given.
- if test "${enable_cdrom+set}" = set; then
- enableval="$enable_cdrom"
-- :
-+
- else
- enable_cdrom=yes
--fi
--
-+fi;
- if test x$enable_cdrom = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS cdrom"
- SDL_EXTRALIBS="$SDL_EXTRALIBS cdrom/libcdrom.la"
-@@ -2925,16 +5099,15 @@ fi
- # Check whether --enable-threads or --disable-threads was given.
- if test "${enable_threads+set}" = set; then
- enableval="$enable_threads"
-- :
-+
- else
- enable_threads=yes
--fi
--
-+fi;
- SDL_EXTRADIRS="$SDL_EXTRADIRS thread"
- SDL_EXTRALIBS="$SDL_EXTRALIBS thread/libthread.la"
- if test x$enable_threads != xyes; then
- CFLAGS="$CFLAGS -DDISABLE_THREADS"
--
-+
- echo "Copying src/thread/generic/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/generic/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -2945,7 +5118,7 @@ if test x$enable_threads != xyes; then
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/generic/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -2956,7 +5129,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/generic/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -2967,7 +5140,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/generic/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -2978,7 +5151,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/generic/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -2989,7 +5162,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -3000,7 +5173,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -3011,7 +5184,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -3026,11 +5199,10 @@ fi
- # Check whether --enable-timers or --disable-timers was given.
- if test "${enable_timers+set}" = set; then
- enableval="$enable_timers"
-- :
-+
- else
- enable_timers=yes
--fi
--
-+fi;
- if test x$enable_timers = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS timer"
- SDL_EXTRALIBS="$SDL_EXTRALIBS timer/libtimer.la"
-@@ -3040,11 +5212,10 @@ fi
- # Check whether --enable-endian or --disable-endian was given.
- if test "${enable_endian+set}" = set; then
- enableval="$enable_endian"
-- :
-+
- else
- enable_endian=yes
--fi
--
-+fi;
- if test x$enable_endian = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS endian"
- SDL_EXTRALIBS="$SDL_EXTRALIBS endian/libendian.la"
-@@ -3054,11 +5225,10 @@ fi
- # Check whether --enable-file or --disable-file was given.
- if test "${enable_file+set}" = set; then
- enableval="$enable_file"
-- :
-+
- else
- enable_file=yes
--fi
--
-+fi;
- if test x$enable_file = xyes; then
- SDL_EXTRADIRS="$SDL_EXTRADIRS file"
- SDL_EXTRALIBS="$SDL_EXTRALIBS file/libfile.la"
-@@ -3071,67 +5241,107 @@ CheckOSS()
- # Check whether --enable-oss or --disable-oss was given.
- if test "${enable_oss+set}" = set; then
- enableval="$enable_oss"
-- :
-+
- else
- enable_oss=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes -a x$enable_oss = xyes; then
-- echo $ac_n "checking for OSS audio support""... $ac_c" 1>&6
--echo "configure:3082: checking for OSS audio support" >&5
-+ echo "$as_me:$LINENO: checking for OSS audio support" >&5
-+echo $ECHO_N "checking for OSS audio support... $ECHO_C" >&6
- have_oss=no
- if test x$have_oss != xyes; then
-- cat > conftest.$ac_ext <<EOF
--#line 3086 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/soundcard.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- int arg = SNDCTL_DSP_SETFRAGMENT;
--
--; return 0; }
--EOF
--if { (eval echo configure:3097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_oss=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- if test x$have_oss != xyes; then
-- cat > conftest.$ac_ext <<EOF
--#line 3110 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <soundcard.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- int arg = SNDCTL_DSP_SETFRAGMENT;
--
--; return 0; }
--EOF
--if { (eval echo configure:3121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_oss=yes
- CFLAGS="$CFLAGS -DOSS_USE_SOUNDCARD_H"
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- fi
-- echo "$ac_t""$have_oss" 1>&6
-+ echo "$as_me:$LINENO: result: $have_oss" >&5
-+echo "${ECHO_T}$have_oss" >&6
- if test x$have_oss = xyes; then
- CFLAGS="$CFLAGS -DOSS_SUPPORT"
-+ LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
-+ SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
- AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -3145,86 +5355,123 @@ CheckALSA()
- # Check whether --enable-alsa or --disable-alsa was given.
- if test "${enable_alsa+set}" = set; then
- enableval="$enable_alsa"
-- :
-+
- else
- enable_alsa=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
-- echo $ac_n "checking for ALSA audio support""... $ac_c" 1>&6
--echo "configure:3156: checking for ALSA audio support" >&5
-+ echo "$as_me:$LINENO: checking for ALSA audio support" >&5
-+echo $ECHO_N "checking for ALSA audio support... $ECHO_C" >&6
- have_alsa=no
-- cat > conftest.$ac_ext <<EOF
--#line 3159 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <alsa/asoundlib.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- #if SND_LIB_VERSION < ((0<<16)|(9<<8)|0)
- #error Your version of ALSA is too old
- #endif
- snd_pcm_t *pcm_handle;
--
--; return 0; }
--EOF
--if { (eval echo configure:3173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-- echo $ac_n "checking for snd_pcm_open in -lasound""... $ac_c" 1>&6
--echo "configure:3177: checking for snd_pcm_open in -lasound" >&5
--ac_lib_var=`echo asound'_'snd_pcm_open | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+
-+ ;
-+ 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
-+
-+ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-+echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6
-+if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lasound $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3185 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 snd_pcm_open();
--
--int main() {
--snd_pcm_open()
--; return 0; }
--EOF
--if { (eval echo configure:3196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char snd_pcm_open ();
-+int
-+main ()
-+{
-+snd_pcm_open ();
-+ ;
-+ 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_lib_asound_snd_pcm_open=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_asound_snd_pcm_open=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6
-+if test $ac_cv_lib_asound_snd_pcm_open = yes; then
- have_alsa=yes
--else
-- echo "$ac_t""no" 1>&6
- fi
-
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- if test x$have_alsa = xyes; then
- CFLAGS="$CFLAGS -DALSA_SUPPORT"
- SYSTEM_LIBS="$SYSTEM_LIBS -lasound"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS alsa"
- AUDIO_DRIVERS="$AUDIO_DRIVERS alsa/libaudio_alsa.la"
- else
-- echo "$ac_t""$have_alsa" 1>&6
-+ echo "$as_me:$LINENO: result: $have_alsa" >&5
-+echo "${ECHO_T}$have_alsa" >&6
- fi
- fi
- }
-@@ -3232,31 +5479,50 @@ rm -f conftest*
- CheckDMEDIA()
- {
- if test x$enable_audio = xyes; then
-- echo $ac_n "checking for dmedia audio support""... $ac_c" 1>&6
--echo "configure:3237: checking for dmedia audio support" >&5
-+ echo "$as_me:$LINENO: checking for dmedia audio support" >&5
-+echo $ECHO_N "checking for dmedia audio support... $ECHO_C" >&6
- have_dmedia=no
-- cat > conftest.$ac_ext <<EOF
--#line 3240 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <dmedia/audio.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- ALport audio_port;
--
--; return 0; }
--EOF
--if { (eval echo configure:3251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_dmedia=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- # Set up files for the audio library
- if test x$have_dmedia = xyes; then
- CFLAGS="$CFLAGS -DDMEDIA_SUPPORT"
-@@ -3272,20 +5538,20 @@ CheckESD()
- # Check whether --enable-esd or --disable-esd was given.
- if test "${enable_esd+set}" = set; then
- enableval="$enable_esd"
-- :
-+
- else
- enable_esd=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes -a x$enable_esd = xyes; then
- use_esd=no
-- # Check whether --with-esd-prefix or --without-esd-prefix was given.
-+
-+# Check whether --with-esd-prefix or --without-esd-prefix was given.
- if test "${with_esd_prefix+set}" = set; then
- withval="$with_esd_prefix"
- esd_prefix="$withval"
- else
- esd_prefix=""
--fi
-+fi;
-
- # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
- if test "${with_esd_exec_prefix+set}" = set; then
-@@ -3293,16 +5559,14 @@ if test "${with_esd_exec_prefix+set}" =
- esd_exec_prefix="$withval"
- else
- esd_exec_prefix=""
--fi
--
-+fi;
- # Check whether --enable-esdtest or --disable-esdtest was given.
- if test "${enable_esdtest+set}" = set; then
- enableval="$enable_esdtest"
-- :
-+
- else
- enable_esdtest=yes
--fi
--
-+fi;
-
- if test x$esd_exec_prefix != x ; then
- esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-@@ -3319,43 +5583,47 @@ fi
-
- # Extract the first word of "esd-config", so it can be a program name with args.
- set dummy esd-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3324: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_ESD_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$ESD_CONFIG" in
-- /*)
-+ case $ESD_CONFIG in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ 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_ESD_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_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
- ;;
- esac
- fi
--ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
-+ESD_CONFIG=$ac_cv_path_ESD_CONFIG
-+
- if test -n "$ESD_CONFIG"; then
-- echo "$ac_t""$ESD_CONFIG" 1>&6
-+ echo "$as_me:$LINENO: result: $ESD_CONFIG" >&5
-+echo "${ECHO_T}$ESD_CONFIG" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- min_esd_version=0.2.8
-- echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
--echo "configure:3359: checking for ESD - version >= $min_esd_version" >&5
-+ echo "$as_me:$LINENO: checking for ESD - version >= $min_esd_version" >&5
-+echo $ECHO_N "checking for ESD - version >= $min_esd_version... $ECHO_C" >&6
- no_esd=""
- if test "$ESD_CONFIG" = "no" ; then
- no_esd=yes
-@@ -3378,9 +5646,13 @@ echo "configure:3359: checking for ESD -
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
-- cat > conftest.$ac_ext <<EOF
--#line 3383 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -3391,7 +5663,7 @@ char*
- my_strdup (char *str)
- {
- char *new_str;
--
-+
- if (str)
- {
- new_str = malloc ((strlen (str) + 1) * sizeof(char));
-@@ -3399,7 +5671,7 @@ my_strdup (char *str)
- }
- else
- new_str = NULL;
--
-+
- return new_str;
- }
-
-@@ -3436,28 +5708,40 @@ int main ()
- }
-
-
--EOF
--if { (eval echo configure:3441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-- :
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -fr conftest*
-- no_esd=yes
-+_ACEOF
-+rm -f 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='./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
-+ :
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+no_esd=yes
- fi
--rm -fr conftest*
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_esd" = x ; then
-- echo "$ac_t""yes" 1>&6
-- use_esd=yes
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ use_esd=yes
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- if test "$ESD_CONFIG" = "no" ; then
- echo "*** The esd-config script installed by ESD could not be found"
- echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -3470,19 +5754,37 @@ fi
- echo "*** Could not run ESD test program, checking why..."
- CFLAGS="$CFLAGS $ESD_CFLAGS"
- LIBS="$LIBS $ESD_LIBS"
-- cat > conftest.$ac_ext <<EOF
--#line 3475 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <stdio.h>
- #include <esd.h>
-
--int main() {
-- return 0;
--; return 0; }
--EOF
--if { (eval echo configure:3485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+int
-+main ()
-+{
-+ return 0;
-+ ;
-+ 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
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding ESD or finding the wrong"
- echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-@@ -3493,15 +5795,15 @@ if { (eval echo configure:3485: \"$ac_li
- 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"
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means ESD was incorrectly installed"
- echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-- echo "*** may want to edit the esd-config script: $ESD_CONFIG"
-+ echo "*** may want to edit the esd-config script: $ESD_CONFIG"
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-@@ -3510,30 +5812,31 @@ rm -f conftest*
- ESD_LIBS=""
- :
- fi
--
--
-+
-+
- rm -f conf.esdtest
-
- if test x$use_esd = xyes; then
- # Check whether --enable-esd-shared or --disable-esd-shared was given.
- if test "${enable_esd_shared+set}" = set; then
- enableval="$enable_esd_shared"
-- :
-+
- else
- enable_esd_shared=yes
--fi
--
-+fi;
- esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'`
- esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
- echo "-- $esd_lib_spec -> $esd_lib"
- if test x$enable_dlopen != xyes && \
- test x$enable_esd_shared = xyes; then
-- { echo "configure: error: You must have dlopen() support and use the --enable-dlopen option" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: You must have dlopen() support and use the --enable-dlopen option" >&5
-+echo "$as_me: error: You must have dlopen() support and use the --enable-dlopen option" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- if test x$enable_dlopen = xyes && \
- test x$enable_esd_shared = xyes && test x$esd_lib != x; then
- CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
--
-+
- else
- CFLAGS="$CFLAGS -DESD_SUPPORT $ESD_CFLAGS"
- SYSTEM_LIBS="$SYSTEM_LIBS $ESD_LIBS"
-@@ -3549,45 +5852,48 @@ CheckARTSC()
- # Check whether --enable-arts or --disable-arts was given.
- if test "${enable_arts+set}" = set; then
- enableval="$enable_arts"
-- :
-+
- else
- enable_arts=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes -a x$enable_arts = xyes; then
- # Extract the first word of "artsc-config", so it can be a program name with args.
- set dummy artsc-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3562: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_ARTSCCONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$ARTSCCONFIG" in
-- /*)
-+ case $ARTSCCONFIG in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_ARTSCCONFIG="$ARTSCCONFIG" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_ARTSCCONFIG="$ARTSCCONFIG" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_ARTSCCONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ 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_ARTSCCONFIG="$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
-+
- ;;
- esac
- fi
--ARTSCCONFIG="$ac_cv_path_ARTSCCONFIG"
-+ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
-+
- if test -n "$ARTSCCONFIG"; then
-- echo "$ac_t""$ARTSCCONFIG" 1>&6
-+ echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
-+echo "${ECHO_T}$ARTSCCONFIG" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
-@@ -3595,55 +5901,76 @@ fi
- else
- ARTSC_CFLAGS=`$ARTSCCONFIG --cflags`
- ARTSC_LIBS=`$ARTSCCONFIG --libs`
-- echo $ac_n "checking for aRts development environment""... $ac_c" 1>&6
--echo "configure:3600: checking for aRts development environment" >&5
-+ echo "$as_me:$LINENO: checking for aRts development environment" >&5
-+echo $ECHO_N "checking for aRts development environment... $ECHO_C" >&6
- audio_arts=no
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $ARTSC_CFLAGS"
-- cat > conftest.$ac_ext <<EOF
--#line 3605 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <artsc.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- arts_stream_t stream;
--
--; return 0; }
--EOF
--if { (eval echo configure:3616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- audio_arts=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$save_CFLAGS"
-- echo "$ac_t""$audio_arts" 1>&6
-+ echo "$as_me:$LINENO: result: $audio_arts" >&5
-+echo "${ECHO_T}$audio_arts" >&6
- if test x$audio_arts = xyes; then
- # Check whether --enable-arts-shared or --disable-arts-shared was given.
- if test "${enable_arts_shared+set}" = set; then
- enableval="$enable_arts_shared"
-- :
-+
- else
- enable_arts_shared=yes
--fi
--
-+fi;
- arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libartsc.so.*/'`
- arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
- echo "-- $arts_lib_spec -> $arts_lib"
- if test x$enable_dlopen != xyes && \
- test x$enable_arts_shared = xyes; then
-- { echo "configure: error: You must have dlopen() support and use the --enable-dlopen option" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: You must have dlopen() support and use the --enable-dlopen option" >&5
-+echo "$as_me: error: You must have dlopen() support and use the --enable-dlopen option" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- if test x$enable_dlopen = xyes && \
- test x$enable_arts_shared = xyes && test x$arts_lib != x; then
- CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
--
-+
- else
- CFLAGS="$CFLAGS -DARTSC_SUPPORT $ARTSC_CFLAGS"
- SYSTEM_LIBS="$SYSTEM_LIBS $ARTSC_LIBS"
-@@ -3660,96 +5987,418 @@ CheckNAS()
- # Check whether --enable-nas or --disable-nas was given.
- if test "${enable_nas+set}" = set; then
- enableval="$enable_nas"
-- :
-+
- else
- enable_nas=yes
--fi
--
-+fi;
- if test x$enable_audio = xyes -a x$enable_nas = xyes; then
-- echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
--echo "configure:3671: checking for NAS audio support" >&5
-+ echo "$as_me:$LINENO: checking for NAS audio support" >&5
-+echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6
+@@ -3669,7 +3669,7 @@ fi
+ echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
+ echo "configure:3671: checking for NAS audio support" >&5
have_nas=no
- if test -r /usr/X11R6/include/audio/audiolib.h; then
+ if true; then
have_nas=yes
CFLAGS="$CFLAGS -DNAS_SUPPORT"
SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
- AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
- AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-
--
-- elif test -r /usr/freeware/include/nas/audiolib.h; then
-- have_nas=yes
-- CFLAGS="$CFLAGS -DNAS_SUPPORT"
-- SYSTEM_LIBS="$SYSTEM_LIBS -lnas -lXt"
-- AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
-- AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-- fi
-- echo "$ac_t""$have_nas" 1>&6
-- fi
--}
-
--CheckDiskAudio()
--{
-- # Check whether --enable-diskaudio or --disable-diskaudio was given.
--if test "${enable_diskaudio+set}" = set; then
-- enableval="$enable_diskaudio"
-- :
--else
-- enable_diskaudio=yes
-+ elif test -r /usr/freeware/include/nas/audiolib.h; then
-+ have_nas=yes
-+ CFLAGS="$CFLAGS -DNAS_SUPPORT"
-+ SYSTEM_LIBS="$SYSTEM_LIBS -lnas -lXt"
-+ AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
-+ AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-+ fi
-+ echo "$as_me:$LINENO: result: $have_nas" >&5
-+echo "${ECHO_T}$have_nas" >&6
-+ fi
-+}
-+
-+CheckDiskAudio()
-+{
-+ # Check whether --enable-diskaudio or --disable-diskaudio was given.
-+if test "${enable_diskaudio+set}" = set; then
-+ enableval="$enable_diskaudio"
-+
-+else
-+ enable_diskaudio=yes
-+fi;
-+ if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
-+ CFLAGS="$CFLAGS -DDISKAUD_SUPPORT"
-+ AUDIO_SUBDIRS="$AUDIO_SUBDIRS disk"
-+ AUDIO_DRIVERS="$AUDIO_DRIVERS disk/libaudio_disk.la"
-+ fi
-+}
-+
-+CheckAtariAudio()
-+{
-+ # Check whether --enable-mintaudio or --disable-mintaudio was given.
-+if test "${enable_mintaudio+set}" = set; then
-+ enableval="$enable_mintaudio"
-+
-+else
-+ enable_mintaudio=yes
-+fi;
-+ if test x$enable_audio = xyes -a x$enable_mintaudio = xyes; then
-+ mintaudio=no
-+ 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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ 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_cv_header_stdc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+ if test "$cross_compiling" = yes; then
-+ :
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ exit(2);
-+ exit (0);
-+}
-+_ACEOF
-+rm -f 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='./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
-+ :
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+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
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+# 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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+
-+#include <$ac_header>
-+_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
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+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
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
-
-- if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
-- CFLAGS="$CFLAGS -DDISKAUD_SUPPORT"
-- AUDIO_SUBDIRS="$AUDIO_SUBDIRS disk"
-- AUDIO_DRIVERS="$AUDIO_DRIVERS disk/libaudio_disk.la"
-- fi
--}
-+done
-
--CheckAtariAudio()
--{
-- # Check whether --enable-mintaudio or --disable-mintaudio was given.
--if test "${enable_mintaudio+set}" = set; then
-- enableval="$enable_mintaudio"
-- :
-+
-+if test "${ac_cv_header_mint_falcon_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for mint/falcon.h" >&5
-+echo $ECHO_N "checking for mint/falcon.h... $ECHO_C" >&6
-+if test "${ac_cv_header_mint_falcon_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_mint_falcon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mint_falcon_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking mint/falcon.h usability" >&5
-+echo $ECHO_N "checking mint/falcon.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <mint/falcon.h>
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking mint/falcon.h presence" >&5
-+echo $ECHO_N "checking mint/falcon.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <mint/falcon.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- enable_mintaudio=yes
-+ ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-- if test x$enable_audio = xyes -a x$enable_mintaudio = xyes; then
-- mintaudio=no
-- ac_safe=`echo "mint/falcon.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for mint/falcon.h""... $ac_c" 1>&6
--echo "configure:3723: checking for mint/falcon.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 3728 "configure"
--#include "confdefs.h"
--#include <mint/falcon.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: mint/falcon.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: mint/falcon.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mint/falcon.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: mint/falcon.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: mint/falcon.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: mint/falcon.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mint/falcon.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: mint/falcon.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: mint/falcon.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: mint/falcon.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for mint/falcon.h" >&5
-+echo $ECHO_N "checking for mint/falcon.h... $ECHO_C" >&6
-+if test "${ac_cv_header_mint_falcon_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cv_header_mint_falcon_h=$ac_header_preproc
- fi
--rm -f conftest*
-+echo "$as_me:$LINENO: result: $ac_cv_header_mint_falcon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_mint_falcon_h" >&6
-+
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+if test $ac_cv_header_mint_falcon_h = yes; then
- have_mint_falcon_hdr=yes
--else
-- echo "$ac_t""no" 1>&6
- fi
-
-+
- if test x$have_mint_falcon_hdr = xyes; then
- mintaudio=yes
- CFLAGS="$CFLAGS -DMINTAUDIO_SUPPORT"
-@@ -3773,45 +6422,48 @@ CheckNASM()
- # Check whether --enable-nasm or --disable-nasm was given.
- if test "${enable_nasm+set}" = set; then
- enableval="$enable_nasm"
-- :
-+
- else
- enable_nasm=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_nasm = xyes; then
- # Extract the first word of "nasm", so it can be a program name with args.
- set dummy nasm; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3786: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_NASM'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_NASM+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$NASM" in
-- /*)
-+ case $NASM in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_NASM="$NASM" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_NASM="$NASM" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_NASM="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ 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_NASM="$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
-+
- ;;
- esac
- fi
--NASM="$ac_cv_path_NASM"
-+NASM=$ac_cv_path_NASM
-+
- if test -n "$NASM"; then
-- echo "$ac_t""$NASM" 1>&6
-+ echo "$as_me:$LINENO: result: $NASM" >&5
-+echo "${ECHO_T}$NASM" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- if test x$NASM = x -o x$NASM = x'"$NASM"'; then
-@@ -3826,10 +6478,10 @@ fi
+@@ -3826,7 +3826,7 @@ fi
NASMFLAGS="-f aoutb"
;;
*)
@@ -7981,3021 +19,11 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
+ test -n "$NASMFLAGS" || NASMFLAGS="-f elf"
;;
esac
--
-+
- CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hermes"
- SDL_EXTRADIRS="$SDL_EXTRADIRS hermes"
- SDL_EXTRALIBS="$SDL_EXTRALIBS hermes/libhermes.la"
-@@ -3842,35 +6494,31 @@ CheckNANOX()
- # Check whether --enable-video-nanox or --disable-video-nanox was given.
- if test "${enable_video_nanox+set}" = set; then
- enableval="$enable_video_nanox"
-- :
-+
- else
- enable_video_nanox=no
--fi
--
-+fi;
- # Check whether --enable-nanox-debug or --disable-nanox-debug was given.
- if test "${enable_nanox_debug+set}" = set; then
- enableval="$enable_nanox_debug"
-- :
-+
- else
- enable_nanox_debug=no
--fi
--
-+fi;
- # Check whether --enable-nanox-share-memory or --disable-nanox-share-memory was given.
- if test "${enable_nanox_share_memory+set}" = set; then
- enableval="$enable_nanox_share_memory"
-- :
-+
- else
- enable_nanox_share_memory=no
--fi
--
-+fi;
- # Check whether --enable-nanox_direct_fb or --disable-nanox_direct_fb was given.
- if test "${enable_nanox_direct_fb+set}" = set; then
- enableval="$enable_nanox_direct_fb"
-- :
-+
- else
- enable_nanox_direct_fb=no
--fi
--
-+fi;
-
- if test x$enable_video = xyes -a x$enable_video_nanox = xyes; then
- if test x$enable_nanox_debug = xyes; then
-@@ -3897,25 +6545,20 @@ CheckX11()
- # Check whether --enable-video-x11 or --disable-video-x11 was given.
- if test "${enable_video_x11+set}" = set; then
- enableval="$enable_video_x11"
-- :
-+
- else
- enable_video_x11=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
-- # If we find X, set shell vars x_includes and x_libraries to the
--# paths, otherwise set no_x=yes.
--# Uses ac_ vars as temps to allow command line to override cache and checks.
--# --without-x overrides everything else, but does not touch the cache.
--echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:3912: 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"
-- :
--fi
-
-+fi;
- # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
- if test "x$with_x" = xno; then
- # The user explicitly disabled X.
-@@ -3925,193 +6568,184 @@ else
- # Both variables are already set.
- have_x=yes
- else
--if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ if test "${ac_cv_have_x+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # One or both of the vars are not set, and there is no cached value.
--ac_x_includes=NO ac_x_libraries=NO
--rm -fr conftestdir
--if mkdir conftestdir; then
-- cd conftestdir
-+ac_x_includes=no ac_x_libraries=no
-+rm -fr conftest.dir
-+if mkdir conftest.dir; then
-+ cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-- cat > Imakefile <<'EOF'
-+ cat >Imakefile <<'_ACEOF'
- acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
--EOF
-+_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-- test -f $ac_im_libdir/libX11.$ac_extension; then
-+ test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
-- case "$ac_im_incroot" in
-+ case $ac_im_incroot in
- /usr/include) ;;
-- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
-- case "$ac_im_usrlibdir" in
-+ case $ac_im_usrlibdir in
- /usr/lib | /lib) ;;
-- *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
- cd ..
-- rm -fr conftestdir
-+ rm -fr conftest.dir
- fi
-
--if test "$ac_x_includes" = NO; then
-- # Guess where to find include files, by looking for this one X11 .h file.
-- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+# Standard set of common directories for X headers.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+ac_x_header_dirs='
-+/usr/X11/include
-+/usr/X11R6/include
-+/usr/X11R5/include
-+/usr/X11R4/include
-+
-+/usr/include/X11
-+/usr/include/X11R6
-+/usr/include/X11R5
-+/usr/include/X11R4
-+
-+/usr/local/X11/include
-+/usr/local/X11R6/include
-+/usr/local/X11R5/include
-+/usr/local/X11R4/include
-+
-+/usr/local/include/X11
-+/usr/local/include/X11R6
-+/usr/local/include/X11R5
-+/usr/local/include/X11R4
-+
-+/usr/X386/include
-+/usr/x386/include
-+/usr/XFree86/include/X11
-+
-+/usr/include
-+/usr/local/include
-+/usr/unsupported/include
-+/usr/athena/include
-+/usr/local/x11r5/include
-+/usr/lpp/Xamples/include
-+
-+/usr/openwin/include
-+/usr/openwin/share/include'
-
-+if test "$ac_x_includes" = no; then
-+ # 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 <<EOF
--#line 3974 "configure"
--#include "confdefs.h"
--#include <$x_direct_test_include>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <X11/Intrinsic.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- # Look for the header file in a standard set of common directories.
--# Check X11 before X11Rn because it is often a symlink to the current release.
-- for ac_dir in \
-- /usr/X11/include \
-- /usr/X11R6/include \
-- /usr/X11R5/include \
-- /usr/X11R4/include \
-- \
-- /usr/include/X11 \
-- /usr/include/X11R6 \
-- /usr/include/X11R5 \
-- /usr/include/X11R4 \
-- \
-- /usr/local/X11/include \
-- /usr/local/X11R6/include \
-- /usr/local/X11R5/include \
-- /usr/local/X11R4/include \
-- \
-- /usr/local/include/X11 \
-- /usr/local/include/X11R6 \
-- /usr/local/include/X11R5 \
-- /usr/local/include/X11R4 \
-- \
-- /usr/X386/include \
-- /usr/x386/include \
-- /usr/XFree86/include/X11 \
-- \
-- /usr/include \
-- /usr/local/include \
-- /usr/unsupported/include \
-- /usr/athena/include \
-- /usr/local/x11r5/include \
-- /usr/lpp/Xamples/include \
-- \
-- /usr/openwin/include \
-- /usr/openwin/share/include \
-- ; \
-- do
-- if test -r "$ac_dir/$x_direct_test_include"; then
-- ac_x_includes=$ac_dir
-- break
-- fi
-- done
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ for ac_dir in $ac_x_header_dirs; do
-+ if test -r "$ac_dir/X11/Intrinsic.h"; then
-+ ac_x_includes=$ac_dir
-+ break
-+ fi
-+done
- fi
--rm -f conftest*
--fi # $ac_x_includes = NO
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
-
--if test "$ac_x_libraries" = NO; then
-+if test "$ac_x_libraries" = no; then
- # Check for the libraries.
--
-- test -z "$x_direct_test_library" && x_direct_test_library=Xt
-- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
--
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
-- ac_save_LIBS="$LIBS"
-- LIBS="-l$x_direct_test_library $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4048 "configure"
--#include "confdefs.h"
--
--int main() {
--${x_direct_test_function}()
--; return 0; }
--EOF
--if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- LIBS="$ac_save_LIBS"
-+ ac_save_LIBS=$LIBS
-+ LIBS="-lXt $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <X11/Intrinsic.h>
-+int
-+main ()
-+{
-+XtMalloc (0)
-+ ;
-+ 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
-+ LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- LIBS="$ac_save_LIBS"
--# First see if replacing the include by lib works.
--# Check X11 before X11Rn because it is often a symlink to the current release.
--for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-- /usr/X11/lib \
-- /usr/X11R6/lib \
-- /usr/X11R5/lib \
-- /usr/X11R4/lib \
-- \
-- /usr/lib/X11 \
-- /usr/lib/X11R6 \
-- /usr/lib/X11R5 \
-- /usr/lib/X11R4 \
-- \
-- /usr/local/X11/lib \
-- /usr/local/X11R6/lib \
-- /usr/local/X11R5/lib \
-- /usr/local/X11R4/lib \
-- \
-- /usr/local/lib/X11 \
-- /usr/local/lib/X11R6 \
-- /usr/local/lib/X11R5 \
-- /usr/local/lib/X11R4 \
-- \
-- /usr/X386/lib \
-- /usr/x386/lib \
-- /usr/XFree86/lib/X11 \
-- \
-- /usr/lib \
-- /usr/local/lib \
-- /usr/unsupported/lib \
-- /usr/athena/lib \
-- /usr/local/x11r5/lib \
-- /usr/lpp/Xamples/lib \
-- /lib/usr/lib/X11 \
-- \
-- /usr/openwin/lib \
-- /usr/openwin/share/lib \
-- ; \
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+LIBS=$ac_save_LIBS
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-+ # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+ if test -r $ac_dir/libXt.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
- done
- fi
--rm -f conftest*
--fi # $ac_x_libraries = NO
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = no
-
--if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
- else
-@@ -4120,12 +6754,14 @@ else
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
- fi
- fi
-+
- fi
- eval "$ac_cv_have_x"
- fi # $with_x != no
-
- if test "$have_x" != yes; then
-- echo "$ac_t""$have_x" 1>&6
-+ echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6
- no_x=yes
- else
- # If each of the values was on the command line, it overrides each guess.
-@@ -4134,14 +6770,16 @@ else
- # 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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
-
- if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-- cat >> confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define X_DISPLAY_MISSING 1
--EOF
-+_ACEOF
-
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
- else
-@@ -4154,60 +6792,99 @@ else
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- case "`(uname -sr) 2>/dev/null`" in
-+ case `(uname -sr) 2>/dev/null` in
- "SunOS 5"*)
-- echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:4161: checking whether -R must be followed by a space" >&5
-- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-- cat > conftest.$ac_ext <<EOF
--#line 4164 "configure"
--#include "confdefs.h"
--
--int main() {
--
--; return 0; }
--EOF
--if { (eval echo configure:4171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ 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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ 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_R_nospace=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_R_nospace=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_R_nospace=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_nospace = yes; then
-- echo "$ac_t""no" 1>&6
-+ 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 <<EOF
--#line 4187 "configure"
--#include "confdefs.h"
--
--int main() {
--
--; return 0; }
--EOF
--if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ 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_R_space=yes
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- ac_R_space=no
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_R_space=no
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_space = yes; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- X_LIBS="$X_LIBS -R $x_libraries"
- else
-- echo "$ac_t""neither works" 1>&6
-+ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6
- fi
- fi
-- LIBS="$ac_xsave_LIBS"
-+ LIBS=$ac_xsave_LIBS
- esac
- fi
-
-@@ -4218,522 +6895,854 @@ rm -f conftest*
- if test "$ISC" = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
- else
-- # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-- # libraries were built with DECnet support. And karl@cs.umb.edu says
-+ # Martyn Johnson says this is needed for Ultrix, if the X
-+ # libraries were built with DECnet support. And Karl Berry says
- # the Alpha needs dnet_stub (dnet does not exist).
-- echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:4226: checking for dnet_ntoa in -ldnet" >&5
--ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-ldnet $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4234 "configure"
--#include "confdefs.h"
-+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dnet_ntoa();
--
--int main() {
--dnet_ntoa()
--; return 0; }
--EOF
--if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
-+ builtin and then its argument prototype would still apply. */
-+char XOpenDisplay ();
-+int
-+main ()
-+{
-+XOpenDisplay ();
-+ ;
-+ 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
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&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
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+/* 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 dnet_ntoa ();
-+int
-+main ()
-+{
-+dnet_ntoa ();
-+ ;
-+ 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_lib_dnet_dnet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_dnet_ntoa=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-- echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:4267: checking for dnet_ntoa in -ldnet_stub" >&5
--ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4275 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dnet_ntoa();
--
--int main() {
--dnet_ntoa()
--; return 0; }
--EOF
--if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dnet_ntoa ();
-+int
-+main ()
-+{
-+dnet_ntoa ();
-+ ;
-+ 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_lib_dnet_stub_dnet_ntoa=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS="$ac_xsave_LIBS"
-
- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
- # to get the SysV transport functions.
-- # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
- # needs -lnsl.
- # The nsl library prevents programs from opening the X display
-- # on Irix 5.2, according to dickey@clark.net.
-- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4315: checking for gethostbyname" >&5
--if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 4320 "configure"
--#include "confdefs.h"
-+ # 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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char gethostbyname(); below. */
--#include <assert.h>
-+ which can conflict with char gethostbyname (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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 gethostbyname();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
- choke me
- #else
--gethostbyname();
-+char (*f) () = gethostbyname;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_gethostbyname=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_gethostbyname=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != gethostbyname;
-+ ;
-+ 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_func_gethostbyname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
-+ac_cv_func_gethostbyname=no
- fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+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 $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4364: checking for gethostbyname in -lnsl" >&5
--ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4372 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 gethostbyname();
--
--int main() {
--gethostbyname()
--; return 0; }
--EOF
--if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
-+ builtin and then its argument prototype would still apply. */
-+char gethostbyname ();
-+int
-+main ()
-+{
-+gethostbyname ();
-+ ;
-+ 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_lib_nsl_gethostbyname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_nsl_gethostbyname=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
--else
-- echo "$ac_t""no" 1>&6
-+ if test $ac_cv_lib_nsl_gethostbyname = no; then
-+ 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
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 gethostbyname ();
-+int
-+main ()
-+{
-+gethostbyname ();
-+ ;
-+ 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_lib_bsd_gethostbyname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_bsd_gethostbyname=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
- fi
-
-+ fi
- fi
-
- # lieder@skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
-- # on later versions), says simon@lia.di.epfl.ch: it contains
-- # gethostby* 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 $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:4413: checking for connect" >&5
--if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 4418 "configure"
--#include "confdefs.h"
-+ # on later versions), says Simon Leinen: it contains gethostby*
-+ # variants that don't use the name server (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:$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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char connect(); below. */
--#include <assert.h>
-+ which can conflict with char connect (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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 connect();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_connect) || defined (__stub___connect)
- choke me
- #else
--connect();
-+char (*f) () = connect;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_connect=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_connect=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != connect;
-+ ;
-+ 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_func_connect=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
-+ac_cv_func_connect=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-+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 $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:4462: checking for connect in -lsocket" >&5
--ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4470 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 connect();
--
--int main() {
--connect()
--; return 0; }
--EOF
--if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char connect ();
-+int
-+main ()
-+{
-+connect ();
-+ ;
-+ 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_lib_socket_connect=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_connect=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-
-- # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-- echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:4505: checking for remove" >&5
--if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 4510 "configure"
--#include "confdefs.h"
-+ # Guillermo Gomez says -lposix is necessary on A/UX.
-+ 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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char remove(); below. */
--#include <assert.h>
-+ which can conflict with char remove (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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 remove();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char remove ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_remove) || defined (__stub___remove)
- choke me
- #else
--remove();
-+char (*f) () = remove;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:4533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_remove=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_remove=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != remove;
-+ ;
-+ 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_func_remove=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
-+ac_cv_func_remove=no
- fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+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 $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:4554: checking for remove in -lposix" >&5
--ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4562 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 remove();
--
--int main() {
--remove()
--; return 0; }
--EOF
--if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char remove ();
-+int
-+main ()
-+{
-+remove ();
-+ ;
-+ 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_lib_posix_remove=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_posix_remove=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-- echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:4597: checking for shmat" >&5
--if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 4602 "configure"
--#include "confdefs.h"
-+ 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 $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shmat(); below. */
--#include <assert.h>
-+ which can conflict with char shmat (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* 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 shmat();
--
--int main() {
--
-+ builtin and then its argument prototype would still apply. */
-+char shmat ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_shmat) || defined (__stub___shmat)
- choke me
- #else
--shmat();
-+char (*f) () = shmat;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
--; return 0; }
--EOF
--if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_func_shmat=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_func_shmat=no"
--fi
--rm -f conftest*
--fi
-+int
-+main ()
-+{
-+return f != shmat;
-+ ;
-+ 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_func_shmat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- :
--else
-- echo "$ac_t""no" 1>&6
-+ac_cv_func_shmat=no
- fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+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 $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:4646: checking for shmat in -lipc" >&5
--ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4654 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 shmat();
--
--int main() {
--shmat()
--; return 0; }
--EOF
--if { (eval echo configure:4665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char shmat ();
-+int
-+main ()
-+{
-+shmat ();
-+ ;
-+ 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_lib_ipc_shmat=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ipc_shmat=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
+
+@@ -5429,34 +5429,53 @@ else
fi
- fi
- fi
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
-- ac_save_LDFLAGS="$LDFLAGS"
-+ ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
-- # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-- echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:4698: checking for IceConnectionNumber in -lICE" >&5
--ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ # John Interrante, Karl Berry
-+ 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
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4706 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 IceConnectionNumber();
--
--int main() {
--IceConnectionNumber()
--; return 0; }
--EOF
--if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char IceConnectionNumber ();
-+int
-+main ()
-+{
-+IceConnectionNumber ();
-+ ;
-+ 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_lib_ICE_IceConnectionNumber=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+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"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
-- LDFLAGS="$ac_save_LDFLAGS"
-+ LDFLAGS=$ac_save_LDFLAGS
-
- fi
-
-@@ -4749,69 +7758,108 @@ fi
- # Check whether --enable-video-x11-vm or --disable-video-x11-vm was given.
- if test "${enable_video_x11_vm+set}" = set; then
- enableval="$enable_video_x11_vm"
-- :
-+
- else
- enable_video_x11_vm=yes
--fi
--
-+fi;
- if test x$enable_video_x11_vm = xyes; then
-- echo $ac_n "checking for XFree86 VidMode 1.0 support""... $ac_c" 1>&6
--echo "configure:4760: checking for XFree86 VidMode 1.0 support" >&5
-+ echo "$as_me:$LINENO: checking for XFree86 VidMode 1.0 support" >&5
-+echo $ECHO_N "checking for XFree86 VidMode 1.0 support... $ECHO_C" >&6
- video_x11_vm=no
-- cat > conftest.$ac_ext <<EOF
--#line 4763 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <XFree86/extensions/xf86vmode.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:4774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_x11_vm=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_vm" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_vm" >&5
-+echo "${ECHO_T}$video_x11_vm" >&6
- if test x$video_x11_vm = xyes; then
- CFLAGS="$CFLAGS -DXFREE86_VM"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
- VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
-- echo $ac_n "checking for XFree86 VidMode gamma support""... $ac_c" 1>&6
--echo "configure:4790: checking for XFree86 VidMode gamma support" >&5
-+ echo "$as_me:$LINENO: checking for XFree86 VidMode gamma support" >&5
-+echo $ECHO_N "checking for XFree86 VidMode gamma support... $ECHO_C" >&6
- video_x11_vmgamma=no
-- cat > conftest.$ac_ext <<EOF
--#line 4793 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <XFree86/extensions/xf86vmode.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- SDL_NAME(XF86VidModeGamma) gamma;
--
--; return 0; }
--EOF
--if { (eval echo configure:4805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_x11_vmgamma=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_vmgamma" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_vmgamma" >&5
-+echo "${ECHO_T}$video_x11_vmgamma" >&6
- if test x$video_x11_vmgamma = xyes; then
- CFLAGS="$CFLAGS -DXFREE86_VMGAMMA"
- fi
-@@ -4820,46 +7868,64 @@ rm -f conftest*
- # Check whether --enable-dga or --disable-dga was given.
- if test "${enable_dga+set}" = set; then
- enableval="$enable_dga"
-- :
-+
- else
- enable_dga=yes
--fi
--
-+fi;
- # Check whether --enable-video-x11-dgamouse or --disable-video-x11-dgamouse was given.
- if test "${enable_video_x11_dgamouse+set}" = set; then
- enableval="$enable_video_x11_dgamouse"
-- :
-+
- else
- enable_video_x11_dgamouse=yes
--fi
--
-+fi;
- if test x$enable_dga = xyes; then
-- echo $ac_n "checking for XFree86 DGA 1.0 support""... $ac_c" 1>&6
--echo "configure:4839: checking for XFree86 DGA 1.0 support" >&5
-+ echo "$as_me:$LINENO: checking for XFree86 DGA 1.0 support" >&5
-+echo $ECHO_N "checking for XFree86 DGA 1.0 support... $ECHO_C" >&6
- video_x11_dga=no
-- cat > conftest.$ac_ext <<EOF
--#line 4842 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <XFree86/extensions/xf86dga.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:4853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_x11_dga=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_dga" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_dga" >&5
-+echo "${ECHO_T}$video_x11_dga" >&6
- if test x$video_x11_dga = xyes; then
- CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
- if test x$enable_video_x11_dgamouse = xyes; then
-@@ -4872,42 +7938,61 @@ rm -f conftest*
- # Check whether --enable-video-x11-xv or --disable-video-x11-xv was given.
- if test "${enable_video_x11_xv+set}" = set; then
- enableval="$enable_video_x11_xv"
-- :
-+
- else
- enable_video_x11_xv=yes
--fi
--
-+fi;
- if test x$enable_video_x11_xv = xyes; then
-- echo $ac_n "checking for XFree86 XvImage support""... $ac_c" 1>&6
--echo "configure:4883: checking for XFree86 XvImage support" >&5
-+ echo "$as_me:$LINENO: checking for XFree86 XvImage support" >&5
-+echo $ECHO_N "checking for XFree86 XvImage support... $ECHO_C" >&6
- video_x11_xv=no
-- cat > conftest.$ac_ext <<EOF
--#line 4886 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/extensions/XShm.h>
- #include <XFree86/extensions/Xvlib.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- SDL_NAME(XvImage) *image;
--
--; return 0; }
--EOF
--if { (eval echo configure:4901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_x11_xv=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_xv" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_xv" >&5
-+echo "${ECHO_T}$video_x11_xv" >&6
- if test x$video_x11_xv = xyes; then
- CFLAGS="$CFLAGS -DXFREE86_XV"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
-@@ -4917,39 +8002,58 @@ rm -f conftest*
- # Check whether --enable-video-x11-xinerama or --disable-video-x11-xinerama was given.
- if test "${enable_video_x11_xinerama+set}" = set; then
- enableval="$enable_video_x11_xinerama"
-- :
-+
- else
- enable_video_x11_xinerama=yes
--fi
--
-+fi;
- if test x$enable_video_x11_xinerama = xyes; then
-- echo $ac_n "checking for X11 Xinerama support""... $ac_c" 1>&6
--echo "configure:4928: checking for X11 Xinerama support" >&5
-+ echo "$as_me:$LINENO: checking for X11 Xinerama support" >&5
-+echo $ECHO_N "checking for X11 Xinerama support... $ECHO_C" >&6
- video_x11_xinerama=no
-- cat > conftest.$ac_ext <<EOF
--#line 4931 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <XFree86/extensions/Xinerama.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- SDL_NAME(XineramaScreenInfo) *xinerama;
--
--; return 0; }
--EOF
--if { (eval echo configure:4943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_x11_xinerama=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_xinerama" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_xinerama" >&5
-+echo "${ECHO_T}$video_x11_xinerama" >&6
- if test x$video_x11_xinerama = xyes; then
- CFLAGS="$CFLAGS -DHAVE_XINERAMA"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
-@@ -4959,39 +8063,58 @@ rm -f conftest*
- # Check whether --enable-video-x11-xme or --disable-video-x11-xme was given.
- if test "${enable_video_x11_xme+set}" = set; then
- enableval="$enable_video_x11_xme"
-- :
-+
- else
- enable_video_x11_xme=yes
--fi
--
-+fi;
- if test x$enable_video_x11_xme = xyes; then
-- echo $ac_n "checking for Xi Graphics XiGMiscExtension support""... $ac_c" 1>&6
--echo "configure:4970: checking for Xi Graphics XiGMiscExtension support" >&5
-+ echo "$as_me:$LINENO: checking for Xi Graphics XiGMiscExtension support" >&5
-+echo $ECHO_N "checking for Xi Graphics XiGMiscExtension support... $ECHO_C" >&6
- video_x11_xme=no
-- cat > conftest.$ac_ext <<EOF
--#line 4973 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <X11/extensions/xme.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- XiGMiscResolutionInfo *resolutions;
--
--; return 0; }
--EOF
--if { (eval echo configure:4985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_x11_xme=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_xme" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_xme" >&5
-+echo "${ECHO_T}$video_x11_xme" >&6
- if test x$video_x11_xme = xyes; then
- CFLAGS="$CFLAGS -DHAVE_XIGXME"
- SYSTEM_LIBS="$SYSTEM_LIBS -lxme"
-@@ -5006,40 +8129,59 @@ CheckDGA()
- # Check whether --enable-video-dga or --disable-video-dga was given.
- if test "${enable_video_dga+set}" = set; then
- enableval="$enable_video_dga"
-- :
-+
- else
- enable_video_dga=yes
--fi
--
-+fi;
- if test x$video_x11_dga = xyes -a x$enable_video_dga = xyes; then
- save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS -Isrc/video"
-- echo $ac_n "checking for XFree86 DGA 2.0 support""... $ac_c" 1>&6
--echo "configure:5018: checking for XFree86 DGA 2.0 support" >&5
-+ echo "$as_me:$LINENO: checking for XFree86 DGA 2.0 support" >&5
-+echo $ECHO_N "checking for XFree86 DGA 2.0 support... $ECHO_C" >&6
- video_x11_dga2=no
-- cat > conftest.$ac_ext <<EOF
--#line 5021 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <X11/Xlib.h>
- #include <XFree86/extensions/xf86dga.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- SDL_NAME(XDGAEvent) xevent;
--
--; return 0; }
--EOF
--if { (eval echo configure:5033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_x11_dga2=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_x11_dga2" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_x11_dga2" >&5
-+echo "${ECHO_T}$video_x11_dga2" >&6
- if test x$video_x11_dga2 = xyes; then
- CFLAGS="$CFLAGS -DENABLE_DGA"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS dga"
-@@ -5053,41 +8195,60 @@ CheckPHOTON()
- # Check whether --enable-video-photon or --disable-video-photon was given.
- if test "${enable_video_photon+set}" = set; then
- enableval="$enable_video_photon"
-- :
-+
- else
- enable_video_photon=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_photon = xyes; then
-- echo $ac_n "checking for QNX Photon support""... $ac_c" 1>&6
--echo "configure:5064: checking for QNX Photon support" >&5
-+ echo "$as_me:$LINENO: checking for QNX Photon support" >&5
-+echo $ECHO_N "checking for QNX Photon support... $ECHO_C" >&6
- video_photon=no
-- cat > conftest.$ac_ext <<EOF
--#line 5067 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <Ph.h>
- #include <Pt.h>
- #include <photon/Pg.h>
- #include <photon/PdDirect.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- PgDisplaySettings_t *visual;
--
--; return 0; }
--EOF
--if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_photon=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_photon" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_photon" >&5
-+echo "${ECHO_T}$video_photon" >&6
- if test x$video_photon = xyes; then
- CFLAGS="$CFLAGS -DENABLE_PHOTON"
- SYSTEM_LIBS="$SYSTEM_LIBS -lph"
-@@ -5103,39 +8264,58 @@ CheckFBCON()
- # Check whether --enable-video-fbcon or --disable-video-fbcon was given.
- if test "${enable_video_fbcon+set}" = set; then
- enableval="$enable_video_fbcon"
-- :
-+
- else
- enable_video_fbcon=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_fbcon = xyes; then
-- echo $ac_n "checking for framebuffer console support""... $ac_c" 1>&6
--echo "configure:5114: checking for framebuffer console support" >&5
-+ echo "$as_me:$LINENO: checking for framebuffer console support" >&5
-+echo $ECHO_N "checking for framebuffer console support... $ECHO_C" >&6
- video_fbcon=no
-- cat > conftest.$ac_ext <<EOF
--#line 5117 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <linux/fb.h>
- #include <linux/kd.h>
- #include <linux/keyboard.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:5129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_fbcon=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_fbcon" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_fbcon" >&5
-+echo "${ECHO_T}$video_fbcon" >&6
- if test x$video_fbcon = xyes; then
- CFLAGS="$CFLAGS -DENABLE_FBCON"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS fbcon"
-@@ -5149,58 +8329,64 @@ CheckDirectFB()
- # Check whether --enable-video-directfb or --disable-video-directfb was given.
- if test "${enable_video_directfb+set}" = set; then
- enableval="$enable_video_directfb"
-- :
-+
- else
- enable_video_directfb=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then
- video_directfb=no
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5164: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case "$PKG_CONFIG" in
-- /*)
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
-- ?:/*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-- ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
-+ 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_PKG_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_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
- esac
- fi
--PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
- if test -n "$PKG_CONFIG"; then
-- echo "$ac_t""$PKG_CONFIG" 1>&6
-+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
-
- if test x$PKG_CONFIG = xno ; then
-- echo "configure: warning: *** pkg-config is required to build the DirectFB video driver." 1>&2
-+ { echo "$as_me:$LINENO: WARNING: *** pkg-config is required to build the DirectFB video driver." >&5
-+echo "$as_me: WARNING: *** pkg-config is required to build the DirectFB video driver." >&2;}
- else
-- echo $ac_n "checking for DirectFB support""... $ac_c" 1>&6
--echo "configure:5201: checking for DirectFB support" >&5
-+ echo "$as_me:$LINENO: checking for DirectFB support" >&5
-+echo $ECHO_N "checking for DirectFB support... $ECHO_C" >&6
-
- if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-- { echo "configure: error: *** pkg-config too old; version 0.7 or better required." 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: *** pkg-config too old; version 0.7 or better required." >&5
-+echo "$as_me: error: *** pkg-config too old; version 0.7 or better required." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- DIRECTFB_REQUIRED_VERSION=0.9.15
-@@ -5212,14 +8398,15 @@ echo "configure:5201: checking for Direc
- fi
- fi
-
-- echo "$ac_t""$video_directfb" 1>&6
-+ echo "$as_me:$LINENO: result: $video_directfb" >&5
-+echo "${ECHO_T}$video_directfb" >&6
- if test x$video_directfb = xyes; then
- CFLAGS="$CFLAGS -DENABLE_DIRECTFB"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS directfb"
- VIDEO_DRIVERS="$VIDEO_DRIVERS directfb/libvideo_directfb.la"
-
--
--
-+
-+
- fi
- fi
- }
-@@ -5229,38 +8416,57 @@ CheckPS2GS()
- # Check whether --enable-video-ps2gs or --disable-video-ps2gs was given.
- if test "${enable_video_ps2gs+set}" = set; then
- enableval="$enable_video_ps2gs"
-- :
-+
- else
- enable_video_ps2gs=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_ps2gs = xyes; then
-- echo $ac_n "checking for PlayStation 2 GS support""... $ac_c" 1>&6
--echo "configure:5240: checking for PlayStation 2 GS support" >&5
-+ echo "$as_me:$LINENO: checking for PlayStation 2 GS support" >&5
-+echo $ECHO_N "checking for PlayStation 2 GS support... $ECHO_C" >&6
- video_ps2gs=no
-- cat > conftest.$ac_ext <<EOF
--#line 5243 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <linux/ps2/dev.h>
- #include <linux/ps2/gs.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:5254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_ps2gs=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_ps2gs" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_ps2gs" >&5
-+echo "${ECHO_T}$video_ps2gs" >&6
- if test x$video_ps2gs = xyes; then
- CFLAGS="$CFLAGS -DENABLE_PS2GS"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS ps2gs"
-@@ -5274,38 +8480,57 @@ CheckGGI()
- # Check whether --enable-video-ggi or --disable-video-ggi was given.
- if test "${enable_video_ggi+set}" = set; then
- enableval="$enable_video_ggi"
-- :
-+
- else
- enable_video_ggi=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_ggi = xyes; then
-- echo $ac_n "checking for GGI support""... $ac_c" 1>&6
--echo "configure:5285: checking for GGI support" >&5
-+ echo "$as_me:$LINENO: checking for GGI support" >&5
-+echo $ECHO_N "checking for GGI support... $ECHO_C" >&6
- video_ggi=no
-- cat > conftest.$ac_ext <<EOF
--#line 5288 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <ggi/ggi.h>
- #include <ggi/gii.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:5299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_ggi=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_ggi" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_ggi" >&5
-+echo "${ECHO_T}$video_ggi" >&6
- if test x$video_ggi = xyes; then
- CFLAGS="$CFLAGS $X_CFLAGS -DENABLE_GGI"
- SYSTEM_LIBS="$SYSTEM_LIBS -lggi -lgii -lgg"
-@@ -5321,42 +8546,61 @@ CheckSVGA()
- # Check whether --enable-video-svga or --disable-video-svga was given.
- if test "${enable_video_svga+set}" = set; then
- enableval="$enable_video_svga"
-- :
-+
- else
- enable_video_svga=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_svga = xyes; then
-- echo $ac_n "checking for SVGAlib (1.4.0+) support""... $ac_c" 1>&6
--echo "configure:5332: checking for SVGAlib (1.4.0+) support" >&5
-+ echo "$as_me:$LINENO: checking for SVGAlib (1.4.0+) support" >&5
-+echo $ECHO_N "checking for SVGAlib (1.4.0+) support... $ECHO_C" >&6
- video_svga=no
-- cat > conftest.$ac_ext <<EOF
--#line 5335 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <vga.h>
- #include <vgamouse.h>
- #include <vgakeyboard.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- if ( SCANCODE_RIGHTWIN && SCANCODE_LEFTWIN ) {
- exit(0);
- }
--
--; return 0; }
--EOF
--if { (eval echo configure:5350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_svga=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_svga" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_svga" >&5
-+echo "${ECHO_T}$video_svga" >&6
- if test x$video_svga = xyes; then
- CFLAGS="$CFLAGS -DENABLE_SVGALIB"
- SYSTEM_LIBS="$SYSTEM_LIBS -lvga"
-@@ -5372,42 +8616,61 @@ CheckVGL()
- # Check whether --enable-video-vgl or --disable-video-vgl was given.
- if test "${enable_video_vgl+set}" = set; then
- enableval="$enable_video_vgl"
-- :
-+
- else
- enable_video_vgl=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_vgl = xyes; then
-- echo $ac_n "checking for libVGL support""... $ac_c" 1>&6
--echo "configure:5383: checking for libVGL support" >&5
-+ echo "$as_me:$LINENO: checking for libVGL support" >&5
-+echo $ECHO_N "checking for libVGL support... $ECHO_C" >&6
- video_vgl=no
-- cat > conftest.$ac_ext <<EOF
--#line 5386 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/fbio.h>
- #include <sys/consio.h>
- #include <sys/kbio.h>
- #include <vgl.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- VGLBitmap bitmap;
- exit(bitmap.Bitmap);
--
--; return 0; }
--EOF
--if { (eval echo configure:5401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- video_vgl=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_vgl" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_vgl" >&5
-+echo "${ECHO_T}$video_vgl" >&6
- if test x$video_vgl = xyes; then
- CFLAGS="$CFLAGS -DENABLE_VGL"
- SYSTEM_LIBS="$SYSTEM_LIBS -lvgl"
-@@ -5423,40 +8686,63 @@ CheckAAlib()
- # Check whether --enable-video-aalib or --disable-video-aalib was given.
- if test "${enable_video_aalib+set}" = set; then
- enableval="$enable_video_aalib"
-- :
-+
- else
- enable_video_aalib=no
-+fi;
-+ if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
-+ # Extract the first word of "aalib-config", so it can be a program name with args.
-+set dummy aalib-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_AALIB_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $AALIB_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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_AALIB_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
-+
-+ ;;
-+esac
- fi
-+AALIB_CONFIG=$ac_cv_path_AALIB_CONFIG
-
-- if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
+ if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
- echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
-echo "configure:5434: checking for AAlib support" >&5
- video_aalib=no
@@ -11015,28 +43,53 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
-
- video_aalib=yes
-
-+if test -n "$AALIB_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $AALIB_CONFIG" >&5
-+echo "${ECHO_T}$AALIB_CONFIG" >&6
++ # Extract the first word of "aalib-config", so it can be a program name with args.
++set dummy aalib-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5436: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_AALIB_CONFIG'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
++ case "$AALIB_CONFIG" in
++ /*)
++ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
++ ;;
++ ?:/*)
++ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a dos path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_path_AALIB_CONFIG="$ac_dir/$ac_word"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++ ;;
++esac
fi
-rm -f conftest*
-- echo "$ac_t""$video_aalib" 1>&6
++AALIB_CONFIG="$ac_cv_path_AALIB_CONFIG"
++if test -n "$AALIB_CONFIG"; then
++ echo "$ac_t""$AALIB_CONFIG" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
+
-+ echo "$as_me:$LINENO: checking for AAlib support" >&5
-+echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
++ echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
++echo "configure:5469: checking for AAlib support" >&5
+ if test x$AALIB_CONFIG = x; then
+ video_aalib=no
+ else
+ AALIB_LIBS=`$AALIB_CONFIG --libs`
+ video_aalib=yes
+ fi
-+ echo "$as_me:$LINENO: result: $video_aalib" >&5
-+echo "${ECHO_T}$video_aalib" >&6
+ echo "$ac_t""$video_aalib" 1>&6
if test x$video_aalib = xyes; then
CFLAGS="$CFLAGS -DENABLE_AALIB"
- SYSTEM_LIBS="$SYSTEM_LIBS -laa"
@@ -11044,870 +97,45 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -5469,11 +8755,10 @@ CheckAtariXbiosVideo()
- # Check whether --enable-xbios or --disable-xbios was given.
- if test "${enable_xbios+set}" = set; then
- enableval="$enable_xbios"
-- :
-+
- else
- enable_video_xbios=yes
--fi
--
-+fi;
- video_xbios=no
- if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
- video_xbios=yes
-@@ -5488,84 +8773,202 @@ CheckAtariGemVideo()
- # Check whether --enable-gem or --disable-gem was given.
- if test "${enable_gem+set}" = set; then
- enableval="$enable_gem"
-- :
-+
- else
- enable_video_gem=yes
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_gem = xyes; then
- video_gem=no
-- ac_safe=`echo "gem.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for gem.h""... $ac_c" 1>&6
--echo "configure:5501: checking for gem.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 5506 "configure"
--#include "confdefs.h"
-+ if test "${ac_cv_header_gem_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for gem.h" >&5
-+echo $ECHO_N "checking for gem.h... $ECHO_C" >&6
-+if test "${ac_cv_header_gem_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_gem_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gem_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking gem.h usability" >&5
-+echo $ECHO_N "checking gem.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
- #include <gem.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking gem.h presence" >&5
-+echo $ECHO_N "checking gem.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <gem.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: gem.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gem.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: gem.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gem.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: gem.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gem.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: gem.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gem.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: gem.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gem.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for gem.h" >&5
-+echo $ECHO_N "checking for gem.h... $ECHO_C" >&6
-+if test "${ac_cv_header_gem_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_gem_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_gem_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gem_h" >&6
-+
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+if test $ac_cv_header_gem_h = yes; then
- have_gem_hdr=yes
--else
-- echo "$ac_t""no" 1>&6
+@@ -5881,19 +5900,20 @@ else
fi
-- echo $ac_n "checking for appl_init in -lgem""... $ac_c" 1>&6
--echo "configure:5533: checking for appl_init in -lgem" >&5
--ac_lib_var=`echo gem'_'appl_init | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+
-+ echo "$as_me:$LINENO: checking for appl_init in -lgem" >&5
-+echo $ECHO_N "checking for appl_init in -lgem... $ECHO_C" >&6
-+if test "${ac_cv_lib_gem_appl_init+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgem $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5541 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 appl_init();
--
--int main() {
--appl_init()
--; return 0; }
--EOF
--if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char appl_init ();
-+int
-+main ()
-+{
-+appl_init ();
-+ ;
-+ 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_lib_gem_appl_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_gem_appl_init=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_gem_appl_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_gem_appl_init" >&6
-+if test $ac_cv_lib_gem_appl_init = yes; then
- have_gem_lib=yes
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
-@@ -5590,11 +8993,10 @@ CheckDummyVideo()
- # Check whether --enable-video-dummy or --disable-video-dummy was given.
- if test "${enable_video_dummy+set}" = set; then
- enableval="$enable_video_dummy"
-- :
-+
- else
- enable_video_dummy=yes
--fi
--
-+fi;
- if test x$enable_video_dummy = xyes; then
- CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy"
-@@ -5605,83 +9007,120 @@ fi
- # Check whether --enable-video-opengl or --disable-video-opengl was given.
- if test "${enable_video_opengl+set}" = set; then
- enableval="$enable_video_opengl"
-- :
-+
- else
- enable_video_opengl=yes
--fi
--
-+fi;
-
- CheckOpenGL()
- {
- if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-- echo $ac_n "checking for OpenGL (GLX) support""... $ac_c" 1>&6
--echo "configure:5619: checking for OpenGL (GLX) support" >&5
-+ echo "$as_me:$LINENO: checking for OpenGL (GLX) support" >&5
-+echo $ECHO_N "checking for OpenGL (GLX) support... $ECHO_C" >&6
- video_opengl=no
-- cat > conftest.$ac_ext <<EOF
--#line 5622 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <GL/gl.h>
- #include <GL/glx.h>
- #include <dlfcn.h> /* For loading extensions */
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:5634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_opengl=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_opengl" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_opengl" >&5
-+echo "${ECHO_T}$video_opengl" >&6
- if test x$video_opengl = xyes; then
- CFLAGS="$CFLAGS -DHAVE_OPENGL"
- if test x$use_dlopen != xyes; then
-- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:5649: checking for dlopen in -ldl" >&5
--ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5657 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:5668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-@@ -5692,111 +9131,168 @@ fi
- CheckOpenGLQNX()
- {
- if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-- echo $ac_n "checking for OpenGL (Photon) support""... $ac_c" 1>&6
--echo "configure:5697: checking for OpenGL (Photon) support" >&5
-+ echo "$as_me:$LINENO: checking for OpenGL (Photon) support" >&5
-+echo $ECHO_N "checking for OpenGL (Photon) support... $ECHO_C" >&6
- video_opengl=no
-- cat > conftest.$ac_ext <<EOF
--#line 5700 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <GL/gl.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:5710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_opengl=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_opengl" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_opengl" >&5
-+echo "${ECHO_T}$video_opengl" >&6
- if test x$video_opengl = xyes; then
- CFLAGS="$CFLAGS -DHAVE_OPENGL"
- SYSTEM_LIBS="$SYSTEM_LIBS -lGL"
- if test x$use_dlopen != xyes; then
-- echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
--echo "configure:5726: checking for dlopen in -lc" >&5
--ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6
-+if test "${ac_cv_lib_c_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5734 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:5745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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_lib_c_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_c_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_c_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_dlopen" >&6
-+if test $ac_cv_lib_c_dlopen = yes; then
- SYSTEM_LIBS="$SYSTEM_LIBS"
- else
-- echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dlopen in -lltdl""... $ac_c" 1>&6
--echo "configure:5764: checking for dlopen in -lltdl" >&5
--ac_lib_var=`echo ltdl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for dlopen in -lltdl" >&5
-+echo $ECHO_N "checking for dlopen in -lltdl... $ECHO_C" >&6
-+if test "${ac_cv_lib_ltdl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lltdl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 5772 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:5783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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_lib_ltdl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ltdl_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_ltdl_dlopen" >&6
-+if test $ac_cv_lib_ltdl_dlopen = yes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-@@ -5830,40 +9326,59 @@ CheckInputEvents()
- # Check whether --enable-input-events or --disable-input-events was given.
- if test "${enable_input_events+set}" = set; then
- enableval="$enable_input_events"
-- :
-+
- else
- enable_input_events=yes
--fi
--
-+fi;
- if test x$enable_input_events = xyes; then
-- echo $ac_n "checking for Linux 2.4 unified input interface""... $ac_c" 1>&6
--echo "configure:5841: checking for Linux 2.4 unified input interface" >&5
-+ echo "$as_me:$LINENO: checking for Linux 2.4 unified input interface" >&5
-+echo $ECHO_N "checking for Linux 2.4 unified input interface... $ECHO_C" >&6
- use_input_events=no
-- cat > conftest.$ac_ext <<EOF
--#line 5844 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <linux/input.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- #ifndef EVIOCGNAME
- #error EVIOCGNAME() ioctl not available
- #endif
--
--; return 0; }
--EOF
--if { (eval echo configure:5857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- use_input_events=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$use_input_events" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $use_input_events" >&5
-+echo "${ECHO_T}$use_input_events" >&6
- if test x$use_input_events = xyes; then
- CFLAGS="$CFLAGS -DUSE_INPUT_EVENTS"
- fi
-@@ -5875,64 +9390,70 @@ CheckPTH()
- # Check whether --enable-pth or --disable-pth was given.
- if test "${enable_pth+set}" = set; then
- enableval="$enable_pth"
-- :
-+
- else
- enable_pth=yes
--fi
--
-+fi;
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
- # Extract the first word of "pth-config", so it can be a program name with args.
-set dummy pth-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++ # Use the libpthread version of the pth library.
++ # Extract the first word of "pthread-config", so it can be a program name with args.
++set dummy pthread-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5888: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PTH_CONFIG'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
++echo "configure:5908: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PTHREAD_CONFIG'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
- case "$PTH_CONFIG" in
-- /*)
++ case "$PTHREAD_CONFIG" in
+ /*)
- ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a path.
-- ;;
-- ?:/*)
-- ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a dos path.
-+ # Use the libpthread version of the pth library.
-+ # Extract the first word of "pthread-config", so it can be a program name with args.
-+set dummy pthread-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PTHREAD_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $PTHREAD_CONFIG in
-+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a path.
;;
+ ?:/*)
+- ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a dos path.
++ ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a dos path.
+ ;;
*)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-- for ac_dir in $ac_dummy; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+@@ -5901,27 +5921,27 @@ else
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
- ac_cv_path_PTH_CONFIG="$ac_dir/$ac_word"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
++ ac_cv_path_PTHREAD_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
- test -z "$ac_cv_path_PTH_CONFIG" && ac_cv_path_PTH_CONFIG="no"
-+ 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_PTHREAD_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_PTHREAD_CONFIG" && ac_cv_path_PTHREAD_CONFIG="no"
;;
esac
@@ -11915,15 +143,11 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
-PTH_CONFIG="$ac_cv_path_PTH_CONFIG"
-if test -n "$PTH_CONFIG"; then
- echo "$ac_t""$PTH_CONFIG" 1>&6
-+PTHREAD_CONFIG=$ac_cv_path_PTHREAD_CONFIG
-+
++PTHREAD_CONFIG="$ac_cv_path_PTHREAD_CONFIG"
+if test -n "$PTHREAD_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $PTHREAD_CONFIG" >&5
-+echo "${ECHO_T}$PTHREAD_CONFIG" >&6
++ echo "$ac_t""$PTHREAD_CONFIG" 1>&6
else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
+ echo "$ac_t""no" 1>&6
fi
- if test "$PTH_CONFIG" = "no"; then
@@ -11937,48 +161,7 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
CFLAGS="$CFLAGS -DENABLE_PTH"
- use_pth=yes
- fi
-- echo $ac_n "checking pth""... $ac_c" 1>&6
--echo "configure:5932: checking pth" >&5
-+ echo "$as_me:$LINENO: checking pth" >&5
-+echo $ECHO_N "checking pth... $ECHO_C" >&6
- if test "x$use_pth" = xyes; then
-- echo "$ac_t""yes" 1>&6
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
- fi
- }
-@@ -5942,19 +9463,17 @@ CheckPTHREAD()
- # Check whether --enable-pthreads or --disable-pthreads was given.
- if test "${enable_pthreads+set}" = set; then
- enableval="$enable_pthreads"
-- :
-+
- else
- enable_pthreads=yes
--fi
--
-+fi;
- # Check whether --enable-pthread-sem or --disable-pthread-sem was given.
- if test "${enable_pthread_sem+set}" = set; then
- enableval="$enable_pthread_sem"
-- :
-+
- else
- enable_pthread_sem=yes
--fi
--
-+fi;
- case "$target" in
- *-*-bsdi*)
- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-@@ -5970,8 +9489,8 @@ fi
+@@ -5970,8 +5990,8 @@ fi
pthread_lib="-pthread"
;;
*-*-netbsd*)
@@ -11989,2366 +172,247 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -6012,33 +9531,53 @@ fi
- # Add the pthread compiler flags and libraries
- CFLAGS="$CFLAGS $pthread_cflags"; LIBS="$LIBS $pthread_lib"
- # Check to see if we have pthread support on this system
-- echo $ac_n "checking for pthreads""... $ac_c" 1>&6
--echo "configure:6017: checking for pthreads" >&5
-+ echo "$as_me:$LINENO: checking for pthreads" >&5
-+echo $ECHO_N "checking for pthreads... $ECHO_C" >&6
- use_pthreads=no
-- cat > conftest.$ac_ext <<EOF
--#line 6020 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <pthread.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- pthread_attr_t type;
- pthread_attr_init(&type);
--
--; return 0; }
--EOF
--if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- use_pthreads=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$use_pthreads" 1>&6
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $use_pthreads" >&5
-+echo "${ECHO_T}$use_pthreads" >&6
- # Restore the compiler flags and libraries
- CFLAGS="$ac_save_cflags"; LIBS="$ac_save_libs"
- # Do futher testing if we have pthread support...
-@@ -6048,16 +9587,22 @@ rm -f conftest*
- SDL_LIBS="$SDL_LIBS $pthread_lib"
-
- # Check to see if recursive mutexes are available
-- echo $ac_n "checking for recursive mutexes""... $ac_c" 1>&6
--echo "configure:6053: checking for recursive mutexes" >&5
-+ echo "$as_me:$LINENO: checking for recursive mutexes" >&5
-+echo $ECHO_N "checking for recursive mutexes... $ECHO_C" >&6
- has_recursive_mutexes=no
-- cat > conftest.$ac_ext <<EOF
--#line 6056 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <pthread.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- pthread_mutexattr_t attr;
- #if defined(linux) && !(defined(__arm__) && defined(QWS))
-@@ -6065,19 +9610,32 @@ int main() {
- #else
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- #endif
--
--; return 0; }
--EOF
--if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- has_recursive_mutexes=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- # Some systems have broken recursive mutex implementations
- case "$target" in
- *-*-darwin*)
-@@ -6087,50 +9645,75 @@ rm -f conftest*
- has_recursive_mutexes=no
- ;;
- esac
-- echo "$ac_t""$has_recursive_mutexes" 1>&6
-+ echo "$as_me:$LINENO: result: $has_recursive_mutexes" >&5
-+echo "${ECHO_T}$has_recursive_mutexes" >&6
- if test x$has_recursive_mutexes != xyes; then
- CFLAGS="$CFLAGS -DPTHREAD_NO_RECURSIVE_MUTEX"
- fi
-
- # Check to see if pthread semaphore support is missing
- if test x$enable_pthread_sem = xyes; then
-- echo $ac_n "checking for pthread semaphores""... $ac_c" 1>&6
--echo "configure:6099: checking for pthread semaphores" >&5
-+ echo "$as_me:$LINENO: checking for pthread semaphores" >&5
-+echo $ECHO_N "checking for pthread semaphores... $ECHO_C" >&6
- have_pthread_sem=no
-- cat > conftest.$ac_ext <<EOF
--#line 6102 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <pthread.h>
- #include <semaphore.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- have_pthread_sem=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$have_pthread_sem" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $have_pthread_sem" >&5
-+echo "${ECHO_T}$have_pthread_sem" >&6
- fi
-
- # Check to see if this is broken glibc 2.0 pthreads
- case "$target" in
- *-*-linux*)
-- echo $ac_n "checking for broken glibc 2.0 pthreads""... $ac_c" 1>&6
--echo "configure:6130: checking for broken glibc 2.0 pthreads" >&5
-+ echo "$as_me:$LINENO: checking for broken glibc 2.0 pthreads" >&5
-+echo $ECHO_N "checking for broken glibc 2.0 pthreads... $ECHO_C" >&6
- glibc20_pthreads=no
-- cat > conftest.$ac_ext <<EOF
--#line 6133 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <features.h>
- #if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
-@@ -6138,54 +9721,90 @@ echo "configure:6130: checking for broke
- #else
- #error pthread implementation okay
- #endif /* glibc 2.0 */
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- glibc20_pthreads=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$glibc20_pthreads" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $glibc20_pthreads" >&5
-+echo "${ECHO_T}$glibc20_pthreads" >&6
- esac
- fi
- fi
-
-- echo $ac_n "checking whether semun is defined in /usr/include/sys/sem.h""... $ac_c" 1>&6
--echo "configure:6164: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-+ echo "$as_me:$LINENO: checking whether semun is defined in /usr/include/sys/sem.h" >&5
-+echo $ECHO_N "checking whether semun is defined in /usr/include/sys/sem.h... $ECHO_C" >&6
- have_semun=no
-- cat > conftest.$ac_ext <<EOF
--#line 6167 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #include <sys/sem.h>
--
--int main() {
-+
-+int
-+main ()
-+{
-
- union semun t;
--
--; return 0; }
--EOF
--if { (eval echo configure:6179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_semun=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$have_semun" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $have_semun" >&5
-+echo "${ECHO_T}$have_semun" >&6
- if test x$have_semun = xyes; then
- CFLAGS="$CFLAGS -DHAVE_SEMUN"
- fi
-@@ -6209,7 +9828,7 @@ CopyUnixThreadSource()
- {
- if test x$use_pthreads = xyes -o x$use_clone = xyes; then
- # Basic thread creation functions
--
-+
- echo "Copying src/thread/linux/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/linux/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -6221,7 +9840,7 @@ __EOF__
- cat >>$new <$old
-
- if test x$use_clone = xyes; then
--
-+
- echo "Copying src/thread/linux/clone.S -> src/thread/clone.S"
- old="$srcdir/src/thread/linux/clone.S"
- new="$srcdir/src/thread/clone.S"
-@@ -6233,7 +9852,7 @@ __EOF__
- cat >>$new <$old
-
- fi
--
-+
- echo "Copying src/thread/linux/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/linux/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -6248,7 +9867,7 @@ __EOF__
- # Semaphores
- # We can fake these with mutexes and condition variables if necessary
- if test x$use_pthreads = xyes -a x$have_pthread_sem != xyes; then
--
-+
- echo "Copying src/thread/generic/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/generic/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -6260,7 +9879,7 @@ __EOF__
- cat >>$new <$old
-
- else
--
-+
- echo "Copying src/thread/linux/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/linux/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -6272,7 +9891,7 @@ __EOF__
- cat >>$new <$old
-
- fi
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -6288,7 +9907,7 @@ __EOF__
- # We can fake these with semaphores if necessary
- case "$target" in
- *-*-bsdi*)
--
-+
- echo "Copying src/thread/bsdi/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/bsdi/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -6299,7 +9918,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -6310,7 +9929,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/linux/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -6321,7 +9940,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/linux/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -6335,7 +9954,7 @@ __EOF__
- ;;
- *)
- if test x$glibc20_pthreads = xyes; then
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/generic/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -6346,7 +9965,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/generic/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -6358,7 +9977,7 @@ __EOF__
- cat >>$new <$old
-
- else
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/linux/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -6369,7 +9988,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/linux/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -6387,7 +10006,7 @@ __EOF__
- # Condition variables
- # We can fake these with semaphores and mutexes if necessary
- if test x$glibc20_pthreads = xyes -o x$has_recursive_mutexes != xyes; then
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -6399,7 +10018,7 @@ __EOF__
- cat >>$new <$old
-
- else
--
-+
- echo "Copying src/thread/linux/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/linux/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -6411,7 +10030,7 @@ __EOF__
- cat >>$new <$old
-
- fi
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -6424,7 +10043,7 @@ __EOF__
-
-
- elif test x$use_pth = xyes; then
--
-+
- echo "Copying src/thread/pth/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/pth/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -6435,7 +10054,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/pth/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/pth/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -6446,7 +10065,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/pth/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/pth/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -6457,7 +10076,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/pth/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/pth/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -6468,7 +10087,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/pth/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/pth/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -6479,7 +10098,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/pth/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/pth/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -6490,7 +10109,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/generic/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -6501,7 +10120,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -6513,53 +10132,80 @@ __EOF__
- cat >>$new <$old
-
- else
-- { echo "configure: error:
-+ { { echo "$as_me:$LINENO: error:
-+*** No thread support detected
-+ " >&5
-+echo "$as_me: error:
- *** No thread support detected
-- " 1>&2; exit 1; }
-+ " >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- }
-
- CheckWIN32()
- {
-- echo $ac_n "checking Win32 compiler""... $ac_c" 1>&6
--echo "configure:6526: checking Win32 compiler" >&5
-+ echo "$as_me:$LINENO: checking Win32 compiler" >&5
-+echo $ECHO_N "checking Win32 compiler... $ECHO_C" >&6
- have_win32_gcc=no
-- cat > conftest.$ac_ext <<EOF
--#line 6529 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <windows.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- have_win32_gcc=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$have_win32_gcc" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $have_win32_gcc" >&5
-+echo "${ECHO_T}$have_win32_gcc" >&6
- if test x$have_win32_gcc != xyes; then
-- { echo "configure: error:
-+ { { echo "$as_me:$LINENO: error:
- *** Your compiler ($CC) does not produce Win32 executables!
-- " 1>&2; exit 1; }
-+ " >&5
-+echo "$as_me: error:
-+*** Your compiler ($CC) does not produce Win32 executables!
-+ " >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
- # Check whether --enable-stdio-redirect or --disable-stdio-redirect was given.
- if test "${enable_stdio_redirect+set}" = set; then
- enableval="$enable_stdio_redirect"
-- :
--else
-- enable_stdio_redirect=yes
--fi
-
-+else
-+ enable_stdio_redirect=yes
-+fi;
- if test x$enable_stdio_redirect != xyes; then
- CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
- fi
-@@ -6570,37 +10216,56 @@ CheckDIRECTX()
- # Check whether --enable-directx or --disable-directx was given.
- if test "${enable_directx+set}" = set; then
- enableval="$enable_directx"
-- :
-+
- else
- enable_directx=yes
--fi
--
-+fi;
- if test x$enable_directx = xyes; then
-- echo $ac_n "checking for DirectX headers and libraries""... $ac_c" 1>&6
--echo "configure:6581: checking for DirectX headers and libraries" >&5
-+ echo "$as_me:$LINENO: checking for DirectX headers and libraries" >&5
-+echo $ECHO_N "checking for DirectX headers and libraries... $ECHO_C" >&6
- use_directx=no
-- cat > conftest.$ac_ext <<EOF
--#line 6584 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include "src/video/windx5/directx.h"
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- use_directx=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$use_directx" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $use_directx" >&5
-+echo "${ECHO_T}$use_directx" >&6
- fi
-
- CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/wincommon"
-@@ -6632,64 +10297,86 @@ CheckQtopia()
- # Check whether --enable-video-qtopia or --disable-video-qtopia was given.
- if test "${enable_video_qtopia+set}" = set; then
- enableval="$enable_video_qtopia"
-- :
-+
- else
- enable_video_qtopia=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_qtopia = xyes; then
-- echo $ac_n "checking for Qtopia support""... $ac_c" 1>&6
--echo "configure:6643: checking for Qtopia support" >&5
-+ echo "$as_me:$LINENO: checking for Qtopia support" >&5
-+echo $ECHO_N "checking for Qtopia support... $ECHO_C" >&6
- video_qtopia=no
-- ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- OLD_CXX="$CXXFLAGS"
- CXXFLAGS="-DQT_QWS_EBX -fno-rtti -fno-exceptions -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG"
-- cat > conftest.$ac_ext <<EOF
--#line 6655 "configure"
--#include "confdefs.h"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <qpe/qpeapplication.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_qtopia=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$OLD_CXX"
-- echo "$ac_t""$video_qtopia" 1>&6
-+ echo "$as_me:$LINENO: result: $video_qtopia" >&5
-+echo "${ECHO_T}$video_qtopia" >&6
- if test x$video_qtopia = xyes; then
- CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions"
- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte"
-- SDL_CFLAGS="$SDL_CFLAGS -DQWS"
-+ SDL_CFLAGS="$SDL_CFLAGS -DQWS"
- VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia"
- VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la"
- else
-- { echo "configure: error:
-+ { { echo "$as_me:$LINENO: error:
- *** Failed to find Qtopia includes. Make sure that the QTDIR and QPEDIR
--*** environment variables are set correctly." 1>&2; exit 1; }
-+*** environment variables are set correctly." >&5
-+echo "$as_me: error:
-+*** Failed to find Qtopia includes. Make sure that the QTDIR and QPEDIR
-+*** environment variables are set correctly." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+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
-
- fi
- }
-@@ -6699,37 +10386,56 @@ CheckPicoGUI()
- # Check whether --enable-video-picogui or --disable-video-picogui was given.
- if test "${enable_video_picogui+set}" = set; then
- enableval="$enable_video_picogui"
-- :
-+
- else
- enable_video_picogui=no
--fi
--
-+fi;
- if test x$enable_video = xyes -a x$enable_video_picogui = xyes; then
-- echo $ac_n "checking for PicoGUI support""... $ac_c" 1>&6
--echo "configure:6710: checking for PicoGUI support" >&5
-+ echo "$as_me:$LINENO: checking for PicoGUI support" >&5
-+echo $ECHO_N "checking for PicoGUI support... $ECHO_C" >&6
- video_picogui=no
-- cat > conftest.$ac_ext <<EOF
--#line 6713 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <picogui.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- video_picogui=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$video_picogui" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $video_picogui" >&5
-+echo "${ECHO_T}$video_picogui" >&6
- if test x$video_picogui = xyes; then
- SDL_LIBS="$SDL_LIBS -lpgui"
- CFLAGS="$CFLAGS -DENABLE_PICOGUI"
-@@ -6737,11 +10443,10 @@ rm -f conftest*
- VIDEO_DRIVERS="$VIDEO_DRIVERS picogui/libvideo_picogui.la"
- fi
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
-+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
-
- fi
- }
-@@ -6790,116 +10495,172 @@ CheckDLOPEN()
- # Check whether --enable-dlopen or --disable-dlopen was given.
- if test "${enable_dlopen+set}" = set; then
- enableval="$enable_dlopen"
-- :
-+
- else
- enable_dlopen=yes
--fi
--
-+fi;
- if test x$enable_dlopen = xyes; then
-- echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:6801: checking for dlopen" >&5
-+ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
- use_dlopen=no
-- cat > conftest.$ac_ext <<EOF
--#line 6804 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <dlfcn.h>
--
--int main() {
-
--
--; return 0; }
--EOF
--if { (eval echo configure:6814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ 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
-+
- use_dlopen=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$use_dlopen" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $use_dlopen" >&5
-+echo "${ECHO_T}$use_dlopen" >&6
-
- if test x$use_dlopen = xyes; then
- CFLAGS="$CFLAGS -DUSE_DLOPEN"
-- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:6829: checking for dlopen in -ldl" >&5
--ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6837 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
- else
-- echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dlopen in -lltdl""... $ac_c" 1>&6
--echo "configure:6867: checking for dlopen in -lltdl" >&5
--ac_lib_var=`echo ltdl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for dlopen in -lltdl" >&5
-+echo $ECHO_N "checking for dlopen in -lltdl... $ECHO_C" >&6
-+if test "${ac_cv_lib_ltdl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lltdl $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6875 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ 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_lib_ltdl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ltdl_dlopen=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_ltdl_dlopen" >&6
-+if test $ac_cv_lib_ltdl_dlopen = yes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"
--else
-- echo "$ac_t""no" 1>&6
- fi
-
- fi
-@@ -6913,84 +10674,203 @@ CheckAtariLdg()
- # Check whether --enable-atari-ldg or --disable-atari-ldg was given.
- if test "${enable_atari_ldg+set}" = set; then
- enableval="$enable_atari_ldg"
-- :
-+
- else
- enable_atari_ldg=yes
--fi
--
-+fi;
- if test x$video_gem = xyes -a x$enable_atari_ldg = xyes; then
-- ac_safe=`echo "ldg.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for ldg.h""... $ac_c" 1>&6
--echo "configure:6925: checking for ldg.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 6930 "configure"
--#include "confdefs.h"
-+ if test "${ac_cv_header_ldg_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for ldg.h" >&5
-+echo $ECHO_N "checking for ldg.h... $ECHO_C" >&6
-+if test "${ac_cv_header_ldg_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_ldg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ldg_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking ldg.h usability" >&5
-+echo $ECHO_N "checking ldg.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
- #include <ldg.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking ldg.h presence" >&5
-+echo $ECHO_N "checking ldg.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ldg.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: ldg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: ldg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: ldg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: ldg.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: ldg.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: ldg.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: ldg.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: ldg.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: ldg.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: ldg.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for ldg.h" >&5
-+echo $ECHO_N "checking for ldg.h... $ECHO_C" >&6
-+if test "${ac_cv_header_ldg_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_ldg_h=$ac_header_preproc
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_ldg_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ldg_h" >&6
-+
-+fi
-+if test $ac_cv_header_ldg_h = yes; then
- have_ldg_hdr=yes
--else
-- echo "$ac_t""no" 1>&6
- fi
-
-- echo $ac_n "checking for ldg_open in -lldg""... $ac_c" 1>&6
--echo "configure:6957: checking for ldg_open in -lldg" >&5
--ac_lib_var=`echo ldg'_'ldg_open | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+
-+ echo "$as_me:$LINENO: checking for ldg_open in -lldg" >&5
-+echo $ECHO_N "checking for ldg_open in -lldg... $ECHO_C" >&6
-+if test "${ac_cv_lib_ldg_ldg_open+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lldg -lgem $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 6965 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 ldg_open();
--
--int main() {
--ldg_open()
--; return 0; }
--EOF
--if { (eval echo configure:6976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-+ builtin and then its argument prototype would still apply. */
-+char ldg_open ();
-+int
-+main ()
-+{
-+ldg_open ();
-+ ;
-+ 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_lib_ldg_ldg_open=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_ldg_ldg_open=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ldg_ldg_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_ldg_ldg_open" >&6
-+if test $ac_cv_lib_ldg_ldg_open = yes; then
- have_ldg_lib=yes
- else
-- echo "$ac_t""no" 1>&6
--have_ldg_lib=no
-+ have_ldg_lib=no
- fi
-
- if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
-@@ -7005,244 +10885,690 @@ CheckUSBHID()
- if test x$enable_joystick = xyes; then
- have_libusbhid=no
- have_libusb=no
-- echo $ac_n "checking for hid_init in -lusbhid""... $ac_c" 1>&6
--echo "configure:7010: checking for hid_init in -lusbhid" >&5
--ac_lib_var=`echo usbhid'_'hid_init | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+ echo "$as_me:$LINENO: checking for hid_init in -lusbhid" >&5
-+echo $ECHO_N "checking for hid_init in -lusbhid... $ECHO_C" >&6
-+if test "${ac_cv_lib_usbhid_hid_init+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_LIBS="$LIBS"
-+ ac_check_lib_save_LIBS=$LIBS
- LIBS="-lusbhid $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 7018 "configure"
--#include "confdefs.h"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 hid_init();
-+ builtin and then its argument prototype would still apply. */
-+char hid_init ();
-+int
-+main ()
-+{
-+hid_init ();
-+ ;
-+ 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_lib_usbhid_hid_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_usbhid_hid_init=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_usbhid_hid_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_usbhid_hid_init" >&6
-+if test $ac_cv_lib_usbhid_hid_init = yes; then
-+ have_libusbhid=yes
-+fi
-
--int main() {
--hid_init()
--; return 0; }
--EOF
--if { (eval echo configure:7029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
-+ if test x$have_libusbhid = xyes; then
-+ SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-+
-+ if test "${ac_cv_header_usbhid_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for usbhid.h" >&5
-+echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usbhid_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking usbhid.h usability" >&5
-+echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <usbhid.h>
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking usbhid.h presence" >&5
-+echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <usbhid.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- have_libusbhid=yes
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: usbhid.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for usbhid.h" >&5
-+echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usbhid_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_t""no" 1>&6
-+ ac_cv_header_usbhid_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
-+
-+fi
-+if test $ac_cv_header_usbhid_h = yes; then
-+ have_usbhid_h=yes
+@@ -7045,56 +7065,45 @@ else
+ echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
-echo "configure:7050: checking for hid_init in -lusb" >&5
-ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
-+
-+ if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for libusbhid.h" >&5
-+echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking libusbhid.h usability" >&5
-+echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <libusbhid.h>
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
++ if test x$have_libusbhid = xyes; then
++ SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking libusbhid.h presence" >&5
-+echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <libusbhid.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
++ ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
++echo "configure:7074: checking for usbhid.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lusb $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7058 "configure"
--#include "confdefs.h"
++ cat > conftest.$ac_ext <<EOF
++#line 7079 "configure"
+ #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char hid_init();
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
+-
-int main() {
-hid_init()
-; return 0; }
--EOF
++#include <usbhid.h>
+ EOF
-if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:7084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
+ rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libusbhid.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for libusbhid.h" >&5
-+echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusbhid_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++ eval "ac_cv_header_$ac_safe=yes"
else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
++ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-+ ac_cv_header_libusbhid_h=$ac_header_preproc
++ eval "ac_cv_header_$ac_safe=no"
fi
--rm -f conftest*
+ rm -f conftest*
-LIBS="$ac_save_LIBS"
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
-
+-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
- have_libusb=yes
--else
-- echo "$ac_t""no" 1>&6
-+if test $ac_cv_header_libusbhid_h = yes; then
-+ have_libusbhid_h=yes
++ have_usbhid_h=yes
+ else
+ echo "$ac_t""no" 1>&6
fi
- if test x$have_libusbhid = xyes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-+
-+ if test x$have_usbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-+ fi
-+ if test x$have_libusbhid_h = xyes; then
-+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
- fi
-+ else
-+ echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5
-+echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6
-+if test "${ac_cv_lib_usb_hid_init+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lusb $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end 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 hid_init ();
-+int
-+main ()
-+{
-+hid_init ();
-+ ;
-+ 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_lib_usb_hid_init=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_usb_hid_init=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6
-+if test $ac_cv_lib_usb_hid_init = yes; then
-+ have_libusb=yes
-+fi
-+
- if test x$have_libusb = xyes; then
- SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
- fi
-
+- if test x$have_libusb = xyes; then
+- SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
+- fi
+-
- ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for usb.h""... $ac_c" 1>&6
-echo "configure:7098: checking for usb.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
++ ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
++echo "configure:7107: checking for libusbhid.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7099,12 +7108,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
-#line 7103 "configure"
--#include "confdefs.h"
-+ if test "${ac_cv_header_usb_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for usb.h" >&5
-+echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usb_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usb_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking usb.h usability" >&5
-+echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
- #include <usb.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++#line 7112 "configure"
+ #include "confdefs.h"
+-#include <usb.h>
++#include <libusbhid.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking usb.h presence" >&5
-+echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <usb.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
-+ ac_cpp_err=yes
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
++{ (eval echo configure:7117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -7120,47 +7129,64 @@ rm -f conftest*
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
- have_usb_h=yes
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
++ have_libusbhid_h=yes
else
-- echo "$ac_t""no" 1>&6
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ echo "$ac_t""no" 1>&6
+ fi
- ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
-echo "configure:7131: checking for usbhid.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
++ if test x$have_usbhid_h = xyes; then
++ CFLAGS="$CFLAGS -DHAVE_USBHID_H"
++ fi
++ if test x$have_libusbhid_h = xyes; then
++ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
++ fi
++ else
++ echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
++echo "configure:7146: checking for hid_init in -lusb" >&5
++ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
- cat > conftest.$ac_ext <<EOF
-#line 7136 "configure"
--#include "confdefs.h"
++ ac_save_LIBS="$LIBS"
++LIBS="-lusb $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 7154 "configure"
+ #include "confdefs.h"
-#include <usbhid.h>
--EOF
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char hid_init();
++
++int main() {
++hid_init()
++; return 0; }
+ EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-- rm -rf conftest*
++if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for usb.h" >&5
-+echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_usb_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-+ ac_cv_header_usb_h=$ac_header_preproc
++ eval "ac_cv_lib_$ac_lib_var=no"
fi
--rm -f conftest*
-+echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_usb_h" >&6
+ rm -f conftest*
++LIBS="$ac_save_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
- have_usbhid_h=yes
--else
-- echo "$ac_t""no" 1>&6
-+if test $ac_cv_header_usb_h = yes; then
-+ have_usb_h=yes
++ have_libusb=yes
+ else
+ echo "$ac_t""no" 1>&6
fi
- ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
-echo "configure:7164: checking for libusb.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
--#line 7169 "configure"
--#include "confdefs.h"
++ if test x$have_libusb = xyes; then
++ SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
+
-+ if test "${ac_cv_header_libusb_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for libusb.h" >&5
-+echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusb_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking libusb.h usability" >&5
-+echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
- #include <libusb.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+_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_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking libusb.h presence" >&5
-+echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <libusb.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&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
-+ else
-+ ac_cpp_err=
-+ fi
++ ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for usb.h""... $ac_c" 1>&6
++echo "configure:7190: checking for usb.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cpp_err=yes
- fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
+@@ -7165,12 +7191,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 7169 "configure"
++#line 7195 "configure"
+ #include "confdefs.h"
+-#include <libusb.h>
++#include <usb.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -7186,14 +7212,14 @@ rm -f conftest*
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
- have_libusb_h=yes
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
++ have_usb_h=yes
else
-- echo "$ac_t""no" 1>&6
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ echo "$ac_t""no" 1>&6
+ fi
- ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
-echo "configure:7197: checking for libusbhid.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.$ac_ext <<EOF
++ ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
++echo "configure:7223: checking for libusb.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7198,12 +7224,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
-#line 7202 "configure"
--#include "confdefs.h"
++#line 7228 "configure"
+ #include "confdefs.h"
-#include <libusbhid.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++#include <libusb.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=yes"
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+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:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+ no:yes )
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libusb.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for libusb.h" >&5
-+echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libusb_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_header_$ac_safe=no"
-+ ac_cv_header_libusb_h=$ac_header_preproc
- fi
--rm -f conftest*
-+echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
-+
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
++{ (eval echo configure:7233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -7219,7 +7245,7 @@ rm -f conftest*
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
- have_libusbhid_h=yes
--else
-- echo "$ac_t""no" 1>&6
-+if test $ac_cv_header_libusb_h = yes; then
+ have_libusb_h=yes
+ else
+ echo "$ac_t""no" 1>&6
fi
-
-+
+@@ -7227,14 +7253,10 @@ fi
if test x$have_usb_h = xyes; then
CFLAGS="$CFLAGS -DHAVE_USB_H"
fi
@@ -14363,294 +427,8 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
+ fi
fi
-- echo $ac_n "checking for usbhid""... $ac_c" 1>&6
--echo "configure:7242: checking for usbhid" >&5
-+ echo "$as_me:$LINENO: checking for usbhid" >&5
-+echo $ECHO_N "checking for usbhid... $ECHO_C" >&6
- have_usbhid=no
-- cat > conftest.$ac_ext <<EOF
--#line 7245 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
-@@ -7257,34 +11583,54 @@ echo "configure:7242: checking for usbhi
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
--
--int main() {
-+
-+int
-+main ()
-+{
-
- struct report_desc *repdesc;
- struct usb_ctl_report *repbuf;
- hid_kind_t hidkind;
--
--; return 0; }
--EOF
--if { (eval echo configure:7270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_usbhid=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-- echo "$ac_t""$have_usbhid" 1>&6
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+ echo "$as_me:$LINENO: result: $have_usbhid" >&5
-+echo "${ECHO_T}$have_usbhid" >&6
-
- if test x$have_usbhid = xyes; then
-- echo $ac_n "checking for ucr_data member of usb_ctl_report""... $ac_c" 1>&6
--echo "configure:7284: checking for ucr_data member of usb_ctl_report" >&5
-+ echo "$as_me:$LINENO: checking for ucr_data member of usb_ctl_report" >&5
-+echo $ECHO_N "checking for ucr_data member of usb_ctl_report... $ECHO_C" >&6
- have_usbhid_ucr_data=no
-- cat > conftest.$ac_ext <<EOF
--#line 7287 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
-@@ -7299,35 +11645,55 @@ echo "configure:7284: checking for ucr_d
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
--
--int main() {
-+
-+int
-+main ()
-+{
-
- struct usb_ctl_report buf;
- if (buf.ucr_data) { }
--
--; return 0; }
--EOF
--if { (eval echo configure:7311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_usbhid_ucr_data=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- if test x$have_usbhid_ucr_data = xyes; then
- CFLAGS="$CFLAGS -DUSBHID_UCR_DATA"
- fi
-- echo "$ac_t""$have_usbhid_ucr_data" 1>&6
--
-- echo $ac_n "checking for new usbhid API""... $ac_c" 1>&6
--echo "configure:7327: checking for new usbhid API" >&5
-+ echo "$as_me:$LINENO: result: $have_usbhid_ucr_data" >&5
-+echo "${ECHO_T}$have_usbhid_ucr_data" >&6
-+
-+ echo "$as_me:$LINENO: checking for new usbhid API" >&5
-+echo $ECHO_N "checking for new usbhid API... $ECHO_C" >&6
- have_usbhid_new=no
-- cat > conftest.$ac_ext <<EOF
--#line 7330 "configure"
--#include "confdefs.h"
-+ cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <sys/types.h>
- #if defined(HAVE_USB_H)
-@@ -7342,28 +11708,44 @@ echo "configure:7327: checking for new u
- #elif defined(HAVE_LIBUSBHID_H)
- #include <libusbhid.h>
- #endif
--
--int main() {
-+
-+int
-+main ()
-+{
-
- report_desc_t d;
- hid_start_parse(d, 1, 1);
--
--; return 0; }
--EOF
--if { (eval echo configure:7354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
--
-+
-+ ;
-+ 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
-+
- have_usbhid_new=yes
--
-+
- else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
--rm -f conftest*
-+rm -f conftest.$ac_objext conftest.$ac_ext
- if test x$have_usbhid_new = xyes; then
- CFLAGS="$CFLAGS -DUSBHID_NEW"
- fi
-- echo "$ac_t""$have_usbhid_new" 1>&6
-+ echo "$as_me:$LINENO: result: $have_usbhid_new" >&5
-+echo "${ECHO_T}$have_usbhid_new" >&6
-
- JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
- JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
-@@ -7399,7 +11781,7 @@ case "$target" in
- CheckPTHREAD
- # Set up files for the main() stub
- if test "x$video_qtopia" = "xyes"; then
--
-+
- echo "Copying src/main/linux/SDL_Qtopia_main.cc -> src/main/SDL_Qtopia_main.cc"
- old="$srcdir/src/main/linux/SDL_Qtopia_main.cc"
- new="$srcdir/src/main/SDL_Qtopia_main.cc"
-@@ -7413,7 +11795,7 @@ __EOF__
- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
- SDL_LIBS="-lSDLmain $SDL_LIBS"
- else
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7448,7 +11830,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7478,7 +11860,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7513,7 +11895,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7545,7 +11927,7 @@ __EOF__
- CheckPTHREAD
- CheckUSBHID
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7574,7 +11956,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7598,12 +11980,13 @@ __EOF__
+ echo $ac_n "checking for usbhid""... $ac_c" 1>&6
+@@ -7598,6 +7620,7 @@ __EOF__
CheckESD
CheckNAS
CheckX11
@@ -14658,14 +436,7 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
CheckAAlib
CheckOpenGL
CheckPTHREAD
- CheckUSBHID
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7616,9 +11999,9 @@ __EOF__
+@@ -7616,9 +7639,9 @@ __EOF__
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -14678,7 +449,7 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
-@@ -7627,14 +12010,11 @@ __EOF__
+@@ -7627,9 +7650,6 @@ __EOF__
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -14688,618 +459,7 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
CopyUnixThreadSource
fi
# Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7665,7 +12045,7 @@ __EOF__
- CheckPTHREAD
- CheckUSBHID
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7697,7 +12077,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7727,7 +12107,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7761,7 +12141,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7790,7 +12170,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7824,7 +12204,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -7850,7 +12230,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -7884,7 +12264,7 @@ __EOF__
- if test x$use_pthreads = xyes -o x$use_pth = xyes; then
- CopyUnixThreadSource
- else
--
-+
- echo "Copying src/thread/irix/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/irix/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -7895,7 +12275,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/irix/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/irix/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -7906,7 +12286,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/linux/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -7917,7 +12297,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/linux/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -7928,7 +12308,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/linux/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/linux/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -7939,7 +12319,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -7950,7 +12330,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -7961,7 +12341,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -7976,7 +12356,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8002,7 +12382,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8037,7 +12417,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8063,7 +12443,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8096,7 +12476,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8122,7 +12502,7 @@ __EOF__
- CheckPTHREAD
- SDL_LIBS="$SDL_LIBS -lrt"
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8158,7 +12538,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8182,7 +12562,7 @@ __EOF__
- CheckOpenGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8217,7 +12597,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8247,7 +12627,7 @@ __EOF__
- CheckDIRECTX
- CheckNASM
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/win32/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/win32/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8279,7 +12659,7 @@ __EOF__
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
--
-+
- echo "Copying src/thread/win32/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/win32/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -8290,7 +12670,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/win32/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/win32/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -8301,7 +12681,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/win32/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/win32/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -8312,7 +12692,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/generic/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -8323,7 +12703,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/win32/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/win32/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -8334,7 +12714,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -8345,7 +12725,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -8356,7 +12736,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -8370,7 +12750,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/win32/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/win32/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8405,7 +12785,7 @@ __EOF__
- CheckBWINDOW
- CheckBeGL
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8416,7 +12796,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/main/beos/SDL_BeApp.cc -> src/main/SDL_BeApp.cc"
- old="$srcdir/src/main/beos/SDL_BeApp.cc"
- new="$srcdir/src/main/SDL_BeApp.cc"
-@@ -8427,7 +12807,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/main/beos/SDL_BeApp.h -> src/main/SDL_BeApp.h"
- old="$srcdir/src/main/beos/SDL_BeApp.h"
- new="$srcdir/src/main/SDL_BeApp.h"
-@@ -8455,7 +12835,7 @@ __EOF__
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
--
-+
- echo "Copying src/thread/beos/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/beos/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -8466,7 +12846,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/beos/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/beos/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -8477,7 +12857,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/generic/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -8488,7 +12868,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/generic/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -8499,7 +12879,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/beos/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/beos/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -8510,7 +12890,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -8521,7 +12901,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -8532,7 +12912,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -8546,7 +12926,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/beos/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/beos/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8571,7 +12951,7 @@ __EOF__
- CheckTOOLBOX
- CheckMacGL
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/macos/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/macos/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8599,7 +12979,7 @@ __EOF__
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
--
-+
- echo "Copying src/thread/macos/SDL_systhread.c -> src/thread/SDL_systhread.c"
- old="$srcdir/src/thread/macos/SDL_systhread.c"
- new="$srcdir/src/thread/SDL_systhread.c"
-@@ -8610,7 +12990,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/macos/SDL_systhread_c.h -> src/thread/SDL_systhread_c.h"
- old="$srcdir/src/thread/macos/SDL_systhread_c.h"
- new="$srcdir/src/thread/SDL_systhread_c.h"
-@@ -8621,7 +13001,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex.c -> src/thread/SDL_sysmutex.c"
- old="$srcdir/src/thread/generic/SDL_sysmutex.c"
- new="$srcdir/src/thread/SDL_sysmutex.c"
-@@ -8632,7 +13012,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_sysmutex_c.h -> src/thread/SDL_sysmutex_c.h"
- old="$srcdir/src/thread/generic/SDL_sysmutex_c.h"
- new="$srcdir/src/thread/SDL_sysmutex_c.h"
-@@ -8643,7 +13023,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/macos/SDL_syssem.c -> src/thread/SDL_syssem.c"
- old="$srcdir/src/thread/macos/SDL_syssem.c"
- new="$srcdir/src/thread/SDL_syssem.c"
-@@ -8654,7 +13034,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h"
- old="$srcdir/src/thread/generic/SDL_syssem_c.h"
- new="$srcdir/src/thread/SDL_syssem_c.h"
-@@ -8665,7 +13045,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond.c -> src/thread/SDL_syscond.c"
- old="$srcdir/src/thread/generic/SDL_syscond.c"
- new="$srcdir/src/thread/SDL_syscond.c"
-@@ -8676,7 +13056,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/thread/generic/SDL_syscond_c.h -> src/thread/SDL_syscond_c.h"
- old="$srcdir/src/thread/generic/SDL_syscond_c.h"
- new="$srcdir/src/thread/SDL_syscond_c.h"
-@@ -8690,7 +13070,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/macos/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/macos/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8717,7 +13097,7 @@ __EOF__
- CheckMacGL
- CheckPTHREAD
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/macosx/SDLMain.m -> src/main/SDLMain.m"
- old="$srcdir/src/main/macosx/SDLMain.m"
- new="$srcdir/src/main/SDLMain.m"
-@@ -8728,7 +13108,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/main/macosx/SDLMain.h -> src/main/SDLMain.h"
- old="$srcdir/src/main/macosx/SDLMain.h"
- new="$srcdir/src/main/SDLMain.h"
-@@ -8765,7 +13145,7 @@ __EOF__
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8793,7 +13173,7 @@ __EOF__
- CheckAtariLdg
- CheckPTH
- # Set up files for the main() stub
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8829,7 +13209,7 @@ __EOF__
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
- if test x$enable_threads = xyes -a x$enable_pth = xyes; then
--
-+
- echo "Copying src/timer/linux/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/linux/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8841,7 +13221,7 @@ __EOF__
- cat >>$new <$old
-
- else
--
-+
- echo "Copying src/timer/mint/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/mint/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8852,7 +13232,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/timer/mint/SDL_vbltimer.S -> src/timer/SDL_vbltimer.S"
- old="$srcdir/src/timer/mint/SDL_vbltimer.S"
- new="$srcdir/src/timer/SDL_vbltimer.S"
-@@ -8863,7 +13243,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/timer/mint/SDL_vbltimer_s.h -> src/timer/SDL_vbltimer_s.h"
- old="$srcdir/src/timer/mint/SDL_vbltimer_s.h"
- new="$srcdir/src/timer/SDL_vbltimer_s.h"
-@@ -8883,7 +13263,7 @@ __EOF__
- ARCH=riscos
- JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS riscos"
- JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS riscos/libjoystick_riscos.la"
--
-+
- echo "Copying src/timer/riscos/SDL_systimer.c -> src/timer/SDL_systimer.c"
- old="$srcdir/src/timer/riscos/SDL_systimer.c"
- new="$srcdir/src/timer/SDL_systimer.c"
-@@ -8894,7 +13274,7 @@ __EOF__
- __EOF__
- cat >>$new <$old
-
--
-+
- echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c"
- old="$srcdir/src/main/linux/SDL_main.c"
- new="$srcdir/src/main/SDL_main.c"
-@@ -8920,7 +13300,9 @@ __EOF__
- SYSTEM_LIBS="$SYSTEM_LIBS -ljpeg -ltiff -lpng -lz"
- ;;
- *)
-- { echo "configure: error: Unsupported target: Please add to configure.in" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: Unsupported target: Please add to configure.in" >&5
-+echo "$as_me: error: Unsupported target: Please add to configure.in" >&2;}
-+ { (exit 1); exit 1; }; }
- ;;
- esac
-
-@@ -9105,7 +13487,7 @@ fi
+@@ -9105,7 +9125,7 @@ fi
# Set runtime shared library paths as needed
@@ -15308,1739 +468,13 @@ $NetBSD: patch-am,v 1.10 2003/09/03 19:30:58 drochner Exp $
SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
fi
if test $ARCH = solaris; then
-@@ -9134,7 +13516,9 @@ STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
-
- if test x$enable_video = xtrue; then
- if test "$VIDEO_SUBDIRS" = ""; then
-- { echo "configure: error: *** No video drivers are enabled!" 1>&2; exit 1; }
-+ { { echo "$as_me:$LINENO: error: *** No video drivers are enabled!" >&5
-+echo "$as_me: error: *** No video drivers are enabled!" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
- fi
-
-@@ -9177,603 +13561,1186 @@ CXXFLAGS="$CFLAGS"
- # We do this here so that we get the full CFLAGS into OBJCFLAGS
- case "$target" in
- *-*-darwin*)
-- echo $ac_n "checking for an Objective-C compiler""... $ac_c" 1>&6
--echo "configure:9182: checking for an Objective-C compiler" >&5
-+ echo "$as_me:$LINENO: checking for an Objective-C compiler" >&5
-+echo $ECHO_N "checking for an Objective-C compiler... $ECHO_C" >&6
- OBJC="$CC"
--
-+
- OBJCFLAGS="$CFLAGS"
--
-+
- OBJCDEPMODE="depmode=gcc"
--
-- echo "$ac_t""not implemented yet" 1>&6
-+
-+ echo "$as_me:$LINENO: result: not implemented yet" >&5
-+echo "${ECHO_T}not implemented yet" >&6
- ;;
- esac
-
- # Finally create all the generated files
--trap '' 1 2 15
--cat > confcache <<\EOF
-+ ac_config_files="$ac_config_files Makefile docs/Makefile docs/html/Makefile docs/man3/Makefile include/Makefile src/Makefile src/main/Makefile src/main/macosx/Makefile src/main/macosx/Info.plist src/audio/Makefile src/audio/alsa/Makefile src/audio/arts/Makefile src/audio/baudio/Makefile src/audio/dc/Makefile src/audio/disk/Makefile src/audio/dma/Makefile src/audio/dmedia/Makefile src/audio/dsp/Makefile src/audio/esd/Makefile src/audio/macrom/Makefile src/audio/mint/Makefile src/audio/mme/Makefile src/audio/nas/Makefile src/audio/nto/Makefile src/audio/openbsd/Makefile src/audio/paudio/Makefile src/audio/riscos/Makefile src/audio/sun/Makefile src/audio/ums/Makefile src/audio/windib/Makefile src/audio/windx5/Makefile src/video/Makefile src/video/aalib/Makefile src/video/ataricommon/Makefile src/video/bwindow/Makefile src/video/cybergfx/Makefile src/video/dc/Makefile src/video/dga/Makefile src/video/directfb/Makefile src/video/dummy/Makefile src/video/epoc/Makefile src/video/fbcon/Makefile src/video/gem/Makefile src/video/ggi/Makefile src/video/maccommon/Makefile src/video/macdsp/Makefile src/video/macrom/Makefile src/video/nanox/Makefile src/video/photon/Makefile src/video/picogui/Makefile src/video/ps2gs/Makefile src/video/qtopia/Makefile src/video/quartz/Makefile src/video/riscos/Makefile src/video/svga/Makefile src/video/vgl/Makefile src/video/wincommon/Makefile src/video/windib/Makefile src/video/windx5/Makefile src/video/x11/Makefile src/video/xbios/Makefile src/video/XFree86/Makefile src/video/XFree86/extensions/Makefile src/video/XFree86/Xinerama/Makefile src/video/XFree86/Xv/Makefile src/video/XFree86/Xxf86dga/Makefile src/video/XFree86/Xxf86vm/Makefile src/events/Makefile src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile src/joystick/bsd/Makefile src/joystick/darwin/Makefile src/joystick/dc/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile src/joystick/macos/Makefile src/joystick/mint/Makefile src/joystick/riscos/Makefile src/joystick/win32/Makefile src/cdrom/Makefile src/cdrom/aix/Makefile src/cdrom/beos/Makefile src/cdrom/dc/Makefile src/cdrom/dummy/Makefile src/cdrom/bsdi/Makefile src/cdrom/freebsd/Makefile src/cdrom/linux/Makefile src/cdrom/macos/Makefile src/cdrom/macosx/Makefile src/cdrom/openbsd/Makefile src/cdrom/osf/Makefile src/cdrom/qnx/Makefile src/cdrom/win32/Makefile src/thread/Makefile src/timer/Makefile src/endian/Makefile src/file/Makefile src/hermes/Makefile sdl-config SDL.spec SDL.qpg"
-+ ac_config_commands="$ac_config_commands default"
-+cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
--# scripts and configure runs. It is not useful on other systems.
--# If it contains results you don't want to keep, you may remove or edit it.
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems. If it contains results you don't
-+# want to keep, you may remove or edit it.
- #
--# By default, configure uses ./config.cache as the cache file,
--# creating it if it does not exist already. You can give configure
--# the --cache-file=FILE option to use a different cache file; that is
--# what configure does when it calls configure scripts in
--# subdirectories, so they share the cache.
--# Giving --cache-file=/dev/null disables caching, for debugging configure.
--# config.status only pays attention to the cache file if you give it the
--# --recheck option to rerun configure.
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
- #
--EOF
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
- # So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--(set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-- # `set' does not quote correctly, so add quotes (double-quote substitution
-- # turns \\\\ into \\, and sed turns \\ into \).
-- sed -n \
-- -e "s/'/'\\\\''/g" \
-- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-- ;;
-- *)
-- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-- ;;
-- esac >> confcache
--if cmp -s $cache_file confcache; then
-- :
--else
-+{
-+ (set) 2>&1 |
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ # `set' does not quote correctly, so add quotes (double-quote
-+ # substitution turns \\\\ into \\, and sed turns \\ into \).
-+ sed -n \
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} |
-+ sed '
-+ t clear
-+ : clear
-+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+ t end
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
-- echo "updating cache $cache_file"
-- cat confcache > $cache_file
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ cat confcache >$cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
- fi
- rm -f confcache
-
--trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
--
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# Any assignment to VPATH causes Sun make to only execute
--# the first set of double-colon rules, so remove it if not needed.
--# If there is a colon in the path, we need to keep it.
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[ ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[ ]*$//;
-+}'
- fi
-
--trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
--
- # Transform confdefs.h into DEFS.
- # Protect against shell expansion while executing Makefile rules.
- # Protect against Makefile macro expansion.
--cat > conftest.defs <<\EOF
--s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
--s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
--s%\[%\\&%g
--s%\]%\\&%g
--s%\$%$$%g
--EOF
--DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
--rm -f conftest.defs
-+#
-+# If the first sed substitution is executed (which looks for macros that
-+# take arguments), then we branch to the quote section. Otherwise,
-+# look for a macro that doesn't take arguments.
-+cat >confdef2opt.sed <<\_ACEOF
-+t clear
-+: clear
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-+t quote
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-+t quote
-+d
-+: quote
-+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-+s,\[,\\&,g
-+s,\],\\&,g
-+s,\$,$$,g
-+p
-+_ACEOF
-+# We use echo to avoid assuming a particular line-breaking character.
-+# The extra dot is to prevent the shell from consuming trailing
-+# line-breaks from the sub-command output. A line-break within
-+# single-quotes doesn't work because, if this script is created in a
-+# platform that uses two characters for line-breaks (e.g., DOS), tr
-+# would break.
-+ac_LF_and_DOT=`echo; echo .`
-+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-+rm -f confdef2opt.sed
-+
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+ # 1. Remove the extension, and $U if already installed.
-+ ac_i=`echo "$ac_i" |
-+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+ # 2. Add them.
-+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-
-+LTLIBOBJS=$ac_ltlibobjs
-
--# Without the "./", some shells look in PATH for config.status.
--: ${CONFIG_STATUS=./config.status}
-
--echo creating $CONFIG_STATUS
--rm -f $CONFIG_STATUS
--cat > $CONFIG_STATUS <<EOF
--#! /bin/sh
--# Generated automatically by configure.
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
- # Run this file to recreate the current configuration.
--# This directory was configured as follows,
--# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--#
--# $0 $ac_configure_args
--#
- # Compiler output produced by configure, useful for debugging
--# configure, is in ./config.log if it exists.
-+# configure, is in config.log if it exists.
-
--ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
--for ac_option
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { { echo "$as_me:$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
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { { echo "$as_me:$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
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+exec 6>&1
-+
-+# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling. Logging --version etc. is OK.
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+} >&5
-+cat >&5 <<_CSEOF
-+
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.57. 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
-+echo >&5
-+_ACEOF
-+
-+# Files that config.status was made for.
-+if test -n "$ac_config_files"; then
-+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_headers"; then
-+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_links"; then
-+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_commands"; then
-+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
-+ -d, --debug don't remove temporary files
-+ --recheck update $as_me by reconfiguring in the same conditions
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.57,
-+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
- do
-- case "\$ac_option" in
-+ case $1 in
-+ --*=*)
-+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_shift=:
-+ ;;
-+ -*)
-+ ac_option=$1
-+ ac_optarg=$2
-+ ac_shift=shift
-+ ;;
-+ *) # This is not an option, so the user has probably given explicit
-+ # arguments.
-+ ac_option=$1
-+ ac_need_defaults=false;;
-+ esac
-+
-+ case $ac_option in
-+ # Handling of the options.
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.13"
-- exit 0 ;;
-- -help | --help | --hel | --he | --h)
-- echo "\$ac_cs_usage"; exit 0 ;;
-- *) echo "\$ac_cs_usage"; exit 1 ;;
-+ ac_cs_recheck=: ;;
-+ --version | --vers* | -V )
-+ echo "$ac_cs_version"; exit 0 ;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { { 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;}
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ $ac_shift
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ ac_need_defaults=false;;
-+ --header | --heade | --head | --hea )
-+ $ac_shift
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+ ac_need_defaults=false;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+ ac_cs_silent=: ;;
-+
-+ # This is an error.
-+ -*) { { 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;}
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$ac_config_targets $1" ;;
-+
- esac
-+ shift
- done
-
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
-+ac_configure_extra_args=
-
--trap 'rm -fr `echo "
--Makefile
--docs/Makefile
--docs/html/Makefile
--docs/man3/Makefile
--include/Makefile
--src/Makefile
--src/main/Makefile
--src/main/macosx/Makefile
--src/main/macosx/Info.plist
--src/audio/Makefile
--src/audio/alsa/Makefile
--src/audio/arts/Makefile
--src/audio/baudio/Makefile
--src/audio/dc/Makefile
--src/audio/disk/Makefile
--src/audio/dma/Makefile
--src/audio/dmedia/Makefile
--src/audio/dsp/Makefile
--src/audio/esd/Makefile
--src/audio/macrom/Makefile
--src/audio/mint/Makefile
--src/audio/mme/Makefile
--src/audio/nas/Makefile
--src/audio/nto/Makefile
--src/audio/openbsd/Makefile
--src/audio/paudio/Makefile
--src/audio/riscos/Makefile
--src/audio/sun/Makefile
--src/audio/ums/Makefile
--src/audio/windib/Makefile
--src/audio/windx5/Makefile
--src/video/Makefile
--src/video/aalib/Makefile
--src/video/ataricommon/Makefile
--src/video/bwindow/Makefile
--src/video/cybergfx/Makefile
--src/video/dc/Makefile
--src/video/dga/Makefile
--src/video/directfb/Makefile
--src/video/dummy/Makefile
--src/video/epoc/Makefile
--src/video/fbcon/Makefile
--src/video/gem/Makefile
--src/video/ggi/Makefile
--src/video/maccommon/Makefile
--src/video/macdsp/Makefile
--src/video/macrom/Makefile
--src/video/nanox/Makefile
--src/video/photon/Makefile
--src/video/picogui/Makefile
--src/video/ps2gs/Makefile
--src/video/qtopia/Makefile
--src/video/quartz/Makefile
--src/video/riscos/Makefile
--src/video/svga/Makefile
--src/video/vgl/Makefile
--src/video/wincommon/Makefile
--src/video/windib/Makefile
--src/video/windx5/Makefile
--src/video/x11/Makefile
--src/video/xbios/Makefile
--src/video/XFree86/Makefile
--src/video/XFree86/extensions/Makefile
--src/video/XFree86/Xinerama/Makefile
--src/video/XFree86/Xv/Makefile
--src/video/XFree86/Xxf86dga/Makefile
--src/video/XFree86/Xxf86vm/Makefile
--src/events/Makefile
--src/joystick/Makefile
--src/joystick/amigaos/Makefile
--src/joystick/beos/Makefile
--src/joystick/bsd/Makefile
--src/joystick/darwin/Makefile
--src/joystick/dc/Makefile
--src/joystick/dummy/Makefile
--src/joystick/linux/Makefile
--src/joystick/macos/Makefile
--src/joystick/mint/Makefile
--src/joystick/riscos/Makefile
--src/joystick/win32/Makefile
--src/cdrom/Makefile
--src/cdrom/aix/Makefile
--src/cdrom/beos/Makefile
--src/cdrom/dc/Makefile
--src/cdrom/dummy/Makefile
--src/cdrom/bsdi/Makefile
--src/cdrom/freebsd/Makefile
--src/cdrom/linux/Makefile
--src/cdrom/macos/Makefile
--src/cdrom/macosx/Makefile
--src/cdrom/openbsd/Makefile
--src/cdrom/osf/Makefile
--src/cdrom/qnx/Makefile
--src/cdrom/win32/Makefile
--src/thread/Makefile
--src/timer/Makefile
--src/endian/Makefile
--src/file/Makefile
--src/hermes/Makefile
--sdl-config
--SDL.spec
--SDL.qpg
--" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
--EOF
--cat >> $CONFIG_STATUS <<EOF
--
--# Protect against being on the right side of a sed subst in config.status.
--sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
--$ac_vpsub
--$extrasub
--s%@SHELL@%$SHELL%g
--s%@CFLAGS@%$CFLAGS%g
--s%@CPPFLAGS@%$CPPFLAGS%g
--s%@CXXFLAGS@%$CXXFLAGS%g
--s%@FFLAGS@%$FFLAGS%g
--s%@DEFS@%$DEFS%g
--s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
--s%@exec_prefix@%$exec_prefix%g
--s%@prefix@%$prefix%g
--s%@program_transform_name@%$program_transform_name%g
--s%@bindir@%$bindir%g
--s%@sbindir@%$sbindir%g
--s%@libexecdir@%$libexecdir%g
--s%@datadir@%$datadir%g
--s%@sysconfdir@%$sysconfdir%g
--s%@sharedstatedir@%$sharedstatedir%g
--s%@localstatedir@%$localstatedir%g
--s%@libdir@%$libdir%g
--s%@includedir@%$includedir%g
--s%@oldincludedir@%$oldincludedir%g
--s%@infodir@%$infodir%g
--s%@mandir@%$mandir%g
--s%@SDL_MAJOR_VERSION@%$SDL_MAJOR_VERSION%g
--s%@SDL_MINOR_VERSION@%$SDL_MINOR_VERSION%g
--s%@SDL_MICRO_VERSION@%$SDL_MICRO_VERSION%g
--s%@SDL_INTERFACE_AGE@%$SDL_INTERFACE_AGE%g
--s%@SDL_BINARY_AGE@%$SDL_BINARY_AGE%g
--s%@SDL_VERSION@%$SDL_VERSION%g
--s%@LT_RELEASE@%$LT_RELEASE%g
--s%@LT_CURRENT@%$LT_CURRENT%g
--s%@LT_REVISION@%$LT_REVISION%g
--s%@LT_AGE@%$LT_AGE%g
--s%@host@%$host%g
--s%@host_alias@%$host_alias%g
--s%@host_cpu@%$host_cpu%g
--s%@host_vendor@%$host_vendor%g
--s%@host_os@%$host_os%g
--s%@target@%$target%g
--s%@target_alias@%$target_alias%g
--s%@target_cpu@%$target_cpu%g
--s%@target_vendor@%$target_vendor%g
--s%@target_os@%$target_os%g
--s%@build@%$build%g
--s%@build_alias@%$build_alias%g
--s%@build_cpu@%$build_cpu%g
--s%@build_vendor@%$build_vendor%g
--s%@build_os@%$build_os%g
--s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
--s%@PACKAGE@%$PACKAGE%g
--s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
--s%@MAKEINFO@%$MAKEINFO%g
--s%@SET_MAKE@%$SET_MAKE%g
--s%@RANLIB@%$RANLIB%g
--s%@CC@%$CC%g
--s%@LN_S@%$LN_S%g
--s%@DLLTOOL@%$DLLTOOL%g
--s%@AS@%$AS%g
--s%@OBJDUMP@%$OBJDUMP%g
--s%@LIBTOOL@%$LIBTOOL%g
--s%@CXX@%$CXX%g
--s%@CPP@%$CPP%g
--s%@ALLOCA@%$ALLOCA%g
--s%@ASFLAGS@%$ASFLAGS%g
--s%@CCAS@%$CCAS%g
--s%@CCASFLAGS@%$CCASFLAGS%g
--s%@am__fastdepOBJC_TRUE@%$am__fastdepOBJC_TRUE%g
--s%@am__fastdepOBJC_FALSE@%$am__fastdepOBJC_FALSE%g
--s%@ESD_CONFIG@%$ESD_CONFIG%g
--s%@ESD_CFLAGS@%$ESD_CFLAGS%g
--s%@ESD_LIBS@%$ESD_LIBS%g
--s%@esd_lib@%$esd_lib%g
--s%@ARTSCCONFIG@%$ARTSCCONFIG%g
--s%@arts_lib@%$arts_lib%g
--s%@NASM@%$NASM%g
--s%@NASMFLAGS@%$NASMFLAGS%g
--s%@X_CFLAGS@%$X_CFLAGS%g
--s%@X_PRE_LIBS@%$X_PRE_LIBS%g
--s%@X_LIBS@%$X_LIBS%g
--s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
--s%@PKG_CONFIG@%$PKG_CONFIG%g
--s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g
--s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g
+@@ -9504,7 +9524,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+ s%@PKG_CONFIG@%$PKG_CONFIG%g
+ s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g
+ s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g
-s%@PTH_CONFIG@%$PTH_CONFIG%g
--s%@ARCH@%$ARCH%g
--s%@TARGET_LINUX_TRUE@%$TARGET_LINUX_TRUE%g
--s%@TARGET_LINUX_FALSE@%$TARGET_LINUX_FALSE%g
--s%@TARGET_QTOPIA_TRUE@%$TARGET_QTOPIA_TRUE%g
--s%@TARGET_QTOPIA_FALSE@%$TARGET_QTOPIA_FALSE%g
--s%@TARGET_SOLARIS_TRUE@%$TARGET_SOLARIS_TRUE%g
--s%@TARGET_SOLARIS_FALSE@%$TARGET_SOLARIS_FALSE%g
--s%@TARGET_IRIX_TRUE@%$TARGET_IRIX_TRUE%g
--s%@TARGET_IRIX_FALSE@%$TARGET_IRIX_FALSE%g
--s%@TARGET_BSDI_TRUE@%$TARGET_BSDI_TRUE%g
--s%@TARGET_BSDI_FALSE@%$TARGET_BSDI_FALSE%g
--s%@TARGET_FREEBSD_TRUE@%$TARGET_FREEBSD_TRUE%g
--s%@TARGET_FREEBSD_FALSE@%$TARGET_FREEBSD_FALSE%g
--s%@TARGET_NETBSD_TRUE@%$TARGET_NETBSD_TRUE%g
--s%@TARGET_NETBSD_FALSE@%$TARGET_NETBSD_FALSE%g
--s%@TARGET_OPENBSD_TRUE@%$TARGET_OPENBSD_TRUE%g
--s%@TARGET_OPENBSD_FALSE@%$TARGET_OPENBSD_FALSE%g
--s%@TARGET_AIX_TRUE@%$TARGET_AIX_TRUE%g
--s%@TARGET_AIX_FALSE@%$TARGET_AIX_FALSE%g
--s%@TARGET_WIN32_TRUE@%$TARGET_WIN32_TRUE%g
--s%@TARGET_WIN32_FALSE@%$TARGET_WIN32_FALSE%g
--s%@TARGET_BEOS_TRUE@%$TARGET_BEOS_TRUE%g
--s%@TARGET_BEOS_FALSE@%$TARGET_BEOS_FALSE%g
--s%@TARGET_MACOS_TRUE@%$TARGET_MACOS_TRUE%g
--s%@TARGET_MACOS_FALSE@%$TARGET_MACOS_FALSE%g
--s%@TARGET_MACOSX_TRUE@%$TARGET_MACOSX_TRUE%g
--s%@TARGET_MACOSX_FALSE@%$TARGET_MACOSX_FALSE%g
--s%@TARGET_QNX_TRUE@%$TARGET_QNX_TRUE%g
--s%@TARGET_QNX_FALSE@%$TARGET_QNX_FALSE%g
--s%@TARGET_MINT_TRUE@%$TARGET_MINT_TRUE%g
--s%@TARGET_MINT_FALSE@%$TARGET_MINT_FALSE%g
--s%@USE_DIRECTX_TRUE@%$USE_DIRECTX_TRUE%g
--s%@USE_DIRECTX_FALSE@%$USE_DIRECTX_FALSE%g
--s%@USE_CLONE_TRUE@%$USE_CLONE_TRUE%g
--s%@USE_CLONE_FALSE@%$USE_CLONE_FALSE%g
--s%@ENABLE_SHARED_TRUE@%$ENABLE_SHARED_TRUE%g
--s%@ENABLE_SHARED_FALSE@%$ENABLE_SHARED_FALSE%g
--s%@ENABLE_STATIC_TRUE@%$ENABLE_STATIC_TRUE%g
--s%@ENABLE_STATIC_FALSE@%$ENABLE_STATIC_FALSE%g
--s%@AUDIO_SUBDIRS@%$AUDIO_SUBDIRS%g
--s%@AUDIO_DRIVERS@%$AUDIO_DRIVERS%g
--s%@VIDEO_SUBDIRS@%$VIDEO_SUBDIRS%g
--s%@VIDEO_DRIVERS@%$VIDEO_DRIVERS%g
--s%@JOYSTICK_SUBDIRS@%$JOYSTICK_SUBDIRS%g
--s%@JOYSTICK_DRIVERS@%$JOYSTICK_DRIVERS%g
--s%@CDROM_SUBDIRS@%$CDROM_SUBDIRS%g
--s%@CDROM_DRIVERS@%$CDROM_DRIVERS%g
--s%@SDL_EXTRADIRS@%$SDL_EXTRADIRS%g
--s%@SDL_EXTRALIBS@%$SDL_EXTRALIBS%g
--s%@SDL_CFLAGS@%$SDL_CFLAGS%g
--s%@SDL_LIBS@%$SDL_LIBS%g
--s%@SDL_RLD_FLAGS@%$SDL_RLD_FLAGS%g
--s%@STATIC_SYSTEM_LIBS@%$STATIC_SYSTEM_LIBS%g
--s%@SHARED_SYSTEM_LIBS@%$SHARED_SYSTEM_LIBS%g
--s%@SYSTEM_LIBS@%$SYSTEM_LIBS%g
--s%@OBJC@%$OBJC%g
--s%@OBJCFLAGS@%$OBJCFLAGS%g
--s%@OBJCDEPMODE@%$OBJCDEPMODE%g
-+if $ac_cs_silent; then
-+ exec 6>/dev/null
-+ ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-
-+_ACEOF
-+
-+
-+
-+
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_config_target in $ac_config_targets
-+do
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-+ "docs/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/html/Makefile" ;;
-+ "docs/man3/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/man3/Makefile" ;;
-+ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-+ "src/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
-+ "src/main/macosx/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/macosx/Makefile" ;;
-+ "src/main/macosx/Info.plist" ) CONFIG_FILES="$CONFIG_FILES src/main/macosx/Info.plist" ;;
-+ "src/audio/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/Makefile" ;;
-+ "src/audio/alsa/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/alsa/Makefile" ;;
-+ "src/audio/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/arts/Makefile" ;;
-+ "src/audio/baudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/baudio/Makefile" ;;
-+ "src/audio/dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/dc/Makefile" ;;
-+ "src/audio/disk/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/disk/Makefile" ;;
-+ "src/audio/dma/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/dma/Makefile" ;;
-+ "src/audio/dmedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/dmedia/Makefile" ;;
-+ "src/audio/dsp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/dsp/Makefile" ;;
-+ "src/audio/esd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/esd/Makefile" ;;
-+ "src/audio/macrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/macrom/Makefile" ;;
-+ "src/audio/mint/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/mint/Makefile" ;;
-+ "src/audio/mme/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/mme/Makefile" ;;
-+ "src/audio/nas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/nas/Makefile" ;;
-+ "src/audio/nto/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/nto/Makefile" ;;
-+ "src/audio/openbsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/openbsd/Makefile" ;;
-+ "src/audio/paudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/paudio/Makefile" ;;
-+ "src/audio/riscos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/riscos/Makefile" ;;
-+ "src/audio/sun/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/sun/Makefile" ;;
-+ "src/audio/ums/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/ums/Makefile" ;;
-+ "src/audio/windib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/windib/Makefile" ;;
-+ "src/audio/windx5/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/audio/windx5/Makefile" ;;
-+ "src/video/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/Makefile" ;;
-+ "src/video/aalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/aalib/Makefile" ;;
-+ "src/video/ataricommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/ataricommon/Makefile" ;;
-+ "src/video/bwindow/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/bwindow/Makefile" ;;
-+ "src/video/cybergfx/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/cybergfx/Makefile" ;;
-+ "src/video/dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/dc/Makefile" ;;
-+ "src/video/dga/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/dga/Makefile" ;;
-+ "src/video/directfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/directfb/Makefile" ;;
-+ "src/video/dummy/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/dummy/Makefile" ;;
-+ "src/video/epoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/epoc/Makefile" ;;
-+ "src/video/fbcon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/fbcon/Makefile" ;;
-+ "src/video/gem/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/gem/Makefile" ;;
-+ "src/video/ggi/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/ggi/Makefile" ;;
-+ "src/video/maccommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/maccommon/Makefile" ;;
-+ "src/video/macdsp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/macdsp/Makefile" ;;
-+ "src/video/macrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/macrom/Makefile" ;;
-+ "src/video/nanox/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/nanox/Makefile" ;;
-+ "src/video/photon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/photon/Makefile" ;;
-+ "src/video/picogui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/picogui/Makefile" ;;
-+ "src/video/ps2gs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/ps2gs/Makefile" ;;
-+ "src/video/qtopia/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/qtopia/Makefile" ;;
-+ "src/video/quartz/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/quartz/Makefile" ;;
-+ "src/video/riscos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/riscos/Makefile" ;;
-+ "src/video/svga/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/svga/Makefile" ;;
-+ "src/video/vgl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/vgl/Makefile" ;;
-+ "src/video/wincommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/wincommon/Makefile" ;;
-+ "src/video/windib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/windib/Makefile" ;;
-+ "src/video/windx5/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/windx5/Makefile" ;;
-+ "src/video/x11/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/x11/Makefile" ;;
-+ "src/video/xbios/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/xbios/Makefile" ;;
-+ "src/video/XFree86/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/Makefile" ;;
-+ "src/video/XFree86/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/extensions/Makefile" ;;
-+ "src/video/XFree86/Xinerama/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/Xinerama/Makefile" ;;
-+ "src/video/XFree86/Xv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/Xv/Makefile" ;;
-+ "src/video/XFree86/Xxf86dga/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/Xxf86dga/Makefile" ;;
-+ "src/video/XFree86/Xxf86vm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/XFree86/Xxf86vm/Makefile" ;;
-+ "src/events/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/events/Makefile" ;;
-+ "src/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/Makefile" ;;
-+ "src/joystick/amigaos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/amigaos/Makefile" ;;
-+ "src/joystick/beos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/beos/Makefile" ;;
-+ "src/joystick/bsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/bsd/Makefile" ;;
-+ "src/joystick/darwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/darwin/Makefile" ;;
-+ "src/joystick/dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/dc/Makefile" ;;
-+ "src/joystick/dummy/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/dummy/Makefile" ;;
-+ "src/joystick/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/linux/Makefile" ;;
-+ "src/joystick/macos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/macos/Makefile" ;;
-+ "src/joystick/mint/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/mint/Makefile" ;;
-+ "src/joystick/riscos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/riscos/Makefile" ;;
-+ "src/joystick/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/joystick/win32/Makefile" ;;
-+ "src/cdrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/Makefile" ;;
-+ "src/cdrom/aix/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/aix/Makefile" ;;
-+ "src/cdrom/beos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/beos/Makefile" ;;
-+ "src/cdrom/dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/dc/Makefile" ;;
-+ "src/cdrom/dummy/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/dummy/Makefile" ;;
-+ "src/cdrom/bsdi/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/bsdi/Makefile" ;;
-+ "src/cdrom/freebsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/freebsd/Makefile" ;;
-+ "src/cdrom/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/linux/Makefile" ;;
-+ "src/cdrom/macos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/macos/Makefile" ;;
-+ "src/cdrom/macosx/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/macosx/Makefile" ;;
-+ "src/cdrom/openbsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/openbsd/Makefile" ;;
-+ "src/cdrom/osf/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/osf/Makefile" ;;
-+ "src/cdrom/qnx/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/qnx/Makefile" ;;
-+ "src/cdrom/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cdrom/win32/Makefile" ;;
-+ "src/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/thread/Makefile" ;;
-+ "src/timer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/timer/Makefile" ;;
-+ "src/endian/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/endian/Makefile" ;;
-+ "src/file/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/file/Makefile" ;;
-+ "src/hermes/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/hermes/Makefile" ;;
-+ "sdl-config" ) CONFIG_FILES="$CONFIG_FILES sdl-config" ;;
-+ "SDL.spec" ) CONFIG_FILES="$CONFIG_FILES SDL.spec" ;;
-+ "SDL.qpg" ) CONFIG_FILES="$CONFIG_FILES SDL.qpg" ;;
-+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-+ *) { { 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
-+done
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used. Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience. Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+} ||
-+{
-+ tmp=./confstat$$-$RANDOM
-+ (umask 077 && mkdir $tmp)
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+}
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+
-+#
-+# CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "\$CONFIG_FILES"; then
-+ # Protect against being on the right side of a sed subst in config.status.
-+ 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
-+s,@bindir@,$bindir,;t t
-+s,@sbindir@,$sbindir,;t t
-+s,@libexecdir@,$libexecdir,;t t
-+s,@datadir@,$datadir,;t t
-+s,@sysconfdir@,$sysconfdir,;t t
-+s,@sharedstatedir@,$sharedstatedir,;t t
-+s,@localstatedir@,$localstatedir,;t t
-+s,@libdir@,$libdir,;t t
-+s,@includedir@,$includedir,;t t
-+s,@oldincludedir@,$oldincludedir,;t t
-+s,@infodir@,$infodir,;t t
-+s,@mandir@,$mandir,;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,@LIBS@,$LIBS,;t t
-+s,@SDL_MAJOR_VERSION@,$SDL_MAJOR_VERSION,;t t
-+s,@SDL_MINOR_VERSION@,$SDL_MINOR_VERSION,;t t
-+s,@SDL_MICRO_VERSION@,$SDL_MICRO_VERSION,;t t
-+s,@SDL_INTERFACE_AGE@,$SDL_INTERFACE_AGE,;t t
-+s,@SDL_BINARY_AGE@,$SDL_BINARY_AGE,;t t
-+s,@SDL_VERSION@,$SDL_VERSION,;t t
-+s,@LT_RELEASE@,$LT_RELEASE,;t t
-+s,@LT_CURRENT@,$LT_CURRENT,;t t
-+s,@LT_REVISION@,$LT_REVISION,;t t
-+s,@LT_AGE@,$LT_AGE,;t t
-+s,@build@,$build,;t t
-+s,@build_cpu@,$build_cpu,;t t
-+s,@build_vendor@,$build_vendor,;t t
-+s,@build_os@,$build_os,;t t
-+s,@host@,$host,;t t
-+s,@host_cpu@,$host_cpu,;t t
-+s,@host_vendor@,$host_vendor,;t t
-+s,@host_os@,$host_os,;t t
-+s,@target@,$target,;t t
-+s,@target_cpu@,$target_cpu,;t t
-+s,@target_vendor@,$target_vendor,;t t
-+s,@target_os@,$target_os,;t t
-+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@PACKAGE@,$PACKAGE,;t t
-+s,@VERSION@,$VERSION,;t t
-+s,@ACLOCAL@,$ACLOCAL,;t t
-+s,@AUTOCONF@,$AUTOCONF,;t t
-+s,@AUTOMAKE@,$AUTOMAKE,;t t
-+s,@AUTOHEADER@,$AUTOHEADER,;t t
-+s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@RANLIB@,$RANLIB,;t t
-+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+s,@CC@,$CC,;t t
-+s,@CFLAGS@,$CFLAGS,;t t
-+s,@LDFLAGS@,$LDFLAGS,;t t
-+s,@CPPFLAGS@,$CPPFLAGS,;t t
-+s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
-+s,@OBJEXT@,$OBJEXT,;t t
-+s,@LN_S@,$LN_S,;t t
-+s,@LIBTOOL@,$LIBTOOL,;t t
-+s,@CXX@,$CXX,;t t
-+s,@CXXFLAGS@,$CXXFLAGS,;t t
-+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@ALLOCA@,$ALLOCA,;t t
-+s,@CPP@,$CPP,;t t
-+s,@EGREP@,$EGREP,;t t
-+s,@ASFLAGS@,$ASFLAGS,;t t
-+s,@CCAS@,$CCAS,;t t
-+s,@CCASFLAGS@,$CCASFLAGS,;t t
-+s,@am__fastdepOBJC_TRUE@,$am__fastdepOBJC_TRUE,;t t
-+s,@am__fastdepOBJC_FALSE@,$am__fastdepOBJC_FALSE,;t t
-+s,@ESD_CONFIG@,$ESD_CONFIG,;t t
-+s,@ESD_CFLAGS@,$ESD_CFLAGS,;t t
-+s,@ESD_LIBS@,$ESD_LIBS,;t t
-+s,@esd_lib@,$esd_lib,;t t
-+s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t
-+s,@arts_lib@,$arts_lib,;t t
-+s,@NASM@,$NASM,;t t
-+s,@NASMFLAGS@,$NASMFLAGS,;t t
-+s,@X_CFLAGS@,$X_CFLAGS,;t t
-+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
-+s,@X_LIBS@,$X_LIBS,;t t
-+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-+s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
-+s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
-+s,@AALIB_CONFIG@,$AALIB_CONFIG,;t t
-+s,@PTHREAD_CONFIG@,$PTHREAD_CONFIG,;t t
-+s,@ARCH@,$ARCH,;t t
-+s,@TARGET_LINUX_TRUE@,$TARGET_LINUX_TRUE,;t t
-+s,@TARGET_LINUX_FALSE@,$TARGET_LINUX_FALSE,;t t
-+s,@TARGET_QTOPIA_TRUE@,$TARGET_QTOPIA_TRUE,;t t
-+s,@TARGET_QTOPIA_FALSE@,$TARGET_QTOPIA_FALSE,;t t
-+s,@TARGET_SOLARIS_TRUE@,$TARGET_SOLARIS_TRUE,;t t
-+s,@TARGET_SOLARIS_FALSE@,$TARGET_SOLARIS_FALSE,;t t
-+s,@TARGET_IRIX_TRUE@,$TARGET_IRIX_TRUE,;t t
-+s,@TARGET_IRIX_FALSE@,$TARGET_IRIX_FALSE,;t t
-+s,@TARGET_BSDI_TRUE@,$TARGET_BSDI_TRUE,;t t
-+s,@TARGET_BSDI_FALSE@,$TARGET_BSDI_FALSE,;t t
-+s,@TARGET_FREEBSD_TRUE@,$TARGET_FREEBSD_TRUE,;t t
-+s,@TARGET_FREEBSD_FALSE@,$TARGET_FREEBSD_FALSE,;t t
-+s,@TARGET_NETBSD_TRUE@,$TARGET_NETBSD_TRUE,;t t
-+s,@TARGET_NETBSD_FALSE@,$TARGET_NETBSD_FALSE,;t t
-+s,@TARGET_OPENBSD_TRUE@,$TARGET_OPENBSD_TRUE,;t t
-+s,@TARGET_OPENBSD_FALSE@,$TARGET_OPENBSD_FALSE,;t t
-+s,@TARGET_AIX_TRUE@,$TARGET_AIX_TRUE,;t t
-+s,@TARGET_AIX_FALSE@,$TARGET_AIX_FALSE,;t t
-+s,@TARGET_WIN32_TRUE@,$TARGET_WIN32_TRUE,;t t
-+s,@TARGET_WIN32_FALSE@,$TARGET_WIN32_FALSE,;t t
-+s,@TARGET_BEOS_TRUE@,$TARGET_BEOS_TRUE,;t t
-+s,@TARGET_BEOS_FALSE@,$TARGET_BEOS_FALSE,;t t
-+s,@TARGET_MACOS_TRUE@,$TARGET_MACOS_TRUE,;t t
-+s,@TARGET_MACOS_FALSE@,$TARGET_MACOS_FALSE,;t t
-+s,@TARGET_MACOSX_TRUE@,$TARGET_MACOSX_TRUE,;t t
-+s,@TARGET_MACOSX_FALSE@,$TARGET_MACOSX_FALSE,;t t
-+s,@TARGET_QNX_TRUE@,$TARGET_QNX_TRUE,;t t
-+s,@TARGET_QNX_FALSE@,$TARGET_QNX_FALSE,;t t
-+s,@TARGET_MINT_TRUE@,$TARGET_MINT_TRUE,;t t
-+s,@TARGET_MINT_FALSE@,$TARGET_MINT_FALSE,;t t
-+s,@USE_DIRECTX_TRUE@,$USE_DIRECTX_TRUE,;t t
-+s,@USE_DIRECTX_FALSE@,$USE_DIRECTX_FALSE,;t t
-+s,@USE_CLONE_TRUE@,$USE_CLONE_TRUE,;t t
-+s,@USE_CLONE_FALSE@,$USE_CLONE_FALSE,;t t
-+s,@ENABLE_SHARED_TRUE@,$ENABLE_SHARED_TRUE,;t t
-+s,@ENABLE_SHARED_FALSE@,$ENABLE_SHARED_FALSE,;t t
-+s,@ENABLE_STATIC_TRUE@,$ENABLE_STATIC_TRUE,;t t
-+s,@ENABLE_STATIC_FALSE@,$ENABLE_STATIC_FALSE,;t t
-+s,@AUDIO_SUBDIRS@,$AUDIO_SUBDIRS,;t t
-+s,@AUDIO_DRIVERS@,$AUDIO_DRIVERS,;t t
-+s,@VIDEO_SUBDIRS@,$VIDEO_SUBDIRS,;t t
-+s,@VIDEO_DRIVERS@,$VIDEO_DRIVERS,;t t
-+s,@JOYSTICK_SUBDIRS@,$JOYSTICK_SUBDIRS,;t t
-+s,@JOYSTICK_DRIVERS@,$JOYSTICK_DRIVERS,;t t
-+s,@CDROM_SUBDIRS@,$CDROM_SUBDIRS,;t t
-+s,@CDROM_DRIVERS@,$CDROM_DRIVERS,;t t
-+s,@SDL_EXTRADIRS@,$SDL_EXTRADIRS,;t t
-+s,@SDL_EXTRALIBS@,$SDL_EXTRALIBS,;t t
-+s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
-+s,@SDL_LIBS@,$SDL_LIBS,;t t
-+s,@SDL_RLD_FLAGS@,$SDL_RLD_FLAGS,;t t
-+s,@STATIC_SYSTEM_LIBS@,$STATIC_SYSTEM_LIBS,;t t
-+s,@SHARED_SYSTEM_LIBS@,$SHARED_SYSTEM_LIBS,;t t
-+s,@SYSTEM_LIBS@,$SYSTEM_LIBS,;t t
-+s,@OBJC@,$OBJC,;t t
-+s,@OBJCFLAGS@,$OBJCFLAGS,;t t
-+s,@OBJCDEPMODE@,$OBJCDEPMODE,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
--EOF
-
--cat >> $CONFIG_STATUS <<\EOF
-+_ACEOF
-
--# Split the substitutions into bite-sized pieces for seds with
--# small command number limits, like on Digital OSF/1 and HP-UX.
--ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
--ac_file=1 # Number of current file.
--ac_beg=1 # First line for current file.
--ac_end=$ac_max_sed_cmds # Line after last line for current file.
--ac_more_lines=:
--ac_sed_cmds=""
--while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-- else
-- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-- fi
-- if test ! -s conftest.s$ac_file; then
-- ac_more_lines=false
-- rm -f conftest.s$ac_file
-- else
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f conftest.s$ac_file"
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Split the substitutions into bite-sized pieces for seds with
-+ # small command number limits, like on Digital OSF/1 and HP-UX.
-+ ac_max_sed_lines=48
-+ ac_sed_frag=1 # Number of current file.
-+ ac_beg=1 # First line for current file.
-+ ac_end=$ac_max_sed_lines # Line after last line for current file.
-+ ac_more_lines=:
-+ ac_sed_cmds=
-+ while $ac_more_lines; do
-+ if test $ac_beg -gt 1; then
-+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ else
-+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ fi
-+ if test ! -s $tmp/subs.frag; then
-+ ac_more_lines=false
- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+ # The purpose of the label and of the branching condition is to
-+ # speed up the sed processing (if there are no `@' at all, there
-+ # is no need to browse any of the substitutions).
-+ # These are the two extra sed commands mentioned above.
-+ (echo ':t
-+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ fi
-+ ac_sed_frag=`expr $ac_sed_frag + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
-- ac_file=`expr $ac_file + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_cmds`
-- fi
--done
--if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
--fi
--EOF
--
--cat >> $CONFIG_STATUS <<EOF
--
--CONFIG_FILES=\${CONFIG_FILES-"Makefile
--docs/Makefile
--docs/html/Makefile
--docs/man3/Makefile
--include/Makefile
--src/Makefile
--src/main/Makefile
--src/main/macosx/Makefile
--src/main/macosx/Info.plist
--src/audio/Makefile
--src/audio/alsa/Makefile
--src/audio/arts/Makefile
--src/audio/baudio/Makefile
--src/audio/dc/Makefile
--src/audio/disk/Makefile
--src/audio/dma/Makefile
--src/audio/dmedia/Makefile
--src/audio/dsp/Makefile
--src/audio/esd/Makefile
--src/audio/macrom/Makefile
--src/audio/mint/Makefile
--src/audio/mme/Makefile
--src/audio/nas/Makefile
--src/audio/nto/Makefile
--src/audio/openbsd/Makefile
--src/audio/paudio/Makefile
--src/audio/riscos/Makefile
--src/audio/sun/Makefile
--src/audio/ums/Makefile
--src/audio/windib/Makefile
--src/audio/windx5/Makefile
--src/video/Makefile
--src/video/aalib/Makefile
--src/video/ataricommon/Makefile
--src/video/bwindow/Makefile
--src/video/cybergfx/Makefile
--src/video/dc/Makefile
--src/video/dga/Makefile
--src/video/directfb/Makefile
--src/video/dummy/Makefile
--src/video/epoc/Makefile
--src/video/fbcon/Makefile
--src/video/gem/Makefile
--src/video/ggi/Makefile
--src/video/maccommon/Makefile
--src/video/macdsp/Makefile
--src/video/macrom/Makefile
--src/video/nanox/Makefile
--src/video/photon/Makefile
--src/video/picogui/Makefile
--src/video/ps2gs/Makefile
--src/video/qtopia/Makefile
--src/video/quartz/Makefile
--src/video/riscos/Makefile
--src/video/svga/Makefile
--src/video/vgl/Makefile
--src/video/wincommon/Makefile
--src/video/windib/Makefile
--src/video/windx5/Makefile
--src/video/x11/Makefile
--src/video/xbios/Makefile
--src/video/XFree86/Makefile
--src/video/XFree86/extensions/Makefile
--src/video/XFree86/Xinerama/Makefile
--src/video/XFree86/Xv/Makefile
--src/video/XFree86/Xxf86dga/Makefile
--src/video/XFree86/Xxf86vm/Makefile
--src/events/Makefile
--src/joystick/Makefile
--src/joystick/amigaos/Makefile
--src/joystick/beos/Makefile
--src/joystick/bsd/Makefile
--src/joystick/darwin/Makefile
--src/joystick/dc/Makefile
--src/joystick/dummy/Makefile
--src/joystick/linux/Makefile
--src/joystick/macos/Makefile
--src/joystick/mint/Makefile
--src/joystick/riscos/Makefile
--src/joystick/win32/Makefile
--src/cdrom/Makefile
--src/cdrom/aix/Makefile
--src/cdrom/beos/Makefile
--src/cdrom/dc/Makefile
--src/cdrom/dummy/Makefile
--src/cdrom/bsdi/Makefile
--src/cdrom/freebsd/Makefile
--src/cdrom/linux/Makefile
--src/cdrom/macos/Makefile
--src/cdrom/macosx/Makefile
--src/cdrom/openbsd/Makefile
--src/cdrom/osf/Makefile
--src/cdrom/qnx/Makefile
--src/cdrom/win32/Makefile
--src/thread/Makefile
--src/timer/Makefile
--src/endian/Makefile
--src/file/Makefile
--src/hermes/Makefile
--sdl-config
--SDL.spec
--SDL.qpg
--"}
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+ done
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
-+ fi
-+fi # test -n "$CONFIG_FILES"
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- *) ac_file_in="${ac_file}.in" ;;
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
- esac
-
-- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
--
-- # Remove last slash and all that follows it. Not all systems have dirname.
-- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-- # The file is in a subdirectory.
-- test ! -d "$ac_dir" && mkdir "$ac_dir"
-- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-- else
-- ac_dir_suffix= ac_dots=
-- fi
--
-- case "$ac_given_srcdir" in
-- .) srcdir=.
-- if test -z "$ac_dots"; then top_srcdir=.
-- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+ 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\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ 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'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
- *) # Relative path.
-- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-- top_srcdir="$ac_dots$ac_given_srcdir" ;;
-- esac
-+ 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`
-
-- case "$ac_given_INSTALL" in
-- [/$]*) INSTALL="$ac_given_INSTALL" ;;
-- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- echo creating "$ac_file"
-- rm -f "$ac_file"
-- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-- case "$ac_file" in
-- *Makefile*) ac_comsub="1i\\
--# $configure_input" ;;
-- *) ac_comsub= ;;
-+ if test x"$ac_file" != x-; then
-+ { 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 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.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ 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;;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo $f
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo $srcdir/$f
-+ else
-+ # /dev/null tree
-+ { { 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;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[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
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+ rm -f $tmp/stdin
-+ if test x"$ac_file" != x-; then
-+ mv $tmp/out $ac_file
-+ else
-+ cat $tmp/out
-+ rm -f $tmp/out
-+ fi
-+
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+#
-+# CONFIG_COMMANDS section.
-+#
-+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_dest" : 'X\(//\)[^/]' \| \
-+ X"$ac_dest" : 'X\(//\)$' \| \
-+ X"$ac_dest" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_dest" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ 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'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ 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`
-+
-+
-+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-+echo "$as_me: executing $ac_dest commands" >&6;}
-+ case $ac_dest in
-+ default ) chmod +x sdl-config ;;
- esac
-+done
-+_ACEOF
-
-- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-- sed -e "$ac_comsub
--s%@configure_input@%$configure_input%g
--s%@srcdir@%$srcdir%g
--s%@top_srcdir@%$top_srcdir%g
--s%@INSTALL@%$INSTALL%g
--" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
--fi; done
--rm -f conftest.s*
--
--EOF
--cat >> $CONFIG_STATUS <<EOF
--
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--chmod +x sdl-config
--exit 0
--EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
- chmod +x $CONFIG_STATUS
--rm -fr confdefs* $ac_clean_files
--test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+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
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded. So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status. When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+ ac_cs_success=:
-+ ac_config_status_args=
-+ test "$silent" = yes &&
-+ ac_config_status_args="$ac_config_status_args --quiet"
-+ exec 5>/dev/null
-+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+ exec 5>>config.log
-+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+ # would make configure fail if this is the last instruction.
-+ $ac_cs_success || { (exit 1); exit 1; }
-+fi
-
++s%@AALIB_CONFIG@%$AALIB_CONFIG%g
++s%@PTHREAD_CONFIG@%$PTHREAD_CONFIG%g
+ s%@ARCH@%$ARCH%g
+ s%@TARGET_LINUX_TRUE@%$TARGET_LINUX_TRUE%g
+ s%@TARGET_LINUX_FALSE@%$TARGET_LINUX_FALSE%g
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-07 21:00:36 +0000