[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:51:20 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d6e996561f39a6db8a6f996b245725e69e6e74ce
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 2 19:22:18 2001 +0000

    It's that time again: I have made a number of changes to the make system.
    
    The two major modification are:
    
    1. The tests directory, which was formerly buried in WebCore, has been moved to the top-level in Labyrinth, and is now a peer of WebCore and WebKit.
    
    2. I have moved the the configure and Makefiles from WebCore one directory up so that they may serve for all of Labyrinth. In other words, running `configure` and `make` in Labyrinth now builds "everything," including WebCore, WebKit, and the test programs.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/Makefile.in b/JavaScriptCore/kjs/Makefile.in
index c8b5f1c..b4aac99 100644
--- a/JavaScriptCore/kjs/Makefile.in
+++ b/JavaScriptCore/kjs/Makefile.in
@@ -35,7 +35,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -73,9 +73,13 @@ CXXOBJECTS = \
 
 PROGRAM = testkjs
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS) 
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib/kjs
+
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
 
 LIBRARY = libkjs.a
 
@@ -96,7 +100,7 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-objects
+all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 45453d8..603289a 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -10,7 +10,7 @@
 #======================================================================
 # Include header
 
-TOPSRCDIR = .
+TOPSRCDIR = ..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -29,17 +29,17 @@ SUBDIRS = \
 	src/kdelibs/khtml/rendering \
 	src/kdelibs/khtml \
 	src/kwq/ \
+	src/kwq/kde \
+	src/kwq/kdecore \
 	src/kwq/qt \
 	src/kwq/kde \
 	lib \
-	src/kwq/tests \
-	src/kwq/tests/qt \
 	$(NULL)
 
 #----------------------------------------------------------------------
 # Standard targets
 
-all depend setup install clean distclean maintainer-clean:		
+all depend setup install clean distclean maintainer-clean:
 	@target=$@; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
@@ -51,40 +51,8 @@ all depend setup install clean distclean maintainer-clean:
 			*) exit 1;; \
 		esac; \
 	done; \
-	echo ">>> Making local-$$target in `pwd`"; \
-	$(MAKE) local-$$target; \
 	$(NULL)	
 
-#----------------------------------------------------------------------
-# Custom targets
-
-test:
-	cd src/kwq/tests && \
-	$(MAKE) && \
-	./harness
-
-local-all:
-local-dep:
-local-install:
-local-setup:
-local-depend:
-local-clean:
-	
-local-distclean:
-	${MAKE} local-clean
-	rm -rf Makefile \
-	Makefile.rules \
-	Makefile.vars \
-	config.h \
-	config.cache \
-	config.log \
-	config.status \
-	$(NULL)
-	
-local-maintainer-clean:
-	rm -f configure;
-	${MAKE} local-distclean
-
 #======================================================================
 # end
 #======================================================================
