Bochs/bochs/patches/patch.check-platform
2002-03-07 15:44:48 +00:00

9744 lines
290 KiB
Plaintext

----------------------------------------------------------------------
Patch name: patch.check-platform
Author: Bryce Denney
Date: Thu Mar 7 09:00:12 2002
Detailed description:
This patch makes significant changes to the configure script. It adds the
lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
processor type. The configure script, knowing the OS and processor type,
can then make intelligent decisions about which CFLAGS are needed and what
is the default GUI for that platform. One of the goals of this patch is
to make it so that on all supported platforms, "configure;make" will compile
cleanly. Configure detects the target platform, but it can be overridden
by using --target=___. This is important when using one platform to generate
Makefiles and header files for another platform. See config.guess script
for the exact details of platform naming.
With the new configure script, here are some examples:
# detect platform, and use default gui for that platform.
# It should detect win32, macosx/darwin, beos, amigaos,
# and for other platforms it assumes you want X windows.
# For platforms such as cygwin and macosx which require certain
# compiler flags (-mno-cygwin, -fpascal-strings), the flags will
# be added to the CFLAGS supplied by the user.
configure
# configure for MSVC++ platform, which defaults to the win32 gui. Since
# windows can't run the configure script, this will always be run on a
# different platform, so the --target override is needed.
configure --target=pentium-windows
# configure for MSVC++ platform, use SDL gui instead of the default
configure --target=pentiumpro-windows --with-sdl
The defaults that are currently implemented in the modified configure script
include:
If platform is windows* or winnt*, use win32 gui.
If platform is cygwin*, use win32 gui and compile with
"-mno-cygwin -DWIN32".
If platform is macosx* or darwin*, use carbon gui and compile
with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
-Wno-unknown-pragmas -Dmacintosh"
If platform is macos, use macos gui.
If platform is beos, use beos gui.
If platform is amigaos, use amigaos gui.
Otherwise, use X windows gui.
To help test the new configure script and its defaults, I have edited the
.conf.* files. No platform should need the --with-* argument anymore, because
configure should default to the right thing. If it doesn't, please report it
as a bug and I will fix configure. You should only need --with-* when you want
to use a different GUI from the default on your platform (e.g. X windows on a
MacOSX machine, SDL on a linux machine, RFB on a windows machine).
Testing so far:
- (OK) configure;make in i686 redhat linux (x11 gui).
- (OK) configure --with-sdl;make in i686 redhat linux.
- (OK) configure --with-rfb;make in i686 redhat linux.
- (OK) configure;make in cygwin (win32 gui).
- (FAIL) SDL gui in cygwin.
./configure --with-sdl
This can be made to compile, but bochs doesn't actually work. It quits
before a window even comes up. See bug #526984: SDL compiled in cygwin
just quits.
- (FAIL) RFB in cygwin fails because I don't have a pthread library.
./configure --with-rfb
- (OK) Use cygwin to configure for for VC++, standard win32 gui.
./configure --target=pentium-windows --enable-cdrom --enable-sb16=win \
--enable-ne2000 --enable-cpp --disable-readline
- (OK) Use cygwin to configure for VC++ with SDL gui. This required
minor hacking of the project files in VC++ so that sdl.cc is used
instead of win32.cc, and to find the SDL headers and library.
./configure --with-sdl --target=pentium-windows --enable-cdrom \
--enable-sb16=win --enable-ne2000 --enable-cpp --disable-readline
- (?) configure;make on MacOSX (carbon gui).
My compiler is broken so I can't test it completely, but it did detect
the platform, add correct CFLAGS, and default to the carbon library.
Patch was created with:
diff -urN between two directories
Apply patch to what version:
current cvs
Instructions:
To patch, go to main bochs directory.
Type "patch -p1 < THIS_PATCH_FILE".
----------------------------------------------------------------------
diff -urN -x *CVS* clean/.conf.amigaos clean-newcfg/.conf.amigaos
--- clean/.conf.amigaos Thu Dec 13 16:02:56 2001
+++ clean-newcfg/.conf.amigaos Thu Mar 7 08:55:30 2002
@@ -3,4 +3,4 @@
# These options should work on Amiga/MorphOS
#
-./configure --with-amigaos --enable-fpu --enable-cdrom --enable-split-hd ${CONFIGURE_ARGS}
+./configure --enable-cdrom ${CONFIGURE_ARGS}
diff -urN -x *CVS* clean/.conf.beos-x86-R4 clean-newcfg/.conf.beos-x86-R4
--- clean/.conf.beos-x86-R4 Mon Apr 9 21:04:08 2001
+++ clean-newcfg/.conf.beos-x86-R4 Thu Mar 7 08:55:30 2002
@@ -15,4 +15,4 @@
export CFLAGS
export CXXFLAGS
-./configure --with-beos
+./configure
diff -urN -x *CVS* clean/.conf.beos-x86-preR4 clean-newcfg/.conf.beos-x86-preR4
--- clean/.conf.beos-x86-preR4 Mon Apr 9 21:04:08 2001
+++ clean-newcfg/.conf.beos-x86-preR4 Thu Mar 7 08:55:30 2002
@@ -15,4 +15,4 @@
export CFLAGS
export CXXFLAGS
-./configure --with-beos
+./configure
diff -urN -x *CVS* clean/.conf.macos clean-newcfg/.conf.macos
--- clean/.conf.macos Sun Oct 7 17:23:00 2001
+++ clean-newcfg/.conf.macos Thu Mar 7 08:55:30 2002
@@ -18,6 +18,6 @@
export CFLAGS
export CXXFLAGS
-./configure --with-macos
+./configure --target=mac-macos
unset echo
diff -urN -x *CVS* clean/.conf.macosx clean-newcfg/.conf.macosx
--- clean/.conf.macosx Thu Dec 13 16:02:56 2001
+++ clean-newcfg/.conf.macosx Thu Mar 7 08:55:30 2002
@@ -4,7 +4,7 @@
set echo
CC="cc"
-CFLAGS="-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants -Wno-unknown-pragmas -Dmacintosh -pipe -g"
+CFLAGS="-pipe -g"
CXX="$CC"
CXXFLAGS="$CFLAGS"
@@ -13,6 +13,6 @@
export CFLAGS
export CXXFLAGS
-./configure --with-carbon
+./configure
unset echo
diff -urN -x *CVS* clean/.conf.sparc clean-newcfg/.conf.sparc
--- clean/.conf.sparc Mon Apr 9 21:04:08 2001
+++ clean-newcfg/.conf.sparc Thu Mar 7 08:55:30 2002
@@ -19,7 +19,8 @@
export CFLAGS
export CXXFLAGS
-./configure --enable-fpu
+./configure
+#./configure --enable-fpu
#./configure
#./configure --enable-instrumentation
#./configure --with-nogui
diff -urN -x *CVS* clean/.conf.win32 clean-newcfg/.conf.win32
--- clean/.conf.win32 Mon Apr 9 21:04:08 2001
+++ clean-newcfg/.conf.win32 Thu Mar 7 08:55:30 2002
@@ -14,6 +14,6 @@
export CFLAGS
export CXXFLAGS
-./configure --with-win32
+./configure --target=pentium-windows
unset echo
diff -urN -x *CVS* clean/.conf.win32-cygwin clean-newcfg/.conf.win32-cygwin
--- clean/.conf.win32-cygwin Fri Nov 16 09:23:18 2001
+++ clean-newcfg/.conf.win32-cygwin Thu Mar 7 08:55:30 2002
@@ -6,7 +6,7 @@
CC="gcc"
CXX="g++"
-CFLAGS="-mno-cygwin -DWIN32 -O6 -march=pentium -mpentium"
+CFLAGS="-O6 -march=pentium -mpentium"
CXXFLAGS="$CFLAGS"
export CC
@@ -14,4 +14,4 @@
export CFLAGS
export CXXFLAGS
-./configure --with-win32 --enable-cdrom --enable-sb16=win
+./configure --enable-cdrom --enable-sb16=win
diff -urN -x *CVS* clean/.conf.win32-vcpp clean-newcfg/.conf.win32-vcpp
--- clean/.conf.win32-vcpp Tue Nov 20 19:16:18 2001
+++ clean-newcfg/.conf.win32-vcpp Thu Mar 7 08:55:30 2002
@@ -15,7 +15,7 @@
#./configure --with-win32-vcpp --enable-debugger --enable-disasm
#./configure --with-win32-vcpp --enable-disasm
-./configure --with-win32-vcpp --enable-cdrom --enable-sb16=win --enable-ne2000 --enable-cpp --disable-readline
+./configure --target=pentium-windows --enable-cdrom --enable-sb16=win --enable-ne2000 --enable-cpp --disable-readline
unset echo
diff -urN -x *CVS* clean/CHANGES clean-newcfg/CHANGES
--- clean/CHANGES Wed Mar 6 15:43:24 2002
+++ clean-newcfg/CHANGES Thu Mar 7 08:55:30 2002
@@ -5,6 +5,30 @@
REMINDER(bryce): add instructions for setting up networking to the docbook docs.
REMINDER(bryce): add Christophe's instructions for keymapping to docbook.
+Compile instructions for sdl, after we apply patch.check-platform.
+For most platforms:
+ configure --with-sdl
+ tested on linux only
+
+For VC++, since you have to configure on a different system.
+ configure --target=pentium-windows --with-sdl
+ make win32_snap
+ load up workspace called bochs.dsw
+ double click "gui files"
+ double click on "source files" under gui files
+ right click source files and choose add files to folder. Add gui/sdl.cc.
+ delete win32.cpp
+ Edit the settings of "gui files". Under C/C++ tab, category=preprocessor,
+ additional include directories, add the directory where SDL/SDL.h can be
+ found.
+ Edit the settings of the "bochs files" project. Under the Link tab,
+ category=General, add SDL.lib to object/library modules list. Then
+ in category=Input, add the path of SDL.lib to additional library path.
+ Click ok.
+ press F7 or select Build:Build Bochs.exe
+
+
+
-------------------------------------------------------------------------
Changes in 1.4 (FIXME(bdenney):change to release date):
- Christophe Bothamy added El Torito support in rombios.c, which allows Bochs
@@ -23,7 +47,7 @@
SDL is a graphics library that has works on many platforms.
This interface is experimental, and is missing a few features of the
standard Bochs interfaces: 1. icons at the top of the window, and
- 2. extended keys (arrows, keypad) are not working.
+ 2. extended keys (arrows, keypad) are not working.
FIXME: need compile instructions for various platforms.
Possibly this will require configure.in improvements that Bryce can help
with.
diff -urN -x *CVS* clean/config.guess clean-newcfg/config.guess
--- clean/config.guess Wed Dec 31 19:00:00 1969
+++ clean-newcfg/config.guess Wed Mar 6 21:41:30 2002
@@ -0,0 +1,1368 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+
+timestamp='2001-03-16'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c
+ for c in cc gcc c89 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+ if test $? = 0 ; then
+ CC_FOR_BUILD="$c"; break
+ fi
+ done
+ rm -f $dummy.c $dummy.o $dummy.rel
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # Netbsd (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ # Determine the machine/vendor (is the vendor relevant).
+ case "${UNAME_MACHINE}" in
+ amiga) machine=m68k-unknown ;;
+ arm32) machine=arm-unknown ;;
+ atari*) machine=m68k-atari ;;
+ sun3*) machine=m68k-sun ;;
+ mac68k) machine=m68k-apple ;;
+ macppc) machine=powerpc-apple ;;
+ hp3[0-9][05]) machine=m68k-hp ;;
+ ibmrt|romp-ibm) machine=romp-ibm ;;
+ *) machine=${UNAME_MACHINE}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE}" in
+ i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
+ alpha:OSF1:*:*)
+ if test $UNAME_RELEASE = "V4.0"; then
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ fi
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ cat <<EOF >$dummy.s
+ .data
+\$Lformat:
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+
+ .text
+ .globl main
+ .align 4
+ .ent main
+main:
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
+ .end main
+EOF
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ case `./$dummy` in
+ 0-0)
+ UNAME_MACHINE="alpha"
+ ;;
+ 1-0)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 1-1)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 1-101)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 2-303)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
+ ;;
+ esac
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit 0;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
+ arc64:OpenBSD:*:*)
+ echo mips64el-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hkmips:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit 0 ;;
+ sun3*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy \
+ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i?86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ case "${HPUX_REV}" in
+ 11.[0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ esac ;;
+ esac
+ fi ;;
+ esac
+ if [ "${HP_ARCH}" = "" ]; then
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
+ fi ;;
+ esac
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ i?86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ hppa*:OpenBSD:*:*)
+ echo hppa-unknown-openbsd
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*X-MP:*:*:*)
+ echo xmp-cray-unicos
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3D:*:*:*)
+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY-2:*:*:*)
+ echo cray2-cray-unicos
+ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i386-pc-interix
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+ printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+ printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ ;;
+ ppc:Linux:*:*)
+ # Determine Lib Version
+ cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+ int argc;
+ char *argv[];
+{
+#if defined(__GLIBC__)
+ printf("%s %s\n", __libc_version, __libc_release);
+#else
+ printf("unknown\n");
+#endif
+ return 0;
+}
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy | grep 1\.99 > /dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; fi
+ fi
+ rm -f $dummy.c $dummy
+ echo powerpc-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ alpha:Linux:*:*)
+ cat <<EOF >$dummy.s
+ .data
+ \$Lformat:
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+ .text
+ .globl main
+ .align 4
+ .ent main
+ main:
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
+ .end main
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ case `./$dummy` in
+ 0-0) UNAME_MACHINE="alpha" ;;
+ 1-0) UNAME_MACHINE="alphaev5" ;;
+ 1-1) UNAME_MACHINE="alphaev56" ;;
+ 1-101) UNAME_MACHINE="alphapca56" ;;
+ 2-303) UNAME_MACHINE="alphaev6" ;;
+ 2-307) UNAME_MACHINE="alphaev67" ;;
+ esac
+ objdump --private-headers $dummy | \
+ grep ld.so.1 > /dev/null
+ if test "$?" = 0 ; then
+ LIBC="libc1"
+ fi
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i?86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ ld_supported_emulations=`cd /; ld --help 2>&1 \
+ | sed -ne '/supported emulations:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported emulations: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_emulations" in
+ i?86linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0
+ ;;
+ elf_i?86)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ i?86coff)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0
+ ;;
+ esac
+ # Either a pre-BFD a.out linker (linux-gnuoldld)
+ # or one that does not give us useful --help.
+ # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+ # If ld does not provide *any* "supported emulations:"
+ # that means it is gnuoldld.
+ test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+ case "${UNAME_MACHINE}" in
+ i?86)
+ VENDOR=pc;
+ ;;
+ *)
+ VENDOR=unknown;
+ ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+# if __GLIBC__ >= 2
+ printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+# else
+ printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+# else
+ printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+ printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+ i?86:DYNIX/ptx:4*:*)
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i?86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
+ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit 0 ;;
+ i?86:*:5:7*)
+ # Fixed at (any) Pentium or better
+ UNAME_MACHINE=i586
+ if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+ echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ i?86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
+ i?86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ M68*:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m68*:LynxOS:2.*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf@swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit 0 ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_MACHINE=pc
+ fi
+ echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+ NSR-[KW]:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ i?86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+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`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -urN -x *CVS* clean/config.h.in clean-newcfg/config.h.in
--- clean/config.h.in Wed Mar 6 15:43:24 2002
+++ clean-newcfg/config.h.in Thu Mar 7 08:55:30 2002
@@ -334,6 +334,7 @@
#define BX_WITH_TERM 0
#define BX_WITH_RFB 0
#define BX_WITH_AMIGAOS 0
+#define BX_WITH_SDL 0
// Roland Mainz's idle hack is presently specific to X11. If people try to
diff -urN -x *CVS* clean/config.sub clean-newcfg/config.sub
--- clean/config.sub Wed Dec 31 19:00:00 1969
+++ clean-newcfg/config.sub Wed Mar 6 21:41:30 2002
@@ -0,0 +1,1357 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+
+timestamp='2001-03-19'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+ | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+ | pyramid | mn10200 | mn10300 | tron | a29k \
+ | 580 | i960 | h8300 \
+ | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ | hppa64 \
+ | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+ | alphaev6[78] \
+ | we32k | ns16k | clipper | i370 | sh | sh[34] \
+ | powerpc | powerpcle \
+ | 1750a | dsp16xx | pdp10 | pdp11 \
+ | mips16 | mips64 | mipsel | mips64el \
+ | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+ | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+ | pj | pjl | h8500)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i[234567]86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ # FIXME: clean up the formatting here.
+ vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+ | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+ | xmp-* | ymp-* \
+ | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+ | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+ | hppa2.0n-* | hppa64-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+ | alphaev6[78]-* \
+ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ | clipper-* | orion-* \
+ | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ | mipstx39-* | mipstx39el-* | mcore-* \
+ | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+ | [cjt]90-* \
+ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+ | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+ | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ cray2)
+ basic_machine=cray2-cray
+ os=-unicos
+ ;;
+ [cjt]90)
+ basic_machine=${basic_machine}-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i[34567]86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i[34567]86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i[34567]86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i[34567]86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mipsel*-linux*)
+ basic_machine=mipsel-unknown
+ os=-linux-gnu
+ ;;
+ mips*-linux*)
+ basic_machine=mips-unknown
+ os=-linux-gnu
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexgen)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2)
+ basic_machine=i686-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sparclite-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=t3e-cray
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ xmp)
+ basic_machine=xmp-cray
+ os=-unicos
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ mips)
+ if [ x$os = x-linux-gnu ]; then
+ basic_machine=mips-unknown
+ else
+ basic_machine=mips-mips
+ fi
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh3 | sh4)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv9)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ c4x*)
+ basic_machine=c4x-none
+ os=-coff
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i[34567]86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto*)
+ os=-nto-qnx
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ pdp10-*)
+ os=-tops20
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -vxsim* | -vxworks*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff -urN -x *CVS* clean/configure clean-newcfg/configure
--- clean/configure Wed Mar 6 21:35:34 2002
+++ clean-newcfg/configure Thu Mar 7 08:55:30 2002
@@ -665,6 +665,11 @@
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 build programs to run on HOST [BUILD]
+ --target=TARGET configure for building compilers for TARGET [HOST]
EOF
fi
@@ -914,7 +919,7 @@
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:917: loading site script $ac_site_file" >&5
+ { echo "$as_me:922: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -925,7 +930,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:928: loading cache $cache_file" >&5
+ { echo "$as_me:933: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -933,7 +938,7 @@
esac
fi
else
- { echo "$as_me:936: creating cache $cache_file" >&5
+ { echo "$as_me:941: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -949,21 +954,21 @@
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:952: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:957: 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:956: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:961: 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:962: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:967: 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:964: former value: $ac_old_val" >&5
+ { echo "$as_me:969: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:966: current value: $ac_new_val" >&5
+ { echo "$as_me:971: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -982,9 +987,9 @@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:985: error: changes in the environment can compromise the build" >&5
+ { echo "$as_me:990: 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:987: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ { { echo "$as_me:992: 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
@@ -1004,10 +1009,10 @@
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1007: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1012: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1010: \$? = $ac_status" >&5
+ echo "$as_me:1015: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1022,6 +1027,175 @@
VER_STRING="1.4.pre1"
REL_STRING="March 5, 2002"
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ 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 "$as_me:1047: 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:1057: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+echo "$as_me:1061: 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:1070: 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:1074: 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:1079: 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:1086: 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:1095: 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:1100: 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:1107: 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:1116: 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:1121: 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/'`
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+ test "$program_prefix$program_suffix$program_transform_name" = \
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+if test "$with_win32_vcpp"; then
+ echo "WARNING: The --with-win32-vcpp option will be treated as:"
+ echo " --with-win32 --target=i686-pc-windows"
+ target="i686-pc-windows"
+ with_win32=yes
+fi
+
+# this case statement defines the compile flags which are needed to
+# compile bochs on a platform. Don't put things like optimization settings
+# into the configure.in file, since people will want to be able to change
+# those settings by defining CFLAGS and CXXFLAGS before running configure.
+case "$target" in
+ *-pc-windows* | *-pc-winnt*)
+ DEFAULT_GUI=win32 # default to win32 gui
+ ;;
+ *-pc-cygwin*)
+ ADD_FLAGS="-mno-cygwin -DWIN32" # required for cygwin compile
+ DEFAULT_GUI=win32 # default to win32 gui
+ ;;
+ *-macosx* | *-darwin*)
+ ADD_FLAGS="-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants -Wno-unknown-pragmas -Dmacintosh" # required for macosx compile
+ DEFAULT_GUI=carbon # default to carbon
+ ;;
+ *-macos*)
+ DEFAULT_GUI=macos # macos defaults to macos
+ ;;
+ *-beos*)
+ DEFAULT_GUI=beos # beos defaults to beos
+ ;;
+ *-amigaos*)
+ DEFAULT_GUI=amigaos # amigaos defaults to amigaos
+ ;;
+ *)
+ DEFAULT_GUI=x11
+ ;;
+esac
+CFLAGS="$CFLAGS $ADD_FLAGS"
+CXXFLAGS="$CXXFLAGS $ADD_FLAGS"
+
+echo "$as_me:1174: checking for standard CFLAGS on this platform" >&5
+echo $ECHO_N "checking for standard CFLAGS on this platform... $ECHO_C" >&6
+echo "$as_me:1176: result: $ADD_FLAGS" >&5
+echo "${ECHO_T}$ADD_FLAGS" >&6
+echo "$as_me:1178: checking for default library on this platform" >&5
+echo $ECHO_N "checking for default library on this platform... $ECHO_C" >&6
+echo "$as_me:1180: result: $DEFAULT_GUI" >&5
+echo "${ECHO_T}$DEFAULT_GUI" >&6
+
+if (test "$with_sdl" != yes) && \
+ (test "$with_x11" != yes) && \
+ (test "$with_beos" != yes) && \
+ (test "$with_win32" != yes) && \
+ (test "$with_nogui" != yes) && \
+ (test "$with_term" != yes) && \
+ (test "$with_rfb" != yes) && \
+ (test "$with_amigaos" != yes) && \
+ (test "$with_carbon" != yes) && \
+ (test "$with_macos" != yes); then
+ # use DEFAULT_GUI. Set the appropriate variable.
+ # DEFAULT_GUI must be set to one of the names above. Otherwise, no
+ # valid $with_* variable will be set and who knows what will happen?
+ eval "with_${DEFAULT_GUI}=yes"
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1030,7 +1204,7 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1033: checking for $ac_word" >&5
+echo "$as_me:1207: 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
@@ -1045,7 +1219,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1048: found $ac_dir/$ac_word" >&5
+echo "$as_me:1222: found $ac_dir/$ac_word" >&5
break
done
@@ -1053,10 +1227,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1056: result: $CC" >&5
+ echo "$as_me:1230: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1059: result: no" >&5
+ echo "$as_me:1233: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1065,7 +1239,7 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:1068: checking for $ac_word" >&5
+echo "$as_me:1242: 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
@@ -1080,7 +1254,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1083: found $ac_dir/$ac_word" >&5
+echo "$as_me:1257: found $ac_dir/$ac_word" >&5
break
done
@@ -1088,10 +1262,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1091: result: $ac_ct_CC" >&5
+ echo "$as_me:1265: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1094: result: no" >&5
+ echo "$as_me:1268: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1104,7 +1278,7 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1107: checking for $ac_word" >&5
+echo "$as_me:1281: 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
@@ -1119,7 +1293,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1122: found $ac_dir/$ac_word" >&5
+echo "$as_me:1296: found $ac_dir/$ac_word" >&5
break
done
@@ -1127,10 +1301,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1130: result: $CC" >&5
+ echo "$as_me:1304: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1133: result: no" >&5
+ echo "$as_me:1307: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1139,7 +1313,7 @@
ac_ct_CC=$CC
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1142: checking for $ac_word" >&5
+echo "$as_me:1316: 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
@@ -1154,7 +1328,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1157: found $ac_dir/$ac_word" >&5
+echo "$as_me:1331: found $ac_dir/$ac_word" >&5
break
done
@@ -1162,10 +1336,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1165: result: $ac_ct_CC" >&5
+ echo "$as_me:1339: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1168: result: no" >&5
+ echo "$as_me:1342: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1178,7 +1352,7 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1181: checking for $ac_word" >&5
+echo "$as_me:1355: 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
@@ -1198,7 +1372,7 @@
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1201: found $ac_dir/$ac_word" >&5
+echo "$as_me:1375: found $ac_dir/$ac_word" >&5
break
done
@@ -1220,10 +1394,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1223: result: $CC" >&5
+ echo "$as_me:1397: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1226: result: no" >&5
+ echo "$as_me:1400: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1234,7 +1408,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1237: checking for $ac_word" >&5
+echo "$as_me:1411: 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
@@ -1249,7 +1423,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+echo "$as_me:1426: found $ac_dir/$ac_word" >&5
break
done
@@ -1257,10 +1431,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1260: result: $CC" >&5
+ echo "$as_me:1434: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1263: result: no" >&5
+ echo "$as_me:1437: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1273,7 +1447,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:1276: checking for $ac_word" >&5
+echo "$as_me:1450: 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
@@ -1288,7 +1462,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1291: found $ac_dir/$ac_word" >&5
+echo "$as_me:1465: found $ac_dir/$ac_word" >&5
break
done
@@ -1296,10 +1470,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1299: result: $ac_ct_CC" >&5
+ echo "$as_me:1473: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1302: result: no" >&5
+ echo "$as_me:1476: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1311,32 +1485,32 @@
fi
-test -z "$CC" && { { echo "$as_me:1314: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1488: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:1319:" \
+echo "$as_me:1493:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1322: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1496: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1325: \$? = $ac_status" >&5
+ echo "$as_me:1499: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1327: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1501: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1330: \$? = $ac_status" >&5
+ echo "$as_me:1504: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1332: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1506: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1335: \$? = $ac_status" >&5
+ echo "$as_me:1509: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1339 "configure"
+#line 1513 "configure"
#include "confdefs.h"
int
@@ -1352,13 +1526,13 @@
# 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:1355: checking for C compiler default output" >&5
+echo "$as_me:1529: 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:1358: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1532: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1361: \$? = $ac_status" >&5
+ echo "$as_me:1535: \$? = $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
@@ -1381,34 +1555,34 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1384: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1558: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:1390: result: $ac_file" >&5
+echo "$as_me:1564: 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:1395: checking whether the C compiler works" >&5
+echo "$as_me:1569: 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:1401: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1575: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1404: \$? = $ac_status" >&5
+ echo "$as_me:1578: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1411: error: cannot run C compiled programs.
+ { { echo "$as_me:1585: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&2;}
@@ -1416,24 +1590,24 @@
fi
fi
fi
-echo "$as_me:1419: result: yes" >&5
+echo "$as_me:1593: result: yes" >&5
echo "${ECHO_T}yes" >&6
rm -f a.out a.exe conftest$ac_cv_exeext
ac_clean_files=$ac_clean_files_save
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1426: checking whether we are cross compiling" >&5
+echo "$as_me:1600: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1428: result: $cross_compiling" >&5
+echo "$as_me:1602: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1431: checking for executable suffix" >&5
+echo "$as_me:1605: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1607: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1436: \$? = $ac_status" >&5
+ echo "$as_me:1610: \$? = $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
@@ -1449,25 +1623,25 @@
esac
done
else
- { { echo "$as_me:1452: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1626: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:1458: result: $ac_cv_exeext" >&5
+echo "$as_me:1632: 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:1464: checking for object suffix" >&5
+echo "$as_me:1638: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $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 1470 "configure"
+#line 1644 "configure"
#include "confdefs.h"
int
@@ -1479,10 +1653,10 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1485: \$? = $ac_status" >&5
+ echo "$as_me:1659: \$? = $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
@@ -1494,24 +1668,24 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1497: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1671: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1504: result: $ac_cv_objext" >&5
+echo "$as_me:1678: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1508: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1682: 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 1514 "configure"
+#line 1688 "configure"
#include "confdefs.h"
int
@@ -1526,16 +1700,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1703: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1532: \$? = $ac_status" >&5
+ echo "$as_me:1706: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1535: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1709: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1538: \$? = $ac_status" >&5
+ echo "$as_me:1712: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1547,19 +1721,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1550: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1724: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
-echo "$as_me:1556: checking whether $CC accepts -g" >&5
+echo "$as_me:1730: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1562 "configure"
+#line 1736 "configure"
#include "confdefs.h"
int
@@ -1571,16 +1745,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1748: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1577: \$? = $ac_status" >&5
+ echo "$as_me:1751: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1580: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1754: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1583: \$? = $ac_status" >&5
+ echo "$as_me:1757: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1590,7 +1764,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1593: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1767: 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
@@ -1617,16 +1791,16 @@
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1794: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1623: \$? = $ac_status" >&5
+ echo "$as_me:1797: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1626: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1800: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1629: \$? = $ac_status" >&5
+ echo "$as_me:1803: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -1638,7 +1812,7 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 1641 "configure"
+#line 1815 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -1651,16 +1825,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1828: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1657: \$? = $ac_status" >&5
+ echo "$as_me:1831: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1660: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1834: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1663: \$? = $ac_status" >&5
+ echo "$as_me:1837: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -1670,7 +1844,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 1673 "configure"
+#line 1847 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -1682,16 +1856,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1859: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1688: \$? = $ac_status" >&5
+ echo "$as_me:1862: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1691: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1865: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1694: \$? = $ac_status" >&5
+ echo "$as_me:1868: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -1728,7 +1902,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1731: checking for $ac_word" >&5
+echo "$as_me:1905: 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
@@ -1743,7 +1917,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:1746: found $ac_dir/$ac_word" >&5
+echo "$as_me:1920: found $ac_dir/$ac_word" >&5
break
done
@@ -1751,10 +1925,10 @@
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:1754: result: $CXX" >&5
+ echo "$as_me:1928: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6
else
- echo "$as_me:1757: result: no" >&5
+ echo "$as_me:1931: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1767,7 +1941,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:1770: checking for $ac_word" >&5
+echo "$as_me:1944: 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
@@ -1782,7 +1956,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:1785: found $ac_dir/$ac_word" >&5
+echo "$as_me:1959: found $ac_dir/$ac_word" >&5
break
done
@@ -1790,10 +1964,10 @@
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:1793: result: $ac_ct_CXX" >&5
+ echo "$as_me:1967: result: $ac_ct_CXX" >&5
echo "${ECHO_T}$ac_ct_CXX" >&6
else
- echo "$as_me:1796: result: no" >&5
+ echo "$as_me:1970: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1805,32 +1979,32 @@
fi
# Provide some information about the compiler.
-echo "$as_me:1808:" \
+echo "$as_me:1982:" \
"checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1811: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1985: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1814: \$? = $ac_status" >&5
+ echo "$as_me:1988: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1816: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1990: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1819: \$? = $ac_status" >&5
+ echo "$as_me:1993: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1821: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1995: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1824: \$? = $ac_status" >&5
+ echo "$as_me:1998: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:1827: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2001: 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 1833 "configure"
+#line 2007 "configure"
#include "confdefs.h"
int
@@ -1845,16 +2019,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2022: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1851: \$? = $ac_status" >&5
+ echo "$as_me:2025: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1854: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2028: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1857: \$? = $ac_status" >&5
+ echo "$as_me:2031: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1866,19 +2040,19 @@
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1869: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2043: 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:1875: checking whether $CXX accepts -g" >&5
+echo "$as_me:2049: 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 1881 "configure"
+#line 2055 "configure"
#include "confdefs.h"
int
@@ -1890,16 +2064,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1896: \$? = $ac_status" >&5
+ echo "$as_me:2070: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1899: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2073: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1902: \$? = $ac_status" >&5
+ echo "$as_me:2076: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
@@ -1909,7 +2083,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1912: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2086: 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
@@ -1936,7 +2110,7 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 1939 "configure"
+#line 2113 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -1949,16 +2123,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2126: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1955: \$? = $ac_status" >&5
+ echo "$as_me:2129: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1958: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2132: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1961: \$? = $ac_status" >&5
+ echo "$as_me:2135: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -1968,7 +2142,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 1971 "configure"
+#line 2145 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -1980,16 +2154,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2157: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1986: \$? = $ac_status" >&5
+ echo "$as_me:2160: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1989: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2163: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1992: \$? = $ac_status" >&5
+ echo "$as_me:2166: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -2011,7 +2185,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2014: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2188: 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
@@ -2031,11 +2205,11 @@
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:2034: result: yes" >&5
+ echo "$as_me:2208: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$as_me:2038: result: no" >&5
+ echo "$as_me:2212: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2043,7 +2217,7 @@
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:2046: checking for $ac_word" >&5
+echo "$as_me:2220: 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
@@ -2058,7 +2232,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2061: found $ac_dir/$ac_word" >&5
+echo "$as_me:2235: found $ac_dir/$ac_word" >&5
break
done
@@ -2066,10 +2240,10 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:2069: result: $RANLIB" >&5
+ echo "$as_me:2243: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
- echo "$as_me:2072: result: no" >&5
+ echo "$as_me:2246: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2078,7 +2252,7 @@
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:2081: checking for $ac_word" >&5
+echo "$as_me:2255: 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
@@ -2093,7 +2267,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2096: found $ac_dir/$ac_word" >&5
+echo "$as_me:2270: found $ac_dir/$ac_word" >&5
break
done
@@ -2102,10 +2276,10 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:2105: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:2279: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$as_me:2108: result: no" >&5
+ echo "$as_me:2282: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2119,7 +2293,7 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2122: checking how to run the C preprocessor" >&5
+echo "$as_me:2296: 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
@@ -2140,18 +2314,18 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 2143 "configure"
+#line 2317 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2148: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2322: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2154: \$? = $ac_status" >&5
+ echo "$as_me:2328: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2174,17 +2348,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2177 "configure"
+#line 2351 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2181: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2355: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2187: \$? = $ac_status" >&5
+ echo "$as_me:2361: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2221,7 +2395,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:2224: result: $CPP" >&5
+echo "$as_me:2398: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -2231,18 +2405,18 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 2234 "configure"
+#line 2408 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2239: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2413: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2245: \$? = $ac_status" >&5
+ echo "$as_me:2419: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2265,17 +2439,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2268 "configure"
+#line 2442 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2272: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2446: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2278: \$? = $ac_status" >&5
+ echo "$as_me:2452: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2303,7 +2477,7 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:2306: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ { { echo "$as_me:2480: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2314,7 +2488,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2317: checking for X" >&5
+echo "$as_me:2491: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
# Check whether --with-x or --without-x was given.
@@ -2411,17 +2585,17 @@
# Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
-#line 2414 "configure"
+#line 2588 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
_ACEOF
-if { (eval echo "$as_me:2418: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2592: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2424: \$? = $ac_status" >&5
+ echo "$as_me:2598: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2454,7 +2628,7 @@
ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2457 "configure"
+#line 2631 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int
@@ -2466,16 +2640,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2643: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2472: \$? = $ac_status" >&5
+ echo "$as_me:2646: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2475: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2649: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2478: \$? = $ac_status" >&5
+ echo "$as_me:2652: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
@@ -2513,7 +2687,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:2516: result: $have_x" >&5
+ echo "$as_me:2690: result: $have_x" >&5
echo "${ECHO_T}$have_x" >&6
no_x=yes
else
@@ -2523,7 +2697,7 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:2526: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "$as_me:2700: result: libraries $x_libraries, headers $x_includes" >&5
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
@@ -2547,11 +2721,11 @@
# others require no space. Words are not sufficient . . . .
case `(uname -sr) 2>/dev/null` in
"SunOS 5"*)
- echo "$as_me:2550: checking whether -R must be followed by a space" >&5
+ echo "$as_me:2724: 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 2554 "configure"
+#line 2728 "configure"
#include "confdefs.h"
int
@@ -2563,16 +2737,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2740: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2569: \$? = $ac_status" >&5
+ echo "$as_me:2743: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2572: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2746: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2575: \$? = $ac_status" >&5
+ echo "$as_me:2749: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_nospace=yes
else
@@ -2582,13 +2756,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_nospace = yes; then
- echo "$as_me:2585: result: no" >&5
+ echo "$as_me:2759: result: no" >&5
echo "${ECHO_T}no" >&6
X_LIBS="$X_LIBS -R$x_libraries"
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat >conftest.$ac_ext <<_ACEOF
-#line 2591 "configure"
+#line 2765 "configure"
#include "confdefs.h"
int
@@ -2600,16 +2774,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2777: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2606: \$? = $ac_status" >&5
+ echo "$as_me:2780: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2609: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2783: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2612: \$? = $ac_status" >&5
+ echo "$as_me:2786: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_space=yes
else
@@ -2619,11 +2793,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_space = yes; then
- echo "$as_me:2622: result: yes" >&5
+ echo "$as_me:2796: result: yes" >&5
echo "${ECHO_T}yes" >&6
X_LIBS="$X_LIBS -R $x_libraries"
else
- echo "$as_me:2626: result: neither works" >&5
+ echo "$as_me:2800: result: neither works" >&5
echo "${ECHO_T}neither works" >&6
fi
fi
@@ -2643,7 +2817,7 @@
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
cat >conftest.$ac_ext <<_ACEOF
-#line 2646 "configure"
+#line 2820 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -2662,22 +2836,22 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2839: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2668: \$? = $ac_status" >&5
+ echo "$as_me:2842: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2671: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2845: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2674: \$? = $ac_status" >&5
+ echo "$as_me:2848: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:2680: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:2854: 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
@@ -2685,7 +2859,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2688 "configure"
+#line 2862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -2704,16 +2878,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2881: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2710: \$? = $ac_status" >&5
+ echo "$as_me:2884: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2713: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2887: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2716: \$? = $ac_status" >&5
+ echo "$as_me:2890: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_dnet_ntoa=yes
else
@@ -2724,14 +2898,14 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:2727: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:2901: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo "$as_me:2734: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo "$as_me:2908: 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
@@ -2739,7 +2913,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2742 "configure"
+#line 2916 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -2758,16 +2932,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2935: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2764: \$? = $ac_status" >&5
+ echo "$as_me:2938: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2767: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2941: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2770: \$? = $ac_status" >&5
+ echo "$as_me:2944: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
@@ -2778,7 +2952,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:2781: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:2955: 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"
@@ -2797,13 +2971,13 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- echo "$as_me:2800: checking for gethostbyname" >&5
+ echo "$as_me:2974: 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 2806 "configure"
+#line 2980 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname (); below. */
@@ -2834,16 +3008,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3011: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2840: \$? = $ac_status" >&5
+ echo "$as_me:3014: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2843: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3017: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2846: \$? = $ac_status" >&5
+ echo "$as_me:3020: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gethostbyname=yes
else
@@ -2853,11 +3027,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:2856: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:3030: result: $ac_cv_func_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
if test $ac_cv_func_gethostbyname = no; then
- echo "$as_me:2860: checking for gethostbyname in -lnsl" >&5
+ echo "$as_me:3034: 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
@@ -2865,7 +3039,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2868 "configure"
+#line 3042 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -2884,16 +3058,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3061: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2890: \$? = $ac_status" >&5
+ echo "$as_me:3064: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2893: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3067: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2896: \$? = $ac_status" >&5
+ echo "$as_me:3070: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_gethostbyname=yes
else
@@ -2904,14 +3078,14 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:2907: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:3081: result: $ac_cv_lib_nsl_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
if test $ac_cv_lib_nsl_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
- echo "$as_me:2914: checking for gethostbyname in -lbsd" >&5
+ echo "$as_me:3088: 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
@@ -2919,7 +3093,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2922 "configure"
+#line 3096 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -2938,16 +3112,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3115: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:2944: \$? = $ac_status" >&5
+ echo "$as_me:3118: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:2947: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3121: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2950: \$? = $ac_status" >&5
+ echo "$as_me:3124: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_gethostbyname=yes
else
@@ -2958,7 +3132,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:2961: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:3135: 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"
@@ -2974,13 +3148,13 @@
# variants that don't use the nameserver (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- echo "$as_me:2977: checking for connect" >&5
+ echo "$as_me:3151: 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 2983 "configure"
+#line 3157 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect (); below. */
@@ -3011,16 +3185,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3188: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3017: \$? = $ac_status" >&5
+ echo "$as_me:3191: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3020: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3194: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3023: \$? = $ac_status" >&5
+ echo "$as_me:3197: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_connect=yes
else
@@ -3030,11 +3204,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3033: result: $ac_cv_func_connect" >&5
+echo "$as_me:3207: result: $ac_cv_func_connect" >&5
echo "${ECHO_T}$ac_cv_func_connect" >&6
if test $ac_cv_func_connect = no; then
- echo "$as_me:3037: checking for connect in -lsocket" >&5
+ echo "$as_me:3211: 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
@@ -3042,7 +3216,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3045 "configure"
+#line 3219 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3061,16 +3235,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3238: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3067: \$? = $ac_status" >&5
+ echo "$as_me:3241: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3070: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3244: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3073: \$? = $ac_status" >&5
+ echo "$as_me:3247: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_connect=yes
else
@@ -3081,7 +3255,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3084: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:3258: 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"
@@ -3090,13 +3264,13 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- echo "$as_me:3093: checking for remove" >&5
+ echo "$as_me:3267: 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 3099 "configure"
+#line 3273 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove (); below. */
@@ -3127,16 +3301,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3304: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3133: \$? = $ac_status" >&5
+ echo "$as_me:3307: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3136: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3310: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3139: \$? = $ac_status" >&5
+ echo "$as_me:3313: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_remove=yes
else
@@ -3146,11 +3320,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3149: result: $ac_cv_func_remove" >&5
+echo "$as_me:3323: result: $ac_cv_func_remove" >&5
echo "${ECHO_T}$ac_cv_func_remove" >&6
if test $ac_cv_func_remove = no; then
- echo "$as_me:3153: checking for remove in -lposix" >&5
+ echo "$as_me:3327: 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
@@ -3158,7 +3332,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3161 "configure"
+#line 3335 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3177,16 +3351,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3354: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3183: \$? = $ac_status" >&5
+ echo "$as_me:3357: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3186: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3360: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3189: \$? = $ac_status" >&5
+ echo "$as_me:3363: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_posix_remove=yes
else
@@ -3197,7 +3371,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3200: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:3374: 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"
@@ -3206,13 +3380,13 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:3209: checking for shmat" >&5
+ echo "$as_me:3383: 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 3215 "configure"
+#line 3389 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat (); below. */
@@ -3243,16 +3417,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3420: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3249: \$? = $ac_status" >&5
+ echo "$as_me:3423: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3252: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3426: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3255: \$? = $ac_status" >&5
+ echo "$as_me:3429: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_shmat=yes
else
@@ -3262,11 +3436,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:3265: result: $ac_cv_func_shmat" >&5
+echo "$as_me:3439: result: $ac_cv_func_shmat" >&5
echo "${ECHO_T}$ac_cv_func_shmat" >&6
if test $ac_cv_func_shmat = no; then
- echo "$as_me:3269: checking for shmat in -lipc" >&5
+ echo "$as_me:3443: 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
@@ -3274,7 +3448,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3277 "configure"
+#line 3451 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3293,16 +3467,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3470: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3299: \$? = $ac_status" >&5
+ echo "$as_me:3473: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3302: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3476: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3305: \$? = $ac_status" >&5
+ echo "$as_me:3479: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ipc_shmat=yes
else
@@ -3313,7 +3487,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3316: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:3490: 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"
@@ -3331,7 +3505,7 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
- echo "$as_me:3334: checking for IceConnectionNumber in -lICE" >&5
+ echo "$as_me:3508: 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
@@ -3339,7 +3513,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3342 "configure"
+#line 3516 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3358,16 +3532,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3535: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3364: \$? = $ac_status" >&5
+ echo "$as_me:3538: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3367: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3541: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3370: \$? = $ac_status" >&5
+ echo "$as_me:3544: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ICE_IceConnectionNumber=yes
else
@@ -3378,7 +3552,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3381: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:3555: 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"
@@ -3388,7 +3562,7 @@
fi
-echo "$as_me:3391: checking whether byte ordering is bigendian" >&5
+echo "$as_me:3565: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3396,7 +3570,7 @@
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat >conftest.$ac_ext <<_ACEOF
-#line 3399 "configure"
+#line 3573 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -3413,20 +3587,20 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3590: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3419: \$? = $ac_status" >&5
+ echo "$as_me:3593: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3422: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3596: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3425: \$? = $ac_status" >&5
+ echo "$as_me:3599: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
# It does; now see whether it defined to BIG_ENDIAN or not.
cat >conftest.$ac_ext <<_ACEOF
-#line 3429 "configure"
+#line 3603 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -3443,16 +3617,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3620: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3449: \$? = $ac_status" >&5
+ echo "$as_me:3623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3452: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3455: \$? = $ac_status" >&5
+ echo "$as_me:3629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_bigendian=yes
else
@@ -3468,12 +3642,12 @@
rm -f conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
if test "$cross_compiling" = yes; then
- { { echo "$as_me:3471: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:3645: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3476 "configure"
+#line 3650 "configure"
#include "confdefs.h"
int
main ()
@@ -3489,15 +3663,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3666: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3495: \$? = $ac_status" >&5
+ echo "$as_me:3669: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:3497: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3671: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3500: \$? = $ac_status" >&5
+ echo "$as_me:3674: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_bigendian=no
else
@@ -3510,7 +3684,7 @@
fi
fi
fi
-echo "$as_me:3513: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:3687: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6
if test $ac_cv_c_bigendian = yes; then
@@ -3520,7 +3694,7 @@
fi
-echo "$as_me:3523: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3697: 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
@@ -3528,7 +3702,7 @@
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line 3531 "configure"
+#line 3705 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -3577,16 +3751,16 @@
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3583: \$? = $ac_status" >&5
+ echo "$as_me:3757: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3586: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3760: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3589: \$? = $ac_status" >&5
+ echo "$as_me:3763: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -3603,15 +3777,15 @@
case "x$ac_cv_prog_cc_stdc" in
x|xno)
- echo "$as_me:3606: result: none needed" >&5
+ echo "$as_me:3780: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
- echo "$as_me:3609: result: $ac_cv_prog_cc_stdc" >&5
+ echo "$as_me:3783: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
-echo "$as_me:3614: checking for inline" >&5
+echo "$as_me:3788: 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
@@ -3619,7 +3793,7 @@
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 3622 "configure"
+#line 3796 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }
@@ -3628,16 +3802,16 @@
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3805: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3634: \$? = $ac_status" >&5
+ echo "$as_me:3808: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3637: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3811: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3640: \$? = $ac_status" >&5
+ echo "$as_me:3814: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -3648,7 +3822,7 @@
done
fi
-echo "$as_me:3651: result: $ac_cv_c_inline" >&5
+echo "$as_me:3825: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
case $ac_cv_c_inline in
inline | yes) ;;
@@ -3663,13 +3837,13 @@
;;
esac
-echo "$as_me:3666: checking for ANSI C header files" >&5
+echo "$as_me:3840: 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 3672 "configure"
+#line 3846 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -3677,13 +3851,13 @@
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:3680: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3854: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:3686: \$? = $ac_status" >&5
+ echo "$as_me:3860: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3705,7 +3879,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 3708 "configure"
+#line 3882 "configure"
#include "confdefs.h"
#include <string.h>
@@ -3723,7 +3897,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 3726 "configure"
+#line 3900 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3744,7 +3918,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3747 "configure"
+#line 3921 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -3770,15 +3944,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3947: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3776: \$? = $ac_status" >&5
+ echo "$as_me:3950: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:3778: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3952: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3781: \$? = $ac_status" >&5
+ echo "$as_me:3955: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3791,7 +3965,7 @@
fi
fi
fi
-echo "$as_me:3794: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3968: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -3807,28 +3981,28 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3810: checking for $ac_header" >&5
+echo "$as_me:3984: 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 3816 "configure"
+#line 3990 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3996: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3825: \$? = $ac_status" >&5
+ echo "$as_me:3999: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3828: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4002: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3831: \$? = $ac_status" >&5
+ echo "$as_me:4005: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -3838,7 +4012,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3841: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4015: 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 <<EOF
@@ -3848,13 +4022,13 @@
fi
done
-echo "$as_me:3851: checking for unsigned char" >&5
+echo "$as_me:4025: checking for unsigned char" >&5
echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6
if test "${ac_cv_type_unsigned_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3857 "configure"
+#line 4031 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -3869,16 +4043,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4046: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3875: \$? = $ac_status" >&5
+ echo "$as_me:4049: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3878: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4052: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3881: \$? = $ac_status" >&5
+ echo "$as_me:4055: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_unsigned_char=yes
else
@@ -3888,10 +4062,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3891: result: $ac_cv_type_unsigned_char" >&5
+echo "$as_me:4065: result: $ac_cv_type_unsigned_char" >&5
echo "${ECHO_T}$ac_cv_type_unsigned_char" >&6
-echo "$as_me:3894: checking size of unsigned char" >&5
+echo "$as_me:4068: checking size of unsigned char" >&5
echo $ECHO_N "checking size of unsigned char... $ECHO_C" >&6
if test "${ac_cv_sizeof_unsigned_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3900,7 +4074,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 3903 "configure"
+#line 4077 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -3912,21 +4086,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4089: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3918: \$? = $ac_status" >&5
+ echo "$as_me:4092: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3921: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4095: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3924: \$? = $ac_status" >&5
+ echo "$as_me:4098: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 3929 "configure"
+#line 4103 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -3938,16 +4112,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4115: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3944: \$? = $ac_status" >&5
+ echo "$as_me:4118: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3947: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4121: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3950: \$? = $ac_status" >&5
+ echo "$as_me:4124: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -3963,7 +4137,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 3966 "configure"
+#line 4140 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -3975,16 +4149,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4152: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3981: \$? = $ac_status" >&5
+ echo "$as_me:4155: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3984: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4158: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3987: \$? = $ac_status" >&5
+ echo "$as_me:4161: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -4000,7 +4174,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 4003 "configure"
+#line 4177 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4012,16 +4186,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4189: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4018: \$? = $ac_status" >&5
+ echo "$as_me:4192: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4021: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4195: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4024: \$? = $ac_status" >&5
+ echo "$as_me:4198: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -4034,12 +4208,12 @@
ac_cv_sizeof_unsigned_char=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:4037: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:4211: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4042 "configure"
+#line 4216 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4055,15 +4229,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4232: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4061: \$? = $ac_status" >&5
+ echo "$as_me:4235: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4063: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4237: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4066: \$? = $ac_status" >&5
+ echo "$as_me:4240: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_char=`cat conftest.val`
else
@@ -4079,19 +4253,19 @@
ac_cv_sizeof_unsigned_char=0
fi
fi
-echo "$as_me:4082: result: $ac_cv_sizeof_unsigned_char" >&5
+echo "$as_me:4256: result: $ac_cv_sizeof_unsigned_char" >&5
echo "${ECHO_T}$ac_cv_sizeof_unsigned_char" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_UNSIGNED_CHAR $ac_cv_sizeof_unsigned_char
EOF
-echo "$as_me:4088: checking for unsigned short" >&5
+echo "$as_me:4262: checking for unsigned short" >&5
echo $ECHO_N "checking for unsigned short... $ECHO_C" >&6
if test "${ac_cv_type_unsigned_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4094 "configure"
+#line 4268 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4106,16 +4280,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4283: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4112: \$? = $ac_status" >&5
+ echo "$as_me:4286: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4115: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4289: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4118: \$? = $ac_status" >&5
+ echo "$as_me:4292: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_unsigned_short=yes
else
@@ -4125,10 +4299,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4128: result: $ac_cv_type_unsigned_short" >&5
+echo "$as_me:4302: result: $ac_cv_type_unsigned_short" >&5
echo "${ECHO_T}$ac_cv_type_unsigned_short" >&6
-echo "$as_me:4131: checking size of unsigned short" >&5
+echo "$as_me:4305: checking size of unsigned short" >&5
echo $ECHO_N "checking size of unsigned short... $ECHO_C" >&6
if test "${ac_cv_sizeof_unsigned_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4137,7 +4311,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 4140 "configure"
+#line 4314 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4149,21 +4323,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4155: \$? = $ac_status" >&5
+ echo "$as_me:4329: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4158: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4332: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4161: \$? = $ac_status" >&5
+ echo "$as_me:4335: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4166 "configure"
+#line 4340 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4175,16 +4349,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4352: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4181: \$? = $ac_status" >&5
+ echo "$as_me:4355: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4184: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4358: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4187: \$? = $ac_status" >&5
+ echo "$as_me:4361: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -4200,7 +4374,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4203 "configure"
+#line 4377 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4212,16 +4386,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4218: \$? = $ac_status" >&5
+ echo "$as_me:4392: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4221: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4395: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4224: \$? = $ac_status" >&5
+ echo "$as_me:4398: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -4237,7 +4411,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 4240 "configure"
+#line 4414 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4249,16 +4423,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4255: \$? = $ac_status" >&5
+ echo "$as_me:4429: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4258: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4432: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4261: \$? = $ac_status" >&5
+ echo "$as_me:4435: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -4271,12 +4445,12 @@
ac_cv_sizeof_unsigned_short=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:4274: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:4448: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4279 "configure"
+#line 4453 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4292,15 +4466,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4469: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4298: \$? = $ac_status" >&5
+ echo "$as_me:4472: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4300: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4474: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4303: \$? = $ac_status" >&5
+ echo "$as_me:4477: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_short=`cat conftest.val`
else
@@ -4316,19 +4490,19 @@
ac_cv_sizeof_unsigned_short=0
fi
fi
-echo "$as_me:4319: result: $ac_cv_sizeof_unsigned_short" >&5
+echo "$as_me:4493: result: $ac_cv_sizeof_unsigned_short" >&5
echo "${ECHO_T}$ac_cv_sizeof_unsigned_short" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short
EOF
-echo "$as_me:4325: checking for unsigned int" >&5
+echo "$as_me:4499: checking for unsigned int" >&5
echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6
if test "${ac_cv_type_unsigned_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4331 "configure"
+#line 4505 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4343,16 +4517,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4520: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4349: \$? = $ac_status" >&5
+ echo "$as_me:4523: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4352: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4526: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4355: \$? = $ac_status" >&5
+ echo "$as_me:4529: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_unsigned_int=yes
else
@@ -4362,10 +4536,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4365: result: $ac_cv_type_unsigned_int" >&5
+echo "$as_me:4539: result: $ac_cv_type_unsigned_int" >&5
echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6
-echo "$as_me:4368: checking size of unsigned int" >&5
+echo "$as_me:4542: checking size of unsigned int" >&5
echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6
if test "${ac_cv_sizeof_unsigned_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4374,7 +4548,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 4377 "configure"
+#line 4551 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4386,21 +4560,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4563: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4392: \$? = $ac_status" >&5
+ echo "$as_me:4566: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4395: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4569: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4398: \$? = $ac_status" >&5
+ echo "$as_me:4572: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4403 "configure"
+#line 4577 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4412,16 +4586,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4589: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4418: \$? = $ac_status" >&5
+ echo "$as_me:4592: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4421: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4595: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4424: \$? = $ac_status" >&5
+ echo "$as_me:4598: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -4437,7 +4611,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4440 "configure"
+#line 4614 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4449,16 +4623,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4626: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4455: \$? = $ac_status" >&5
+ echo "$as_me:4629: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4458: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4632: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4461: \$? = $ac_status" >&5
+ echo "$as_me:4635: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -4474,7 +4648,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 4477 "configure"
+#line 4651 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4486,16 +4660,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4663: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4492: \$? = $ac_status" >&5
+ echo "$as_me:4666: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4495: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4669: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4498: \$? = $ac_status" >&5
+ echo "$as_me:4672: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -4508,12 +4682,12 @@
ac_cv_sizeof_unsigned_int=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:4511: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:4685: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4516 "configure"
+#line 4690 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4529,15 +4703,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4706: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4535: \$? = $ac_status" >&5
+ echo "$as_me:4709: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4537: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4711: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4540: \$? = $ac_status" >&5
+ echo "$as_me:4714: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_int=`cat conftest.val`
else
@@ -4553,19 +4727,19 @@
ac_cv_sizeof_unsigned_int=0
fi
fi
-echo "$as_me:4556: result: $ac_cv_sizeof_unsigned_int" >&5
+echo "$as_me:4730: result: $ac_cv_sizeof_unsigned_int" >&5
echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
EOF
-echo "$as_me:4562: checking for unsigned long" >&5
+echo "$as_me:4736: checking for unsigned long" >&5
echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4568 "configure"
+#line 4742 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4580,16 +4754,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4757: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4586: \$? = $ac_status" >&5
+ echo "$as_me:4760: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4589: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4763: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4592: \$? = $ac_status" >&5
+ echo "$as_me:4766: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_unsigned_long=yes
else
@@ -4599,10 +4773,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4602: result: $ac_cv_type_unsigned_long" >&5
+echo "$as_me:4776: result: $ac_cv_type_unsigned_long" >&5
echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-echo "$as_me:4605: checking size of unsigned long" >&5
+echo "$as_me:4779: checking size of unsigned long" >&5
echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4611,7 +4785,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 4614 "configure"
+#line 4788 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4623,21 +4797,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4800: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4629: \$? = $ac_status" >&5
+ echo "$as_me:4803: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4632: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4806: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4635: \$? = $ac_status" >&5
+ echo "$as_me:4809: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4640 "configure"
+#line 4814 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4649,16 +4823,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4826: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4655: \$? = $ac_status" >&5
+ echo "$as_me:4829: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4658: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4832: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4661: \$? = $ac_status" >&5
+ echo "$as_me:4835: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -4674,7 +4848,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4677 "configure"
+#line 4851 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4686,16 +4860,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4863: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4692: \$? = $ac_status" >&5
+ echo "$as_me:4866: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4695: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4869: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4698: \$? = $ac_status" >&5
+ echo "$as_me:4872: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -4711,7 +4885,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 4714 "configure"
+#line 4888 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4723,16 +4897,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4900: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4729: \$? = $ac_status" >&5
+ echo "$as_me:4903: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4732: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4906: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4735: \$? = $ac_status" >&5
+ echo "$as_me:4909: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -4745,12 +4919,12 @@
ac_cv_sizeof_unsigned_long=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:4748: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:4922: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4753 "configure"
+#line 4927 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4766,15 +4940,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4943: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4772: \$? = $ac_status" >&5
+ echo "$as_me:4946: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4774: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4948: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4777: \$? = $ac_status" >&5
+ echo "$as_me:4951: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_long=`cat conftest.val`
else
@@ -4790,19 +4964,19 @@
ac_cv_sizeof_unsigned_long=0
fi
fi
-echo "$as_me:4793: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "$as_me:4967: result: $ac_cv_sizeof_unsigned_long" >&5
echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
EOF
-echo "$as_me:4799: checking for unsigned long long" >&5
+echo "$as_me:4973: checking for unsigned long long" >&5
echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
if test "${ac_cv_type_unsigned_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4805 "configure"
+#line 4979 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4817,16 +4991,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4994: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4823: \$? = $ac_status" >&5
+ echo "$as_me:4997: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4826: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5000: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4829: \$? = $ac_status" >&5
+ echo "$as_me:5003: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_unsigned_long_long=yes
else
@@ -4836,10 +5010,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4839: result: $ac_cv_type_unsigned_long_long" >&5
+echo "$as_me:5013: result: $ac_cv_type_unsigned_long_long" >&5
echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
-echo "$as_me:4842: checking size of unsigned long long" >&5
+echo "$as_me:5016: checking size of unsigned long long" >&5
echo $ECHO_N "checking size of unsigned long long... $ECHO_C" >&6
if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4848,7 +5022,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 4851 "configure"
+#line 5025 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4860,21 +5034,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5037: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4866: \$? = $ac_status" >&5
+ echo "$as_me:5040: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4869: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5043: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4872: \$? = $ac_status" >&5
+ echo "$as_me:5046: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4877 "configure"
+#line 5051 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4886,16 +5060,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5063: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4892: \$? = $ac_status" >&5
+ echo "$as_me:5066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4895: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4898: \$? = $ac_status" >&5
+ echo "$as_me:5072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -4911,7 +5085,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 4914 "configure"
+#line 5088 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4923,16 +5097,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5100: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4929: \$? = $ac_status" >&5
+ echo "$as_me:5103: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4932: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5106: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4935: \$? = $ac_status" >&5
+ echo "$as_me:5109: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -4948,7 +5122,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 4951 "configure"
+#line 5125 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -4960,16 +5134,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5137: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4966: \$? = $ac_status" >&5
+ echo "$as_me:5140: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4969: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5143: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4972: \$? = $ac_status" >&5
+ echo "$as_me:5146: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -4982,12 +5156,12 @@
ac_cv_sizeof_unsigned_long_long=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:4985: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:5159: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4990 "configure"
+#line 5164 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5003,15 +5177,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5180: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5009: \$? = $ac_status" >&5
+ echo "$as_me:5183: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5011: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5185: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5014: \$? = $ac_status" >&5
+ echo "$as_me:5188: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_unsigned_long_long=`cat conftest.val`
else
@@ -5027,19 +5201,19 @@
ac_cv_sizeof_unsigned_long_long=0
fi
fi
-echo "$as_me:5030: result: $ac_cv_sizeof_unsigned_long_long" >&5
+echo "$as_me:5204: result: $ac_cv_sizeof_unsigned_long_long" >&5
echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_UNSIGNED_LONG_LONG $ac_cv_sizeof_unsigned_long_long
EOF
-echo "$as_me:5036: checking for int *" >&5
+echo "$as_me:5210: checking for int *" >&5
echo $ECHO_N "checking for int *... $ECHO_C" >&6
if test "${ac_cv_type_int_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5042 "configure"
+#line 5216 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5054,16 +5228,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5231: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5060: \$? = $ac_status" >&5
+ echo "$as_me:5234: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5063: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5237: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5066: \$? = $ac_status" >&5
+ echo "$as_me:5240: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_int_p=yes
else
@@ -5073,10 +5247,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5076: result: $ac_cv_type_int_p" >&5
+echo "$as_me:5250: result: $ac_cv_type_int_p" >&5
echo "${ECHO_T}$ac_cv_type_int_p" >&6
-echo "$as_me:5079: checking size of int *" >&5
+echo "$as_me:5253: checking size of int *" >&5
echo $ECHO_N "checking size of int *... $ECHO_C" >&6
if test "${ac_cv_sizeof_int_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5085,7 +5259,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 5088 "configure"
+#line 5262 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5097,21 +5271,21 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5274: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5103: \$? = $ac_status" >&5
+ echo "$as_me:5277: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5106: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5280: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5109: \$? = $ac_status" >&5
+ echo "$as_me:5283: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 5114 "configure"
+#line 5288 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5123,16 +5297,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5300: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5129: \$? = $ac_status" >&5
+ echo "$as_me:5303: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5132: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5306: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5135: \$? = $ac_status" >&5
+ echo "$as_me:5309: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -5148,7 +5322,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 5151 "configure"
+#line 5325 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5160,16 +5334,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5337: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5166: \$? = $ac_status" >&5
+ echo "$as_me:5340: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5169: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5343: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5172: \$? = $ac_status" >&5
+ echo "$as_me:5346: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -5185,7 +5359,7 @@
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 5188 "configure"
+#line 5362 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5197,16 +5371,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5203: \$? = $ac_status" >&5
+ echo "$as_me:5377: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5206: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5380: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5209: \$? = $ac_status" >&5
+ echo "$as_me:5383: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -5219,12 +5393,12 @@
ac_cv_sizeof_int_p=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:5222: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:5396: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5227 "configure"
+#line 5401 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5240,15 +5414,15 @@
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5417: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5246: \$? = $ac_status" >&5
+ echo "$as_me:5420: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5248: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5422: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5251: \$? = $ac_status" >&5
+ echo "$as_me:5425: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_int_p=`cat conftest.val`
else
@@ -5264,7 +5438,7 @@
ac_cv_sizeof_int_p=0
fi
fi
-echo "$as_me:5267: result: $ac_cv_sizeof_int_p" >&5
+echo "$as_me:5441: result: $ac_cv_sizeof_int_p" >&5
echo "${ECHO_T}$ac_cv_sizeof_int_p" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_INT_P $ac_cv_sizeof_int_p
@@ -5273,13 +5447,13 @@
for ac_func in getenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5276: checking for $ac_func" >&5
+echo "$as_me:5450: 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 5282 "configure"
+#line 5456 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5310,16 +5484,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5487: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5316: \$? = $ac_status" >&5
+ echo "$as_me:5490: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5319: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5493: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5322: \$? = $ac_status" >&5
+ echo "$as_me:5496: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5329,7 +5503,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5332: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5506: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5345,13 +5519,13 @@
for ac_func in select
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5348: checking for $ac_func" >&5
+echo "$as_me:5522: 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 5354 "configure"
+#line 5528 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5382,16 +5556,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5559: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5388: \$? = $ac_status" >&5
+ echo "$as_me:5562: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5391: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5565: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5394: \$? = $ac_status" >&5
+ echo "$as_me:5568: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5401,7 +5575,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5404: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5578: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5417,13 +5591,13 @@
for ac_func in snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5420: checking for $ac_func" >&5
+echo "$as_me:5594: 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 5426 "configure"
+#line 5600 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5454,16 +5628,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5631: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5460: \$? = $ac_status" >&5
+ echo "$as_me:5634: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5463: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5637: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5466: \$? = $ac_status" >&5
+ echo "$as_me:5640: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5473,7 +5647,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5476: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5650: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5489,13 +5663,13 @@
for ac_func in strtoull
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5492: checking for $ac_func" >&5
+echo "$as_me:5666: 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 5498 "configure"
+#line 5672 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5526,16 +5700,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5703: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5532: \$? = $ac_status" >&5
+ echo "$as_me:5706: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5535: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5709: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5538: \$? = $ac_status" >&5
+ echo "$as_me:5712: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5545,7 +5719,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5548: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5722: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5561,13 +5735,13 @@
for ac_func in strtouq
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5564: checking for $ac_func" >&5
+echo "$as_me:5738: 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 5570 "configure"
+#line 5744 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5598,16 +5772,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5775: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5604: \$? = $ac_status" >&5
+ echo "$as_me:5778: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5607: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5781: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5610: \$? = $ac_status" >&5
+ echo "$as_me:5784: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5617,7 +5791,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5620: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5794: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5633,13 +5807,13 @@
for ac_func in strdup
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5636: checking for $ac_func" >&5
+echo "$as_me:5810: 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 5642 "configure"
+#line 5816 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5670,16 +5844,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5847: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5676: \$? = $ac_status" >&5
+ echo "$as_me:5850: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5679: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5853: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5682: \$? = $ac_status" >&5
+ echo "$as_me:5856: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5689,7 +5863,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5692: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5866: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5705,13 +5879,13 @@
for ac_func in sleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5708: checking for $ac_func" >&5
+echo "$as_me:5882: 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 5714 "configure"
+#line 5888 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5742,16 +5916,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5919: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5748: \$? = $ac_status" >&5
+ echo "$as_me:5922: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5751: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5925: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5754: \$? = $ac_status" >&5
+ echo "$as_me:5928: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5761,7 +5935,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5764: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5938: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5777,13 +5951,13 @@
for ac_func in usleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5780: checking for $ac_func" >&5
+echo "$as_me:5954: 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 5786 "configure"
+#line 5960 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5814,16 +5988,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5991: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5820: \$? = $ac_status" >&5
+ echo "$as_me:5994: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5823: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5997: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5826: \$? = $ac_status" >&5
+ echo "$as_me:6000: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5833,7 +6007,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5836: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6010: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5849,13 +6023,13 @@
for ac_func in nanosleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5852: checking for $ac_func" >&5
+echo "$as_me:6026: 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 5858 "configure"
+#line 6032 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5886,16 +6060,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6063: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5892: \$? = $ac_status" >&5
+ echo "$as_me:6066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5895: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5898: \$? = $ac_status" >&5
+ echo "$as_me:6072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5905,7 +6079,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5908: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6082: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5921,13 +6095,13 @@
for ac_func in abort
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5924: checking for $ac_func" >&5
+echo "$as_me:6098: 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 5930 "configure"
+#line 6104 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5958,16 +6132,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6135: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5964: \$? = $ac_status" >&5
+ echo "$as_me:6138: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5967: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6141: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5970: \$? = $ac_status" >&5
+ echo "$as_me:6144: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5977,7 +6151,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5980: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6154: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5990,10 +6164,10 @@
fi
done
-echo "$as_me:5993: checking for struct timeval" >&5
+echo "$as_me:6167: checking for struct timeval" >&5
echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 5996 "configure"
+#line 6170 "configure"
#include "confdefs.h"
#include <sys/time.h>
int
@@ -6005,19 +6179,19 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6011: \$? = $ac_status" >&5
+ echo "$as_me:6185: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6014: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6188: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6017: \$? = $ac_status" >&5
+ echo "$as_me:6191: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6020: result: yes" >&5
+ echo "$as_me:6194: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_HAVE_STRUCT_TIMEVAL 1
@@ -6026,15 +6200,15 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:6029: result: no" >&5
+echo "$as_me:6203: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6034: checking if compiler allows empty structs" >&5
+echo "$as_me:6208: checking if compiler allows empty structs" >&5
echo $ECHO_N "checking if compiler allows empty structs... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6037 "configure"
+#line 6211 "configure"
#include "confdefs.h"
int
@@ -6046,18 +6220,18 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6052: \$? = $ac_status" >&5
+ echo "$as_me:6226: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6055: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6229: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6058: \$? = $ac_status" >&5
+ echo "$as_me:6232: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6060: result: yes" >&5
+ echo "$as_me:6234: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
@@ -6067,16 +6241,16 @@
#define BX_NO_EMPTY_STRUCTS 1
EOF
- echo "$as_me:6070: result: no" >&5
+ echo "$as_me:6244: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6076: checking if compiler allows __attribute__" >&5
+echo "$as_me:6250: checking if compiler allows __attribute__" >&5
echo $ECHO_N "checking if compiler allows __attribute__... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6079 "configure"
+#line 6253 "configure"
#include "confdefs.h"
int
@@ -6088,24 +6262,24 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6265: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6094: \$? = $ac_status" >&5
+ echo "$as_me:6268: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6097: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6271: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6100: \$? = $ac_status" >&5
+ echo "$as_me:6274: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6102: result: yes" >&5
+ echo "$as_me:6276: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:6108: result: no" >&5
+ echo "$as_me:6282: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_NO_ATTRIBUTES 1
@@ -6120,11 +6294,11 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:6123: checking for hash_map.h" >&5
+echo "$as_me:6297: checking for hash_map.h" >&5
echo $ECHO_N "checking for hash_map.h... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6127 "configure"
+#line 6301 "configure"
#include "confdefs.h"
#include <hash_map.h>
int
@@ -6136,19 +6310,19 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6139: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6142: \$? = $ac_status" >&5
+ echo "$as_me:6316: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6145: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6319: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6148: \$? = $ac_status" >&5
+ echo "$as_me:6322: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6151: result: yes" >&5
+ echo "$as_me:6325: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_HAVE_HASH_MAP 1
@@ -6157,7 +6331,7 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:6160: result: no" >&5
+echo "$as_me:6334: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.$ac_objext conftest.$ac_ext
@@ -6167,20 +6341,20 @@
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:6170: checking for control panel" >&5
+echo "$as_me:6344: checking for control panel" >&5
echo $ECHO_N "checking for control panel... $ECHO_C" >&6
# Check whether --enable-control-panel or --disable-control-panel was given.
if test "${enable_control_panel+set}" = set; then
enableval="$enable_control_panel"
if test "$enableval" = yes; then
- echo "$as_me:6176: result: yes" >&5
+ echo "$as_me:6350: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_CONTROL_PANEL 1
EOF
else
- echo "$as_me:6183: result: no" >&5
+ echo "$as_me:6357: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_CONTROL_PANEL 0
@@ -6189,7 +6363,7 @@
fi
else
- echo "$as_me:6192: result: yes" >&5
+ echo "$as_me:6366: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_CONTROL_PANEL 1
@@ -6197,20 +6371,20 @@
fi;
-echo "$as_me:6200: checking for new PIT model" >&5
+echo "$as_me:6374: checking for new PIT model" >&5
echo $ECHO_N "checking for new PIT model... $ECHO_C" >&6
# Check whether --enable-new-pit or --disable-new-pit was given.
if test "${enable_new_pit+set}" = set; then
enableval="$enable_new_pit"
if test "$enableval" = yes; then
- echo "$as_me:6206: result: yes" >&5
+ echo "$as_me:6380: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_NEW_PIT 1
EOF
else
- echo "$as_me:6213: result: no" >&5
+ echo "$as_me:6387: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_NEW_PIT 0
@@ -6219,7 +6393,7 @@
fi
else
- echo "$as_me:6222: result: yes" >&5
+ echo "$as_me:6396: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_NEW_PIT 1
@@ -6227,13 +6401,13 @@
fi;
-echo "$as_me:6230: checking for slowdown timer" >&5
+echo "$as_me:6404: checking for slowdown timer" >&5
echo $ECHO_N "checking for slowdown timer... $ECHO_C" >&6
# Check whether --enable-slowdown or --disable-slowdown was given.
if test "${enable_slowdown+set}" = set; then
enableval="$enable_slowdown"
if test "$enableval" = yes; then
- echo "$as_me:6236: result: yes" >&5
+ echo "$as_me:6410: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_SLOWDOWN_TIMER 1
@@ -6241,7 +6415,7 @@
SLOWDOWN_OBJS='$(SLOWDOWN_OBJS)'
else
- echo "$as_me:6244: result: no" >&5
+ echo "$as_me:6418: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_SLOWDOWN_TIMER 0
@@ -6251,7 +6425,7 @@
fi
else
- echo "$as_me:6254: result: no" >&5
+ echo "$as_me:6428: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_SLOWDOWN_TIMER 0
@@ -6261,20 +6435,20 @@
fi;
-echo "$as_me:6264: checking for idle hack" >&5
+echo "$as_me:6438: checking for idle hack" >&5
echo $ECHO_N "checking for idle hack... $ECHO_C" >&6
# Check whether --enable-idle-hack or --disable-idle-hack was given.
if test "${enable_idle_hack+set}" = set; then
enableval="$enable_idle_hack"
if test "$enableval" = yes; then
- echo "$as_me:6270: result: yes" >&5
+ echo "$as_me:6444: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_IDLE_HACK 1
EOF
else
- echo "$as_me:6277: result: no" >&5
+ echo "$as_me:6451: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_IDLE_HACK 0
@@ -6283,7 +6457,7 @@
fi
else
- echo "$as_me:6286: result: no" >&5
+ echo "$as_me:6460: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_IDLE_HACK 0
@@ -6291,14 +6465,14 @@
fi;
-echo "$as_me:6294: checking for number of processors" >&5
+echo "$as_me:6468: checking for number of processors" >&5
echo $ECHO_N "checking for number of processors... $ECHO_C" >&6
# Check whether --enable-processors or --disable-processors was given.
if test "${enable_processors+set}" = set; then
enableval="$enable_processors"
case "$enableval" in
1)
- echo "$as_me:6301: result: 1" >&5
+ echo "$as_me:6475: result: 1" >&5
echo "${ECHO_T}1" >&6
cat >>confdefs.h <<\EOF
#define BX_SMP_PROCESSORS 1
@@ -6314,7 +6488,7 @@
;;
2)
- echo "$as_me:6317: result: 2" >&5
+ echo "$as_me:6491: result: 2" >&5
echo "${ECHO_T}2" >&6
cat >>confdefs.h <<\EOF
#define BX_SMP_PROCESSORS 2
@@ -6334,7 +6508,7 @@
;;
4)
- echo "$as_me:6337: result: 4" >&5
+ echo "$as_me:6511: result: 4" >&5
echo "${ECHO_T}4" >&6
cat >>confdefs.h <<\EOF
#define BX_SMP_PROCESSORS 4
@@ -6356,7 +6530,7 @@
*)
echo " "
echo "WARNING: processors != 1,2,4 can work, but you need to modify rombios.c manually"
- echo "$as_me:6359: result: $enable_val" >&5
+ echo "$as_me:6533: result: $enable_val" >&5
echo "${ECHO_T}$enable_val" >&6
cat >>confdefs.h <<\EOF
#define BX_SMP_PROCESSORS $enable_val
@@ -6380,7 +6554,7 @@
else
- echo "$as_me:6383: result: 1" >&5
+ echo "$as_me:6557: result: 1" >&5
echo "${ECHO_T}1" >&6
cat >>confdefs.h <<\EOF
#define BX_SMP_PROCESSORS 1
@@ -6398,10 +6572,10 @@
fi;
-echo "$as_me:6401: checking if compiler allows blank labels" >&5
+echo "$as_me:6575: checking if compiler allows blank labels" >&5
echo $ECHO_N "checking if compiler allows blank labels... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6404 "configure"
+#line 6578 "configure"
#include "confdefs.h"
int
@@ -6413,24 +6587,24 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6590: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6419: \$? = $ac_status" >&5
+ echo "$as_me:6593: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6422: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6596: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6425: \$? = $ac_status" >&5
+ echo "$as_me:6599: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6427: result: yes" >&5
+ echo "$as_me:6601: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:6433: result: no" >&5
+ echo "$as_me:6607: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_NO_BLANK_LABELS 1
@@ -6439,10 +6613,10 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6442: checking if compiler allows LL for 64-bit constants" >&5
+echo "$as_me:6616: checking if compiler allows LL for 64-bit constants" >&5
echo $ECHO_N "checking if compiler allows LL for 64-bit constants... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6445 "configure"
+#line 6619 "configure"
#include "confdefs.h"
int
@@ -6454,24 +6628,24 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6631: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6460: \$? = $ac_status" >&5
+ echo "$as_me:6634: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6463: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6637: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6466: \$? = $ac_status" >&5
+ echo "$as_me:6640: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:6468: result: yes" >&5
+ echo "$as_me:6642: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:6474: result: no" >&5
+ echo "$as_me:6648: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_64BIT_CONSTANTS_USE_LL 0
@@ -6480,14 +6654,14 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6483: checking for cpu level" >&5
+echo "$as_me:6657: checking for cpu level" >&5
echo $ECHO_N "checking for cpu level... $ECHO_C" >&6
# Check whether --enable-cpu-level or --disable-cpu-level was given.
if test "${enable_cpu_level+set}" = set; then
enableval="$enable_cpu_level"
case "$enableval" in
3)
- echo "$as_me:6490: result: 3" >&5
+ echo "$as_me:6664: result: 3" >&5
echo "${ECHO_T}3" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 3
@@ -6499,7 +6673,7 @@
;;
4)
- echo "$as_me:6502: result: 4" >&5
+ echo "$as_me:6676: result: 4" >&5
echo "${ECHO_T}4" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 4
@@ -6511,7 +6685,7 @@
;;
5)
- echo "$as_me:6514: result: 5" >&5
+ echo "$as_me:6688: result: 5" >&5
echo "${ECHO_T}5" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 5
@@ -6523,7 +6697,7 @@
;;
6)
- echo "$as_me:6526: result: 6" >&5
+ echo "$as_me:6700: result: 6" >&5
echo "${ECHO_T}6" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 6
@@ -6550,7 +6724,7 @@
# for multiprocessors, cpu level must be 6
if test "$bx_procs" -gt 1; then
- echo "$as_me:6553: result: 6" >&5
+ echo "$as_me:6727: result: 6" >&5
echo "${ECHO_T}6" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 6
@@ -6562,7 +6736,7 @@
bx_cpu_level=6
else
- echo "$as_me:6565: result: 5" >&5
+ echo "$as_me:6739: result: 5" >&5
echo "${ECHO_T}5" >&6
cat >>confdefs.h <<\EOF
#define BX_CPU_LEVEL 5
@@ -6577,13 +6751,13 @@
fi;
-echo "$as_me:6580: checking for dynamic translation support" >&5
+echo "$as_me:6754: checking for dynamic translation support" >&5
echo $ECHO_N "checking for dynamic translation support... $ECHO_C" >&6
# Check whether --enable-dynamic or --disable-dynamic was given.
if test "${enable_dynamic+set}" = set; then
enableval="$enable_dynamic"
if test "$enableval" = no; then
- echo "$as_me:6586: result: no" >&5
+ echo "$as_me:6760: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_DYNAMIC_TRANSLATION 0
@@ -6626,7 +6800,7 @@
AS_DYNAMIC_INCS=''
exit 1 ;;
esac
- echo "$as_me:6629: result: yes" >&5
+ echo "$as_me:6803: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_DYNAMIC_TRANSLATION 1
@@ -6636,7 +6810,7 @@
fi
else
- echo "$as_me:6639: result: no" >&5
+ echo "$as_me:6813: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_DYNAMIC_TRANSLATION 0
@@ -6648,13 +6822,13 @@
fi;
-echo "$as_me:6651: checking for APIC support" >&5
+echo "$as_me:6825: checking for APIC support" >&5
echo $ECHO_N "checking for APIC support... $ECHO_C" >&6
# Check whether --enable-apic or --disable-apic was given.
if test "${enable_apic+set}" = set; then
enableval="$enable_apic"
if test "$enableval" = yes; then
- echo "$as_me:6657: result: yes" >&5
+ echo "$as_me:6831: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_APIC 1
@@ -6663,7 +6837,7 @@
IOAPIC_OBJS='ioapic.o'
APIC_OBJS='apic.o'
else
- echo "$as_me:6666: result: no" >&5
+ echo "$as_me:6840: result: no" >&5
echo "${ECHO_T}no" >&6
if test "$bx_procs" -gt 1; then
echo "Number of processors = $bx_procs"
@@ -6682,7 +6856,7 @@
if test "$bx_procs" -gt 1 -o "$bx_cpu_level" -gt 5; then
# enable APIC by default, if processors>1 or if cpulevel>5
- echo "$as_me:6685: result: yes" >&5
+ echo "$as_me:6859: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_APIC 1
@@ -6691,7 +6865,7 @@
IOAPIC_OBJS='ioapic.o'
APIC_OBJS='apic.o'
else
- echo "$as_me:6694: result: no" >&5
+ echo "$as_me:6868: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_APIC 0
@@ -6703,20 +6877,20 @@
fi;
-echo "$as_me:6706: checking for split hard disk image support" >&5
+echo "$as_me:6880: checking for split hard disk image support" >&5
echo $ECHO_N "checking for split hard disk image support... $ECHO_C" >&6
# Check whether --enable-split-hd or --disable-split-hd was given.
if test "${enable_split_hd+set}" = set; then
enableval="$enable_split_hd"
if test "$enableval" = yes; then
- echo "$as_me:6712: result: yes" >&5
+ echo "$as_me:6886: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SPLIT_HD_SUPPORT 1
EOF
else
- echo "$as_me:6719: result: no" >&5
+ echo "$as_me:6893: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_SPLIT_HD_SUPPORT 0
@@ -6725,7 +6899,7 @@
fi
else
- echo "$as_me:6728: result: yes" >&5
+ echo "$as_me:6902: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SPLIT_HD_SUPPORT 1
@@ -6733,36 +6907,36 @@
fi;
-echo "$as_me:6736: checking for NE2000 support" >&5
+echo "$as_me:6910: checking for NE2000 support" >&5
echo $ECHO_N "checking for NE2000 support... $ECHO_C" >&6
# Check whether --enable-ne2000 or --disable-ne2000 was given.
if test "${enable_ne2000+set}" = set; then
enableval="$enable_ne2000"
if test "$enableval" = yes; then
- echo "$as_me:6742: result: yes" >&5
+ echo "$as_me:6916: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_NE2K_SUPPORT 1
EOF
NE2K_OBJS='ne2k.o eth.o eth_null.o'
- echo "$as_me:6749: checking for net/bpf.h" >&5
+ echo "$as_me:6923: checking for net/bpf.h" >&5
echo $ECHO_N "checking for net/bpf.h... $ECHO_C" >&6
if test "${ac_cv_header_net_bpf_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6755 "configure"
+#line 6929 "configure"
#include "confdefs.h"
#include <net/bpf.h>
_ACEOF
-if { (eval echo "$as_me:6759: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6933: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:6765: \$? = $ac_status" >&5
+ echo "$as_me:6939: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6781,29 +6955,29 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:6784: result: $ac_cv_header_net_bpf_h" >&5
+echo "$as_me:6958: result: $ac_cv_header_net_bpf_h" >&5
echo "${ECHO_T}$ac_cv_header_net_bpf_h" >&6
if test $ac_cv_header_net_bpf_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_fbsd.o"
fi
- echo "$as_me:6790: checking for netpacket/packet.h" >&5
+ echo "$as_me:6964: checking for netpacket/packet.h" >&5
echo $ECHO_N "checking for netpacket/packet.h... $ECHO_C" >&6
if test "${ac_cv_header_netpacket_packet_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6796 "configure"
+#line 6970 "configure"
#include "confdefs.h"
#include <netpacket/packet.h>
_ACEOF
-if { (eval echo "$as_me:6800: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6974: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:6806: \$? = $ac_status" >&5
+ echo "$as_me:6980: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6822,18 +6996,18 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:6825: result: $ac_cv_header_netpacket_packet_h" >&5
+echo "$as_me:6999: result: $ac_cv_header_netpacket_packet_h" >&5
echo "${ECHO_T}$ac_cv_header_netpacket_packet_h" >&6
if test $ac_cv_header_netpacket_packet_h = yes; then
NE2K_OBJS="$NE2K_OBJS eth_linux.o"
fi
- if test "$with_win32" = yes -o "$with_win32_vcpp" = yes; then
+ if test "$with_win32" = yes; then
NE2K_OBJS="$NE2K_OBJS eth_win32.o"
fi
networking=yes
else
- echo "$as_me:6836: result: no" >&5
+ echo "$as_me:7010: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_NE2K_SUPPORT 0
@@ -6844,7 +7018,7 @@
fi
else
- echo "$as_me:6847: result: no" >&5
+ echo "$as_me:7021: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_NE2K_SUPPORT 0
@@ -6855,13 +7029,13 @@
fi;
-echo "$as_me:6858: checking for i440FX PCI support" >&5
+echo "$as_me:7032: checking for i440FX PCI support" >&5
echo $ECHO_N "checking for i440FX PCI support... $ECHO_C" >&6
# Check whether --enable-pci or --disable-pci was given.
if test "${enable_pci+set}" = set; then
enableval="$enable_pci"
if test "$enableval" = yes; then
- echo "$as_me:6864: result: yes" >&5
+ echo "$as_me:7038: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_PCI_SUPPORT 1
@@ -6869,7 +7043,7 @@
PCI_OBJ='pci.o'
else
- echo "$as_me:6872: result: no" >&5
+ echo "$as_me:7046: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_PCI_SUPPORT 0
@@ -6879,7 +7053,7 @@
fi
else
- echo "$as_me:6882: result: no" >&5
+ echo "$as_me:7056: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_PCI_SUPPORT 0
@@ -6889,20 +7063,20 @@
fi;
-echo "$as_me:6892: checking for port e9 hack" >&5
+echo "$as_me:7066: checking for port e9 hack" >&5
echo $ECHO_N "checking for port e9 hack... $ECHO_C" >&6
# Check whether --enable-port-e9-hack or --disable-port-e9-hack was given.
if test "${enable_port_e9_hack+set}" = set; then
enableval="$enable_port_e9_hack"
if test "$enableval" = yes; then
- echo "$as_me:6898: result: yes" >&5
+ echo "$as_me:7072: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_PORT_E9_HACK 1
EOF
else
- echo "$as_me:6905: result: no" >&5
+ echo "$as_me:7079: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_PORT_E9_HACK 0
@@ -6911,7 +7085,7 @@
fi
else
- echo "$as_me:6914: result: yes" >&5
+ echo "$as_me:7088: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_PORT_E9_HACK 1
@@ -6919,25 +7093,25 @@
fi;
-echo "$as_me:6922: checking for use of .cpp as suffix" >&5
+echo "$as_me:7096: checking for use of .cpp as suffix" >&5
echo $ECHO_N "checking for use of .cpp as suffix... $ECHO_C" >&6
# Check whether --enable-cpp or --disable-cpp was given.
if test "${enable_cpp+set}" = set; then
enableval="$enable_cpp"
if test "$enableval" = yes; then
- echo "$as_me:6928: result: yes" >&5
+ echo "$as_me:7102: result: yes" >&5
echo "${ECHO_T}yes" >&6
SUFFIX_LINE='.SUFFIXES: .cpp'
CPP_SUFFIX='cpp'
else
- echo "$as_me:6933: result: no" >&5
+ echo "$as_me:7107: result: no" >&5
echo "${ECHO_T}no" >&6
SUFFIX_LINE='.SUFFIXES: .cc'
CPP_SUFFIX='cc'
fi
else
- echo "$as_me:6940: result: no" >&5
+ echo "$as_me:7114: result: no" >&5
echo "${ECHO_T}no" >&6
SUFFIX_LINE='.SUFFIXES: .cc'
CPP_SUFFIX='cc'
@@ -6959,13 +7133,13 @@
fi
fi
-echo "$as_me:6962: checking for Bochs internal debugger support" >&5
+echo "$as_me:7136: checking for Bochs internal debugger support" >&5
echo $ECHO_N "checking for Bochs internal debugger support... $ECHO_C" >&6
# Check whether --enable-debugger or --disable-debugger was given.
if test "${enable_debugger+set}" = set; then
enableval="$enable_debugger"
if test "$enableval" = yes; then
- echo "$as_me:6968: result: yes" >&5
+ echo "$as_me:7142: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_DEBUGGER 1
@@ -6974,7 +7148,7 @@
DEBUGGER_VAR='$(DEBUGGER_LIB)'
bx_debugger=1
else
- echo "$as_me:6977: result: no" >&5
+ echo "$as_me:7151: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_DEBUGGER 0
@@ -6986,7 +7160,7 @@
else
- echo "$as_me:6989: result: no" >&5
+ echo "$as_me:7163: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_DEBUGGER 0
@@ -6997,13 +7171,13 @@
fi;
-echo "$as_me:7000: checking for disassembler support" >&5
+echo "$as_me:7174: checking for disassembler support" >&5
echo $ECHO_N "checking for disassembler support... $ECHO_C" >&6
# Check whether --enable-disasm or --disable-disasm was given.
if test "${enable_disasm+set}" = set; then
enableval="$enable_disasm"
if test "$enableval" = yes; then
- echo "$as_me:7006: result: yes" >&5
+ echo "$as_me:7180: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_DISASM 1
@@ -7011,7 +7185,7 @@
DISASM_VAR='$(DISASM_LIB)'
else
- echo "$as_me:7014: result: no" >&5
+ echo "$as_me:7188: result: no" >&5
echo "${ECHO_T}no" >&6
if test "$bx_debugger" = 1; then
echo "ERROR: debugger is enabled, so --enable-disasm is required"
@@ -7026,7 +7200,7 @@
else
if test "$bx_debugger" = 1; then
- echo "$as_me:7029: result: yes" >&5
+ echo "$as_me:7203: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_DISASM 1
@@ -7034,7 +7208,7 @@
DISASM_VAR='$(DISASM_LIB)'
else
- echo "$as_me:7037: result: no" >&5
+ echo "$as_me:7211: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_DISASM 0
@@ -7049,17 +7223,17 @@
rl_without_curses_ok=no
rl_with_curses_ok=no
-echo "$as_me:7052: checking if readline works without -lcurses" >&5
+echo "$as_me:7226: checking if readline works without -lcurses" >&5
echo $ECHO_N "checking if readline works without -lcurses... $ECHO_C" >&6
OLD_LIBS=$LIBS
LIBS="$LIBS -lreadline"
if test "$cross_compiling" = yes; then
- { { echo "$as_me:7057: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:7231: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7062 "configure"
+#line 7236 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7068,39 +7242,39 @@
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7245: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7074: \$? = $ac_status" >&5
+ echo "$as_me:7248: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:7076: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7250: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7079: \$? = $ac_status" >&5
+ echo "$as_me:7253: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:7081: result: yes" >&5
+ echo "$as_me:7255: result: yes" >&5
echo "${ECHO_T}yes" >&6
rl_without_curses_ok=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:7088: result: no" >&5
+ echo "$as_me:7262: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7094: checking if readline works with -lcurses" >&5
+echo "$as_me:7268: checking if readline works with -lcurses" >&5
echo $ECHO_N "checking if readline works with -lcurses... $ECHO_C" >&6
LIBS="$LIBS -lcurses"
if test "$cross_compiling" = yes; then
- { { echo "$as_me:7098: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:7272: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7103 "configure"
+#line 7277 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -7109,24 +7283,24 @@
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7286: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7115: \$? = $ac_status" >&5
+ echo "$as_me:7289: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:7117: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7291: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7120: \$? = $ac_status" >&5
+ echo "$as_me:7294: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:7122: result: yes" >&5
+ echo "$as_me:7296: result: yes" >&5
echo "${ECHO_T}yes" >&6
rl_with_curses_ok=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:7129: result: no" >&5
+ echo "$as_me:7303: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -7134,34 +7308,34 @@
fi
LIBS=$OLD_LIBS
-echo "$as_me:7137: checking whether user wants readline" >&5
+echo "$as_me:7311: checking whether user wants readline" >&5
echo $ECHO_N "checking whether user wants readline... $ECHO_C" >&6
# Check whether --enable-readline or --disable-readline was given.
if test "${enable_readline+set}" = set; then
enableval="$enable_readline"
if test "$enableval" = yes; then
- echo "$as_me:7143: result: yes" >&5
+ echo "$as_me:7317: result: yes" >&5
echo "${ECHO_T}yes" >&6
want_readline=yes
else
- echo "$as_me:7147: result: no" >&5
+ echo "$as_me:7321: result: no" >&5
echo "${ECHO_T}no" >&6
want_readline=no
fi
else
- echo "$as_me:7153: result: yes" >&5
+ echo "$as_me:7327: result: yes" >&5
echo "${ECHO_T}yes" >&6
want_readline=yes
fi;
-echo "$as_me:7159: checking whether to use readline" >&5
+echo "$as_me:7333: checking whether to use readline" >&5
echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6
if test "$want_readline" = yes; then
if test "$bx_debugger" = 1; then
if test "$rl_without_curses_ok" = yes; then
- echo "$as_me:7164: result: yes" >&5
+ echo "$as_me:7338: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define HAVE_LIBREADLINE 1
@@ -7169,7 +7343,7 @@
READLINE_LIB="-lreadline"
elif test "$rl_with_curses_ok" = yes; then
- echo "$as_me:7172: result: yes" >&5
+ echo "$as_me:7346: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define HAVE_LIBREADLINE 1
@@ -7177,36 +7351,36 @@
READLINE_LIB="-lreadline -lcurses"
else
- echo "$as_me:7180: result: no" >&5
+ echo "$as_me:7354: result: no" >&5
echo "${ECHO_T}no" >&6
echo WARNING: The readline library was disabled because it was not found.
fi
else
- echo "$as_me:7185: result: no" >&5
+ echo "$as_me:7359: result: no" >&5
echo "${ECHO_T}no" >&6
fi
else
- echo "$as_me:7189: result: no" >&5
+ echo "$as_me:7363: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:7193: checking for readline/history.h" >&5
+echo "$as_me:7367: checking for readline/history.h" >&5
echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6
if test "${ac_cv_header_readline_history_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7199 "configure"
+#line 7373 "configure"
#include "confdefs.h"
#include <readline/history.h>
_ACEOF
-if { (eval echo "$as_me:7203: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7377: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:7209: \$? = $ac_status" >&5
+ echo "$as_me:7383: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7225,7 +7399,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7228: result: $ac_cv_header_readline_history_h" >&5
+echo "$as_me:7402: result: $ac_cv_header_readline_history_h" >&5
echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6
if test $ac_cv_header_readline_history_h = yes; then
cat >>confdefs.h <<\EOF
@@ -7234,13 +7408,13 @@
fi
-echo "$as_me:7237: checking for loader support" >&5
+echo "$as_me:7411: checking for loader support" >&5
echo $ECHO_N "checking for loader support... $ECHO_C" >&6
# Check whether --enable-loader or --disable-loader was given.
if test "${enable_loader+set}" = set; then
enableval="$enable_loader"
if test "$enableval" = yes; then
- echo "$as_me:7243: result: yes" >&5
+ echo "$as_me:7417: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_LOADER 1
@@ -7248,7 +7422,7 @@
BX_LOADER_OBJS='bx_loader.o loader.o'
else
- echo "$as_me:7251: result: no" >&5
+ echo "$as_me:7425: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_LOADER 0
@@ -7258,7 +7432,7 @@
fi
else
- echo "$as_me:7261: result: no" >&5
+ echo "$as_me:7435: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_USE_LOADER 0
@@ -7270,13 +7444,13 @@
INSTRUMENT_DIR='instrument/stubs'
-echo "$as_me:7273: checking for instrumentation support" >&5
+echo "$as_me:7447: checking for instrumentation support" >&5
echo $ECHO_N "checking for instrumentation support... $ECHO_C" >&6
# Check whether --enable-instrumentation or --disable-instrumentation was given.
if test "${enable_instrumentation+set}" = set; then
enableval="$enable_instrumentation"
if test "$enableval" = yes; then
- echo "$as_me:7279: result: yes" >&5
+ echo "$as_me:7453: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_INSTRUMENTATION 1
@@ -7284,7 +7458,7 @@
INSTRUMENT_VAR='$(INSTRUMENT_LIB)'
elif test "$enableval" = no; then
- echo "$as_me:7287: result: no" >&5
+ echo "$as_me:7461: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_INSTRUMENTATION 0
@@ -7292,7 +7466,7 @@
INSTRUMENT_VAR=''
else
- echo "$as_me:7295: result: yes" >&5
+ echo "$as_me:7469: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_INSTRUMENTATION 1
@@ -7303,7 +7477,7 @@
fi
else
- echo "$as_me:7306: result: no" >&5
+ echo "$as_me:7480: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_INSTRUMENTATION 0
@@ -7394,13 +7568,13 @@
fi;
-echo "$as_me:7397: checking for VGA emulation" >&5
+echo "$as_me:7571: checking for VGA emulation" >&5
echo $ECHO_N "checking for VGA emulation... $ECHO_C" >&6
# Check whether --enable-vga or --disable-vga was given.
if test "${enable_vga+set}" = set; then
enableval="$enable_vga"
if test "$enableval" = yes; then
- echo "$as_me:7403: result: yes" >&5
+ echo "$as_me:7577: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_VGA 1
@@ -7408,7 +7582,7 @@
VIDEO_OBJS='$(VIDEO_OBJS_VGA)'
else
- echo "$as_me:7411: result: no" >&5
+ echo "$as_me:7585: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_VGA 0
@@ -7418,7 +7592,7 @@
fi
else
- echo "$as_me:7421: result: yes" >&5
+ echo "$as_me:7595: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_VGA 1
@@ -7428,7 +7602,7 @@
fi;
-echo "$as_me:7431: checking for FPU emulation" >&5
+echo "$as_me:7605: checking for FPU emulation" >&5
echo $ECHO_N "checking for FPU emulation... $ECHO_C" >&6
FPU_VAR=''
FPU_GLUE_OBJ=''
@@ -7436,7 +7610,7 @@
if test "${enable_fpu+set}" = set; then
enableval="$enable_fpu"
if test "$enableval" = yes; then
- echo "$as_me:7439: result: yes" >&5
+ echo "$as_me:7613: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_FPU 1
@@ -7445,7 +7619,7 @@
FPU_VAR='$(FPU_LIB)'
FPU_GLUE_OBJ='$(FPU_GLUE_OBJ)'
elif test "$enableval" = no; then
- echo "$as_me:7448: result: no" >&5
+ echo "$as_me:7622: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_FPU 0
@@ -7459,7 +7633,7 @@
else
- echo "$as_me:7462: result: yes" >&5
+ echo "$as_me:7636: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_SUPPORT_FPU 1
@@ -7470,27 +7644,27 @@
fi;
-echo "$as_me:7473: checking for x86 debugger support" >&5
+echo "$as_me:7647: checking for x86 debugger support" >&5
echo $ECHO_N "checking for x86 debugger support... $ECHO_C" >&6
# Check whether --enable-x86-debugger or --disable-x86-debugger was given.
if test "${enable_x86_debugger+set}" = set; then
enableval="$enable_x86_debugger"
if test "$enableval" = yes; then
- echo "$as_me:7479: result: yes" >&5
+ echo "$as_me:7653: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_X86_DEBUGGER 1
EOF
elif test "$enableval" = no; then
- echo "$as_me:7486: result: no" >&5
+ echo "$as_me:7660: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_X86_DEBUGGER 0
EOF
else
- echo "$as_me:7493: result: yes" >&5
+ echo "$as_me:7667: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_X86_DEBUGGER 1
@@ -7499,7 +7673,7 @@
fi
else
- echo "$as_me:7502: result: no" >&5
+ echo "$as_me:7676: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_X86_DEBUGGER 0
@@ -7507,23 +7681,23 @@
fi;
-echo "$as_me:7510: checking for IOKit/storage/IOCDMedia.h" >&5
+echo "$as_me:7684: checking for IOKit/storage/IOCDMedia.h" >&5
echo $ECHO_N "checking for IOKit/storage/IOCDMedia.h... $ECHO_C" >&6
if test "${ac_cv_header_IOKit_storage_IOCDMedia_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7516 "configure"
+#line 7690 "configure"
#include "confdefs.h"
#include <IOKit/storage/IOCDMedia.h>
_ACEOF
-if { (eval echo "$as_me:7520: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7694: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:7526: \$? = $ac_status" >&5
+ echo "$as_me:7700: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7542,20 +7716,20 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:7545: result: $ac_cv_header_IOKit_storage_IOCDMedia_h" >&5
+echo "$as_me:7719: result: $ac_cv_header_IOKit_storage_IOCDMedia_h" >&5
echo "${ECHO_T}$ac_cv_header_IOKit_storage_IOCDMedia_h" >&6
if test $ac_cv_header_IOKit_storage_IOCDMedia_h = yes; then
can_use_osx_cdrom=yes
fi
-echo "$as_me:7552: checking for CDROM support" >&5
+echo "$as_me:7726: checking for CDROM support" >&5
echo $ECHO_N "checking for CDROM support... $ECHO_C" >&6
# Check whether --enable-cdrom or --disable-cdrom was given.
if test "${enable_cdrom+set}" = set; then
enableval="$enable_cdrom"
if test "$enableval" = no; then
- echo "$as_me:7558: result: no" >&5
+ echo "$as_me:7732: result: no" >&5
echo "${ECHO_T}no" >&6
CDROM_OBJS=''
cat >>confdefs.h <<\EOF
@@ -7563,7 +7737,7 @@
EOF
else
- echo "$as_me:7566: result: yes" >&5
+ echo "$as_me:7740: result: yes" >&5
echo "${ECHO_T}yes" >&6
CDROM_OBJS='cdrom.o'
if test "$with_amigaos" = yes; then
@@ -7571,7 +7745,7 @@
CDROM_OBJS="cdrom_amigaos.o"
elif test "$can_use_osx_cdrom" = yes; then
# use cdrom_osx
- echo "$as_me:7574: result: Using OSX IOKit CD Interface" >&5
+ echo "$as_me:7748: result: Using OSX IOKit CD Interface" >&5
echo "${ECHO_T}Using OSX IOKit CD Interface" >&6
CDROM_OBJS="cdrom_osx.o"
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
@@ -7586,7 +7760,7 @@
fi
else
- echo "$as_me:7589: result: no" >&5
+ echo "$as_me:7763: result: no" >&5
echo "${ECHO_T}no" >&6
CDROM_OBJS=''
cat >>confdefs.h <<\EOF
@@ -7595,13 +7769,13 @@
fi;
-echo "$as_me:7598: checking for Sound Blaster 16 support" >&5
+echo "$as_me:7772: checking for Sound Blaster 16 support" >&5
echo $ECHO_N "checking for Sound Blaster 16 support... $ECHO_C" >&6
# Check whether --enable-sb16 or --disable-sb16 was given.
if test "${enable_sb16+set}" = set; then
enableval="$enable_sb16"
if test "$enableval" = no; then
- echo "$as_me:7604: result: no" >&5
+ echo "$as_me:7778: result: no" >&5
echo "${ECHO_T}no" >&6
SB16_OBJS=''
cat >>confdefs.h <<\EOF
@@ -7616,7 +7790,7 @@
#define BX_SOUND_OUTPUT_C bx_sound_output_c
EOF
- echo "$as_me:7619: result: dummy" >&5
+ echo "$as_me:7793: result: dummy" >&5
echo "${ECHO_T}dummy" >&6
;;
freebsd|linux)
@@ -7625,7 +7799,7 @@
#define BX_SOUND_OUTPUT_C bx_sound_linux_c
EOF
- echo "$as_me:7628: result: linux" >&5
+ echo "$as_me:7802: result: linux" >&5
echo "${ECHO_T}linux" >&6
;;
win)
@@ -7634,7 +7808,7 @@
#define BX_SOUND_OUTPUT_C bx_sound_windows_c
EOF
- echo "$as_me:7637: result: win" >&5
+ echo "$as_me:7811: result: win" >&5
echo "${ECHO_T}win" >&6
;;
*)
@@ -7650,7 +7824,7 @@
fi
else
- echo "$as_me:7653: result: no" >&5
+ echo "$as_me:7827: result: no" >&5
echo "${ECHO_T}no" >&6
SB16_OBJS=''
cat >>confdefs.h <<\EOF
@@ -7668,14 +7842,14 @@
fi;
-echo "$as_me:7671: checking for I/O Interface to the debugger" >&5
+echo "$as_me:7845: checking for I/O Interface to the debugger" >&5
echo $ECHO_N "checking for I/O Interface to the debugger... $ECHO_C" >&6
IODEBUG_OBJS=''
# Check whether --enable-iodebug or --disable-iodebug was given.
if test "${enable_iodebug+set}" = set; then
enableval="$enable_iodebug"
if test "$enableval" = yes; then
- echo "$as_me:7678: result: yes" >&5
+ echo "$as_me:7852: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define BX_IODEBUG_SUPPORT 1
@@ -7683,7 +7857,7 @@
IODEBUG_OBJS='iodebug.o'
else
- echo "$as_me:7686: result: no" >&5
+ echo "$as_me:7860: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_IODEBUG_SUPPORT 0
@@ -7693,7 +7867,7 @@
else
- echo "$as_me:7696: result: no" >&5
+ echo "$as_me:7870: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\EOF
#define BX_IODEBUG_SUPPORT 0
@@ -7780,23 +7954,6 @@
fi;
-echo "$as_me:7783: checking for gui library to use" >&5
-echo $ECHO_N "checking for gui library to use... $ECHO_C" >&6
-
-if (test "$with_sdl" != yes) && \
- (test "$with_x11" != yes) && \
- (test "$with_beos" != yes) && \
- (test "$with_win32" != yes) && \
- (test "$with_nogui" != yes) && \
- (test "$with_win32_vcpp" != yes) && \
- (test "$with_term" != yes) && \
- (test "$with_rfb" != yes) && \
- (test "$with_amigaos" != yes) && \
- (test "$with_carbon" != yes) && \
- (test "$with_macos" != yes); then
- with_x11=yes
-fi
-
DASH="-"
SLASH="/"
CXXFP=""
@@ -7813,8 +7970,15 @@
INSTALL_TARGET=install_unix
INSTALL_LIST_FOR_PLATFORM=
+echo "$as_me:7973: checking for gui library to use" >&5
+echo $ECHO_N "checking for gui library to use... $ECHO_C" >&6
+
+# the $with_* variable tells the gui library to use, but does NOT necessarily
+# indicate the platform. Settings that depend on the platform should be
+# handled later.
+
if test "$with_x11" = yes; then
- echo "$as_me:7817: result: X windows" >&5
+ echo "$as_me:7981: result: X windows" >&5
echo "${ECHO_T}X windows" >&6
if test "$no_x" = yes; then
echo ERROR: X windows gui was selected, but X windows libraries were not found.
@@ -7827,18 +7991,8 @@
GUI_OBJS='$(GUI_OBJS_X11)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_X)'
INSTALL_LIST_FOR_PLATFORM='$(INSTALL_LIST_X11)'
-elif test "$with_win32" = yes; then
- echo "$as_me:7831: result: win32" >&5
-echo "${ECHO_T}win32" >&6
- cat >>confdefs.h <<\EOF
-#define BX_WITH_WIN32 1
-EOF
-
- GUI_OBJS='$(GUI_OBJS_WIN32)'
- GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32)'
- INSTALL_TARGET='install_win32'
elif test "$with_beos" = yes; then
- echo "$as_me:7841: result: beos" >&5
+ echo "$as_me:7995: result: beos" >&5
echo "${ECHO_T}beos" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_BEOS 1
@@ -7847,7 +8001,7 @@
GUI_OBJS='$(GUI_OBJS_BEOS)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_BEOS)'
elif test "$with_sdl" = yes; then
- echo "$as_me:7850: result: sdl" >&5
+ echo "$as_me:8004: result: sdl" >&5
echo "${ECHO_T}sdl" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_SDL 1
@@ -7856,7 +8010,7 @@
GUI_OBJS='$(GUI_OBJS_SDL)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_SDL)'
elif test "$with_rfb" = yes; then
- echo "$as_me:7859: result: rfb" >&5
+ echo "$as_me:8013: result: rfb" >&5
echo "${ECHO_T}rfb" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_RFB 1
@@ -7865,7 +8019,7 @@
GUI_OBJS='$(GUI_OBJS_RFB)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_RFB)'
elif test "$with_amigaos" = yes; then
- echo "$as_me:7868: result: amigaos" >&5
+ echo "$as_me:8022: result: amigaos" >&5
echo "${ECHO_T}amigaos" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_AMIGAOS 1
@@ -7873,90 +8027,35 @@
GUI_OBJS='$(GUI_OBJS_AMIGAOS)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_AMIGAOS)'
-elif test "$with_win32_vcpp" = yes; then
- echo "$as_me:7877: result: win32-vcpp" >&5
-echo "${ECHO_T}win32-vcpp" >&6
+elif test "$with_win32" = yes; then
+ echo "$as_me:8031: result: win32" >&5
+echo "${ECHO_T}win32" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_WIN32 1
EOF
GUI_OBJS='$(GUI_OBJS_WIN32)'
- INSTALL_TARGET='install_win32'
- GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32_VCPP)'
-
- CC="cl"
- CXX="$CC"
- #C_OPT="/Zi" # for debugging
- C_OPT="/O2" # optimize for speed
- CFLAGS="/nologo /G6 /MT /W3 /GX /DNDEBUG /DWIN32 /D_WINDOWS $C_OPT"
- CXXFLAGS="$CFLAGS"
- DASH="/"
- SLASH="\\"
- CXXFP="/Tp"
- CFP="/Tc"
- OFP="/Fo"
- MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
- RMCOMMAND="-del"
- RANLIB="echo"
- #L_OPT="/debug" # for debugging
- L_OPT="" # no debug info
- LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
- EXE=".exe"
- PRIMARY_TARGET="bochs.exe"
- # also compile niclist if networking is on
- if test "$networking" = yes; then
- PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
- fi
- COMMAND_SEPARATOR=""
- CD_UP_ONE="cd .."
- CD_UP_TWO="cd ..\.."
- cat >>confdefs.h <<\EOF
-#define BX_64BIT_CONSTANTS_USE_LL 0
-EOF
-
- cat >>confdefs.h <<\EOF
-#define inline __inline
-EOF
-
- cat >>confdefs.h <<\EOF
-#define BX_NO_EMPTY_STRUCTS 1
-EOF
-
- cat >>confdefs.h <<\EOF
-#define BX_NO_ATTRIBUTES 1
-EOF
-
- cat >>confdefs.h <<\EOF
-#define BX_HAVE_HASH_MAP 0
-EOF
-
- cat >>confdefs.h <<\EOF
-#define BX_HAVE_STRTOULL 0
-EOF
-
- cat >>confdefs.h <<\EOF
-#define BX_HAVE_STRTOUQ 0
-EOF
-
- cat >>confdefs.h <<\EOF
-#define HAVE_LIBREADLINE 0
-EOF
-
+ case $target in
+ *-pc-windows*)
+ GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32_VCPP)' # native libs for win gui
+ ;;
+ *-cygwin*)
+ GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32)' # cygwin/mingw libs for win gui
+ ;;
+ *) echo Unsupported compile setup: GUI library is win32, but target is neither windows nor cygwin.
+ ;;
+ esac
elif test "$with_macos" = yes; then
- echo "$as_me:7946: result: macos" >&5
+ echo "$as_me:8049: result: macos" >&5
echo "${ECHO_T}macos" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_MACOS 1
EOF
- cat >>confdefs.h <<\EOF
-#define BX_HAVE_STRDUP 0
-EOF
-
GUI_OBJS='$(GUI_OBJS_MACOS)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_MACOS)'
elif test "$with_carbon" = yes; then
- echo "$as_me:7959: result: carbon" >&5
+ echo "$as_me:8058: result: carbon" >&5
echo "${ECHO_T}carbon" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_CARBON 1
@@ -7964,9 +8063,9 @@
GUI_OBJS='$(GUI_OBJS_CARBON)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_CARBON)'
- PRIMARY_TARGET=bochs.app/.build
+ PRIMARY_TARGET=bochs.app/.build # only for carbon application
elif test "$with_term" = yes; then
- echo "$as_me:7969: result: term" >&5
+ echo "$as_me:8068: result: term" >&5
echo "${ECHO_T}term" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_TERM 1
@@ -7976,7 +8075,7 @@
GUI_LINK_OPTS='$(GUI_LINK_OPTS_TERM)'
use_curses=yes
else
- echo "$as_me:7979: result: none" >&5
+ echo "$as_me:8078: result: none" >&5
echo "${ECHO_T}none" >&6
cat >>confdefs.h <<\EOF
#define BX_WITH_NOGUI 1
@@ -7986,8 +8085,79 @@
GUI_LINK_OPTS='$(GUI_LINK_OPTS_NOGUI)'
fi
+# modify settings based on target platform
+case "$target" in
+ *-macos*)
+ cat >>confdefs.h <<\EOF
+#define BX_HAVE_STRDUP 0
+EOF
+
+ ;;
+ *-pc-windows*)
+ INSTALL_TARGET='install_win32'
+ CC="cl"
+ CXX="$CC"
+ #C_OPT="/Zi" # for debugging
+ C_OPT="/O2" # optimize for speed
+ CFLAGS="/nologo /G6 /MT /W3 /GX /DNDEBUG /DWIN32 /D_WINDOWS $C_OPT"
+ CXXFLAGS="$CFLAGS"
+ DASH="/"
+ SLASH="\\"
+ CXXFP="/Tp"
+ CFP="/Tc"
+ OFP="/Fo"
+ MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
+ RMCOMMAND="-del"
+ RANLIB="echo"
+ #L_OPT="/debug" # for debugging
+ L_OPT="" # no debug info
+ LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
+ EXE=".exe"
+ PRIMARY_TARGET="bochs.exe"
+ # also compile niclist if networking is on
+ if test "$networking" = yes; then
+ PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
+ fi
+ COMMAND_SEPARATOR=""
+ CD_UP_ONE="cd .."
+ CD_UP_TWO="cd ..\.."
+ cat >>confdefs.h <<\EOF
+#define BX_64BIT_CONSTANTS_USE_LL 0
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define inline __inline
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define BX_NO_EMPTY_STRUCTS 1
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define BX_NO_ATTRIBUTES 1
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define BX_HAVE_HASH_MAP 0
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define BX_HAVE_STRTOULL 0
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define BX_HAVE_STRTOUQ 0
+EOF
+
+ cat >>confdefs.h <<\EOF
+#define HAVE_LIBREADLINE 0
+EOF
+
+ ;;
+esac
+
if test "$use_curses" = yes; then
- echo "$as_me:7990: checking for mvaddch in -lcurses" >&5
+ echo "$as_me:8160: checking for mvaddch in -lcurses" >&5
echo $ECHO_N "checking for mvaddch in -lcurses... $ECHO_C" >&6
if test "${ac_cv_lib_curses_mvaddch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7995,7 +8165,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7998 "configure"
+#line 8168 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8014,16 +8184,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8187: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8020: \$? = $ac_status" >&5
+ echo "$as_me:8190: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8023: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8193: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8026: \$? = $ac_status" >&5
+ echo "$as_me:8196: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_mvaddch=yes
else
@@ -8034,13 +8204,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8037: result: $ac_cv_lib_curses_mvaddch" >&5
+echo "$as_me:8207: result: $ac_cv_lib_curses_mvaddch" >&5
echo "${ECHO_T}$ac_cv_lib_curses_mvaddch" >&6
if test $ac_cv_lib_curses_mvaddch = yes; then
GUI_LINK_OPTS_TERM='-lcurses'
fi
- echo "$as_me:8043: checking for mvaddch in -lncurses" >&5
+ echo "$as_me:8213: checking for mvaddch in -lncurses" >&5
echo $ECHO_N "checking for mvaddch in -lncurses... $ECHO_C" >&6
if test "${ac_cv_lib_ncurses_mvaddch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8048,7 +8218,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8051 "configure"
+#line 8221 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8067,16 +8237,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8240: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8073: \$? = $ac_status" >&5
+ echo "$as_me:8243: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8076: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8246: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8079: \$? = $ac_status" >&5
+ echo "$as_me:8249: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ncurses_mvaddch=yes
else
@@ -8087,13 +8257,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8090: result: $ac_cv_lib_ncurses_mvaddch" >&5
+echo "$as_me:8260: result: $ac_cv_lib_ncurses_mvaddch" >&5
echo "${ECHO_T}$ac_cv_lib_ncurses_mvaddch" >&6
if test $ac_cv_lib_ncurses_mvaddch = yes; then
GUI_LINK_OPTS_TERM='-lncurses'
fi
- echo "$as_me:8096: checking for mvaddch in -ltermlib" >&5
+ echo "$as_me:8266: checking for mvaddch in -ltermlib" >&5
echo $ECHO_N "checking for mvaddch in -ltermlib... $ECHO_C" >&6
if test "${ac_cv_lib_termlib_mvaddch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8101,7 +8271,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermlib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8104 "configure"
+#line 8274 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8120,16 +8290,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8293: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8126: \$? = $ac_status" >&5
+ echo "$as_me:8296: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8129: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8299: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8132: \$? = $ac_status" >&5
+ echo "$as_me:8302: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termlib_mvaddch=yes
else
@@ -8140,7 +8310,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8143: result: $ac_cv_lib_termlib_mvaddch" >&5
+echo "$as_me:8313: result: $ac_cv_lib_termlib_mvaddch" >&5
echo "${ECHO_T}$ac_cv_lib_termlib_mvaddch" >&6
if test $ac_cv_lib_termlib_mvaddch = yes; then
GUI_LINK_OPTS_TERM='-ltermlib'
@@ -8154,12 +8324,12 @@
if test "$with_rfb" = yes; then
# first see if compiler takes "-pthread" argument
- echo "$as_me:8157: checking for -pthread arg to compiler" >&5
+ echo "$as_me:8327: checking for -pthread arg to compiler" >&5
echo $ECHO_N "checking for -pthread arg to compiler... $ECHO_C" >&6
CFLAGS_SAVE="$CFLAGS"
CFLAGS="$CFLAGS -pthread"
cat >conftest.$ac_ext <<_ACEOF
-#line 8162 "configure"
+#line 8332 "configure"
#include "confdefs.h"
#include <pthread.h>
int
@@ -8171,20 +8341,20 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8344: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8177: \$? = $ac_status" >&5
+ echo "$as_me:8347: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8180: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8350: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8183: \$? = $ac_status" >&5
+ echo "$as_me:8353: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
# it compiles with -pthread
- echo "$as_me:8187: result: yes" >&5
+ echo "$as_me:8357: result: yes" >&5
echo "${ECHO_T}yes" >&6
CXXFLAGS="$CXXFLAGS -pthread"
@@ -8192,11 +8362,11 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- echo "$as_me:8195: result: no" >&5
+ echo "$as_me:8365: result: no" >&5
echo "${ECHO_T}no" >&6
# now try with -lpthread
CFLAGS="$CFLAGS_SAVE"
- echo "$as_me:8199: checking for pthread_create in -lpthread" >&5
+ echo "$as_me:8369: checking for pthread_create in -lpthread" >&5
echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8204,7 +8374,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8207 "configure"
+#line 8377 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8223,16 +8393,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8396: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8229: \$? = $ac_status" >&5
+ echo "$as_me:8399: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8232: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8402: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8235: \$? = $ac_status" >&5
+ echo "$as_me:8405: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_pthread_pthread_create=yes
else
@@ -8243,7 +8413,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8246: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "$as_me:8416: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -8268,7 +8438,7 @@
# Extract the first word of "gzip", so it can be a program name with args.
set dummy gzip; ac_word=$2
-echo "$as_me:8271: checking for $ac_word" >&5
+echo "$as_me:8441: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_GZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8285,7 +8455,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GZIP="$ac_dir/$ac_word"
- echo "$as_me:8288: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8458: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8296,16 +8466,16 @@
GZIP=$ac_cv_path_GZIP
if test -n "$GZIP"; then
- echo "$as_me:8299: result: $GZIP" >&5
+ echo "$as_me:8469: result: $GZIP" >&5
echo "${ECHO_T}$GZIP" >&6
else
- echo "$as_me:8302: result: no" >&5
+ echo "$as_me:8472: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
-echo "$as_me:8308: checking for $ac_word" >&5
+echo "$as_me:8478: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TAR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8322,7 +8492,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TAR="$ac_dir/$ac_word"
- echo "$as_me:8325: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8495: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8333,10 +8503,10 @@
TAR=$ac_cv_path_TAR
if test -n "$TAR"; then
- echo "$as_me:8336: result: $TAR" >&5
+ echo "$as_me:8506: result: $TAR" >&5
echo "${ECHO_T}$TAR" >&6
else
- echo "$as_me:8339: result: no" >&5
+ echo "$as_me:8509: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -8420,7 +8590,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:8423: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:8593: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -8592,7 +8762,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:8595: error: ambiguous option: $1
+ { { echo "$as_me:8765: 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;}
@@ -8611,7 +8781,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:8614: error: unrecognized option: $1
+ -*) { { echo "$as_me:8784: 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;}
@@ -8664,7 +8834,7 @@
"bxversion.h" ) CONFIG_FILES="$CONFIG_FILES bxversion.h" ;;
"build/linux/DOC-linux.html" ) CONFIG_FILES="$CONFIG_FILES build/linux/DOC-linux.html" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- *) { { echo "$as_me:8667: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:8837: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -8745,6 +8915,18 @@
s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
s,@DEFS@,$DEFS,;t t
s,@LIBS@,$LIBS,;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,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
@@ -8928,7 +9110,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:8931: creating $ac_file" >&5
+ { echo "$as_me:9113: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -8946,7 +9128,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:8949: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:9131: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -8959,7 +9141,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:8962: error: cannot find input file: $f" >&5
+ { { echo "$as_me:9144: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -9019,7 +9201,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:9022: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:9204: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -9030,7 +9212,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:9033: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:9215: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -9043,7 +9225,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:9046: error: cannot find input file: $f" >&5
+ { { echo "$as_me:9228: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -9160,7 +9342,7 @@
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:9163: $ac_file is unchanged" >&5
+ { echo "$as_me:9345: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff -urN -x *CVS* clean/configure.in clean-newcfg/configure.in
--- clean/configure.in Tue Mar 5 10:56:10 2002
+++ clean-newcfg/configure.in Thu Mar 7 08:55:30 2002
@@ -13,6 +13,71 @@
changequote(<<, >>)
changequote([, ])
+dnl Detect host and target
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+if test "$with_win32_vcpp"; then
+ echo "WARNING: The --with-win32-vcpp option will be treated as:"
+ echo " --with-win32 --target=i686-pc-windows"
+ target="i686-pc-windows"
+ with_win32=yes
+fi
+
+# this case statement defines the compile flags which are needed to
+# compile bochs on a platform. Don't put things like optimization settings
+# into the configure.in file, since people will want to be able to change
+# those settings by defining CFLAGS and CXXFLAGS before running configure.
+case "$target" in
+ *-pc-windows* | *-pc-winnt*)
+ DEFAULT_GUI=win32 # default to win32 gui
+ ;;
+ *-pc-cygwin*)
+ ADD_FLAGS="-mno-cygwin -DWIN32" # required for cygwin compile
+ DEFAULT_GUI=win32 # default to win32 gui
+ ;;
+ *-macosx* | *-darwin*)
+ ADD_FLAGS="-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants -Wno-unknown-pragmas -Dmacintosh" # required for macosx compile
+ DEFAULT_GUI=carbon # default to carbon
+ ;;
+ *-macos*)
+ DEFAULT_GUI=macos # macos defaults to macos
+ ;;
+ *-beos*)
+ DEFAULT_GUI=beos # beos defaults to beos
+ ;;
+ *-amigaos*)
+ DEFAULT_GUI=amigaos # amigaos defaults to amigaos
+ ;;
+ *)
+ DEFAULT_GUI=x11
+ ;;
+esac
+CFLAGS="$CFLAGS $ADD_FLAGS"
+CXXFLAGS="$CXXFLAGS $ADD_FLAGS"
+
+AC_MSG_CHECKING(for standard CFLAGS on this platform)
+AC_MSG_RESULT($ADD_FLAGS)
+AC_MSG_CHECKING(for default library on this platform)
+AC_MSG_RESULT($DEFAULT_GUI)
+
+dnl // make sure X Windows is default if no other chosen
+if (test "$with_sdl" != yes) && \
+ (test "$with_x11" != yes) && \
+ (test "$with_beos" != yes) && \
+ (test "$with_win32" != yes) && \
+ (test "$with_nogui" != yes) && \
+ (test "$with_term" != yes) && \
+ (test "$with_rfb" != yes) && \
+ (test "$with_amigaos" != yes) && \
+ (test "$with_carbon" != yes) && \
+ (test "$with_macos" != yes); then
+ # use DEFAULT_GUI. Set the appropriate variable.
+ # DEFAULT_GUI must be set to one of the names above. Otherwise, no
+ # valid $with_* variable will be set and who knows what will happen?
+ eval "with_${DEFAULT_GUI}=yes"
+fi
+
AC_PROG_CC
AC_PROG_CXX
AC_PROG_MAKE_SET
@@ -379,7 +444,7 @@
NE2K_OBJS='ne2k.o eth.o eth_null.o'
AC_CHECK_HEADER(net/bpf.h, NE2K_OBJS="$NE2K_OBJS eth_fbsd.o")
AC_CHECK_HEADER(netpacket/packet.h, NE2K_OBJS="$NE2K_OBJS eth_linux.o")
- if test "$with_win32" = yes -o "$with_win32_vcpp" = yes; then
+ if test "$with_win32" = yes; then
NE2K_OBJS="$NE2K_OBJS eth_win32.o"
fi
networking=yes
@@ -928,23 +993,6 @@
[ --with-sdl use SDL libraries],
)
-AC_MSG_CHECKING(for gui library to use)
-
-dnl // make sure X Windows is default if no other chosen
-if (test "$with_sdl" != yes) && \
- (test "$with_x11" != yes) && \
- (test "$with_beos" != yes) && \
- (test "$with_win32" != yes) && \
- (test "$with_nogui" != yes) && \
- (test "$with_win32_vcpp" != yes) && \
- (test "$with_term" != yes) && \
- (test "$with_rfb" != yes) && \
- (test "$with_amigaos" != yes) && \
- (test "$with_carbon" != yes) && \
- (test "$with_macos" != yes); then
- with_x11=yes
-fi
-
dnl // DASH is option prefix for your platform
dnl // SLASH is directory for your platform
dnl // CXXFP is C++ File Prefix; the flag that tells the compiler
@@ -969,6 +1017,12 @@
INSTALL_TARGET=install_unix
INSTALL_LIST_FOR_PLATFORM=
+AC_MSG_CHECKING(for gui library to use)
+
+# the $with_* variable tells the gui library to use, but does NOT necessarily
+# indicate the platform. Settings that depend on the platform should be
+# handled later.
+
if test "$with_x11" = yes; then
AC_MSG_RESULT(X windows)
if test "$no_x" = yes; then
@@ -979,12 +1033,6 @@
GUI_OBJS='$(GUI_OBJS_X11)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_X)'
INSTALL_LIST_FOR_PLATFORM='$(INSTALL_LIST_X11)'
-elif test "$with_win32" = yes; then
- AC_MSG_RESULT(win32)
- AC_DEFINE(BX_WITH_WIN32, 1)
- GUI_OBJS='$(GUI_OBJS_WIN32)'
- GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32)'
- INSTALL_TARGET='install_win32'
elif test "$with_beos" = yes; then
AC_MSG_RESULT(beos)
AC_DEFINE(BX_WITH_BEOS, 1)
@@ -1005,51 +1053,23 @@
AC_DEFINE(BX_WITH_AMIGAOS, 1)
GUI_OBJS='$(GUI_OBJS_AMIGAOS)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_AMIGAOS)'
-elif test "$with_win32_vcpp" = yes; then
- AC_MSG_RESULT(win32-vcpp)
+elif test "$with_win32" = yes; then
+ AC_MSG_RESULT(win32)
AC_DEFINE(BX_WITH_WIN32, 1)
GUI_OBJS='$(GUI_OBJS_WIN32)'
- INSTALL_TARGET='install_win32'
- GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32_VCPP)'
-
- CC="cl"
- CXX="$CC"
- #C_OPT="/Zi" # for debugging
- C_OPT="/O2" # optimize for speed
- CFLAGS="/nologo /G6 /MT /W3 /GX /DNDEBUG /DWIN32 /D_WINDOWS $C_OPT"
- CXXFLAGS="$CFLAGS"
- DASH="/"
- SLASH="\\"
- CXXFP="/Tp"
- CFP="/Tc"
- OFP="/Fo"
- MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
- RMCOMMAND="-del"
- RANLIB="echo"
- #L_OPT="/debug" # for debugging
- L_OPT="" # no debug info
- LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
- EXE=".exe"
- PRIMARY_TARGET="bochs.exe"
- # also compile niclist if networking is on
- if test "$networking" = yes; then
- PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
- fi
- COMMAND_SEPARATOR=""
- CD_UP_ONE="cd .."
- CD_UP_TWO="cd ..\.."
- AC_DEFINE(BX_64BIT_CONSTANTS_USE_LL, 0)
- AC_DEFINE(inline, __inline)
- AC_DEFINE(BX_NO_EMPTY_STRUCTS, 1)
- AC_DEFINE(BX_NO_ATTRIBUTES, 1)
- AC_DEFINE(BX_HAVE_HASH_MAP, 0)
- AC_DEFINE(BX_HAVE_STRTOULL, 0)
- AC_DEFINE(BX_HAVE_STRTOUQ, 0)
- AC_DEFINE(HAVE_LIBREADLINE, 0)
+ case $target in
+ *-pc-windows*)
+ GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32_VCPP)' # native libs for win gui
+ ;;
+ *-cygwin*)
+ GUI_LINK_OPTS='$(GUI_LINK_OPTS_WIN32)' # cygwin/mingw libs for win gui
+ ;;
+ *) echo Unsupported compile setup: GUI library is win32, but target is neither windows nor cygwin.
+ ;;
+ esac
elif test "$with_macos" = yes; then
AC_MSG_RESULT(macos)
AC_DEFINE(BX_WITH_MACOS, 1)
- AC_DEFINE(BX_HAVE_STRDUP, 0)
GUI_OBJS='$(GUI_OBJS_MACOS)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_MACOS)'
elif test "$with_carbon" = yes; then
@@ -1057,7 +1077,7 @@
AC_DEFINE(BX_WITH_CARBON, 1)
GUI_OBJS='$(GUI_OBJS_CARBON)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_CARBON)'
- PRIMARY_TARGET=bochs.app/.build
+ PRIMARY_TARGET=bochs.app/.build # only for carbon application
elif test "$with_term" = yes; then
AC_MSG_RESULT(term)
AC_DEFINE(BX_WITH_TERM, 1)
@@ -1070,6 +1090,50 @@
GUI_OBJS='$(GUI_OBJS_NOGUI)'
GUI_LINK_OPTS='$(GUI_LINK_OPTS_NOGUI)'
fi
+
+# modify settings based on target platform
+case "$target" in
+ *-macos*)
+ AC_DEFINE(BX_HAVE_STRDUP, 0)
+ ;;
+ *-pc-windows*)
+ INSTALL_TARGET='install_win32'
+ CC="cl"
+ CXX="$CC"
+ #C_OPT="/Zi" # for debugging
+ C_OPT="/O2" # optimize for speed
+ CFLAGS="/nologo /G6 /MT /W3 /GX /DNDEBUG /DWIN32 /D_WINDOWS $C_OPT"
+ CXXFLAGS="$CFLAGS"
+ DASH="/"
+ SLASH="\\"
+ CXXFP="/Tp"
+ CFP="/Tc"
+ OFP="/Fo"
+ MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
+ RMCOMMAND="-del"
+ RANLIB="echo"
+ #L_OPT="/debug" # for debugging
+ L_OPT="" # no debug info
+ LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
+ EXE=".exe"
+ PRIMARY_TARGET="bochs.exe"
+ # also compile niclist if networking is on
+ if test "$networking" = yes; then
+ PRIMARY_TARGET="$PRIMARY_TARGET niclist.exe"
+ fi
+ COMMAND_SEPARATOR=""
+ CD_UP_ONE="cd .."
+ CD_UP_TWO="cd ..\.."
+ AC_DEFINE(BX_64BIT_CONSTANTS_USE_LL, 0)
+ AC_DEFINE(inline, __inline)
+ AC_DEFINE(BX_NO_EMPTY_STRUCTS, 1)
+ AC_DEFINE(BX_NO_ATTRIBUTES, 1)
+ AC_DEFINE(BX_HAVE_HASH_MAP, 0)
+ AC_DEFINE(BX_HAVE_STRTOULL, 0)
+ AC_DEFINE(BX_HAVE_STRTOUQ, 0)
+ AC_DEFINE(HAVE_LIBREADLINE, 0)
+ ;;
+esac
if test "$use_curses" = yes; then
AC_CHECK_LIB(curses, mvaddch, GUI_LINK_OPTS_TERM='-lcurses')
diff -urN -x *CVS* clean/install-sh clean-newcfg/install-sh
--- clean/install-sh Wed Dec 31 19:00:00 1969
+++ clean-newcfg/install-sh Wed Mar 6 21:41:30 2002
@@ -0,0 +1,251 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission. M.I.T. makes no representations about the
+# suitability of this software for any purpose. It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+ case $1 in
+ -c) instcmd="$cpprog"
+ shift
+ continue;;
+
+ -d) dir_arg=true
+ shift
+ continue;;
+
+ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd="$stripprog"
+ shift
+ continue;;
+
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
+
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
+ continue;;
+
+ *) if [ x"$src" = x ]
+ then
+ src=$1
+ else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
+ dst=$1
+ fi
+ shift
+ continue;;
+ esac
+done
+
+if [ x"$src" = x ]
+then
+ echo "install: no input file specified"
+ exit 1
+else
+ true
+fi
+
+if [ x"$dir_arg" != x ]; then
+ dst=$src
+ src=""
+
+ if [ -d $dst ]; then
+ instcmd=:
+ chmodcmd=""
+ else
+ instcmd=mkdir
+ fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+ if [ -f $src -o -d $src ]
+ then
+ true
+ else
+ echo "install: $src does not exist"
+ exit 1
+ fi
+
+ if [ x"$dst" = x ]
+ then
+ echo "install: no destination specified"
+ exit 1
+ else
+ true
+ fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+ if [ -d $dst ]
+ then
+ dst="$dst"/`basename $src`
+ else
+ true
+ fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+# this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+ pathcomp="${pathcomp}${1}"
+ shift
+
+ if [ ! -d "${pathcomp}" ] ;
+ then
+ $mkdirprog "${pathcomp}"
+ else
+ true
+ fi
+
+ pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+ $doit $instcmd $dst &&
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+ if [ x"$transformarg" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ dstfile=`basename $dst $transformbasename |
+ sed $transformarg`$transformbasename
+ fi
+
+# don't allow the sed command to completely eliminate the filename
+
+ if [ x"$dstfile" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ true
+ fi
+
+# Make a temp file name in the proper directory.
+
+ dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+ $doit $instcmd $src $dsttmp &&
+
+ trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing. If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+ $doit $rmcmd -f $dstdir/$dstfile &&
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
+
+fi &&
+
+
+exit 0