diff --git a/WebCore/Makefile.rules.in b/WebCore/Makefile.rules.in
deleted file mode 100644
index 5009c61..0000000
--- a/WebCore/Makefile.rules.in
+++ /dev/null
@@ -1,104 +0,0 @@
-#======================================================================
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-# Make.rules boilerplate 
-#
-#======================================================================
-# Suffix rules
-#
-
-$(filter %.c,$(CLEXOBJECTS)): %.c: %.l
-	$(LEX) $(LEXFLAGS) $<
-
-$(filter %.cpp,$(CXXLEXOBJECTS)): %.cpp: %.l
-	$(LEX) $(LEXFLAGS) $<
-
-$(filter %.c,$(CYACCOBJECTS)): %.c: %.y
-	$(YACC) $(YACCFLAGS) $<
-
-$(filter %.cpp,$(CXXYACCOBJECTS)): %.cpp: %.y
-	$(YACC) $(YACCFLAGS) $<
-
-$(filter %.o,$(COBJECTS)): %.o: %.c
-	$(CC) $(CFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-$(filter %.o,$(CMMOBJECTS)): %.o: %.mm
-	$(CC) $(CFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-$(filter %.o,$(CMOBJECTS)): %.o: %.m
-	$(CC) $(CFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-$(filter %.o,$(CXXOBJECTS)): %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-.SUFFIXES: .cpp .h .c .mm .m .p
-
-.h.p:
-	$(CC) -precomp $(CCPRECOMPFLAGS) -I$(TOPSRCDIR) $*.h -o $*.p  
-
-.cpp.o:
-	$(CXX) $(CXXFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-.mm.o:
-	$(CC) $(CMMFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-.m.o:
-	$(CC) $(CMFLAGS) -I$(TOPSRCDIR) -c $< -o $@
-
-#----------------------------------------------------------------------
-# Standard subdir targets
-
-export-objects: $(EXPORT_OBJECTS)
-	if [ ! -d "$(EXPORT_OBJECTS_DIR)" ]; then \
-		rm -f $(EXPORT_OBJECTS_DIR); \
-		mkdir -p $(EXPORT_OBJECTS_DIR); \
-	fi
-	for OBJECT in $?; do \
-		ln -f $$OBJECT $(EXPORT_OBJECTS_DIR)/$$OBJECT; \
-	done
-	touch $@
-
-lib:
-	@$(MAKE)
-	if [ ! -d "$(TOPSRCDIR)/lib" ]; then \
-	rm -f $(EXPORT_OBJECTS_DIR); \
-	mkdir -p $(EXPORT_OBJECTS_DIR); \
-	fi
-	cd $(TOPSRCDIR)/lib; $(MAKE)
-
-setup:
-	@if (test -f "./MakeSystemChanges.sh"); then \
-		./MakeSystemChanges.sh; \
-	fi
-
-depend: 
-	$(CC) -MM $(DEPFLAGS) $(SOURCES) > Makefile.dep
-
-clean:
-	rm -rf ${CLEAN_FILES} core
-
-distclean:
-	${MAKE} clean
-	rm -f Makefile \
-	config.h \
-	config.cache \
-	config.log \
-	config.status \
-	$(NULL)
-
-maintainer-clean:
-	rm -f configure
-	${MAKE} distclean;
-	
-#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#======================================================================
-# end $RCSfile$
-#======================================================================
diff --git a/WebCore/Makefile.vars.in b/WebCore/Makefile.vars.in
deleted file mode 100644
index b2cf18b..0000000
--- a/WebCore/Makefile.vars.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#======================================================================
-#
-# $RCSfile$
-# $Revision$
-# $Author$
-# $Date$
-#
-# Makefile.in boilerplate 
-#
-#======================================================================
-# Shell
-
-SHELL = /bin/sh
-
-#----------------------------------------------------------------------
-# Variables
-
-PROGRAM =
-LIBRARY =
-LEXOBJECTS =
-YACCOBJECTS =
-COBJECTS =
-CXXOBJECTS =
-OBJECTS = 
-EXPORT_OBJECTS =
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib
-HEADERS =
-CLEAN_FILES = 
-
-#----------------------------------------------------------------------
-# Executables
-
-CC = @CC@
-CXX = @CXX@
-AR = @AR@
-LEX = @LEX@
-YACC = @YACC@
-RANLIB = @RANLIB@
-SED = @SED@
-INSTALL = @INSTALL@
-GPERF = gperf
-
-#----------------------------------------------------------------------
-# Flags
-
-BASEARFLAGS = @ARFLAGS@
-BASECFLAGS = @CFLAGS@
-BASECXXFLAGS = @CXXFLAGS@
-BASECMMFLAGS = @CXXFLAGS@
-BASELDFLAGS = @LDFLAGS@
-BASEYACCFLAGS = @YACCFLAGS@
-BASELEXFLAGS = @LEXFLAGS@
-BASEDYLIBFLAGS = @DYLIBFLAGS@
-BASECCPRECOMPFLAGS = @CXXFLAGS@
-
-ARFLAGS = $(BASEARFLAGS)
-CFLAGS = $(BASECFLAGS)
-CXXFLAGS = $(BASECXXFLAGS)
-CMMFLAGS = $(BASECMMFLAGS)
-LDFLAGS = $(BASELDFLAGS)
-YACCFLAGS = $(BASEYACCFLAGS)
-LEXFLAGS = $(BASELEXFLAGS)
-DYLIBFLAGS = $(BASEDYLIBFLAGS)
-CCPRECOMPFLAGS = $(BASECCPRECOMPFLAGS)
-
-DEPFLAGS = $(BASECXXFLAGS)
-
-#======================================================================
-# end $RCSfile$
-#======================================================================
diff --git a/WebCore/aclocal.m4 b/WebCore/aclocal.m4
deleted file mode 100644
index 03b0361..0000000
--- a/WebCore/aclocal.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl -------------------------------------------------------------------
-dnl
-dnl Local autoconf macros 
-dnl
-dnl $RCSfile$
-dnl $Revision$
-dnl $Author$
-dnl $Date$
-dnl
-dnl -------------------------------------------------------------------
-dnl
-dnl Sets the top directory for the build
-dnl
-dnl Usage: AC_PATH_SET_TOPSRCDIR(PROGRAM_NAME)
-dnl
-AC_DEFUN(AC_PATH_SET_TOPSRCDIR,
-[AC_MSG_CHECKING([top directory])
-ac_cv_path_TOPSRCDIR=`pwd`
-AC_MSG_RESULT(ok)
-])dnl
-dnl
-dnl
-dnl -------------------------------------------------------------------
-dnl
-dnl Sets the top directory for the build
-dnl
-dnl Usage: 
-dnl
-AC_DEFUN(AC_CHECK_ISSOCK, [
-AC_MSG_CHECKING([whether sys/stat.h declares S_ISSOCK])
-AC_TRY_COMPILE([#include <sys/stat.h>] ,[
-#ifndef S_ISSOCK
-#define S_ISSOCK no workie
-#endif
-void foo() {
-    int mode = S_ISSOCK(0);
-}
-], [
-    AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK,1)
-    AC_MSG_RESULT([yes])
-] , [
-    AC_MSG_RESULT([no])
-])
-])dnl
-dnl
-dnl -------------------------------------------------------------------
-dnl
-dnl#ifndef S_ISSOCK
-dnl#define S_ISSOCK does not compile
-dnl#endif
-dnlint main() {
-dnl    int i = S_ISSOCK(0);
-dnl    return 0;
-dnl}
diff --git a/WebCore/borrowed-classes.txt b/WebCore/borrowed-classes.txt
deleted file mode 100644
index f141fcd..0000000
--- a/WebCore/borrowed-classes.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-KURL
-QArray
-QBuffer
-QCollection
-QColor
-#QDateTime
-QDict
-QDir
-QFile
-QList
-QMap
-QPoint
-QPtrDict
-QRect
-QRegExp
-#QRegion
-QSize
-QSortedList
-QStack
-#QString
-QStringList
-QTextStream
-QValueList
-QVector
diff --git a/WebCore/config.err b/WebCore/config.err
deleted file mode 100644
index a5ad353..0000000
--- a/WebCore/config.err
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Script for handling errors encountered while configuring source code.
-# Copyright (C) 2000 Webcodex, Inc.
-# Webcodex, Inc.
-# 840 C Street, #621
-# San Rafael, CA 94901
-# http://www.webcodex.com
-
-# This program 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, 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in  
-  
-  -h|--h|--he|--hel|--help)
-    echo "
-This is 'config.err' - a script for handling configuration errors
-
-Usage: $0 [OPTION]... ERR [ARGUMENT]...
-
-Handle \`ERR [ARGUMENT]...' for ERR, or return an
-error status if there is no known handling for ERR.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported ERR values:
-  dir             Not in a supported directory
-  cc              No compiler for the C language
-  bison           No GNU bison
-  flex            No GNU flex
-"    
-	 ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo 1>&2 "
-This is 'config.err' - a script for handling configuration errors
-\$RCSfile$
-\$Revision$
-\$Author$
-\$Date$
-"	 
-	 ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-  
-  dir)
-    echo 1>&2 "
-*** ERROR: This script must run in a directory that ends with this path:
-\`$2'.  
-"     	 
-	 exit 1    
-	 ;;
-
-  cc)
-    echo 1>&2 "
-*** ERROR: Your system seems to be missing a C compiler.  You will need to 
-install one before you can to build and install this program.  Check with 
-the documentation for your system to see how best to acquire or locate a C 
-compiler.  
-"     	 
-	 exit 1    
-	 ;;
-
-  flex|bison)
-    echo 1>&2 "
-*** ERROR: \`$1' is missing on your system.  You will need to install 
-\`$1' to compile this program.  You can get the source code for this 
-program from any GNU archive site.
-"     	 
-	 exit 1    
-	 ;;
-
-  gperf)
-      echo 1>&2 "\
-*** ERROR: \`$1' is missing on your system.  It is required to build this
-tree. To obtain gperf, run the install-gperf.sh script that
-is available from cvs in the Labyrinth/Updates directory.
-If you have further questions, contact Ken Kocienda <kocienda at apple.com>
-"
-         exit 1
-         ;;
-
-	*) echo 1>&2 "
-*** ERROR: \`$1' is needed, and you do not seem to have it installed on 
-your system.  You might have modified some files in a manner that is not 
-yet supported.  Check the \`README' file.  It tells you about the 
-requirements for compiling and installing this package.  You may also 
-check at any GNU archive site, in case some other package might contain 
-this missing \`$1' program.
-" 
-	exit 1 
-	;; 
-
-esac 
-
-exit 0
diff --git a/WebCore/config.guess b/WebCore/config.guess
deleted file mode 100644
index 7fbe9e6..0000000
--- a/WebCore/config.guess
+++ /dev/null
@@ -1,1368 +0,0 @@
-#! /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-30'
-
-# 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 at cygnus.com>.
-# Please send patches to <config-patches at 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 at 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 at 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 at 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.*:* | m68*:LynxOS:3.0*:*)
-	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]*:* | i?86:LynxOS:4.0*:*)
-	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]*:* | PowerPC:LynxOS:4.0*:*)
-	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 at ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes at openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf at 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 at 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 --git a/WebCore/config.h.in b/WebCore/config.h.in
deleted file mode 100644
index 3e7f09d..0000000
--- a/WebCore/config.h.in
+++ /dev/null
@@ -1,950 +0,0 @@
-#ifndef CONFIG_H_
-#define CONFIG_H_
-
-/* Define for compiling in KWQ land */
-#undef _KWQ_
-
-/* Define for compiling in pedantic KWQ land */
-/* This adds pendantic C++ declarations to KDE/QT C++ code */
-#undef _KWQ_PEDANTIC_
-
-/* Define for using more complete Qt/KDE interfaces */
-/* This may also include "borrowed implementations */
-#ifndef _KWQ_COMPLETE_
-#undef _KWQ_COMPLETE_
-#endif
-
-/* Define for using KWQ-implementation of iostreams in KWQ classes */
-#undef _KWQ_IOSTREAM_
-
-/* Define for compiling bootstrap/borrowed Qt environment */
-/* This turns off support for Qt textstreams */
-#undef QT_NO_TEXTSTREAM
-
-/* Define for compiling bootstrap/borrowed Qt environment */
-/* This turns off support for Qt datastreams */
-#undef QT_NO_DATASTREAM
-
-/* Define for compiling bootstrap/borrowed Qt environment */
-/* This turns off support for Qt textcodecs */
-#undef QT_NO_TEXTCODEC
-
-/* Define for compiling bootstrap/borrowed Qt environment */
-/* Our platform requires this to handle certain Qt memory mgmt. conventions */
-#define Q_DELETING_VOID_UNDEFINED 1
-
-/* Define if using "borrowed" KURL */
-#undef USING_BORROWED_KURL
-
-/* Define if using "borrowed" QArray */
-#undef USING_BORROWED_QARRAY
-
-/* Define if using "borrowed" QBuffer */
-#undef USING_BORROWED_QBUFFER
-
-/* Define if using "borrowed" QCollection */
-#undef USING_BORROWED_QCOLLECTION
-
-/* Define if using "borrowed" QColor */
-#undef USING_BORROWED_QCOLOR
-
-/* Define if using "borrowed" QDateTime */
-#undef USING_BORROWED_QDATETIME
-
-/* Define if using "borrowed" QDict */
-#undef USING_BORROWED_QDICT
-
-/* Define if using "borrowed" QDir */
-#undef USING_BORROWED_QDIR
-
-/* Define if using "borrowed" QFile */
-#undef USING_BORROWED_QFILE
-
-/* Define if using "borrowed" QList */
-#undef USING_BORROWED_QLIST
-
-/* Define if using "borrowed" QMap */
-#undef USING_BORROWED_QMAP
-
-/* Define if using "borrowed" QPoint */
-#undef USING_BORROWED_QPOINT
-
-/* Define if using "borrowed" QPtrDict */
-#undef USING_BORROWED_QPTRDICT
-
-/* Define if using "borrowed" QRect */
-#undef USING_BORROWED_QRECT
-
-/* Define if using "borrowed" QRegExp */
-#undef USING_BORROWED_QREGEXP
-
-/* Define if using "borrowed" QRegion */
-#undef USING_BORROWED_QREGION
-
-/* Define if using "borrowed" QSize */
-#undef USING_BORROWED_QSIZE
-
-/* Define if using "borrowed" QSortedList */
-#undef USING_BORROWED_QSORTEDLIST
-
-/* Define if using "borrowed" QStack */
-#undef USING_BORROWED_QSTACK
-
-/* Define if using "borrowed" QString */
-#undef USING_BORROWED_QSTRING
-
-/* Define if using "borrowed" QStringList */
-#undef USING_BORROWED_QSTRINGLIST
-
-/* Define if using "borrowed" QTextStream */
-#undef USING_BORROWED_QTEXTSTREAM
-
-/* Define if using "borrowed" QValueList */
-#undef USING_BORROWED_QVALUELIST
-
-/* Define if using "borrowed" QVector */
-#undef USING_BORROWED_QVECTOR
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if you have <vfork.h>.  */
-#undef HAVE_VFORK_H
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef pid_t
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
-
-/* Define vfork as fork if vfork does not work.  */
-#undef vfork
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
-
-/* The number of bytes in a char *.  */
-#undef SIZEOF_CHAR_P
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a long.  */
-#undef SIZEOF_LONG
-
-/* Define if you have the _IceTransNoListen function.  */
-#undef HAVE__ICETRANSNOLISTEN
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the freeaddrinfo function.  */
-#undef HAVE_FREEADDRINFO
-
-/* Define if you have the gai_strerror function.  */
-#undef HAVE_GAI_STRERROR
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getgroups function.  */
-#undef HAVE_GETGROUPS
-
-/* Define if you have the gethostbyname2 function.  */
-#undef HAVE_GETHOSTBYNAME2
-
-/* Define if you have the gethostbyname2_r function.  */
-#undef HAVE_GETHOSTBYNAME2_R
-
-/* Define if you have the gethostbyname_r function.  */
-#undef HAVE_GETHOSTBYNAME_R
-
-/* Define if you have the getmntinfo function.  */
-#undef HAVE_GETMNTINFO
-
-/* Define if you have the getnameinfo function.  */
-#undef HAVE_GETNAMEINFO
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the getpeername function.  */
-#undef HAVE_GETPEERNAME
-
-/* Define if you have the getpt function.  */
-#undef HAVE_GETPT
-
-/* Define if you have the getsockname function.  */
-#undef HAVE_GETSOCKNAME
-
-/* Define if you have the getsockopt function.  */
-#undef HAVE_GETSOCKOPT
-
-/* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the grantpt function.  */
-#undef HAVE_GRANTPT
-
-/* Define if you have the inet_ntop function.  */
-#undef HAVE_INET_NTOP
-
-/* Define if you have the inet_pton function.  */
-#undef HAVE_INET_PTON
-
-/* Define if you have the initgroups function.  */
-#undef HAVE_INITGROUPS
-
-/* Define if you have the mkstemp function.  */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the mkstemps function.  */
-#undef HAVE_MKSTEMPS
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the openpty function.  */
-#undef HAVE_OPENPTY
-
-/* Define if you have the ptsname function.  */
-#undef HAVE_PTSNAME
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the random function.  */
-#undef HAVE_RANDOM
-
-/* Define if you have the res_init function.  */
-#undef HAVE_RES_INIT
-
-/* Define if you have the setegid function.  */
-#undef HAVE_SETEGID
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the seteuid function.  */
-#undef HAVE_SETEUID
-
-/* Define if you have the setfsent function.  */
-#undef HAVE_SETFSENT
-
-/* Define if you have the setgroups function.  */
-#undef HAVE_SETGROUPS
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the setmntent function.  */
-#undef HAVE_SETMNTENT
-
-/* Define if you have the setpriority function.  */
-#undef HAVE_SETPRIORITY
-
-/* Define if you have the socket function.  */
-#undef HAVE_SOCKET
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the strfmon function.  */
-#undef HAVE_STRFMON
-
-/* Define if you have the unlockpt function.  */
-#undef HAVE_UNLOCKPT
-
-/* Define if you have the unsetenv function.  */
-#undef HAVE_UNSETENV
-
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
-/* Define if you have the </usr/src/sys/gnu/i386/isa/sound/awe_voice.h> header file.  */
-#undef HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H
-
-/* Define if you have the </usr/src/sys/i386/isa/sound/awe_voice.h> header file.  */
-#undef HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H
-
-/* Define if you have the <X11/ICE/ICElib.h> header file.  */
-#undef HAVE_X11_ICE_ICELIB_H
-
-/* Define if you have the <X11/extensions/XShm.h> header file.  */
-#undef HAVE_X11_EXTENSIONS_XSHM_H
-
-/* Define if you have the <X11/extensions/shape.h> header file.  */
-#undef HAVE_X11_EXTENSIONS_SHAPE_H
-
-/* Define if you have the <alloca.h> header file.  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have the <ansidecl.h> header file.  */
-#undef HAVE_ANSIDECL_H
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <awe_voice.h> header file.  */
-#undef HAVE_AWE_VOICE_H
-
-/* Define if you have the <ctype.h> header file.  */
-#undef HAVE_CTYPE_H
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
-
-/* Define if you have the <float.h> header file.  */
-#undef HAVE_FLOAT_H
-
-/* Define if you have the <fnmatch.h> header file.  */
-#undef HAVE_FNMATCH_H
-
-/* Define if you have the <fp_class.h> header file.  */
-#undef HAVE_FP_CLASS_H
-
-/* Define if you have the <fstab.h> header file.  */
-#undef HAVE_FSTAB_H
-
-/* Define if you have the <ieeefp.h> header file.  */
-#undef HAVE_IEEEFP_H
-
-/* Define if you have the <libutil.h> header file.  */
-#undef HAVE_LIBUTIL_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <linux/awe_voice.h> header file.  */
-#undef HAVE_LINUX_AWE_VOICE_H
-
-/* Define if you have the <linux/socket.h> header file.  */
-#undef HAVE_LINUX_SOCKET_H
-
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <machine/soundcard.h> header file.  */
-#undef HAVE_MACHINE_SOUNDCARD_H
-
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <math.h> header file.  */
-#undef HAVE_MATH_H
-
-/* Define if you have the <mntent.h> header file.  */
-#undef HAVE_MNTENT_H
-
-/* Define if you have the <monetary.h> header file.  */
-#undef HAVE_MONETARY_H
-
-/* Define if you have the <nan.h> header file.  */
-#undef HAVE_NAN_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <netinet/in.h> header file.  */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <paths.h> header file.  */
-#undef HAVE_PATHS_H
-
-/* Define if you have the <pthread/linuxthreads/pthread.h> header file.  */
-#undef HAVE_PTHREAD_LINUXTHREADS_PTHREAD_H
-
-/* Define if you have the <pty.h> header file.  */
-#undef HAVE_PTY_H
-
-/* Define if you have the <sigaction.h> header file.  */
-#undef HAVE_SIGACTION_H
-
-/* Define if you have the <socketbits.h> header file.  */
-#undef HAVE_SOCKETBITS_H
-
-/* Define if you have the <soundcard.h> header file.  */
-#undef HAVE_SOUNDCARD_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <sys/acl.h> header file.  */
-#undef HAVE_SYS_ACL_H
-
-/* Define if you have the <sys/cdefs.h> header file.  */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/mman.h> header file.  */
-#undef HAVE_SYS_MMAN_H
-
-/* Define if you have the <sys/mnttab.h> header file.  */
-#undef HAVE_SYS_MNTTAB_H
-
-/* Define if you have the <sys/mount.h> header file.  */
-#undef HAVE_SYS_MOUNT_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/select.h> header file.  */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/socket.h> header file.  */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define if you have the <sys/soundcard.h> header file.  */
-#undef HAVE_SYS_SOUNDCARD_H
-
-/* Define if you have the <sys/stat.h> header file.  */
-#undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/types.h> header file.  */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if you have the <sys/ucred.h> header file.  */
-#undef HAVE_SYS_UCRED_H
-
-/* Define if you have the <sysent.h> header file.  */
-#undef HAVE_SYSENT_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <util.h> header file.  */
-#undef HAVE_UTIL_H
-
-/* Define if you have the <values.h> header file.  */
-#undef HAVE_VALUES_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* C++ compiler supports template repository */
-#undef HAVE_TEMPLATE_REPOSITORY
-
-/* Define if you have stpcpy */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define if you have a STL implementation by HP */
-#undef HAVE_HP_STL
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define the real type of socklen_t */
-#undef socklen_t
-
-/* Compatibility define */
-#undef ksize_t
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define if you want Xinerama support */
-#undef HAVE_XINERAMA
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libtiff */
-#undef HAVE_LIBTIFF
-
-/* Define if you have libtiff */
-#undef HAVE_LIBTIFF
-
-/* The prefix to use as fallback */
-#undef KDEDIR
-
-/* You _must_ have bool */
-#undef HAVE_BOOL
-
-/* Define if you have the usleep function */
-#undef HAVE_USLEEP
-
-/* Define if you have getdomainname */
-#undef HAVE_GETDOMAINNAME
-
-/* Define if you have getdomainname prototype */
-#undef HAVE_GETDOMAINNAME_PROTO
-
-/* Define if you have gethostname prototype */
-#undef HAVE_GETHOSTNAME_PROTO
-
-/* Define if you have gethostname */
-#undef HAVE_GETHOSTNAME
-
-/* Define if you have random */
-#undef HAVE_RANDOM
-
-/* Define if sys/stat.h declares S_ISSOCK. */
-#undef HAVE_S_ISSOCK
-
-/* Define the file for mount entries */
-#undef MTAB_FILE
-
-/* Define if using the dmalloc debugging malloc package */
-#undef WITH_DMALLOC
-
-/* Define if you want MIT-SHM support */
-#undef HAVE_MITSHM
-
-/* where rgb.txt is in */
-#undef X11_RGBFILE
-
-/* what C++ computer were used for compilation */
-#undef KDE_COMPILER_VERSION
-
-/* what OS used for compilation */
-#undef KDE_COMPILING_OS
-
-/* Distribution Text to append to OS */
-#undef KDE_DISTRIBUTION_TEXT
-
-/* Define if you have libaudioIO (required if you want to have libaudioio support) */
-#undef HAVE_LIBAUDIOIO
-
-/* Define if you have libaudio (required if you want to have NAS support) */
-#undef HAVE_LIBAUDIONAS
-
-/* Define if you have libaudiofile (required for playing wavs with aRts) */
-#undef HAVE_LIBAUDIOFILE
-
-/* Define if your system supports realtime scheduling */
-#undef HAVE_REALTIME_SCHED
-
-/* Define if you have getdomainname */
-#undef HAVE_GETDOMAINNAME
-
-/* Define if you have getdomainname prototype */
-#undef HAVE_GETDOMAINNAME_PROTO
-
-/* Define if ioctl is declared as int ioctl(int d, int request,...) */
-#undef HAVE_IOCTL_INT_INT_DOTS
-
-/* Define if ioctl is declared as int ioctl(int d, unsigned long request,...) */
-#undef HAVE_IOCTL_INT_ULONG_DOTS
-
-/* Define if ioctl is declared as int ioctl(int d, unsigned long int request,...) */
-#undef HAVE_IOCTL_INT_ULONGINT_DOTS
-
-/* Define if you want to use optimized x86 float to int conversion code */
-#undef HAVE_X86_FLOAT_INT
-
-/* Define if your assembler supports x86 SSE instructions */
-#undef HAVE_X86_SSE
-
-/* Define if you want to use glibc facilities to emulate stdio accesses in artsdsp */
-#undef HAVE_ARTSDSP_STDIO_EMU
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libasound (required for alsa support) */
-#undef HAVE_LIBASOUND
-
-/* Define if netdb.h defines struct addrinfo */
-#undef HAVE_STRUCT_ADDRINFO
-
-/* Define if getaddrinfo is present */
-#undef HAVE_GETADDRINFO
-
-/* Define if getaddrinfo is broken and should be replaced */
-#undef HAVE_BROKEN_GETADDRINFO
-
-/* Define if getaddrinfo returns AF_UNIX sockets */
-#undef GETADDRINFO_RETURNS_UNIX
-
-/* Define if getaddrinfo is broken and should be replaced */
-#undef HAVE_BROKEN_GETADDRINFO
-
-/* Define if getaddrinfo returns AF_UNIX sockets */
-#undef GETADDRINFO_RETURNS_UNIX
-
-/* Define if getaddrinfo returns AF_UNIX sockets */
-#undef GETADDRINFO_RETURNS_UNIX
-
-/* Define if getaddrinfo returns AF_UNIX sockets */
-#undef GETADDRINFO_RETURNS_UNIX
-
-/* Define if struct sockaddr has member sa_len */
-#undef HAVE_SOCKADDR_SA_LEN
-
-/* Define if we have struct sockaddr_in6 in netinet/in.h */
-#undef HAVE_SOCKADDR_IN6
-
-/* Define if this system already has sin6_scope_id in sockaddr_in6 */
-#undef HAVE_SOCKADDR_IN6_SCOPE_ID
-
-/* Lookup mode for IPv6 addresses: 0 for always, 1 for check and 2 for disabled */
-#undef KDE_IPV6_LOOKUP_MODE
-
-/* Lookup mode for IPv6 addresses: 0 for always, 1 for check and 2 for disabled */
-#undef KDE_IPV6_LOOKUP_MODE
-
-/* Lookup mode for IPv6 addresses: 0 for always, 1 for check and 2 for disabled */
-#undef KDE_IPV6_LOOKUP_MODE
-
-/* Lookup mode for IPv6 addresses: 0 for always, 1 for check and 2 for disabled */
-#undef KDE_IPV6_LOOKUP_MODE
-
-/* Defines if you have CUPS (Common UNIX Printing System) */
-#undef HAVE_CUPS
-
-/* path to su */
-#undef __PATH_SU
-
-/* Define if you have POSIX.1b scheduling */
-#undef POSIX1B_SCHEDULING
-
-/* KDE bindir */
-#undef __KDE_BINDIR
-
-/* Define if you have openpty in -lutil */
-#undef HAVE_OPENPTY
-
-/* Define if struct ucred is present from sys/socket.h */
-#undef HAVE_STRUCT_UCRED
-
-/* Defines the executable of xmllint */
-#undef XMLLINT
-
-/* Define if you have isnan */
-#undef HAVE_ISNAN
-
-/* Define if you have isinf */
-#undef HAVE_ISINF
-
-/* Define if you have pow */
-#undef HAVE_POW
-
-/* Define if you have floor */
-#undef HAVE_FLOOR
-
-/* Define if you have fabs */
-#undef HAVE_FABS
-
-/* Define if the libbz2 functions need the BZ2_ prefix */
-#undef NEED_BZ2_PREFIX
-
-/* Defines if bzip2 is compiled */
-#undef HAVE_BZIP2_SUPPORT
-
-/* Define if your system has libfam */
-#undef HAVE_FAM
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define, to enable volume management (Solaris 2.x), if you have -lvolmgt */
-#undef HAVE_VOLMGT
-
-/* Define if you need to use the GNU extensions */
-#undef _GNU_SOURCE
-
-/* Define if your system has Linux Directory Notification */
-#undef HAVE_DNOTIFY
-
-/* if setgroups() takes short *as second arg */
-#undef HAVE_SHORTSETGROUPS
-
-/* Define if you have isinf */
-#undef HAVE_FUNC_ISINF
-
-/* Define if you have finite */
-#undef HAVE_FUNC_FINITE
-
-/* Define if you have _finite */
-#undef HAVE_FUNC__FINITE
-
-/* Define if you have isnan */
-#undef HAVE_FUNC_ISNAN
-
-/* Define if you have pcreposix libraries and header files. */
-#undef HAVE_PCREPOSIX
-
-/* If we are going to use OpenSSL */
-#undef HAVE_SSL
-
-/* Define if you have OpenSSL < 0.9.6 */
-#undef HAVE_OLD_SSL_API
-
-/* this is included everywhere anyway (mostly indirecty)
-   and we need it for socklen_t being always available */
-#include <sys/types.h>
-
-/* provide a definition for a 32 bit entity, usable as a typedef, possibly
-   extended by "unsigned" */
-#undef INT32_BASETYPE
-#ifdef SIZEOF_INT
-#if SIZEOF_INT == 4
-#define INT32_BASETYPE int
-#endif
-#endif
-#if !defined(INT32_BASETYPE) && defined(SIZEOF_LONG)
-#if SIZEOF_LONG == 4
-#define INT32_BASETYPE long
-#endif
-#endif
-#ifndef INT32_BASETYPE
-#define INT32_BASETYPE int
-#endif
-
-/* this is needed for Solaris and others */
-#ifndef HAVE_GETDOMAINNAME_PROTO
-#define HAVE_GETDOMAINNAME_PROTO
-#ifdef __cplusplus
-extern "C"
-#endif
-int getdomainname (char *Name, int Namelen);
-#endif  
-
-#ifndef HAVE_GETHOSTNAME_PROTO
-#define HAVE_GETHOSTNAME_PROTO
-#ifdef __cplusplus  
-extern "C" 
-#endif
-int gethostname (char *Name, int Namelen);
-#endif  
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-/* random() returns a value between 0 and RANDOM_MAX.
- * RANDOM_MAX is needed to generate good random numbers. (Nicolas)
- */
-#ifndef HAVE_RANDOM
-#define HAVE_RANDOM
-#define RANDOM_MAX 2^31 
-#ifdef __cplusplus  
-extern "C" 
-#endif
-long int random(void); /* defined in fakes.c */
-#ifdef __cplusplus  
-extern "C" 
-#endif
-void srandom(unsigned int seed);
-#else
-/* normal random() */
-#define RANDOM_MAX RAND_MAX 
-#endif
-
-#ifndef HAVE_SETEUID
-#define HAVE_SETEUID
-#define HAVE_SETEUID_FAKE
-#ifdef __cplusplus
-extern "C"
-#endif
-int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */
-#endif
-
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-
-/* this is for Tru64 Unix (alias OSF, alias Digital Unix) */
-
-#ifdef __osf__
-#if !defined(__STDC__) || !__STDC__
-#define __STDC__  1
-#endif
-#define SOL_TCP 6
-typedef unsigned int   u_int32_t;
-typedef unsigned char  uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int   uint32_t;
-#include <stdarg.h>          /* va_start and the like */
-#define RTLD_GLOBAL 0        /* dlopen flag not known under Tru64  */
-#ifndef HAVE_USLEEP          /* usleep not defined in Tru64        */
-#ifdef __cplusplus  
-extern "C" void usleep(unsigned int);
-#else
-void usleep(unsigned int);
-#endif
-#endif
-#ifdef __cplusplus  
-extern "C" {
-#endif
-#include <sys/mount.h>
-int getmntinfo(struct statfs **mntbufp, int flags);
-#include <sys/fs_types.h>    /* for mnt_names[] */
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
- 
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus  
-extern "C" 
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-/* Bloody HP-UX (10.20) headers don't define all the res_xxx functions,
-   although they are there.  */
-#if defined(hpux) && defined(HAVE_RES_INIT)
-#ifdef __cplusplus
-extern "C"
-#endif
-void res_init (void);
-#endif
-
-#if !defined(HAVE_SETENV)
-#ifdef __cplusplus  
-extern "C" 
-#endif
-int setenv(const char *name, const char *value, int overwrite);
-#endif
-
-#if !defined(HAVE_UNSETENV)
-#ifdef __cplusplus  
-extern "C" 
-#endif
-int unsetenv(const char *name);
-#endif
-
-#if !defined(HAVE_MKSTEMPS)
-#ifdef __cplusplus  
-extern "C" 
-#endif
-int mkstemps (char* _template, int suffix_len); /* defined in fakes.c */
-#endif
-
-
-#if !defined(HAVE_MKSTEMP)
-#define HAVE_MKSTEMP
-#ifdef __cplusplus
-extern "C"
-#endif
-int mkstemp (char* _template); /* defined in fakes.c */
-#endif
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero. 
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-/*
- * AIX prior to 5.1 fails to provide a declaration for initgroups()
- */
-#if defined(_AIX) && !defined(_AIX43) && !defined(_AIX51)
-#include <grp.h>
-#ifdef __cplusplus
-extern "C"
-#endif
-int initgroups(char *, gid_t);  /* missing declaration in AIX < 5.1 */
-#endif
-
-/*
- * Steven Schultz <sms at to.gd-es.com> tells us :
- * BSD/OS 4.2 doesn't have a prototype for openpty in its system header files
- */
-#ifdef __bsdi__
-__BEGIN_DECLS
-int openpty(int *, int *, char *, struct termios *, struct winsize *);
-__END_DECLS
-#endif
-
-#endif 
diff --git a/WebCore/config.sub b/WebCore/config.sub
deleted file mode 100644
index 8af5d4f..0000000
--- a/WebCore/config.sub
+++ /dev/null
@@ -1,1361 +0,0 @@
-#! /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-30'
-
-# 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 at 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 at 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
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		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* \
-	      | -msvc* \
-	      | -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 --git a/WebCore/configure b/WebCore/configure
deleted file mode 100644
index ee19e5b..0000000
--- a/WebCore/configure
+++ /dev/null
@@ -1,3989 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-kwq-complete   enables more complete Qt/KDE interfaces (default on)"
-ac_help="$ac_help
-  --enable-kwq-pedantic   enables pedantic declarations in KWQ code (default on)"
-ac_help="$ac_help
-  --enable-kwq-iostream   enables iostream support for KWQ classes (default on)"
-ac_help="$ac_help
-  --enable-qt-textstream  enables Qt textstreams (default off)"
-ac_help="$ac_help
-  --enable-qt-datastream  enables Qt datastreams (default off)"
-ac_help="$ac_help
-  --enable-qt-textcodec   enables Qt textcodecs (default off)"
-ac_help="$ac_help
-  --enable-borrowed-kurl   enabled use of borrowed KURL (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qarray   enabled use of borrowed QArray (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qbuffer   enabled use of borrowed QBuffer (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qcollection   enabled use of borrowed QCollection (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qcolor   enabled use of borrowed QColor (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qdatetime   enabled use of borrowed QDateTime (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qdict   enabled use of borrowed QDict (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qdir   enabled use of borrowed QDir (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qfile   enabled use of borrowed QFile (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qlist   enabled use of borrowed QList (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qmap   enabled use of borrowed QMap (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qpoint   enabled use of borrowed QPoint (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qptrdict   enabled use of borrowed QPtrDict (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qrect   enabled use of borrowed QRect (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qregexp   enabled use of borrowed QRegExp (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qregion   enabled use of borrowed QRegion (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qsize   enabled use of borrowed QSize (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qsortedlist   enabled use of borrowed QSortedList (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qstack   enabled use of borrowed QStack (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qstring   enabled use of borrowed QString (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qstringlist   enabled use of borrowed QStringList (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qtextstream   enabled use of borrowed QTextStream (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qvaluelist   enabled use of borrowed QValueList (default on)"
-ac_help="$ac_help
-  --enable-borrowed-qvector   enabled use of borrowed QVector (default on)"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.vars.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
-WEBPAGEVIEW_MAJOR_VERSION=0
-WEBPAGEVIEW_MINOR_VERSION=0
-WEBPAGEVIEW_MICRO_VERSION=1
-WEBPAGEVIEW_VERSION=$WEBPAGEVIEW_MAJOR_VERSION.$WEBPAGEVIEW_MINOR_VERSION.$WEBPAGEVIEW_MICRO_VERSION
-
-VERSION=$WEBPAGEVIEW_VERSION
-PACKAGE=WEBPAGEVIEW
-
-
-
-
-
-cat >> confdefs.h <<EOF
-#define WEBPAGEVIEW_MAJOR_VERSION $WEBPAGEVIEW_MAJOR_VERSION
-EOF
-
-cat >> confdefs.h <<EOF
-#define WEBPAGEVIEW_MINOR_VERSION $WEBPAGEVIEW_MINOR_VERSION
-EOF
-
-cat >> confdefs.h <<EOF
-#define WEBPAGEVIEW_MICRO_VERSION $WEBPAGEVIEW_MICRO_VERSION
-EOF
-
-
-
-CONFIG_ERR=`pwd`/config.err
-
-
-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
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:644: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-case "$host" in
-*macosx*) cat >> confdefs.h <<\EOF
-#define MACOSX 1
-EOF
- ;;
-esac
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:675: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:705: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:756: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:788: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 799 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:830: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:835: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:863: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-if test -z "$ac_cv_prog_CC"; then 
-	$CONFIG_ERR cc
-	exit 1
-fi
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:903: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$CXX" && break
-done
-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:935: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 946 "configure"
-#include "confdefs.h"
-
-int main(){return(0);}
-EOF
-if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:977: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:982: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
-else
-  ac_cv_prog_gxx=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1010: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
-else
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS="$ac_save_CXXFLAGS"
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-
-if test -z "$ac_cv_prog_CXX"; then 
-	$CONFIG_ERR c++
-	exit 1
-fi
-CFLAGS="-DHAVE_CONFIG_H -g -fno-common"
- 
-CXXFLAGS="$CFLAGS -fno-coalesce-static-vtables"
- 
-DYLIBFLAGS="-dynamiclib"
- 
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1053: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1068 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1085 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1102 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1135: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1169: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1177 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1211: checking lex output file root" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1232: checking whether yytext is a pointer" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $LEXLIB"
-cat > conftest.$ac_ext <<EOF
-#line 1244 "configure"
-#include "confdefs.h"
-`cat $LEX_OUTPUT_ROOT.c`
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_prog_lex_yytext_pointer=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"
-
-fi
-
-echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  cat >> confdefs.h <<\EOF
-#define YYTEXT_POINTER 1
-EOF
-
-fi
-
-for ac_prog in flex lex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1277: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$LEX" && break
-done
-
-if test -z "$ac_cv_prog_LEX"; then 
-	$CONFIG_ERR lex
-	exit 1
-fi
-LEXFLAGS="-I -d"
- 
-
-for ac_prog in bison
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YACC" && break
-done
-
-if test "$ac_cv_prog_YACC" != "bison"; then 
-	$CONFIG_ERR bison
-	exit 1
-fi
-YACCFLAGS="-d"
- 
-
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1357: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$ac_cv_prog_AR"; then 
-	$CONFIG_ERR ar
-	exit 1
-fi
-ARFLAGS="cr"
- 
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1393: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$ac_cv_prog_RANLIB"; then 
-	$CONFIG_ERR ranlib
-	exit 1
-fi
-
-for ac_prog in sed
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1430: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$SED"; then
-  ac_cv_prog_SED="$SED" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_SED="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-SED="$ac_cv_prog_SED"
-if test -n "$SED"; then
-  echo "$ac_t""$SED" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$SED" && break
-done
-
-if test -z "$ac_cv_prog_SED"; then 
-	$CONFIG_ERR sed
-	exit 1
-fi
-
-# Extract the first word of "gperf", so it can be a program name with args.
-set dummy gperf; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1467: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GPERF'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GPERF"; then
-  ac_cv_prog_GPERF="$GPERF" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GPERF="gperf"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GPERF="$ac_cv_prog_GPERF"
-if test -n "$GPERF"; then
-  echo "$ac_t""$GPERF" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$ac_cv_prog_GPERF"; then 
-	$CONFIG_ERR gperf
-	exit 1
-fi
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1499: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
- 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1537: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-
-echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:1612: checking whether stat file-mode macros are broken" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1617 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(S_ISBLK) && defined(S_IFDIR)
-# if S_ISBLK (S_IFDIR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISBLK) && defined(S_IFCHR)
-# if S_ISBLK (S_IFCHR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISLNK) && defined(S_IFREG)
-# if S_ISLNK (S_IFREG)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISSOCK) && defined(S_IFREG)
-# if S_ISSOCK (S_IFREG)
-You lose.
-# endif
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "You lose" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_header_stat_broken=yes
-else
-  rm -rf conftest*
-  ac_cv_header_stat_broken=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
-if test $ac_cv_header_stat_broken = yes; then
-  cat >> confdefs.h <<\EOF
-#define STAT_MACROS_BROKEN 1
-EOF
-
-fi
- 
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1672: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1677 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
-EOF
-if { (eval echo configure:1685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- ac_header_dirent=$ac_hdr; break
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1710: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldir  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1718 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -ldir"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1751: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lx  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1759 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lx"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1793: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1798 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1823 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1841 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1862 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1900: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1905 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in fnmatch.h sysent.h strings.h sys/stat.h sys/select.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1940: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1945 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sys/socket.h socketbits.h sigaction.h paths.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1980: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1985 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
- 
-for ac_hdr in malloc.h limits.h dlfcn.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2020: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2025 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-echo $ac_n "checking for jpeg_mem_init in -ljpeg""... $ac_c" 1>&6
-echo "configure:2059: checking for jpeg_mem_init in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_'jpeg_mem_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ljpeg  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2067 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char jpeg_mem_init();
-
-int main() {
-jpeg_mem_init()
-; return 0; }
-EOF
-if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ljpeg $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2108: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2113 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:2162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2183: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 2190 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:2197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2223: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2228 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-int main() {
-struct tm *tp;
-; return 0; }
-EOF
-if { (eval echo configure:2237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_time=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_time=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_time" 1>&6
-if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\EOF
-#define TIME_WITH_SYS_TIME 1
-EOF
-
-fi
-
-
-echo $ac_n "checking whether sys/stat.h declares S_ISSOCK""... $ac_c" 1>&6
-echo "configure:2259: checking whether sys/stat.h declares S_ISSOCK" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2261 "configure"
-#include "confdefs.h"
-#include <sys/stat.h> 
-int main() {
-
-#ifndef S_ISSOCK
-#define S_ISSOCK no workie
-#endif
-void foo() {
-    int mode = S_ISSOCK(0);
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-    cat >> confdefs.h <<EOF
-#define HAVE_S_ISSOCK 1
-EOF
-
-    echo "$ac_t""yes" 1>&6
- 
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-    echo "$ac_t""no" 1>&6
-
-fi
-rm -f conftest*
-
-
-
-for ac_func in socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2299: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2304 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2360: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_pid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_pid_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define pid_t int
-EOF
-
-fi
-
-ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2394: checking for vfork.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
-#include "confdefs.h"
-#include <vfork.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VFORK_H 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2429: checking for working vfork" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:2435: checking for vfork" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2440 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vfork(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char vfork();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vfork) || defined (__stub___vfork)
-choke me
-#else
-vfork();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_vfork=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_vfork=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-ac_cv_func_vfork_works=$ac_cv_func_vfork
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2485 "configure"
-#include "confdefs.h"
-/* Thanks to Paul Eggert for this test.  */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_VFORK_H
-#include <vfork.h>
-#endif
-/* On some sparc systems, changes by the child to local and incoming
-   argument registers are propagated back to the parent.
-   The compiler is told about this with #include <vfork.h>,
-   but some compilers (e.g. gcc -O) don't grok <vfork.h>.
-   Test for this by using a static variable whose address
-   is put into a register that is clobbered by the vfork.  */
-static
-#ifdef __cplusplus
-sparc_address_test (int arg)
-#else
-sparc_address_test (arg) int arg;
-#endif
-{
-  static pid_t child;
-  if (!child) {
-    child = vfork ();
-    if (child < 0) {
-      perror ("vfork");
-      _exit(2);
-    }
-    if (!child) {
-      arg = getpid();
-      write(-1, "", 0);
-      _exit (arg);
-    }
-  }
-}
-main() {
-  pid_t parent = getpid ();
-  pid_t child;
-
-  sparc_address_test ();
-
-  child = vfork ();
-
-  if (child == 0) {
-    /* Here is another test for sparc vfork register problems.
-       This test uses lots of local variables, at least
-       as many local variables as main has allocated so far
-       including compiler temporaries.  4 locals are enough for
-       gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
-       A buggy compiler should reuse the register of parent
-       for one of the local variables, since it will think that
-       parent can't possibly be used any more in this routine.
-       Assigning to the local variable will thus munge parent
-       in the parent process.  */
-    pid_t
-      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
-      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
-    /* Convince the compiler that p..p7 are live; otherwise, it might
-       use the same hardware register for all 8 local variables.  */
-    if (p != p1 || p != p2 || p != p3 || p != p4
-	|| p != p5 || p != p6 || p != p7)
-      _exit(1);
-
-    /* On some systems (e.g. IRIX 3.3),
-       vfork doesn't separate parent from child file descriptors.
-       If the child closes a descriptor before it execs or exits,
-       this munges the parent's descriptor as well.
-       Test for this by closing stdout in the child.  */
-    _exit(close(fileno(stdout)) != 0);
-  } else {
-    int status;
-    struct stat st;
-
-    while (wait(&status) != child)
-      ;
-    exit(
-	 /* Was there some problem with vforking?  */
-	 child < 0
-
-	 /* Did the child fail?  (This shouldn't happen.)  */
-	 || status
-
-	 /* Did the vfork/compiler bug occur?  */
-	 || parent != getpid()
-
-	 /* Did the file descriptor bug occur?  */
-	 || fstat(fileno(stdout), &st) != 0
-	 );
-  }
-}
-EOF
-if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_vfork_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_vfork_works=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
-if test $ac_cv_func_vfork_works = no; then
-  cat >> confdefs.h <<\EOF
-#define vfork fork
-EOF
-
-fi
-
-
-for ac_hdr in ieeefp.h float.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2607: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2612 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2644: checking for isinf in -lm" >&5
-ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2652 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char isinf();
-
-int main() {
-isinf()
-; return 0; }
-EOF
-if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  cat >> confdefs.h <<EOF
-#define HAVE_FUNC_ISINF 1
-EOF
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2689: checking for finite in -lm" >&5
-ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2697 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char finite();
-
-int main() {
-finite()
-; return 0; }
-EOF
-if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  cat >> confdefs.h <<EOF
-#define HAVE_FUNC_FINITE 1
-EOF
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2734: checking for _finite in -lm" >&5
-ac_lib_var=`echo m'_'_finite | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2742 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _finite();
-
-int main() {
-_finite()
-; return 0; }
-EOF
-if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  cat >> confdefs.h <<EOF
-#define HAVE_FUNC__FINITE 1
-EOF
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2779: checking for isnan in -lm" >&5
-ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2787 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char isnan();
-
-int main() {
-isnan()
-; return 0; }
-EOF
-if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-  cat >> confdefs.h <<EOF
-#define HAVE_FUNC_ISNAN 1
-EOF
-
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-
-cat >> confdefs.h <<EOF
-#define _KWQ_ 1
-EOF
-
-
-# Check whether --enable-kwq-complete or --disable-kwq-complete was given.
-if test "${enable_kwq_complete+set}" = set; then
-  enableval="$enable_kwq_complete"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define _KWQ_COMPLETE_ 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define _KWQ_COMPLETE_ 1
-EOF
-
-
-fi
-
-
-# Check whether --enable-kwq-pedantic or --disable-kwq-pedantic was given.
-if test "${enable_kwq_pedantic+set}" = set; then
-  enableval="$enable_kwq_pedantic"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define _KWQ_PEDANTIC_ 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define _KWQ_PEDANTIC_ 1
-EOF
-
-
-fi
-
-
-# Check whether --enable-kwq-iostream or --disable-kwq-iostream was given.
-if test "${enable_kwq_iostream+set}" = set; then
-  enableval="$enable_kwq_iostream"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define _KWQ_IOSTREAM_ 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define _KWQ_IOSTREAM_ 1
-EOF
-
-
-fi
-
-
-# Check whether --enable-qt-no-textstream or --disable-qt-no-textstream was given.
-if test "${enable_qt_no_textstream+set}" = set; then
-  enableval="$enable_qt_no_textstream"
-  if ( test "$enableval" = "no" ); then
-    cat >> confdefs.h <<EOF
-#define QT_NO_TEXTSTREAM 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define QT_NO_TEXTSTREAM 1
-EOF
-
-
-fi
-
-
-# Check whether --enable-qt-no-datastream or --disable-qt-no-datastream was given.
-if test "${enable_qt_no_datastream+set}" = set; then
-  enableval="$enable_qt_no_datastream"
-  if ( test "$enableval" = "no" ); then
-    cat >> confdefs.h <<EOF
-#define QT_NO_DATASTREAM 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define QT_NO_DATASTREAM 1
-EOF
-
-
-fi
-
-
-# Check whether --enable-qt-no-textcodec or --disable-qt-no-textcodec was given.
-if test "${enable_qt_no_textcodec+set}" = set; then
-  enableval="$enable_qt_no_textcodec"
-  if ( test "$enableval" = "no" ); then
-    cat >> confdefs.h <<EOF
-#define QT_NO_TEXTCODEC 1
-EOF
-
-fi
-
-else
-  cat >> confdefs.h <<EOF
-#define QT_NO_TEXTCODEC 1
-EOF
-
-
-fi
-
-
-
-# Check whether --enable-borrowed-kurl or --disable-borrowed-kurl was given.
-if test "${enable_borrowed_kurl+set}" = set; then
-  enableval="$enable_borrowed_kurl"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_KURL 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^KURL$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_KURL 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qarray or --disable-borrowed-qarray was given.
-if test "${enable_borrowed_qarray+set}" = set; then
-  enableval="$enable_borrowed_qarray"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QARRAY 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QArray$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QARRAY 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qbuffer or --disable-borrowed-qbuffer was given.
-if test "${enable_borrowed_qbuffer+set}" = set; then
-  enableval="$enable_borrowed_qbuffer"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QBUFFER 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QBuffer$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QBUFFER 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qcollection or --disable-borrowed-qcollection was given.
-if test "${enable_borrowed_qcollection+set}" = set; then
-  enableval="$enable_borrowed_qcollection"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QCOLLECTION 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QCollection$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QCOLLECTION 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qcolor or --disable-borrowed-qcolor was given.
-if test "${enable_borrowed_qcolor+set}" = set; then
-  enableval="$enable_borrowed_qcolor"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QCOLOR 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QColor$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QCOLOR 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qdatetime or --disable-borrowed-qdatetime was given.
-if test "${enable_borrowed_qdatetime+set}" = set; then
-  enableval="$enable_borrowed_qdatetime"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDATETIME 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDateTime$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDATETIME 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qdict or --disable-borrowed-qdict was given.
-if test "${enable_borrowed_qdict+set}" = set; then
-  enableval="$enable_borrowed_qdict"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDICT 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDict$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDICT 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qdir or --disable-borrowed-qdir was given.
-if test "${enable_borrowed_qdir+set}" = set; then
-  enableval="$enable_borrowed_qdir"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDIR 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDir$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QDIR 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qfile or --disable-borrowed-qfile was given.
-if test "${enable_borrowed_qfile+set}" = set; then
-  enableval="$enable_borrowed_qfile"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QFILE 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QFile$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QFILE 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qlist or --disable-borrowed-qlist was given.
-if test "${enable_borrowed_qlist+set}" = set; then
-  enableval="$enable_borrowed_qlist"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QLIST 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QLIST 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qmap or --disable-borrowed-qmap was given.
-if test "${enable_borrowed_qmap+set}" = set; then
-  enableval="$enable_borrowed_qmap"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QMAP 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QMap$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QMAP 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qpoint or --disable-borrowed-qpoint was given.
-if test "${enable_borrowed_qpoint+set}" = set; then
-  enableval="$enable_borrowed_qpoint"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QPOINT 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QPoint$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QPOINT 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qptrdict or --disable-borrowed-qptrdict was given.
-if test "${enable_borrowed_qptrdict+set}" = set; then
-  enableval="$enable_borrowed_qptrdict"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QPTRDICT 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QPtrDict$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QPTRDICT 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qrect or --disable-borrowed-qrect was given.
-if test "${enable_borrowed_qrect+set}" = set; then
-  enableval="$enable_borrowed_qrect"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QRECT 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRect$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QRECT 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qregexp or --disable-borrowed-qregexp was given.
-if test "${enable_borrowed_qregexp+set}" = set; then
-  enableval="$enable_borrowed_qregexp"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QREGEXP 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRegExp$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QREGEXP 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qregion or --disable-borrowed-qregion was given.
-if test "${enable_borrowed_qregion+set}" = set; then
-  enableval="$enable_borrowed_qregion"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QREGION 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRegion$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QREGION 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qsize or --disable-borrowed-qsize was given.
-if test "${enable_borrowed_qsize+set}" = set; then
-  enableval="$enable_borrowed_qsize"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSIZE 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QSize$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSIZE 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qsortedlist or --disable-borrowed-qsortedlist was given.
-if test "${enable_borrowed_qsortedlist+set}" = set; then
-  enableval="$enable_borrowed_qsortedlist"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSORTEDLIST 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QSortedList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSORTEDLIST 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qstack or --disable-borrowed-qstack was given.
-if test "${enable_borrowed_qstack+set}" = set; then
-  enableval="$enable_borrowed_qstack"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTACK 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QStack$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTACK 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qstring or --disable-borrowed-qstring was given.
-if test "${enable_borrowed_qstring+set}" = set; then
-  enableval="$enable_borrowed_qstring"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTRING 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QString$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTRING 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qstringlist or --disable-borrowed-qstringlist was given.
-if test "${enable_borrowed_qstringlist+set}" = set; then
-  enableval="$enable_borrowed_qstringlist"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTRINGLIST 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QStringList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QSTRINGLIST 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qtextstream or --disable-borrowed-qtextstream was given.
-if test "${enable_borrowed_qtextstream+set}" = set; then
-  enableval="$enable_borrowed_qtextstream"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QTEXTSTREAM 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QTextStream$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QTEXTSTREAM 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qvaluelist or --disable-borrowed-qvaluelist was given.
-if test "${enable_borrowed_qvaluelist+set}" = set; then
-  enableval="$enable_borrowed_qvaluelist"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QVALUELIST 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QValueList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QVALUELIST 1
-EOF
-
-fi
-fi
-
-fi
-
-
-# Check whether --enable-borrowed-qvector or --disable-borrowed-qvector was given.
-if test "${enable_borrowed_qvector+set}" = set; then
-  enableval="$enable_borrowed_qvector"
-  if ( test "$enableval" = "yes" ); then
-    cat >> confdefs.h <<EOF
-#define USING_BORROWED_QVECTOR 1
-EOF
-
-fi
-
-else
-  if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QVector$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-cat >> confdefs.h <<EOF
-#define USING_BORROWED_QVECTOR 1
-EOF
-
-fi
-fi
-
-fi
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile
-	Makefile.vars
-	Makefile.rules
-	src/kdelibs/kjs/Makefile 
-	src/kdelibs/kdecore/Makefile 
-	src/kdelibs/khtml/misc/Makefile
-	src/kdelibs/khtml/css/Makefile
-	src/kdelibs/khtml/dom/Makefile
-	src/kdelibs/khtml/ecma/Makefile
-	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/java/Makefile
-	src/kdelibs/khtml/html/Makefile
-	src/kdelibs/khtml/rendering/Makefile
-	src/kdelibs/khtml/Makefile
-	src/kwq/Makefile
-	src/kwq/qt/Makefile
-	src/kwq/kde/Makefile
-	src/kwq/tests/Makefile
-	src/kwq/tests/qt/Makefile
-	lib/Makefile
- config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@WEBPAGEVIEW_MAJOR_VERSION@%$WEBPAGEVIEW_MAJOR_VERSION%g
-s%@WEBPAGEVIEW_MINOR_VERSION@%$WEBPAGEVIEW_MINOR_VERSION%g
-s%@WEBPAGEVIEW_MICRO_VERSION@%$WEBPAGEVIEW_MICRO_VERSION%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@DYLIBFLAGS@%$DYLIBFLAGS%g
-s%@CPP@%$CPP%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
-s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
-s%@LEXFLAGS@%$LEXFLAGS%g
-s%@YACC@%$YACC%g
-s%@YACCFLAGS@%$YACCFLAGS%g
-s%@AR@%$AR%g
-s%@ARFLAGS@%$ARFLAGS%g
-s%@RANLIB@%$RANLIB%g
-s%@SED@%$SED%g
-s%@GPERF@%$GPERF%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-	Makefile.vars
-	Makefile.rules
-	src/kdelibs/kjs/Makefile 
-	src/kdelibs/kdecore/Makefile 
-	src/kdelibs/khtml/misc/Makefile
-	src/kdelibs/khtml/css/Makefile
-	src/kdelibs/khtml/dom/Makefile
-	src/kdelibs/khtml/ecma/Makefile
-	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/java/Makefile
-	src/kdelibs/khtml/html/Makefile
-	src/kdelibs/khtml/rendering/Makefile
-	src/kdelibs/khtml/Makefile
-	src/kwq/Makefile
-	src/kwq/qt/Makefile
-	src/kwq/kde/Makefile
-	src/kwq/tests/Makefile
-	src/kwq/tests/qt/Makefile
-	lib/Makefile
-"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/WebCore/configure.in b/WebCore/configure.in
deleted file mode 100644
index fb13de6..0000000
--- a/WebCore/configure.in
+++ /dev/null
@@ -1,732 +0,0 @@
-AC_INIT(Makefile.vars.in)
-
-AC_CONFIG_HEADER(config.h)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Set the package and version
-dnl -------------------------------------------------------------------
-dnl
-
-WEBPAGEVIEW_MAJOR_VERSION=0
-WEBPAGEVIEW_MINOR_VERSION=0
-WEBPAGEVIEW_MICRO_VERSION=1
-WEBPAGEVIEW_VERSION=$WEBPAGEVIEW_MAJOR_VERSION.$WEBPAGEVIEW_MINOR_VERSION.$WEBPAGEVIEW_MICRO_VERSION
-
-VERSION=$WEBPAGEVIEW_VERSION
-PACKAGE=WEBPAGEVIEW
-
-AC_SUBST(WEBPAGEVIEW_MAJOR_VERSION)
-AC_SUBST(WEBPAGEVIEW_MINOR_VERSION)
-AC_SUBST(WEBPAGEVIEW_MICRO_VERSION)
-
-AC_DEFINE_UNQUOTED(WEBPAGEVIEW_MAJOR_VERSION,$WEBPAGEVIEW_MAJOR_VERSION)
-AC_DEFINE_UNQUOTED(WEBPAGEVIEW_MINOR_VERSION,$WEBPAGEVIEW_MINOR_VERSION)
-AC_DEFINE_UNQUOTED(WEBPAGEVIEW_MICRO_VERSION,$WEBPAGEVIEW_MICRO_VERSION)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Set configuration error script
-dnl -------------------------------------------------------------------
-dnl
-
-CONFIG_ERR=`pwd`/config.err
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Check the host system configuration
-dnl -------------------------------------------------------------------
-dnl
-
-AC_CANONICAL_HOST
-case "$host" in
-*macosx*) AC_DEFINE(MACOSX) ;;
-esac
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Check for programs
-dnl -------------------------------------------------------------------
-dnl
-
-AC_PROG_CC
-if test -z "$ac_cv_prog_CC"; then 
-	$CONFIG_ERR cc
-	exit 1
-fi
-AC_PROG_CXX
-if test -z "$ac_cv_prog_CXX"; then 
-	$CONFIG_ERR c++
-	exit 1
-fi
-CFLAGS="-DHAVE_CONFIG_H -g -fno-common"
-AC_SUBST(CFLAGS) 
-CXXFLAGS="$CFLAGS -fno-coalesce-static-vtables"
-AC_SUBST(CXXFLAGS) 
-DYLIBFLAGS="-dynamiclib"
-AC_SUBST(DYLIBFLAGS) 
-
-AC_DECL_YYTEXT
-AC_CHECK_PROGS(LEX, flex lex)
-if test -z "$ac_cv_prog_LEX"; then 
-	$CONFIG_ERR lex
-	exit 1
-fi
-LEXFLAGS="-I -d"
-AC_SUBST(LEXFLAGS) 
-
-AC_CHECK_PROGS(YACC, bison)
-if test "$ac_cv_prog_YACC" != "bison"; then 
-	$CONFIG_ERR bison
-	exit 1
-fi
-YACCFLAGS="-d"
-AC_SUBST(YACCFLAGS) 
-
-AC_CHECK_PROG(AR, ar, ar)
-if test -z "$ac_cv_prog_AR"; then 
-	$CONFIG_ERR ar
-	exit 1
-fi
-ARFLAGS="cr"
-AC_SUBST(ARFLAGS) 
-
-AC_PROG_RANLIB
-if test -z "$ac_cv_prog_RANLIB"; then 
-	$CONFIG_ERR ranlib
-	exit 1
-fi
-
-AC_CHECK_PROGS(SED, sed)
-if test -z "$ac_cv_prog_SED"; then 
-	$CONFIG_ERR sed
-	exit 1
-fi
-
-AC_CHECK_PROG(GPERF, gperf, gperf)
-if test -z "$ac_cv_prog_GPERF"; then 
-	$CONFIG_ERR gperf
-	exit 1
-fi
-
-AC_PROG_MAKE_SET 
-AC_PROG_INSTALL
-
-AC_ARG_PROGRAM
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Checks for header files.
-dnl -------------------------------------------------------------------
-dnl
-
-AC_HEADER_STAT 
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sys/cdefs.h)
-AC_CHECK_HEADERS(fnmatch.h sysent.h strings.h sys/stat.h sys/select.h)
-AC_CHECK_HEADERS(sys/socket.h socketbits.h sigaction.h paths.h) 
-AC_CHECK_HEADERS(malloc.h limits.h dlfcn.h)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Checks for libraries.
-dnl -------------------------------------------------------------------
-dnl
-
-AC_CHECK_LIB(jpeg,jpeg_mem_init)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl -------------------------------------------------------------------
-dnl
-
-AC_C_CONST
-AC_C_INLINE
-AC_HEADER_TIME
-AC_CHECK_ISSOCK
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Checks for library functions.
-dnl -------------------------------------------------------------------
-dnl
-
-AC_CHECK_FUNCS(socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps)
-AC_LANG_SAVE
-AC_LANG_C
-AC_FUNC_VFORK
-
-AC_CHECK_HEADERS(ieeefp.h float.h)
-AC_CHECK_LIB(m, isinf, [
-  AC_DEFINE_UNQUOTED(HAVE_FUNC_ISINF, 1, [Define if you have isinf])
-])
-AC_CHECK_LIB(m, finite, [
-  AC_DEFINE_UNQUOTED(HAVE_FUNC_FINITE, 1, [Define if you have finite])
-])
-AC_CHECK_LIB(m, _finite, [
-  AC_DEFINE_UNQUOTED(HAVE_FUNC__FINITE, 1, [Define if you have _finite])
-])
-AC_CHECK_LIB(m, isnan, [
-  AC_DEFINE_UNQUOTED(HAVE_FUNC_ISNAN, 1, [Define if you have isnan])
-])
-
-dnl AC_CHECK_GETDOMAINNAME
-dnl AC_CHECK_GETHOSTNAME
-dnl AC_CHECK_RANDOM
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Special tweaks for our environment
-dnl -------------------------------------------------------------------
-dnl
-
-dnl Define _KWQ_ to get hacks we've made to KDE/QT
-AC_DEFINE_UNQUOTED(_KWQ_, 1)
-
-AC_ARG_ENABLE(kwq-complete,
-[  --enable-kwq-complete   enables more complete Qt/KDE interfaces (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(_KWQ_COMPLETE_, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(_KWQ_COMPLETE_, 1)
-)
-
-AC_ARG_ENABLE(kwq-pedantic,
-[  --enable-kwq-pedantic   enables pedantic declarations in KWQ code (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(_KWQ_PEDANTIC_, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(_KWQ_PEDANTIC_, 1)
-)
-
-AC_ARG_ENABLE(kwq-iostream,
-[  --enable-kwq-iostream   enables iostream support for KWQ classes (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(_KWQ_IOSTREAM_, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(_KWQ_IOSTREAM_, 1)
-)
-
-AC_ARG_ENABLE(qt-no-textstream,
-[  --enable-qt-textstream  enables Qt textstreams (default off)],
-if ( test "$enableval" = "no" ); then
-    AC_DEFINE_UNQUOTED(QT_NO_TEXTSTREAM, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(QT_NO_TEXTSTREAM, 1)
-)
-
-AC_ARG_ENABLE(qt-no-datastream,
-[  --enable-qt-datastream  enables Qt datastreams (default off)],
-if ( test "$enableval" = "no" ); then
-    AC_DEFINE_UNQUOTED(QT_NO_DATASTREAM, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(QT_NO_DATASTREAM, 1)
-)
-
-AC_ARG_ENABLE(qt-no-textcodec,
-[  --enable-qt-textcodec   enables Qt textcodecs (default off)],
-if ( test "$enableval" = "no" ); then
-    AC_DEFINE_UNQUOTED(QT_NO_TEXTCODEC, 1)
-fi
-,
-AC_DEFINE_UNQUOTED(QT_NO_TEXTCODEC, 1)
-)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Set what we're borrowing and what we've implemented
-dnl -------------------------------------------------------------------
-dnl
-
-dnl
-dnl KURL borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-kurl,
-[  --enable-borrowed-kurl   enabled use of borrowed KURL (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_KURL, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^KURL$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_KURL, 1)
-fi
-fi
-)
-
-dnl
-dnl QArray borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qarray,
-[  --enable-borrowed-qarray   enabled use of borrowed QArray (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QARRAY, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QArray$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QARRAY, 1)
-fi
-fi
-)
-
-dnl
-dnl QBuffer borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qbuffer,
-[  --enable-borrowed-qbuffer   enabled use of borrowed QBuffer (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QBUFFER, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QBuffer$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QBUFFER, 1)
-fi
-fi
-)
-
-dnl
-dnl QCollection borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qcollection,
-[  --enable-borrowed-qcollection   enabled use of borrowed QCollection (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QCOLLECTION, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QCollection$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QCOLLECTION, 1)
-fi
-fi
-)
-
-dnl
-dnl QColor borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qcolor,
-[  --enable-borrowed-qcolor   enabled use of borrowed QColor (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QCOLOR, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QColor$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QCOLOR, 1)
-fi
-fi
-)
-
-dnl
-dnl QDateTime borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qdatetime,
-[  --enable-borrowed-qdatetime   enabled use of borrowed QDateTime (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QDATETIME, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDateTime$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QDATETIME, 1)
-fi
-fi
-)
-
-dnl
-dnl QDict borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qdict,
-[  --enable-borrowed-qdict   enabled use of borrowed QDict (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QDICT, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDict$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QDICT, 1)
-fi
-fi
-)
-
-dnl
-dnl QDir borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qdir,
-[  --enable-borrowed-qdir   enabled use of borrowed QDir (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QDIR, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QDir$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QDIR, 1)
-fi
-fi
-)
-
-dnl
-dnl QFile borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qfile,
-[  --enable-borrowed-qfile   enabled use of borrowed QFile (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QFILE, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QFile$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QFILE, 1)
-fi
-fi
-)
-
-dnl
-dnl QList borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qlist,
-[  --enable-borrowed-qlist   enabled use of borrowed QList (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QLIST, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QLIST, 1)
-fi
-fi
-)
-
-dnl
-dnl QMap borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qmap,
-[  --enable-borrowed-qmap   enabled use of borrowed QMap (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QMAP, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QMap$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QMAP, 1)
-fi
-fi
-)
-
-dnl
-dnl QPoint borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qpoint,
-[  --enable-borrowed-qpoint   enabled use of borrowed QPoint (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QPOINT, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QPoint$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QPOINT, 1)
-fi
-fi
-)
-
-dnl
-dnl QPtrDict borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qptrdict,
-[  --enable-borrowed-qptrdict   enabled use of borrowed QPtrDict (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QPTRDICT, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QPtrDict$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QPTRDICT, 1)
-fi
-fi
-)
-
-dnl
-dnl QRect borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qrect,
-[  --enable-borrowed-qrect   enabled use of borrowed QRect (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QRECT, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRect$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QRECT, 1)
-fi
-fi
-)
-
-dnl
-dnl QRegExp borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qregexp,
-[  --enable-borrowed-qregexp   enabled use of borrowed QRegExp (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QREGEXP, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRegExp$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QREGEXP, 1)
-fi
-fi
-)
-
-dnl
-dnl QRegion borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qregion,
-[  --enable-borrowed-qregion   enabled use of borrowed QRegion (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QREGION, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QRegion$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QREGION, 1)
-fi
-fi
-)
-
-dnl
-dnl QSize borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qsize,
-[  --enable-borrowed-qsize   enabled use of borrowed QSize (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QSIZE, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QSize$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QSIZE, 1)
-fi
-fi
-)
-
-dnl
-dnl QSortedList borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qsortedlist,
-[  --enable-borrowed-qsortedlist   enabled use of borrowed QSortedList (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QSORTEDLIST, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QSortedList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QSORTEDLIST, 1)
-fi
-fi
-)
-
-dnl
-dnl QStack borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qstack,
-[  --enable-borrowed-qstack   enabled use of borrowed QStack (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QSTACK, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QStack$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QSTACK, 1)
-fi
-fi
-)
-
-dnl
-dnl QString borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qstring,
-[  --enable-borrowed-qstring   enabled use of borrowed QString (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QSTRING, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QString$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QSTRING, 1)
-fi
-fi
-)
-
-dnl
-dnl QStringList borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qstringlist,
-[  --enable-borrowed-qstringlist   enabled use of borrowed QStringList (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QSTRINGLIST, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QStringList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QSTRINGLIST, 1)
-fi
-fi
-)
-
-dnl
-dnl QTextStream borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qtextstream,
-[  --enable-borrowed-qtextstream   enabled use of borrowed QTextStream (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QTEXTSTREAM, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QTextStream$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QTEXTSTREAM, 1)
-fi
-fi
-)
-
-dnl
-dnl QValueList borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qvaluelist,
-[  --enable-borrowed-qvaluelist   enabled use of borrowed QValueList (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QVALUELIST, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QValueList$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QVALUELIST, 1)
-fi
-fi
-)
-
-dnl
-dnl QVector borrowing 
-dnl
-AC_ARG_ENABLE(borrowed-qvector,
-[  --enable-borrowed-qvector   enabled use of borrowed QVector (default on)],
-if ( test "$enableval" = "yes" ); then
-    AC_DEFINE_UNQUOTED(USING_BORROWED_QVECTOR, 1)
-fi
-,
-if ( test -f borrowed-classes.txt )
-then
-BORROWED=`sed -e 's/^QVector$/yes/' borrowed-classes.txt | grep yes`
-if ( test "$BORROWED" = "yes" )
-then 
-AC_DEFINE_UNQUOTED(USING_BORROWED_QVECTOR, 1)
-fi
-fi
-)
-
-dnl
-dnl -------------------------------------------------------------------
-dnl Output files
-dnl -------------------------------------------------------------------
-dnl
-
-AC_OUTPUT(
-	Makefile
-	Makefile.vars
-	Makefile.rules
-	src/kdelibs/kjs/Makefile 
-	src/kdelibs/kdecore/Makefile 
-	src/kdelibs/khtml/misc/Makefile
-	src/kdelibs/khtml/css/Makefile
-	src/kdelibs/khtml/dom/Makefile
-	src/kdelibs/khtml/ecma/Makefile
-	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/java/Makefile
-	src/kdelibs/khtml/html/Makefile
-	src/kdelibs/khtml/rendering/Makefile
-	src/kdelibs/khtml/Makefile
-	src/kwq/Makefile
-	src/kwq/qt/Makefile
-	src/kwq/kde/Makefile
-	src/kwq/tests/Makefile
-	src/kwq/tests/qt/Makefile
-	lib/Makefile
-)
-
diff --git a/WebCore/include/.cvsignore b/WebCore/include/.cvsignore
index 4ed060c..7d0ebe6 100644
--- a/WebCore/include/.cvsignore
+++ b/WebCore/include/.cvsignore
@@ -1 +1,2 @@
 *.dummy
+private
diff --git a/WebCore/install-sh b/WebCore/install-sh
deleted file mode 100644
index e9de238..0000000
--- a/WebCore/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/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
diff --git a/WebCore/khtml/.cvsignore b/WebCore/khtml/.cvsignore
index 6bf3bf6..cd5b4d2 100644
--- a/WebCore/khtml/.cvsignore
+++ b/WebCore/khtml/.cvsignore
@@ -9,3 +9,4 @@ ir.out
 testkhtml_static
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/khtml/Makefile.in b/WebCore/khtml/Makefile.in
index 335eafc..de8841e 100644
--- a/WebCore/khtml/Makefile.in
+++ b/WebCore/khtml/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -22,9 +22,14 @@ CXXOBJECTS = \
     khtmlview.o \
     $(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -36,15 +41,15 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../kdecore \
 	-I../kjs \
 	-I./misc \
@@ -61,7 +66,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/css/.cvsignore b/WebCore/khtml/css/.cvsignore
index 687f319..1148efd 100644
--- a/WebCore/khtml/css/.cvsignore
+++ b/WebCore/khtml/css/.cvsignore
@@ -12,3 +12,4 @@ cssproperties.c
 cssproperties.strip
 cssproperties.h
 export-objects
+export-headers
diff --git a/WebCore/khtml/css/Makefile.in b/WebCore/khtml/css/Makefile.in
index 26c8e91..b19e876 100644
--- a/WebCore/khtml/css/Makefile.in
+++ b/WebCore/khtml/css/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -42,9 +42,14 @@ PROPFILES = \
 
 CFILES = $(VALUEFILES) $(PROPFILES)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlcss.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -57,15 +62,15 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../dom \
 	-I../html \
 	-I../misc \
@@ -79,7 +84,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CFILES) $(OBJECTS) export-objects
+all: $(CFILES) $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/dom/.cvsignore b/WebCore/khtml/dom/.cvsignore
index def1ee8..9b43b7e 100644
--- a/WebCore/khtml/dom/.cvsignore
+++ b/WebCore/khtml/dom/.cvsignore
@@ -3,3 +3,4 @@ Makefile.in
 *.kde
 *.dep
 export-objects
+export-headers
diff --git a/WebCore/khtml/dom/Makefile.in b/WebCore/khtml/dom/Makefile.in
index 58f8c3b..70761c1 100644
--- a/WebCore/khtml/dom/Makefile.in
+++ b/WebCore/khtml/dom/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -22,9 +22,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmldom.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -36,14 +41,14 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../css \
 	-I../html \
 	-I../misc \
@@ -57,7 +62,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/ecma/.cvsignore b/WebCore/khtml/ecma/.cvsignore
index 35b78ab..708a929 100644
--- a/WebCore/khtml/ecma/.cvsignore
+++ b/WebCore/khtml/ecma/.cvsignore
@@ -6,3 +6,4 @@ Makefile.in
 *.moc
 *.gperf
 export-objects
+export-headers
diff --git a/WebCore/khtml/ecma/Makefile.in b/WebCore/khtml/ecma/Makefile.in
index a02a9d1..6242626 100644
--- a/WebCore/khtml/ecma/Makefile.in
+++ b/WebCore/khtml/ecma/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlecma.a
 
 PROGRAM = testecma
@@ -36,12 +41,12 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../css \
 	-I../dom \
 	-I../html \
@@ -57,7 +62,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) export-objects
+all: $(OBJECTS) $(LIBRARY) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/html/.cvsignore b/WebCore/khtml/html/.cvsignore
index 9769007..c905f15 100644
--- a/WebCore/khtml/html/.cvsignore
+++ b/WebCore/khtml/html/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
 *.moc
 *.kde
 export-objects
+export-headers
diff --git a/WebCore/khtml/html/Makefile.in b/WebCore/khtml/html/Makefile.in
index 881e406..92da133 100644
--- a/WebCore/khtml/html/Makefile.in
+++ b/WebCore/khtml/html/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlhtml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -33,15 +38,15 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../../kdecore \
 	-I../../kjs \
 	-I.. \
@@ -59,7 +64,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/java/.cvsignore b/WebCore/khtml/java/.cvsignore
index 2e02a1b..58fe1e4 100644
--- a/WebCore/khtml/java/.cvsignore
+++ b/WebCore/khtml/java/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 *.dep
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/khtml/java/Makefile.in b/WebCore/khtml/java/Makefile.in
index 9057bae..eb718d7 100644
--- a/WebCore/khtml/java/Makefile.in
+++ b/WebCore/khtml/java/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -24,9 +24,14 @@ ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 SKIPOBJECTS = javaembed.o
 CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmljava.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -43,10 +48,10 @@ CLEAN_FILES = $(OBJECTS) \
 CXXFLAGS = $(BASECXXFLAGS) \
 	-DNEED_BOGUS_TEXTSTREAMS \
 	-DNEED_BOGUS_X_DEFINES \
-	-I$(TOPSRCDIR)/src/kwq \
-        -I$(TOPSRCDIR)/src/kwq/kde \
-        -I$(TOPSRCDIR)/src/kwq/qt \
-        -I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
         -I.. \
         -I. \
         $(NULL)
@@ -56,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/misc/.cvsignore b/WebCore/khtml/misc/.cvsignore
index 1385010..2334feb 100644
--- a/WebCore/khtml/misc/.cvsignore
+++ b/WebCore/khtml/misc/.cvsignore
@@ -11,3 +11,4 @@ htmlattrs.c
 htmlattrs.h
 htmlattrs.gperf
 export-objects
+export-headers
diff --git a/WebCore/khtml/misc/Makefile.in b/WebCore/khtml/misc/Makefile.in
index 0de5941..4ba1adb 100644
--- a/WebCore/khtml/misc/Makefile.in
+++ b/WebCore/khtml/misc/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -36,9 +36,14 @@ ATTRSFILES = \
 
 CFILES = $(TAGFILES) $(ATTRSFILES)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlmisc.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -51,13 +56,13 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
 	-I../dom \
 	-I../html \
 	-I../xml \
@@ -70,7 +75,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CFILES) $(OBJECTS) export-objects
+all: $(CFILES) $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/rendering/.cvsignore b/WebCore/khtml/rendering/.cvsignore
index 35b78ab..708a929 100644
--- a/WebCore/khtml/rendering/.cvsignore
+++ b/WebCore/khtml/rendering/.cvsignore
@@ -6,3 +6,4 @@ Makefile.in
 *.moc
 *.gperf
 export-objects
+export-headers
diff --git a/WebCore/khtml/rendering/Makefile.in b/WebCore/khtml/rendering/Makefile.in
index ca026b1..622f9e0 100644
--- a/WebCore/khtml/rendering/Makefile.in
+++ b/WebCore/khtml/rendering/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlrendering.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -34,15 +39,15 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
         -DNEED_BOGUS_X_DEFINES \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kfile \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../../kdecore \
 	-I../../kjs \
 	-I../html \
@@ -61,7 +66,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) export-objects
+all: $(OBJECTS) $(LIBRARY) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/xml/.cvsignore b/WebCore/khtml/xml/.cvsignore
index 2e02a1b..58fe1e4 100644
--- a/WebCore/khtml/xml/.cvsignore
+++ b/WebCore/khtml/xml/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 *.dep
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/khtml/xml/Makefile.in b/WebCore/khtml/xml/Makefile.in
index 3a1ec0e..ddfc9db 100644
--- a/WebCore/khtml/xml/Makefile.in
+++ b/WebCore/khtml/xml/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -35,9 +35,14 @@ CXXOBJECTS = \
 	xml_tokenizer.o \
 	$(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -54,12 +59,12 @@ CLEAN_FILES = $(OBJECTS) \
 CXXFLAGS = $(BASECXXFLAGS) \
     -DNEED_BOGUS_TEXTSTREAMS \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
-    -I$(TOPSRCDIR)/src/kwq/kdeui \
-    -I$(TOPSRCDIR)/src/kwq/khtml \
-    -I$(TOPSRCDIR)/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
     -I../css \
     -I../dom \
     -I../html \
@@ -73,7 +78,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 dom_docimpl.cpp: dom_docimpl.moc
 dom_docimpl.moc:
diff --git a/WebCore/kwq/.cvsignore b/WebCore/kwq/.cvsignore
index 34df4bd..0dd5e43 100644
--- a/WebCore/kwq/.cvsignore
+++ b/WebCore/kwq/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 *.dummy
 export-objects
+export-headers
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 07b3233..5c84a78 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../..
+TOPSRCDIR = ../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -127,9 +127,14 @@ MMOBJECTS = \
 MOBJECTS = \
 	$(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(MMOBJECTS) $(MOBJECTS)
 EXPORT_OBJECTS = $(OBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkwq.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -142,23 +147,23 @@ CLEAN_FILES = $(OBJECTS) \
 CMMFLAGS = $(BASECMMFLAGS) \
     -g \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/include \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/dom \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/html \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/misc \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/xml \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/dcop \
-    -I$(TOPSRCDIR)/src/kwq/qt \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
-    -I$(TOPSRCDIR)/src/kwq/kdeui \
-    -I$(TOPSRCDIR)/src/kwq/kfile \
-    -I$(TOPSRCDIR)/src/kwq/khtml \
-    -I$(TOPSRCDIR)/src/kwq/khtml/java \
-    -I$(TOPSRCDIR)/src/kwq/kio \
-    -I$(TOPSRCDIR)/src/kwq/kparts \
+    -I$(TOPSRCDIR)/WebCore/include \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/dom \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/html \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/misc \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/xml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml/java \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
     -I. \
     $(NULL)
 
@@ -166,11 +171,11 @@ DEPFLAGS = $(CMMFLAGS)
 
 CMFLAGS = $(BASECMFLAGS) \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/qt \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
     -I. \
     $(NULL)
 
@@ -179,7 +184,7 @@ DEPFLAGS = $(CMFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
diff --git a/WebCore/kwq/kde/.cvsignore b/WebCore/kwq/kde/.cvsignore
index 26585a5..f4dee06 100644
--- a/WebCore/kwq/kde/.cvsignore
+++ b/WebCore/kwq/kde/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 export-objects
+export-headers
diff --git a/WebCore/kwq/kde/Makefile.in b/WebCore/kwq/kde/Makefile.in
index d8b8cd8..125cfcb 100644
--- a/WebCore/kwq/kde/Makefile.in
+++ b/WebCore/kwq/kde/Makefile.in
@@ -9,18 +9,24 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
+HEADERS = $(wildcard *.h)
 SOURCES = $(wildcard *.cpp)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = lib_kde.a
 
 CLEAN_FILES = *.o \
@@ -43,7 +49,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/kwq/kdecore/.cvsignore b/WebCore/kwq/kdecore/.cvsignore
new file mode 100644
index 0000000..71f692b
--- /dev/null
+++ b/WebCore/kwq/kdecore/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+export-headers
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.in b/WebCore/kwq/kdecore/Makefile.in
similarity index 81%
copy from WebCore/src/kdelibs/kdecore/Makefile.in
copy to WebCore/kwq/kdecore/Makefile.in
index dab7779..7383c2e 100644
--- a/WebCore/src/kdelibs/kdecore/Makefile.in
+++ b/WebCore/kwq/kdecore/Makefile.in
@@ -9,23 +9,25 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CLEAN_FILES = kentities.c
+HEADERS = $(wildcard *.h)
 
-#----------------------------------------------------------------------
-# Set targets for this directory
+EXPORT_HEADERS = $(HEADERS)
+
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
 
-all: kentities.c
+CLEAN_FILES = \
+    $(NULL)
 
-depend:
+#----------------------------------------------------------------------
+# Set targets for this directory
 
-kentities.c: kentities.gperf
-	$(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
+all: export-headers
 
 #----------------------------------------------------------------------
 # include make rules boilerplate
diff --git a/WebCore/kwq/qt/.cvsignore b/WebCore/kwq/qt/.cvsignore
index b57ad68..e251683 100644
--- a/WebCore/kwq/qt/.cvsignore
+++ b/WebCore/kwq/qt/.cvsignore
@@ -3,3 +3,4 @@
 Makefile
 Makefile.dep
 export-objects
+export-headers
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/kwq/qt/Makefile.in
index aaa1715..4d344fd 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/kwq/qt/Makefile.in
@@ -9,18 +9,24 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
+HEADERS = $(wildcard *.h)
 SOURCES = $(wildcard *.cpp)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = lib_qt.a
 
 CLEAN_FILES = *.o \
@@ -41,7 +47,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/lib/Makefile.in b/WebCore/lib/Makefile.in
index 223f165..0b9be3d 100644
--- a/WebCore/lib/Makefile.in
+++ b/WebCore/lib/Makefile.in
@@ -14,7 +14,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ..
+TOPSRCDIR = ../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
diff --git a/WebCore/makelibkde b/WebCore/makelibkde
deleted file mode 100644
index e01239a..0000000
--- a/WebCore/makelibkde
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-SUBLIBS=`find src/kdelibs -name 'lib*.a' -print`
-LIBRARY=libkde.a
-
-mkdir -p .objects
-cd .objects
-
-for SUBLIB in $SUBLIBS; do
-	ar x ../$SUBLIB
-done
-
-cd ..
-
-rm -f $LIBRARY
-ar cru $LIBRARY .objects/*.o
-ranlib $LIBRARY
-
-rm -rf .objects
diff --git a/WebCore/missing b/WebCore/missing
deleted file mode 100644
index 7789652..0000000
--- a/WebCore/missing
+++ /dev/null
@@ -1,190 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-# This program 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, 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/WebCore/mkinstalldirs b/WebCore/mkinstalldirs
deleted file mode 100644
index 6b3b5fc..0000000
--- a/WebCore/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.in b/WebCore/src/kdelibs/kdecore/Makefile.in
index dab7779..0f372cf 100644
--- a/WebCore/src/kdelibs/kdecore/Makefile.in
+++ b/WebCore/src/kdelibs/kdecore/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
diff --git a/WebCore/src/kdelibs/khtml/.cvsignore b/WebCore/src/kdelibs/khtml/.cvsignore
index 6bf3bf6..cd5b4d2 100644
--- a/WebCore/src/kdelibs/khtml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/.cvsignore
@@ -9,3 +9,4 @@ ir.out
 testkhtml_static
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/Makefile.in b/WebCore/src/kdelibs/khtml/Makefile.in
index 335eafc..de8841e 100644
--- a/WebCore/src/kdelibs/khtml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -22,9 +22,14 @@ CXXOBJECTS = \
     khtmlview.o \
     $(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -36,15 +41,15 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../kdecore \
 	-I../kjs \
 	-I./misc \
@@ -61,7 +66,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/css/.cvsignore b/WebCore/src/kdelibs/khtml/css/.cvsignore
index 687f319..1148efd 100644
--- a/WebCore/src/kdelibs/khtml/css/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/css/.cvsignore
@@ -12,3 +12,4 @@ cssproperties.c
 cssproperties.strip
 cssproperties.h
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
index 26c8e91..b19e876 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -42,9 +42,14 @@ PROPFILES = \
 
 CFILES = $(VALUEFILES) $(PROPFILES)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlcss.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -57,15 +62,15 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../dom \
 	-I../html \
 	-I../misc \
@@ -79,7 +84,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CFILES) $(OBJECTS) export-objects
+all: $(CFILES) $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/dom/.cvsignore b/WebCore/src/kdelibs/khtml/dom/.cvsignore
index def1ee8..9b43b7e 100644
--- a/WebCore/src/kdelibs/khtml/dom/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/dom/.cvsignore
@@ -3,3 +3,4 @@ Makefile.in
 *.kde
 *.dep
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in b/WebCore/src/kdelibs/khtml/dom/Makefile.in
index 58f8c3b..70761c1 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -22,9 +22,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmldom.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -36,14 +41,14 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../css \
 	-I../html \
 	-I../misc \
@@ -57,7 +62,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/ecma/.cvsignore b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
index 35b78ab..708a929 100644
--- a/WebCore/src/kdelibs/khtml/ecma/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
@@ -6,3 +6,4 @@ Makefile.in
 *.moc
 *.gperf
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
index a02a9d1..6242626 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlecma.a
 
 PROGRAM = testecma
@@ -36,12 +41,12 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../css \
 	-I../dom \
 	-I../html \
@@ -57,7 +62,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) export-objects
+all: $(OBJECTS) $(LIBRARY) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/html/.cvsignore b/WebCore/src/kdelibs/khtml/html/.cvsignore
index 9769007..c905f15 100644
--- a/WebCore/src/kdelibs/khtml/html/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/html/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
 *.moc
 *.kde
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.in b/WebCore/src/kdelibs/khtml/html/Makefile.in
index 881e406..92da133 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlhtml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -33,15 +38,15 @@ CLEAN_FILES = $(OBJECTS) \
 # Set flags for this directory
 
 CXXFLAGS = $(BASECXXFLAGS) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/khtml \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
-	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
 	-I../../kdecore \
 	-I../../kjs \
 	-I.. \
@@ -59,7 +64,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/java/.cvsignore b/WebCore/src/kdelibs/khtml/java/.cvsignore
index 2e02a1b..58fe1e4 100644
--- a/WebCore/src/kdelibs/khtml/java/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/java/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 *.dep
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in b/WebCore/src/kdelibs/khtml/java/Makefile.in
index 9057bae..eb718d7 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -24,9 +24,14 @@ ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 SKIPOBJECTS = javaembed.o
 CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmljava.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -43,10 +48,10 @@ CLEAN_FILES = $(OBJECTS) \
 CXXFLAGS = $(BASECXXFLAGS) \
 	-DNEED_BOGUS_TEXTSTREAMS \
 	-DNEED_BOGUS_X_DEFINES \
-	-I$(TOPSRCDIR)/src/kwq \
-        -I$(TOPSRCDIR)/src/kwq/kde \
-        -I$(TOPSRCDIR)/src/kwq/qt \
-        -I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+        -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
         -I.. \
         -I. \
         $(NULL)
@@ -56,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/misc/.cvsignore b/WebCore/src/kdelibs/khtml/misc/.cvsignore
index 1385010..2334feb 100644
--- a/WebCore/src/kdelibs/khtml/misc/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/misc/.cvsignore
@@ -11,3 +11,4 @@ htmlattrs.c
 htmlattrs.h
 htmlattrs.gperf
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in b/WebCore/src/kdelibs/khtml/misc/Makefile.in
index 0de5941..4ba1adb 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -36,9 +36,14 @@ ATTRSFILES = \
 
 CFILES = $(TAGFILES) $(ATTRSFILES)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlmisc.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -51,13 +56,13 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
 	-I$(TOPSRCDIR) \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
 	-I../dom \
 	-I../html \
 	-I../xml \
@@ -70,7 +75,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CFILES) $(OBJECTS) export-objects
+all: $(CFILES) $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/rendering/.cvsignore b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
index 35b78ab..708a929 100644
--- a/WebCore/src/kdelibs/khtml/rendering/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
@@ -6,3 +6,4 @@ Makefile.in
 *.moc
 *.gperf
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.in b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
index ca026b1..622f9e0 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
@@ -9,7 +9,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -19,9 +19,14 @@ SOURCES = $(wildcard *.cpp)
 HEADERS = $(wildcard *.h)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlrendering.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -34,15 +39,15 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = $(BASECXXFLAGS) \
         -DNEED_BOGUS_X_DEFINES \
-	-I$(TOPSRCDIR)/src/kwq \
-	-I$(TOPSRCDIR)/src/kwq/kde \
-	-I$(TOPSRCDIR)/src/kwq/qt \
-	-I$(TOPSRCDIR)/src/kwq/dcop \
-	-I$(TOPSRCDIR)/src/kwq/kdecore \
-	-I$(TOPSRCDIR)/src/kwq/kfile \
-	-I$(TOPSRCDIR)/src/kwq/kio \
-	-I$(TOPSRCDIR)/src/kwq/kdeui \
-	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I$(TOPSRCDIR)/WebCore/src/kwq \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+	-I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
 	-I../../kdecore \
 	-I../../kjs \
 	-I../html \
@@ -61,7 +66,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) export-objects
+all: $(OBJECTS) $(LIBRARY) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/xml/.cvsignore b/WebCore/src/kdelibs/khtml/xml/.cvsignore
index 2e02a1b..58fe1e4 100644
--- a/WebCore/src/kdelibs/khtml/xml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/xml/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 *.dep
 *.moc
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in b/WebCore/src/kdelibs/khtml/xml/Makefile.in
index 3a1ec0e..ddfc9db 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../../..
+TOPSRCDIR = ../../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -35,9 +35,14 @@ CXXOBJECTS = \
 	xml_tokenizer.o \
 	$(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -54,12 +59,12 @@ CLEAN_FILES = $(OBJECTS) \
 CXXFLAGS = $(BASECXXFLAGS) \
     -DNEED_BOGUS_TEXTSTREAMS \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
-    -I$(TOPSRCDIR)/src/kwq/kdeui \
-    -I$(TOPSRCDIR)/src/kwq/khtml \
-    -I$(TOPSRCDIR)/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
     -I../css \
     -I../dom \
     -I../html \
@@ -73,7 +78,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 dom_docimpl.cpp: dom_docimpl.moc
 dom_docimpl.moc:
diff --git a/WebCore/src/kdelibs/kjs/.cvsignore b/WebCore/src/kdelibs/kjs/.cvsignore
index cf0d15c..4afaf60 100644
--- a/WebCore/src/kdelibs/kjs/.cvsignore
+++ b/WebCore/src/kdelibs/kjs/.cvsignore
@@ -11,3 +11,4 @@ grammar.h
 *.kde
 *.dep
 export-objects
+export-headers
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in b/WebCore/src/kdelibs/kjs/Makefile.in
index c8b5f1c..b4aac99 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.in
+++ b/WebCore/src/kdelibs/kjs/Makefile.in
@@ -35,7 +35,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -73,9 +73,13 @@ CXXOBJECTS = \
 
 PROGRAM = testkjs
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS) 
 EXPORT_OBJECTS = $(CXXOBJECTS) 
-EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib/kjs
+
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
 
 LIBRARY = libkjs.a
 
@@ -96,7 +100,7 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-objects
+all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-headers export-objects 
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kwq/.cvsignore b/WebCore/src/kwq/.cvsignore
index 34df4bd..0dd5e43 100644
--- a/WebCore/src/kwq/.cvsignore
+++ b/WebCore/src/kwq/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 *.dummy
 export-objects
+export-headers
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 07b3233..5c84a78 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -12,7 +12,7 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../..
+TOPSRCDIR = ../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
@@ -127,9 +127,14 @@ MMOBJECTS = \
 MOBJECTS = \
 	$(NULL)
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(MMOBJECTS) $(MOBJECTS)
 EXPORT_OBJECTS = $(OBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = libkwq.a
 
 CLEAN_FILES = $(OBJECTS) \
@@ -142,23 +147,23 @@ CLEAN_FILES = $(OBJECTS) \
 CMMFLAGS = $(BASECMMFLAGS) \
     -g \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/include \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/dom \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/html \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/misc \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml/xml \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/dcop \
-    -I$(TOPSRCDIR)/src/kwq/qt \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
-    -I$(TOPSRCDIR)/src/kwq/kdeui \
-    -I$(TOPSRCDIR)/src/kwq/kfile \
-    -I$(TOPSRCDIR)/src/kwq/khtml \
-    -I$(TOPSRCDIR)/src/kwq/khtml/java \
-    -I$(TOPSRCDIR)/src/kwq/kio \
-    -I$(TOPSRCDIR)/src/kwq/kparts \
+    -I$(TOPSRCDIR)/WebCore/include \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/dom \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/html \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/misc \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml/xml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/dcop \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdeui \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kfile \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/khtml/java \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kio \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kparts \
     -I. \
     $(NULL)
 
@@ -166,11 +171,11 @@ DEPFLAGS = $(CMMFLAGS)
 
 CMFLAGS = $(BASECMFLAGS) \
     -I$(TOPSRCDIR) \
-    -I$(TOPSRCDIR)/src/kdelibs/khtml \
-    -I$(TOPSRCDIR)/src/kwq \
-    -I$(TOPSRCDIR)/src/kwq/qt \
-    -I$(TOPSRCDIR)/src/kwq/kde \
-    -I$(TOPSRCDIR)/src/kwq/kdecore \
+    -I$(TOPSRCDIR)/WebCore/src/kdelibs/khtml \
+    -I$(TOPSRCDIR)/WebCore/src/kwq \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/qt \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kde \
+    -I$(TOPSRCDIR)/WebCore/src/kwq/kdecore \
     -I. \
     $(NULL)
 
@@ -179,7 +184,7 @@ DEPFLAGS = $(CMFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
diff --git a/WebCore/src/kwq/kde/.cvsignore b/WebCore/src/kwq/kde/.cvsignore
index 26585a5..f4dee06 100644
--- a/WebCore/src/kwq/kde/.cvsignore
+++ b/WebCore/src/kwq/kde/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 export-objects
+export-headers
diff --git a/WebCore/src/kwq/kde/Makefile.in b/WebCore/src/kwq/kde/Makefile.in
index d8b8cd8..125cfcb 100644
--- a/WebCore/src/kwq/kde/Makefile.in
+++ b/WebCore/src/kwq/kde/Makefile.in
@@ -9,18 +9,24 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
+HEADERS = $(wildcard *.h)
 SOURCES = $(wildcard *.cpp)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = lib_kde.a
 
 CLEAN_FILES = *.o \
@@ -43,7 +49,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kwq/kdecore/.cvsignore b/WebCore/src/kwq/kdecore/.cvsignore
new file mode 100644
index 0000000..71f692b
--- /dev/null
+++ b/WebCore/src/kwq/kdecore/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+export-headers
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.in b/WebCore/src/kwq/kdecore/Makefile.in
similarity index 81%
copy from WebCore/src/kdelibs/kdecore/Makefile.in
copy to WebCore/src/kwq/kdecore/Makefile.in
index dab7779..7383c2e 100644
--- a/WebCore/src/kdelibs/kdecore/Makefile.in
+++ b/WebCore/src/kwq/kdecore/Makefile.in
@@ -9,23 +9,25 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CLEAN_FILES = kentities.c
+HEADERS = $(wildcard *.h)
 
-#----------------------------------------------------------------------
-# Set targets for this directory
+EXPORT_HEADERS = $(HEADERS)
+
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
 
-all: kentities.c
+CLEAN_FILES = \
+    $(NULL)
 
-depend:
+#----------------------------------------------------------------------
+# Set targets for this directory
 
-kentities.c: kentities.gperf
-	$(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
+all: export-headers
 
 #----------------------------------------------------------------------
 # include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/.cvsignore b/WebCore/src/kwq/qt/.cvsignore
index b57ad68..e251683 100644
--- a/WebCore/src/kwq/qt/.cvsignore
+++ b/WebCore/src/kwq/qt/.cvsignore
@@ -3,3 +3,4 @@
 Makefile
 Makefile.dep
 export-objects
+export-headers
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kwq/qt/Makefile.in
index aaa1715..4d344fd 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kwq/qt/Makefile.in
@@ -9,18 +9,24 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
+HEADERS = $(wildcard *.h)
 SOURCES = $(wildcard *.cpp)
 CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 
+EXPORT_HEADERS = $(HEADERS)
+
 OBJECTS = $(CXXOBJECTS)
 EXPORT_OBJECTS = $(CXXOBJECTS)
 
+EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+
 LIBRARY = lib_qt.a
 
 CLEAN_FILES = *.o \
@@ -41,7 +47,7 @@ DEPFLAGS = $(CXXFLAGS)
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) export-objects
+all: $(OBJECTS) export-headers export-objects 
 
 $(LIBRARY): $(OBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list