Added wxAccelerators (sort of)

Moved configure (once again)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile

@@ -58,7 +58,7 @@ user::
 makefiles:: recreate
 Makefiles:: recreate
 recreate::
-	@install/unix/setup/general/createall
+	@setup/general/createall
 
 # the following ones define what needs to be done to distribute the 
 # library and its components

config.guess

@@ -0,0 +1,599 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# 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 system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    alpha:OSF1:[VX]*:*)
+	# After 1.2, OSF1 uses "V1.3" for uname -r.
+	# After 4.x, OSF1 uses "X4.x" for uname -r.
+	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VX]//'`
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	# 1.2 uses "1.2" for uname -r.
+	echo alpha-dec-osf${UNAME_RELEASE}
+        exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    Pyramid*:OSx*:*:*)
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    sun4*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-unknown-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 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:4*:UMIPS)
+	echo mips-mips-riscos4sysv
+	exit 0 ;;
+    mips:*:5*:RISCos)
+	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=`uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${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[34]86:AIX:*:*)
+	echo i386-ibm-aix
+	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-cc} dummy.c -o dummy && ./dummy && rm 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:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | 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=4.${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 NetBSD 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/[3478]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-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-cc} dummy.c -o dummy && ./dummy && rm 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 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	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*C90:*:*:*)
+	echo c90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i[34]86:BSD/386:*:* | *: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 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo i386-unknown-cygwin32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`ld --help 2>&1`
+	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
+	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
+	  echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
+	  echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+	elif test "${UNAME_MACHINE}" = "alpha" ; then
+	  echo alpha-unknown-linux ; exit 0
+	else
+	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
+	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
+	  test ! -d /usr/lib/ldscripts/. \
+	    && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
+	  # Determine whether the default compiler is a.out or elf
+	  cat >dummy.c <<EOF
+main(argc, argv)
+int argc;
+char *argv[];
+{
+#ifdef __ELF__
+  printf ("%s-unknown-linux\n", argv[1]);
+#else
+  printf ("%s-unknown-linuxaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# 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[34]86:DYNIX/ptx:4*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    i[34]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}-unknown-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
+		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-unknown-sysv32
+	fi
+	exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-unknown-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 ;;
+    M680[234]0:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
+        uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4.3 && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m680[234]0:LynxOS:2.[23]*:*)
+	echo m68k-lynx-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i[34]86:LynxOS:2.[23]*:*)
+	echo i386-lynx-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.[23]*:*)
+	echo sparc-lynx-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.[23]*:*)
+	echo rs6000-lynx-lynxos${UNAME_RELEASE}
+	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 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    R3000:*System_V*:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        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`;
+  printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
+  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-unknown-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)
+  printf ("vax-dec-bsd\n"); exit (0);
+#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-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm 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
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1

config.sub

@@ -0,0 +1,927 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+# 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.
+
+# 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.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+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
+  linux-gnu*)
+    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)
+		os=
+		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/'`
+		;;
+	-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
+		;;
+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 | m68k | m68000 | m88k | ns32k | arm \
+		| arme[lb] | pyramid \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| alpha | we32k | ns16k | clipper | i370 | sh \
+		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
+		| pdp11 | mips64el | mips64orion | mips64orionel \
+		| sparc | sparclet | sparclite | sparc64)
+		basic_machine=$basic_machine-unknown
+		;;
+	# 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[3456]86)
+	  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.
+	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	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-cbm
+		;;
+	amigados)
+		basic_machine=m68k-cbm
+		os=-amigados
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	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
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	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
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-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
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[3456]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[3456]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[3456]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[3456]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	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
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	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
+		;;
+	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
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	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)
+		basic_machine=i586-intel
+		;;
+	pentiumpro | p6)
+		basic_machine=i686-intel
+		;;
+	pentium-* | p5-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	k5)
+		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+		basic_machine=i586-amd
+		;;
+	nexen)
+		# We don't have specific support for Nexgen yet, so just call it a Pentium
+		basic_machine=i586-nexgen
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-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
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	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
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	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
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	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.
+	mips)
+		basic_machine=mips-mips
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		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
+		;;
+	-unixware* | svr4*)
+		os=-sysv4
+		;;
+	-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* \
+	      | -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* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-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|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# 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*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-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*-semi)
+		os=-aout
+		;;
+        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
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigados
+		;;
+	*-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
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		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
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os

include/wx/gtk/accel.h

@@ -0,0 +1,106 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Robert
+// Modified by:
+// RCS-ID:      
+// Copyright:   (c) Robert Roebling
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GTKACCELH__
+#define __GTKACCELH__
+
+#ifdef __GNUG__
+#pragma interface "accel.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/event.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorEntry;
+class wxAcceleratorTable;
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+extern wxAcceleratorTable wxNullAcceleratorTable;
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+// Hold Ctrl key down
+#define wxACCEL_ALT     0x01
+
+// Hold Ctrl key down
+#define wxACCEL_CTRL    0x02
+
+ // Hold Shift key down
+#define wxACCEL_SHIFT   0x04
+
+ // Hold no other key
+#define wxACCEL_NORMAL  0x00
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorEntry
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorEntry
+{
+  public:
+
+    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
+      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
+
+    inline void Set(int flags, int keyCode, int cmd)
+      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
+
+    inline int GetFlags() const { return m_flags; }
+    inline int GetKeyCode() const { return m_keyCode; }
+    inline int GetCommand() const { return m_command; }
+
+    int  m_flags;
+    int  m_keyCode; // ASCII or virtual keycode
+    int  m_command; // Command id to generate
+};
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorTable
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorTable: public wxObject
+{
+  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+  
+  public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
+    ~wxAcceleratorTable();
+
+    inline wxAcceleratorTable(const wxAcceleratorTable& accel) 
+      { Ref(accel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable* accel) 
+      { if (accel) Ref(*accel); }
+    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) 
+      { if (*this == accel) return (*this); Ref(accel); return *this; }
+    inline bool operator == (const wxAcceleratorTable& accel) 
+      { return m_refData == accel.m_refData; }
+    inline bool operator != (const wxAcceleratorTable& accel) 
+      { return m_refData != accel.m_refData; }
+
+    bool Ok() const;
+    
+//  private:
+  
+    int GetCommand( wxKeyEvent &event ); 
+    
+};
+
+#endif

include/wx/gtk/app.h

@@ -15,6 +15,7 @@
 #pragma interface
 #endif
 
+#include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 

include/wx/gtk/window.h

@@ -26,6 +26,7 @@
 #include "wx/dc.h"
 #include "wx/region.h"
 #include "wx/dnd.h"
+#include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
 // global data
@@ -77,8 +78,10 @@ public:
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 
-  virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, 
-  virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
+                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual wxControl *CreateItem( const wxItemResource *childResource, 
+                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
@@ -131,6 +134,9 @@ public:
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 
+  virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
+  virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
+  
   bool IsBeingDeleted();
 
   void SetId( wxWindowID id );
@@ -211,11 +217,6 @@ public:
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
 
-//private:
-  virtual GtkWidget* GetConnectWidget(void);
-  virtual bool IsOwnGtkWindow( GdkWindow *window );
-
-public:
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
   virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
@@ -224,15 +225,14 @@ public:
   virtual int GetScrollRange( int orient ) const;
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
-  // return FALSE from here if the window doesn't want the focus
   virtual bool AcceptsFocus() const;
-
-  // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 
-
 public:         // cannot get private going yet
 
+  virtual GtkWidget* GetConnectWidget(void);
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
   void PostCreation();
@@ -240,47 +240,48 @@ public:         // cannot get private going yet
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
 
-  wxWindow       *m_parent;
+  wxWindow            *m_parent;
-  wxList          m_children;
+  wxList               m_children;
-  int             m_x,m_y;
+  int                  m_x,m_y;
-  int             m_width,m_height;
+  int                  m_width,m_height;
-  int             m_minWidth,m_minHeight;
+  int                  m_minWidth,m_minHeight;
-  int             m_maxWidth,m_maxHeight;
+  int                  m_maxWidth,m_maxHeight;
-  int             m_retCode;
+  int                  m_retCode;
-  wxEvtHandler   *m_eventHandler;
+  wxEvtHandler        *m_eventHandler;
-  wxValidator    *m_windowValidator;
+  wxValidator         *m_windowValidator;
-  wxDropTarget   *m_pDropTarget;
+  wxDropTarget        *m_pDropTarget;
-  wxWindowID      m_windowId;
+  wxWindowID           m_windowId;
-  wxCursor       *m_cursor;
+  wxCursor            *m_cursor;
-  wxFont          m_font;
+  wxFont               m_font;
-  wxColour        m_backgroundColour;
+  wxColour             m_backgroundColour;
-  wxColour        m_defaultBackgroundColour;
+  wxColour             m_defaultBackgroundColour;
-  wxColour        m_foregroundColour ;
+  wxColour             m_foregroundColour ;
-  wxColour        m_defaultForegroundColour;
+  wxColour             m_defaultForegroundColour;
-  wxRegion        m_updateRegion;
+  wxRegion             m_updateRegion;
-  long            m_windowStyle;
+  long                 m_windowStyle;
-  bool            m_isShown;
+  bool                 m_isShown;
-  bool            m_isEnabled;
+  bool                 m_isEnabled;
-  wxString        m_windowName;
+  wxString             m_windowName;
+  wxAcceleratorTable   m_acceleratorTable;
 
-  GtkWidget      *m_widget;
+  GtkWidget           *m_widget;
-  GtkWidget      *m_wxwindow;
+  GtkWidget           *m_wxwindow;
-  GtkAdjustment  *m_hAdjust,*m_vAdjust;
+  GtkAdjustment       *m_hAdjust,*m_vAdjust;
-  float           m_oldHorizontalPos;
+  float                m_oldHorizontalPos;
-  float           m_oldVerticalPos;
+  float                m_oldVerticalPos;
-  bool            m_needParent;
+  bool                 m_needParent;
-  bool            m_hasScrolling;
+  bool                 m_hasScrolling;
-  bool            m_hasVMT;
+  bool                 m_hasVMT;
-  bool            m_sizeSet;
+  bool                 m_sizeSet;
-  bool            m_resizing;
+  bool                 m_resizing;
 
-public:  // Layout section
+public:
 
-  wxLayoutConstraints * m_constraints;
+  wxLayoutConstraints *m_constraints;
-  wxList *              m_constraintsInvolvedIn;
+  wxList              *m_constraintsInvolvedIn;
-  wxSizer *             m_windowSizer;
+  wxSizer             *m_windowSizer;
-  wxWindow *            m_sizerParent;
+  wxWindow            *m_sizerParent;
-  bool                  m_autoLayout;
+  bool                 m_autoLayout;
 
   wxLayoutConstraints *GetConstraints() const;
   void SetConstraints( wxLayoutConstraints *constraints );

include/wx/gtk1/accel.h

@@ -0,0 +1,106 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Robert
+// Modified by:
+// RCS-ID:      
+// Copyright:   (c) Robert Roebling
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GTKACCELH__
+#define __GTKACCELH__
+
+#ifdef __GNUG__
+#pragma interface "accel.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/event.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorEntry;
+class wxAcceleratorTable;
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+extern wxAcceleratorTable wxNullAcceleratorTable;
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+// Hold Ctrl key down
+#define wxACCEL_ALT     0x01
+
+// Hold Ctrl key down
+#define wxACCEL_CTRL    0x02
+
+ // Hold Shift key down
+#define wxACCEL_SHIFT   0x04
+
+ // Hold no other key
+#define wxACCEL_NORMAL  0x00
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorEntry
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorEntry
+{
+  public:
+
+    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
+      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
+
+    inline void Set(int flags, int keyCode, int cmd)
+      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
+
+    inline int GetFlags() const { return m_flags; }
+    inline int GetKeyCode() const { return m_keyCode; }
+    inline int GetCommand() const { return m_command; }
+
+    int  m_flags;
+    int  m_keyCode; // ASCII or virtual keycode
+    int  m_command; // Command id to generate
+};
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorTable
+//-----------------------------------------------------------------------------
+
+class wxAcceleratorTable: public wxObject
+{
+  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+  
+  public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
+    ~wxAcceleratorTable();
+
+    inline wxAcceleratorTable(const wxAcceleratorTable& accel) 
+      { Ref(accel); }
+    inline wxAcceleratorTable(const wxAcceleratorTable* accel) 
+      { if (accel) Ref(*accel); }
+    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) 
+      { if (*this == accel) return (*this); Ref(accel); return *this; }
+    inline bool operator == (const wxAcceleratorTable& accel) 
+      { return m_refData == accel.m_refData; }
+    inline bool operator != (const wxAcceleratorTable& accel) 
+      { return m_refData != accel.m_refData; }
+
+    bool Ok() const;
+    
+//  private:
+  
+    int GetCommand( wxKeyEvent &event ); 
+    
+};
+
+#endif

include/wx/gtk1/app.h

@@ -15,6 +15,7 @@
 #pragma interface
 #endif
 
+#include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 

include/wx/gtk1/window.h

@@ -26,6 +26,7 @@
 #include "wx/dc.h"
 #include "wx/region.h"
 #include "wx/dnd.h"
+#include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
 // global data
@@ -77,8 +78,10 @@ public:
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 
-  virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, 
-  virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
+                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual wxControl *CreateItem( const wxItemResource *childResource, 
+                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
@@ -131,6 +134,9 @@ public:
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 
+  virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
+  virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
+  
   bool IsBeingDeleted();
 
   void SetId( wxWindowID id );
@@ -211,11 +217,6 @@ public:
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
 
-//private:
-  virtual GtkWidget* GetConnectWidget(void);
-  virtual bool IsOwnGtkWindow( GdkWindow *window );
-
-public:
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
   virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
@@ -224,15 +225,14 @@ public:
   virtual int GetScrollRange( int orient ) const;
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
-  // return FALSE from here if the window doesn't want the focus
   virtual bool AcceptsFocus() const;
-
-  // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 
-
 public:         // cannot get private going yet
 
+  virtual GtkWidget* GetConnectWidget(void);
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
   void PostCreation();
@@ -240,47 +240,48 @@ public:         // cannot get private going yet
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
 
-  wxWindow       *m_parent;
+  wxWindow            *m_parent;
-  wxList          m_children;
+  wxList               m_children;
-  int             m_x,m_y;
+  int                  m_x,m_y;
-  int             m_width,m_height;
+  int                  m_width,m_height;
-  int             m_minWidth,m_minHeight;
+  int                  m_minWidth,m_minHeight;
-  int             m_maxWidth,m_maxHeight;
+  int                  m_maxWidth,m_maxHeight;
-  int             m_retCode;
+  int                  m_retCode;
-  wxEvtHandler   *m_eventHandler;
+  wxEvtHandler        *m_eventHandler;
-  wxValidator    *m_windowValidator;
+  wxValidator         *m_windowValidator;
-  wxDropTarget   *m_pDropTarget;
+  wxDropTarget        *m_pDropTarget;
-  wxWindowID      m_windowId;
+  wxWindowID           m_windowId;
-  wxCursor       *m_cursor;
+  wxCursor            *m_cursor;
-  wxFont          m_font;
+  wxFont               m_font;
-  wxColour        m_backgroundColour;
+  wxColour             m_backgroundColour;
-  wxColour        m_defaultBackgroundColour;
+  wxColour             m_defaultBackgroundColour;
-  wxColour        m_foregroundColour ;
+  wxColour             m_foregroundColour ;
-  wxColour        m_defaultForegroundColour;
+  wxColour             m_defaultForegroundColour;
-  wxRegion        m_updateRegion;
+  wxRegion             m_updateRegion;
-  long            m_windowStyle;
+  long                 m_windowStyle;
-  bool            m_isShown;
+  bool                 m_isShown;
-  bool            m_isEnabled;
+  bool                 m_isEnabled;
-  wxString        m_windowName;
+  wxString             m_windowName;
+  wxAcceleratorTable   m_acceleratorTable;
 
-  GtkWidget      *m_widget;
+  GtkWidget           *m_widget;
-  GtkWidget      *m_wxwindow;
+  GtkWidget           *m_wxwindow;
-  GtkAdjustment  *m_hAdjust,*m_vAdjust;
+  GtkAdjustment       *m_hAdjust,*m_vAdjust;
-  float           m_oldHorizontalPos;
+  float                m_oldHorizontalPos;
-  float           m_oldVerticalPos;
+  float                m_oldVerticalPos;
-  bool            m_needParent;
+  bool                 m_needParent;
-  bool            m_hasScrolling;
+  bool                 m_hasScrolling;
-  bool            m_hasVMT;
+  bool                 m_hasVMT;
-  bool            m_sizeSet;
+  bool                 m_sizeSet;
-  bool            m_resizing;
+  bool                 m_resizing;
 
-public:  // Layout section
+public:
 
-  wxLayoutConstraints * m_constraints;
+  wxLayoutConstraints *m_constraints;
-  wxList *              m_constraintsInvolvedIn;
+  wxList              *m_constraintsInvolvedIn;
-  wxSizer *             m_windowSizer;
+  wxSizer             *m_windowSizer;
-  wxWindow *            m_sizerParent;
+  wxWindow            *m_sizerParent;
-  bool                  m_autoLayout;
+  bool                 m_autoLayout;
 
   wxLayoutConstraints *GetConstraints() const;
   void SetConstraints( wxLayoutConstraints *constraints );

include/wx/object.h

@@ -199,7 +199,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData *m_refData;
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
   wxObject_Serialize *m_serialObj;
 #endif
 };

include/wx/setup.h

@@ -19,7 +19,7 @@
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXGTK__)
-#include "wx/../../install/unix/setup/setup.h"
+#include "wx/../../setup/setup.h"
 #endif
 
 #endif

include/wx/wx.h

@@ -65,7 +65,7 @@
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif

samples/Makefile

@@ -1 +1 @@
-include ../install/unix/setup/general/makedirs
+include ../setup/general/makedirs

samples/config/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/controls/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/dialogs/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/dnd/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/docview/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/docvwmdi/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/dynamic/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/forty/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/grid/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/internat/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/layout/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/listctrl/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/mdi/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/memcheck/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/minimal/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/png/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/printing/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/resource/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/splitter/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/tab/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/thread/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/toolbar/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/treectrl/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

samples/validate/Makefile

@@ -1 +1 @@
-include ../../install/unix/setup/general/makeapp
+include ../../setup/general/makeapp

setup/.cvsignore

@@ -0,0 +1,4 @@
+Makefile
+Linux
+linux-gnu
+setup.h

setup/general/createall

@@ -0,0 +1,106 @@
+#! /bin/sh
+
+# Just grab dirbase/dir(s)
+readbase ()
+{
+    DIRBASE=$1
+    DIRCONTENTS=$2
+    for each in $DIRBASE/*
+    do
+	if test -d $each
+	then
+	    DIRCONTENTS="$DIRCONTENTS $each"
+	fi
+    done
+    echo $DIRCONTENTS
+}
+
+# Prefer subdir/src over subdir, use whichever available
+readbase2 ()
+{
+    DIRBASE=$1
+    DIRCONTENTS=$2
+    for each in $DIRBASE/*
+    do
+	if test -d $each
+	then
+	    if test -d $each/src
+	    then
+		DIRCONTENTS="$DIRCONTENTS $each/src"
+	    else
+		DIRCONTENTS="$DIRCONTENTS $each"
+	    fi
+	fi
+    done
+    echo $DIRCONTENTS
+}
+
+OS=$OSTYPE
+
+if test "x$OS" = x; then 
+  echo "please set the environment variable OSTYPE "
+  echo "to a value appropriate for your system."
+  echo "to do so type: setenv OSTYPE `uname`   for the csh, tcsh"
+  echo "               export OSTYPE=`uname`   for other shells"
+  exit 1
+fi
+
+SRC_DIR=`readbase src src`
+SAMPLES_DIR=`readbase2 samples`
+UTILS_DIR=`readbase2 utils`
+USER_DIR=`readbase2 user`
+
+ALL_DIR="$SRC_DIR $SAMPLES_DIR $UTILS_DIR $USER_DIR"
+
+echo Creating for: $OS
+
+# create defaults
+if test ! -d setup/$OS; then
+    mkdir setup/$OS
+fi
+
+SUBSTFILE=setup/$OS/substit
+
+# the substit file first
+if test -f setup/substit ; then
+  cat setup/substit | sed "s/*/@/g" > $SUBSTFILE;
+  rm -f setup/substit 
+fi
+# now the template file
+cat setup/maketmpl.in | sed -f $SUBSTFILE > setup/$OS/maketmpl
+
+# now the config header file
+#if test -f setup/wx_setup.h ; then
+#  cat setup/wx_setup.h > setup/$OS/wx_setup.h;
+#  rm -f setup/wx_setup.h
+#fi
+
+# create lib and bin directory
+if test ! -d lib; then
+  mkdir lib
+fi
+if test ! -d lib/$OS; then
+  mkdir lib/$OS
+fi
+if test ! -d bin; then
+  mkdir bin
+fi
+if test ! -d bin/$OS; then
+  mkdir bin/$OS
+fi
+
+# create makefiles
+for each in $ALL_DIR; do
+    DIR=$each/$OS
+    # create Makefile in directory
+    if test -r $each/Makefile.in ; then
+        # create directory
+        if test ! -d $DIR; then
+            echo "Creating Directory: $DIR..."
+	    mkdir $DIR
+        fi
+	echo "Creating: $DIR/Makefile..."
+	cat $each/Makefile.in | sed -f $SUBSTFILE > $DIR/Makefile
+	(cd $DIR; make subdirs > /dev/null;)
+    fi
+done

setup/general/jointar

@@ -0,0 +1,67 @@
+#! /bin/sh
+#
+# Written by Martin Sperl
+# (sperl@dsn.ast.univie.ac.at)
+#
+
+
+if test $# -lt 3 ; then
+  cat <<EOF
+Usage: `basename $0` <basedir> <SOURCE-FILES> <DESTINATION-FILS>
+  copies all files from the source-tar-files to the common
+  destination-tar-file with basedir as a common base directory.
+EOF
+  exit 0
+fi
+
+BaseDir="$1"
+shift
+
+Sourcefiles="$1"
+
+while test "$#" != 2 ; do
+  shift
+  Sourcefiles="$Sourcefiles $1"
+done
+
+shift
+Final=$1
+
+Destination=/tmp/join$$.tar
+
+touch $Destination
+
+curdir=`pwd`
+
+mkdir tmp$$
+mkdir tmp$$/$BaseDir
+
+#uncompress all files
+cd tmp$$/$BaseDir
+for each in $Sourcefiles ; do
+  ( \
+  if test `basename $each gz` != `basename $each` ; then \
+    gzip -dc ../../$each;\
+  else \
+    cat ../../$each;\
+  fi; \
+  ) | tar xf -
+done
+cd ..
+#now tar everything
+tar -cf $Destination *
+
+cd ..
+
+rm -fr tmp$$
+
+# goto old directory
+cd $curdir
+
+if test `basename $Final gz` != `basename $Final` ; then
+  gzip -c $Destination > $Final
+else
+  cat $Destination > $Final
+fi
+
+rm -f $Destination

setup/general/makeapp

@@ -0,0 +1,73 @@
+SHELL=/bin/sh
+
+OS=$(OSTYPE)
+
+all::
+	-@if test "x$(OS)" = x; then \
+          echo "please set the environment variable OSTYPE ";\
+	  echo "to a value appropriate for your system.";\
+	  echo "to do so type: setenv OSTYPE `uname`   for the csh, tcsh";\
+          echo "               export OSTYPE=`uname`   for other shells";\
+        else \
+	  if test -f Makefile.in ; then \
+	    if test -f $(OS)/Makefile ; then \
+	      NEEDED=`(cd $(OS); ${MAKE} checkneeds;) | grep "needed to compile" `;\
+	      if test "x$$NEEDED" = x; then \
+	        (cd $(OS); ${MAKE} $@); \
+	      else \
+                (cd $(OS); ${MAKE} checkneeds); \
+	      fi ; \
+	    else \
+	      echo "Did you configure your system?";\
+	    fi; \
+	  fi; \
+	fi;
+
+distrib::
+	@if test ! -d ../../distrib ; then mkdir ../../distrib; fi;
+	@if test ! -f ../../system.list ; then \
+	 echo "dummy" > ../../system.list;\
+	fi
+	@(curr=`pwd`; direc=`basename $$curr`;\
+	 basedir=`dirname $$curr`;\
+         basedirname=`basename $$basedir`;\
+	 if test ! -d ../../distrib/$$basedirname ; then \
+	   mkdir ../../distrib/$$basedirname;\
+	 fi;\
+	 if test -d doc; then (cd doc; make clean;); fi;\
+	 (cd ..; \
+	  echo creating $$direc.tar from the current directory;\
+	  files="`\
+	       find $$direc -type f \
+	       | fgrep -vf ../system.list \
+	       | grep -v "~" \
+	       | grep -v "#" \
+	      ` $(DISTRIBUTE_ADDITIONAL)";\
+	  tar -cf /tmp/$$direc.tar $$files;\
+	  echo compressing $$direc.tar to $$direc.tgz;\
+	  gzip -c /tmp/$$direc.tar > ../distrib/$$basedirname/$$direc.tgz;\
+	  rm /tmp/$$direc.tar;\
+	 )\
+	)
+
+.DEFAULT:
+	-@if test "x$(OS)" = x; then \
+          echo "please set the environment variable OSTYPE ";\
+	  echo "to a value appropriate for your system.";\
+	  echo "to do so type: setenv OSTYPE `uname`   for the csh, tcsh";\
+          echo "               export OSTYPE=`uname`   for other shells";\
+        else \
+	  if test -f Makefile.in ; then \
+	    if test -f $(OS)/Makefile ; then \
+	      NEEDED=`(cd $(OS); ${MAKE} checkneeds) | grep "needed to compile" `;\
+	      if test "x$$NEEDED" = x; then \
+	        (cd $(OS); ${MAKE} $@); \
+	      else \
+                (cd $(OS); ${MAKE} checkneeds); \
+	      fi ; \
+	    else \
+	      echo "Did you configure your system?";\
+	    fi \
+	  fi \
+	fi
+

setup/general/makedirs

@@ -0,0 +1,19 @@
+SHELL=/bin/sh
+
+DIRS=`find . -print | sed "s|\./||g" | grep -v "/" | grep -v "\." `
+
+all:
+	@for i in $(DIRS) xxx; do \
+	  if test -r $$i/Makefile ; then \
+	    echo "entering directory $$i building $@";\
+	    (cd $$i ; ${MAKE} $@); \
+	  fi; \
+	done
+
+.DEFAULT:
+	@for i in $(DIRS) xxx; do \
+	  if test -r $$i/Makefile ; then \
+	    echo "entering directory $$i building $@";\
+	    (cd $$i ; ${MAKE} $@); \
+	  fi; \
+	done

setup/general/makedoc

@@ -0,0 +1,102 @@
+SHELL=/bin/sh
+
+FILE_BASE=$(TEX_BASE:.tex=)
+
+BMP_FILES=$(XPM_FILES:.xpm=.bmp)
+EPS_FILES=$(XPM_FILES:.xpm=.eps)
+GIF_FILES=$(XPM_FILES:.xpm=.gif)
+
+HTML_BUTTONS=back.gif forward.gif contents.gif up.gif
+
+all:: doc
+
+clean::
+	@ for each in $(DIRS) . ; do \
+	( cd $$each; \
+	  rm -f *.bmp *.eps *.gif *.aux *.dvi *.log  \
+	        *.ps  *.toc *~    *.idx *.hlp *.html \
+	        *.rtf *.ref *.xlp *.con *.win *.fts  \
+	        *.hpj *.HLP; \
+	); done 
+
+doc:: doc_ps doc_html doc_xlp doc_winhelp doc_rtf
+
+#############################################
+
+doc_ps:: $(FILE_BASE).ps
+
+$(FILE_BASE).ps: $(FILE_BASE).dvi
+	dvips $(FILE_BASE).dvi -o$@
+
+#############################################
+
+doc_dvi:: $(FILE_BASE).dvi
+
+$(FILE_BASE).dvi: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(EPS_FILES)
+	latex $(FILE_BASE).tex
+	latex $(FILE_BASE).tex
+
+#############################################
+
+doc_xlp:: $(FILE_BASE).xlp
+
+$(FILE_BASE).xlp: $(FILE_BASE).tex $(TEX_ADDITIONAL)
+	../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).xlp -twice -xlp
+
+#############################################
+
+doc_html:: $(FILE_BASE)_contents.html $(FILE_BASE).html
+
+$(FILE_BASE).html: 
+	@ln -s $(FILE_BASE)_contents.html $@
+
+$(FILE_BASE)_contents.html: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(GIF_FILES) $(HTML_BUTTONS)
+	../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE) -twice -html
+
+#############################################
+
+doc_rtf:: $(FILE_BASE).rtf
+
+$(FILE_BASE).rtf: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
+	../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).rtf -twice -rtf
+
+#############################################
+
+doc_winhelp:: $(FILE_BASE).win
+
+$(FILE_BASE).win: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
+	../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).win -twice -winhelp
+	@echo final conversion still needs to be done by MSWin
+
+#############################################
+
+subst::
+	@if test "x$(OLD)" = x; then \
+	  echo "OLD not defined!"; exit -1; \
+	fi
+	@if test "x$(NEW)" = x; then \
+	  echo "NEW not defined!"; exit -1; \
+	fi
+	@for each in $(TEX_BASE) $(TEX_ADITIONAL) ; do \
+	  cat $$each | sed "s/$(OLD)/$(NEW)/g" > /tmp/subst; \
+	  rm $$each; cp /tmp/subst $$each; rm /tmp/subst; \
+	done
+
+#############################################
+
+.SUFFIXES:
+.SUFFIXES: .eps .xpm
+.SUFFIXES: .bmp .xpm
+.SUFFIXES: .gif .xpm
+
+.xpm.eps :
+	@$(RM) -f $@
+	xpmtoppm $< | ppmtogif | giftopnm | pnmtops -rle -center -noturn -scale 0.5 - > $@
+
+.xpm.bmp :
+	@$(RM) -f $@
+	xpmtoppm $< | ppmtobmp -windows - > $@
+
+.xpm.gif :
+	@$(RM) -f $@ 
+	xpmtoppm $< | ppmtogif -interlace - > $@

setup/general/mygrep

@@ -0,0 +1,3 @@
+#! /bin/sh
+grep $@
+exit 0

setup/general/needed

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+for each in $@ ; do
+  LINE=`grep " $each " ../$OSTYPE/wx_setup.h | grep "#define" | grep 1`
+  if test "x$LINE" = x ; then
+    echo "$each needed to compile";
+    exit 1;
+  fi
+done
+

setup/maketmpl.in

@@ -0,0 +1,126 @@
+# Makefile for Autoconf.
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+
+# 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.
+
+#### Start of system configuration section. ####
+
+GLOBAL_LIB_DIR = $(WXBASEDIR)/lib/$(OS)
+GLOBAL_BIN_DIR = $(WXBASEDIR)/bin/$(OS)
+
+# define toolkit to use
+TOOLKIT_DEF = -D@TOOLKIT_DEF@
+
+# general compiler stuff
+OPTIMISE = @OPTIMISE@
+PROFILE = @PROFILE@
+DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
+
+# c-compiler stuff
+CC = @CC@
+CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
+CPP = @CPP@
+
+# c++-compiler stuff
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
+CXXCPP = @CXXCPP@
+
+# shared compile stuff
+PICFLAGS = @PICFLAGS@
+CREATE_SHARED = @CREATE_SHARED@
+
+# other stuff
+RM = rm -f
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+YACC = @YACC@
+RANLIB = @RANLIB@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+AWK = @AWK@
+LN_S = @LN_S@
+CJPEG_PROG = 
+CONVERT_PATH = /usr/bin/X11
+CONVERT_PROG = /usr/bin/X11/convert
+DJPEG_PROG = 
+GIFTOPNM_PROG = 
+NETPBM_PATH = 
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+# Directory in which to install scripts.
+#bindir = @bindir@
+
+# Directory in which to install library files.
+datadir = @datadir@
+acdatadir = $(datadir)/autoconf
+
+# Directory in which to install documentation info files.
+infodir = @infodir@
+
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_LIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+
+GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
+GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
+GUI_TK_LINK = @GUI_TK_LINK@
+
+OPENGL_INCLUDE = @OPENGL_INCLUDE@
+OPENGL_LIBRARY = @OPENGL_LIBRARY@
+OPENGL_LINK = @OPENGL_LINK@
+
+THREADS_LINK = @THREADS_LINK@
+EXTRA_LINK = @EXTRA_LINK@
+
+# INCLUDES
+WX_INCLUDES = \
+$(TOOLKIT_DEF) \
+-I. \
+-I.. \
+-I$(WXBASEDIR)/include \
+-I$(WXBASEDIR)/src/zlib \
+$(GUI_TK_INCLUDE) \
+$(OPENGL_INCLUDE) \
+$(X_CFLAGS)
+
+# -I$(WXBASEDIR)/src/png \
+# -I$(WXBASEDIR)/src/zlib \
+# -I$(WXBASEDIR)/src/gdk_imlib \
+
+WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
+
+OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
+
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl
+
+LINK = $(CXX) -o $@
+LINK_LIBS= \
+  $(WX_LIBS) \
+  $(GUI_TK_LIBS) \
+  $(X_EXTRA_LIBS) \
+  $(X_PRE_LIBS) \
+  $(THREADS_LINK) \
+  $(EXTRA_LINK)
+  
+# Don't include $(OPENGL_LIBS) in LINK_LIBS; they
+# can be conveniently added to BIN_LINK in Makefile.in.
+
+#### End of system configuration section. ####

setup/rules/bin

@@ -0,0 +1,13 @@
+# all that is to do
+all:: checkneeds binary
+clean:: clean_binary clean_obj
+
+# now include definite rules
+BIN_BASE_DIR=.
+
+# include rules to create library
+include $(RULES_GENERIC)/bin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed

setup/rules/bin2

@@ -0,0 +1,14 @@
+# all that is to do
+all:: checkneeds binary
+clean:: clean_binary clean_obj
+
+# now include definite rules
+BIN_BASE_DIR=.
+
+# include rules to create library
+include $(RULES_GENERIC)/bin2
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/doc

@@ -0,0 +1,90 @@
+SHELL=/bin/sh
+
+FILE_BASE=$(TEX_BASE:.tex=)
+
+BMP_FILES=$(XPM_FILES:.xpm=.bmp)
+EPS_FILES=$(XPM_FILES:.xpm=.eps)
+GIF_FILES=$(XPM_FILES:.xpm=.gif)
+
+TEX2RTF=$(WXBASEDIR)/bin/$(OSTYPE)/tex2rtf
+
+HTML_BUTTONS=back.gif forward.gif contents.gif up.gif
+
+all:: doc
+
+clean::
+	@ for each in $(DIRS) . ; do \
+	( cd $$each; \
+	  rm -f *.bmp *.eps *.gif *.aux *.dvi *.log  \
+	        *.ps  *.toc *~    *.idx *.hlp *.html \
+	        *.rtf *.ref *.xlp *.con *.win *.fts  \
+	        *.hpj *.HLP; \
+	); done 
+
+doc:: doc_ps doc_html doc_xlp doc_winhelp doc_rtf
+
+#############################################
+
+doc_ps:: $(FILE_BASE).ps
+
+$(FILE_BASE).ps: $(FILE_BASE).dvi
+	dvips $(FILE_BASE).dvi -o$@
+
+#############################################
+
+doc_dvi:: $(FILE_BASE).dvi
+
+$(FILE_BASE).dvi: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(EPS_FILES)
+	latex $(FILE_BASE).tex
+	latex $(FILE_BASE).tex
+
+#############################################
+
+doc_xlp:: $(FILE_BASE).xlp
+
+$(FILE_BASE).xlp: $(FILE_BASE).tex $(TEX_ADDITIONAL)
+	$(TEX2RTF) $(FILE_BASE).tex $(FILE_BASE).xlp -twice -xlp
+
+#############################################
+
+doc_html:: $(FILE_BASE)_contents.html $(FILE_BASE).html
+
+$(FILE_BASE).html: 
+	@ln -s $(FILE_BASE)_contents.html $@
+
+$(FILE_BASE)_contents.html: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(GIF_FILES) $(HTML_BUTTONS)
+	$(TEX2RTF) $(FILE_BASE).tex $(FILE_BASE) -twice -html
+
+#############################################
+
+doc_rtf:: $(FILE_BASE).rtf
+
+$(FILE_BASE).rtf: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
+	$(TEX2RTF) $(FILE_BASE).tex $(FILE_BASE).rtf -twice -rtf
+
+#############################################
+
+doc_winhelp:: $(FILE_BASE).win
+
+$(FILE_BASE).win: $(FILE_BASE).tex $(TEX_ADDITIONAL) $(BMP_FILES)
+	../../../bin/$(OSTYPE)/tex2rtf $(FILE_BASE).tex $(FILE_BASE).win -twice -winhelp
+	@echo final conversion still needs to be done by MSWin
+
+#############################################
+
+.SUFFIXES:
+.SUFFIXES: .eps .xpm
+.SUFFIXES: .bmp .xpm
+.SUFFIXES: .gif .xpm
+
+.xpm.eps :
+	@$(RM) -f $@
+	xpmtoppm $< | ppmtogif | giftopnm | pnmtops -rle -center -noturn -scale 0.5 - > $@
+
+.xpm.bmp :
+	@$(RM) -f $@
+	xpmtoppm $< | ppmtobmp -windows - > $@
+
+.xpm.gif :
+	@$(RM) -f $@ 
+	xpmtoppm $< | ppmtogif -interlace - > $@

setup/rules/gbin

@@ -0,0 +1,14 @@
+# all that is to do
+all:: checkneeds binary
+clean:: clean_binary clean_obj
+
+# now include definite rules
+BIN_BASE_DIR=$(GLOBAL_BIN_DIR)
+
+# include rules to create library
+include $(RULES_GENERIC)/bin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/gbin2

@@ -0,0 +1,14 @@
+# all that is to do
+all:: checkneeds binary
+clean:: clean_binary clean_obj
+
+# now include definite rules
+BIN_BASE_DIR=$(GLOBAL_BIN_DIR)
+
+# include rules to create library
+include $(RULES_GENERIC)/bin2
+# include rules to create objects
+include $(RULES_GENERIC)/mkobj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/generic/bin1

@@ -0,0 +1,8 @@
+binary:: binary1
+
+depend_binary:: depend_binary1
+
+clean_binary:: clean_binary1
+
+include $(RULES_GENERIC)/bin1gen
+

setup/rules/generic/bin1gen

@@ -0,0 +1,16 @@
+# create binary
+
+binary1:: $(BIN_BASE_DIR)/$(BIN_TARGET)
+
+$(BIN_BASE_DIR)/$(BIN_TARGET): $(BIN_OBJ)
+	@$(RM) -f $@
+	$(LINK) $(BIN_OBJ) -L. $(BIN_LINK) $(LINK_LIBS)
+
+# defining dependencies
+
+depend_binary1::
+
+# cleaning all files
+
+clean_binary1::
+	@$(RM) -f $(BIN_BASE_DIR)/$(BIN_TARGET)

setup/rules/generic/bin2

@@ -0,0 +1,9 @@
+binary:: binary1 binary2
+
+depend_binary:: depend_binary1 depend_binary2
+
+clean_binary:: clean_binary1 clean_binary2
+
+include $(RULES_GENERIC)/bin1gen
+include $(RULES_GENERIC)/bin2gen
+

setup/rules/generic/bin2gen

@@ -0,0 +1,16 @@
+# create binary
+
+binary2:: $(BIN_BASE_DIR)/$(BIN2_TARGET)
+
+$(BIN_BASE_DIR)/$(BIN2_TARGET): $(BIN2_OBJ)
+	@$(RM) -f $@
+	$(LINK) $(BIN2_OBJ) -L. $(BIN2_LINK) $(LINK_LIBS)
+
+# defining dependencies
+
+depend_binary2::
+
+# cleaning all files
+
+clean_binary2::
+	@$(RM) -f $(BIN_BASE_DIR)/$(BIN2_TARGET)

setup/rules/generic/depend

@@ -0,0 +1,18 @@
+depend::
+	@echo "$(CXX) -MM \
+	    $(WX_INCLUDES) \
+	    $(ADD_COMPILE) \
+	    $(LIB_SRC) $(BIN_SRC) $(BIN2_SRC)"
+	@(cd .. ;\
+	    $(CXX) -MM \
+	    $(WX_INCLUDES) \
+	    $(ADD_COMPILE) \
+	    $(LIB_SRC) $(BIN_SRC) $(BIN2_SRC)\
+	) > .depend
+	@cp Makefile Makefile.bak
+	@cat Makefile.bak | awk 'BEGIN { found=0;} { if ( $$0 == "# DO NOT DELETE") {found=1} ; { if ( found==0 ) { print $$0; } } }' > Makefile1
+	@echo "# DO NOT DELETE" >> Makefile1
+	@cat .depend >> Makefile1
+	@mv Makefile1 Makefile
+	@rm .depend
+

setup/rules/generic/globals

@@ -0,0 +1,15 @@
+# creates subdirectories for object-files in case they are needed...
+
+subdirs::
+	@if test "x$(SRC_DIR)" != x ; then \
+	  echo -n "Creating necessary subdirs: "; \
+	  for each in $(SRC_DIR) xxx; do \
+	    if test "x$$each" != xxxx; then \
+	      echo -n "$$each "; \
+	      if test ! -d $$each ; then \
+	        mkdir $$each ; \
+	      fi; \
+	    fi; \
+	  done; \
+	  echo "";\
+	fi

setup/rules/generic/lib

@@ -0,0 +1,17 @@
+# create library
+
+library:: $(LIB_BASE_DIR)/lib$(LIB_TARGET).a
+
+$(LIB_BASE_DIR)/lib$(LIB_TARGET).a: $(LIB_OBJ)
+	@$(RM) -f $@
+	$(AR) rv $@ $(LIB_OBJ)
+
+# defining dependencies
+
+depend_library::
+
+# cleaning all files
+
+clean_library::
+	@$(RM) -f $(LIB_BASE_DIR)/lib$(LIB_TARGET).a
+

setup/rules/generic/needed

@@ -0,0 +1,24 @@
+#SHELL=/bin/sh
+MYGREP=$(WXBASEDIR)/setup/general/mygrep
+checkneeds::
+	@if test "x$(NEEDED_DEFINES)" != x ; then \
+	  RESULT=0 ; \
+	  for each in $(NEEDED_DEFINES) xxx; do \
+	    if test "$$each" != xxx ; then \
+	      LINE=`cat $(SETUP_DIR)/wx_setup.h \
+	            | sed "s/ /,/g" \
+	            | $(MYGREP) ",$$each," \
+	            | $(MYGREP) "#define" \
+	            | $(MYGREP) "1" ` ; \
+	      if test "x$$LINE" = x ; then \
+	        (TMPVAR=`pwd`;\
+	         TMPVAR=`dirname $$TMPVAR`;\
+	         echo "$$each needed to compile "`basename $$TMPVAR`"...";\
+                );\
+	        RESULT=1 ; \
+	      fi; \
+	    fi; \
+	  done ;\
+	  exit $$RESULT; \
+	fi
+

setup/rules/generic/obj

@@ -0,0 +1,30 @@
+.SUFFIXES:
+.SUFFIXES: .o .c 
+.SUFFIXES: .o .cc 
+.SUFFIXES: .o .cpp
+
+VPATH= ..
+
+.c.o :
+	@$(RM) -f $@
+	$(CC) -c -o $@ $(CFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+.cc.o :
+	@$(RM) -f $@
+	$(CXX) -c -o $@ $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+.cpp.o :
+	@$(RM) -f $@
+	$(CXX) -c -o $@ $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+clean_obj::
+	@$(RM) *.o *.osh
+	@if test "x$(SRC_DIR)" != x ; then \
+	  for each in $(SRC_DIR) xxx; do \
+	    if test -d $$each ; then \
+              $(RM) $$each/*.o $$each/*.osh ; \
+	    fi; \
+	  done; \
+	fi;
+
+include $(RULES_GENERIC)/depend

setup/rules/generic/slib

@@ -0,0 +1,21 @@
+# create library
+
+library:: $(LIB_BASE_DIR)/lib$(LIB_TARGET).a
+
+$(LIB_BASE_DIR)/lib$(LIB_TARGET).a: $(LIB_OBJ)
+	@$(RM) -f $@ $(LIB_BASE_DIR)/lib$(LIB_TARGET).so $(LIB_BASE_DIR)/lib$(LIB_TARGET).so.*
+	@if test "x$(CREATE_SHARED)" != x; then\
+	  echo "$(SHARE_DIR)/$(CREATE_SHARED) $(CC) $(LIB_BASE_DIR)/lib$(LIB_TARGET).so $(LIB_MAJOR) $(LIB_MINOR) $(LIB_OBJ)"; \
+	  $(SHARE_DIR)/$(CREATE_SHARED) $(CC) $(LIB_BASE_DIR)/lib$(LIB_TARGET).so $(LIB_MAJOR) $(LIB_MINOR) $(LIB_OBJ); \
+	fi
+	$(AR) rv $@ $(LIB_OBJ)
+
+# defining dependencies
+
+depend_library::
+
+# cleaning all files
+
+clean_library::
+	@$(RM) -f $(LIB_BASE_DIR)/lib$(LIB_TARGET).a $(LIB_BASE_DIR)/lib$(LIB_TARGET).so.* $(LIB_BASE_DIR)/lib$(LIB_TARGET).so
+

setup/rules/generic/sobj

@@ -0,0 +1,42 @@
+.SUFFIXES:
+.SUFFIXES: .o .c 
+.SUFFIXES: .o .cc 
+.SUFFIXES: .o .cpp
+
+VPATH= ..
+
+.c.o :
+	@$(RM) -f $@ $@sh
+	@if test "x$(PICFLAGS)" != x; then \
+	  echo "$(CC) -c -o $@sh $(PICFLAGS) $(CFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<";\
+	  $(CC) -c -o $@sh $(PICFLAGS) $(CFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<;\
+	fi
+	$(CC) -c -o $@ $(CFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+.cc.o :
+	@$(RM) -f $@ $@sh
+	@if test "x$(PICFLAGS)" != x; then \
+	  echo "$(CXX) -c -o $@sh $(PICFLAGS) $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<";\
+	  $(CXX) -c -o $@sh $(PICFLAGS) $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<;\
+	fi
+	$(CXX) -c -o $@ $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+.cpp.o :
+	@$(RM) -f $@ $@sh
+	@if test "x$(PICFLAGS)" != x; then \
+	  echo "$(CXX) -c -o $@sh $(PICFLAGS) $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<";\
+	  $(CXX) -c -o $@sh $(PICFLAGS) $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<;\
+	fi
+	$(CXX) -c -o $@ $(CXXFLAGS) -I.. $(WX_INCLUDES) $(ADD_COMPILE) $(WX_DEFINES) $<
+
+clean_obj::
+	@$(RM) *.o *.osh
+	@if test "x$(SRC_DIR)" != x ; then \
+	  for each in $(SRC_DIR) xxx; do \
+	    if test -d $$each ; then \
+              $(RM) $$each/*.o $$each/*.osh ; \
+	    fi; \
+	  done; \
+	fi;
+
+include $(RULES_GENERIC)/depend

setup/rules/glib

@@ -0,0 +1,15 @@
+# all that is to do
+all:: checkneeds library
+clean:: clean_library clean_obj
+
+# now include definite rules
+LIB_BASE_DIR=$(GLOBAL_LIB_DIR)
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+
+

setup/rules/glibbin

@@ -0,0 +1,17 @@
+# all that is to do
+all:: checkneeds library binary
+clean:: clean_library clean_obj clean_binary
+
+# now include definite rules
+LIB_BASE_DIR=$(GLOBAL_LIB_DIR)
+BIN_BASE_DIR=.
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create binary
+include $(RULES_GENERIC)/bin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/glibgbin

@@ -0,0 +1,18 @@
+# all that is to do
+all:: checkneeds library binary
+depend:: depend_library depend_binary 
+clean:: clean_library clean_obj clean_binary
+
+# now include definite rules
+LIB_BASE_DIR=$(GLOBAL_LIB_DIR)
+BIN_BASE_DIR=$(GLOBAL_BIN_DIR)
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create binary
+include $(RULES_GENERIC)/mkbin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/gslib

@@ -0,0 +1,15 @@
+# all that is to do
+all:: checkneeds library
+clean:: clean_library clean_obj
+
+# now include definite rules
+LIB_BASE_DIR=$(GLOBAL_LIB_DIR)
+
+# include rules to create shared library
+include $(RULES_GENERIC)/slib
+# include rules to create shared objects
+include $(RULES_GENERIC)/sobj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+
+

setup/rules/lib

@@ -0,0 +1,14 @@
+# all that is to do
+all:: checkneeds library
+clean:: clean_library clean_obj
+
+# now include definite rules
+LIB_BASE_DIR=.
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/libbin

@@ -0,0 +1,17 @@
+# all that is to do
+all:: checkneeds library binary
+clean:: clean_library clean_obj clean_binary
+
+# now include definite rules
+LIB_BASE_DIR=.
+BIN_BASE_DIR=.
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create binary
+include $(RULES_GENERIC)/bin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/rules/libgbin

@@ -0,0 +1,17 @@
+# all that is to do
+all:: checkneeds library binary
+clean:: clean_library clean_obj clean_binary
+
+# now include definite rules
+LIB_BASE_DIR=.
+BIN_BASE_DIR=$(GLOBAL_BIN_DIR)
+
+# include rules to create library
+include $(RULES_GENERIC)/lib
+# include rules to create binary
+include $(RULES_GENERIC)/mkbin1
+# include rules to create objects
+include $(RULES_GENERIC)/obj
+# include rule to check for defines needed
+include $(RULES_GENERIC)/needed
+

setup/setup.hin

@@ -0,0 +1,562 @@
+/* setup.h
+
+   Do not edit this file. It is autogenerated by configure.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+
+
+// ------------------------------------------------------------------------
+// Features as requested by configure
+// ------------------------------------------------------------------------
+
+#ifndef __GTKSETUPH__
+#define __GTKSETUPH__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+/* define the system to compile */
+#undef __WXGTK__
+#undef __WXMOTIF__
+#undef __WXQT__
+#undef __UNIX__
+#undef __LINUX__
+#undef __SGI__
+#undef __HPUX__
+#undef __SYSV__
+#undef __SVR4__
+#undef __AIX__
+#undef __SUN__
+#undef __SOLARIS__
+#undef __SUNOS__
+#undef __ALPHA__
+#undef __OSF__
+#undef __BSD__
+#undef __FREEBSD__
+#undef __VMS__
+#undef __ULTRIX__
+#undef __DATA_GENERAL__
+
+//------------------------------------------------------------------------
+// library options
+//------------------------------------------------------------------------
+
+/*
+ * Use zlib
+ */
+#undef USE_ZLIB
+/*
+ * Use gdk_imlib
+ */
+#undef USE_GDK_IMLIB
+/*
+ * Use libpng
+ */
+#undef USE_LIBPNG
+/*
+ * Use iODBC
+ */
+#undef USE_ODBC
+/*
+ * Use Threads
+ */
+#undef USE_THREADS
+
+//------------------------------------------------------------------------
+// GUI control options
+//------------------------------------------------------------------------
+
+/*
+ * Use gauge item
+ */
+#undef USE_GAUGE
+/*
+ * Use scrollbar item
+ */
+#undef USE_SCROLLBAR
+/*
+ * Use notebook item
+ */
+#undef USE_NOTEBOOK
+/*
+ * Use listctrl item
+ */
+#undef USE_LISTCTRL
+/*
+ * Use treectrl item
+ */
+#undef USE_TREECTRL
+/*
+ * Use grid item
+ */
+#undef USE_GRID
+/*
+ * Use tab dialog item
+ */
+#undef USE_TAB_DIALOG
+
+//------------------------------------------------------------------------
+// non-GUI options
+//------------------------------------------------------------------------
+
+/*
+ * Use fraction class
+ */
+#undef USE_FRACTION
+/*
+ * Use time and date classes
+ */
+#undef USE_TIMEDATE
+/*
+ * Use config system
+ */
+#undef USE_CONFIG
+/*
+ * Use intl system
+ */
+#undef USE_INTL
+/*
+ * Use streams
+ */
+#undef USE_STREAMS
+/*
+ * Use wxFile
+ */
+#undef USE_FILE
+/*
+ * Use wxTextFile
+ */
+#undef USE_TEXTFILE
+/*
+ * Use class serialization
+ */
+#undef USE_SERIAL
+
+//------------------------------------------------------------------------
+// PS options
+//------------------------------------------------------------------------
+
+/*
+ * Use font metric files in GetTextExtent for wxPostScriptDC
+ * Use consistent PostScript fonts for AFM and printing (!)
+ */
+#undef USE_AFM_FOR_POSTSCRIPT
+#undef WX_NORMALIZED_PS_FONTS
+/*
+ * Use PostScript device context
+ */
+#undef USE_POSTSCRIPT
+
+//------------------------------------------------------------------------
+// misc options
+//------------------------------------------------------------------------
+
+/*
+ * Use Interprocess communication
+ */
+#undef USE_IPC
+/*
+ * Use wxGetResource & wxWriteResource (change .Xdefaults)
+ */
+#undef USE_RESOURCES
+/*
+ * Use clipboard
+ */
+#undef USE_CLIPBOARD
+/*
+ * Use dnd
+ */
+#undef USE_DND
+/*
+ * Use wxWindows layout constraint system
+ */
+#undef USE_CONSTRAINTS
+ 
+//------------------------------------------------------------------------
+// architecture options
+//------------------------------------------------------------------------
+ 
+/*
+ * Use the mdi architecture
+ */
+#undef USE_MDI_ARCHITECTURE
+/*
+ * Use the document/view architecture
+ */
+#undef USE_DOC_VIEW_ARCHITECTURE
+/*
+ * Use the print/preview architecture
+ */
+#undef USE_PRINTING_ARCHITECTURE
+
+//------------------------------------------------------------------------
+// Prolog and wxWindows' resource system options
+//------------------------------------------------------------------------
+
+/*
+ * Use Prolog IO
+ */
+#undef USE_PROLOGIO
+/*
+ * Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
+ */
+#undef USE_RPC
+/*
+ * Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
+ */
+#undef USE_WX_RESOURCES
+
+//------------------------------------------------------------------------
+// the rest
+//------------------------------------------------------------------------
+
+/*
+ * Implement a GLCanvas class as an interface to OpenGL, using the GLX
+ * extension to the X11 protocol.  You can use the (free) Mesa library
+ * if you don't have a 'real' OpenGL.
+ */
+#undef USE_GLX
+/*
+ * Use wxWindows help facility (needs USE_IPC 1)
+ */
+#undef USE_HELP
+/*
+ * Use iostream.h rather than iostream
+ */
+#undef USE_IOSTREAMH
+/*
+ * Use Metafile and Metafile device context
+ */
+#undef USE_METAFILE
+/*
+ * Use wxGraph
+ */
+#undef USE_WXGRAPH
+/*
+ * Use wxTree
+ */
+#undef USE_WXTREE
+/*
+ * Use Apple Ieee-double converter
+ */
+#undef USE_APPLE_IEEE
+/* Compatibility with 1.66 API.
+   Level 0: no backward compatibility, all new features
+   Level 1: wxDC, OnSize (etc.) compatibility, but
+   some new features such as event tables */
+#define WXWIN_COMPATIBILITY  1
+/*
+ * Enables debugging: memory tracing, assert, etc., contains debug level
+ */
+#undef WXDEBUG
+/*
+ * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
+ * WARNING: this code may not work with all architectures, especially
+ * if alignment is an issue.
+ */
+#undef USE_MEMORY_TRACING
+/*
+ * Enable debugging version of global memory operators new and delete
+ * Disable it, If this causes problems (e.g. link errors)
+ */
+#undef USE_GLOBAL_MEMORY_OPERATORS
+/*
+ * If WXDEBUG && USE_MEMORY_TRACING && USE_GLOBAL_MEMORY_OPERATORS
+ * used to debug the memory allocation of wxWindows Xt port code
+ */
+#define USE_INTERNAL_MEMORY_TRACING 0
+/*
+ * Matthews garbage collection (used for MrEd?)
+ */
+#define WXGARBAGE_COLLECTION_ON 0
+/*
+ * Use splines
+ */
+#define USE_SPLINES 1
+/*
+ * USE_DYNAMIC_CLASSES is TRUE for the Xt port
+ */
+#define USE_DYNAMIC_CLASSES 1
+/*
+ * Disable this if your compiler can't cope
+ * with omission of prototype parameters.
+ */
+#define REMOVE_UNUSED_ARG 1
+/*
+ * The const keyword is being introduced more in wxWindows.
+ * You can use this setting to maintain backward compatibility.
+ * If 0:	will use const wherever possible.
+ * If 1:	will use const only where necessary
+ *              for precompiled headers to work.
+ * If 2:	will be totally backward compatible, but precompiled
+ *	headers may not work and program size will be larger.
+ */
+#define CONST_COMPATIBILITY 0
+
+// ------------------------------------------------------------------------
+// System-specific stuff
+// ------------------------------------------------------------------------
+
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file. */
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define if type char is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
+#undef __CHAR_UNSIGNED__
+#endif
+
+/* Define if the closedir function returns void instead of int.  */
+#undef CLOSEDIR_VOID
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* 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 for DGUX with <sys/dg_sys_info.h>.  */
+#undef DGUX
+
+/* Define if you have <dirent.h>.  */
+#undef DIRENT
+
+/* Define to the type of elements in the array set by `getgroups'.
+   Usually this is either `int' or `gid_t'.  */
+#undef GETGROUPS_T
+
+/* Define if the `getloadavg' function needs to be run setuid or setgid.  */
+#undef GETLOADAVG_PRIVILEGED
+
+/* Define if the `getpgrp' function takes no argument.  */
+#undef GETPGRP_VOID
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
+
+/* 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 don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
+/* Define if your system has its own `getloadavg' function.  */
+#undef HAVE_GETLOADAVG
+
+/* Define if you have the getmntent function.  */
+#undef HAVE_GETMNTENT
+
+/* Define if the `long double' type works.  */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you support file names longer than 14 characters.  */
+#undef HAVE_LONG_FILE_NAMES
+
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
+/* Define if system calls automatically restart after interruption
+   by a signal.  */
+#undef HAVE_RESTARTABLE_SYSCALLS
+
+/* Define if your struct stat has st_blksize.  */
+#undef HAVE_ST_BLKSIZE
+
+/* Define if your struct stat has st_blocks.  */
+#undef HAVE_ST_BLOCKS
+
+/* Define if you have the strcoll function and it is properly defined.  */
+#undef HAVE_STRCOLL
+
+/* Define if your struct stat has st_rdev.  */
+#undef HAVE_ST_RDEV
+
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if your struct tm has tm_zone.  */
+#undef HAVE_TM_ZONE
+
+/* Define if you don't have tm_zone but do have the external array
+   tzname.  */
+#undef HAVE_TZNAME
+
+/* Define if you have <unistd.h>.  */
+#undef HAVE_UNISTD_H
+
+/* Define if utime(file, NULL) sets file's timestamp to the present.  */
+#undef HAVE_UTIME_NULL
+
+/* Define if you have <vfork.h>.  */
+#undef HAVE_VFORK_H
+
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
+
+/* Define if you have the wait3 system call.  */
+#undef HAVE_WAIT3
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define if major, minor, and makedev are declared in <mkdev.h>.  */
+#undef MAJOR_IN_MKDEV
+
+/* Define if major, minor, and makedev are declared in <sysmacros.h>.  */
+#undef MAJOR_IN_SYSMACROS
+
+/* Define if on MINIX.  */
+#undef _MINIX
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef mode_t
+
+/* Define if you don't have <dirent.h>, but have <ndir.h>.  */
+#undef NDIR
+
+/* Define if you have <memory.h>, and <string.h> doesn't declare the
+   mem* functions.  */
+#undef NEED_MEMORY_H
+
+/* Define if your struct nlist has an n_un member.  */
+#undef NLIST_NAME_UNION
+
+/* Define if you have <nlist.h>.  */
+#undef NLIST_STRUCT
+
+/* Define if your C compiler doesn't accept -c and -o together.  */
+#undef NO_MINUS_C_MINUS_O
+
+/* 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 if the system does not provide POSIX.1 features except
+   with this defined.  */
+#undef _POSIX_1_SOURCE
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define if the setvbuf function takes the buffering type as its second
+   argument and the buffer pointer as the third, as on System V
+   before release 3.  */
+#undef SETVBUF_REVERSED
+
+/* Define SIZESOF for some Objects  */
+#undef SIZEOF_INT
+#undef SIZEOF_INT_P
+#undef SIZEOF_LONG
+
+/* 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 the `S_IS*' macros in <sys/stat.h> do not work properly.  */
+#undef STAT_MACROS_BROKEN
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define on System V Release 4.  */
+#undef SVR4
+
+/* Define on BSD  */
+#undef BSD
+
+/* Define on System V */
+#undef SYSV
+
+/* Define if you don't have <dirent.h>, but have <sys/dir.h>.  */
+#undef SYSDIR
+
+/* Define if you don't have <dirent.h>, but have <sys/ndir.h>.  */
+#undef SYSNDIR
+
+/* Define if `sys_siglist' is declared by <signal.h>.  */
+#undef SYS_SIGLIST_DECLARED
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your <sys/time.h> declares struct tm.  */
+#undef TM_IN_SYS_TIME
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
+
+/* Define for Encore UMAX.  */
+#undef UMAX
+
+/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
+   instead of <sys/cpustats.h>.  */
+#undef UMAX4_3
+
+/* Define if you do not have <strings.h>, index, bzero, etc..  */
+#undef USG
+
+/* Define if the system is System V Release 4 */
+#undef SVR4
+
+/* Define vfork as fork if vfork does not work.  */
+#undef vfork
+
+/* Define if the closedir function returns void instead of int.  */
+#undef VOID_CLOSEDIR
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define if lex declares yytext as a char * by default, not a char[].  */
+#undef YYTEXT_POINTER
+
+#endif /* __GTKSETUPH__ */
+
+
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */

setup/shared/sharedAIX

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_BASE=`echo $LIBRARY_BASE | sed 's/.so/.sa/'`
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+ar cr $LIBRARY_FILE~ $LIBRARY_OBJS
+nm $LIBRARY_OBJS | awk  '/ [BD] /{print $$3}' | sort | uniq > ${LIBRARY_FILE}.syms
+ld -o shr.o $LIBRARY_FILE~ -lX11 -lXt -lc -lm -H512 -T512 -bE:${LIBRARY_FILE}.syms -bM:SRE
+rm -f $LIBRARY_FILE~
+ar ruv $LIBRARY_FILE shr.o
+chmod a+x $LIBRARY_FILE
+

setup/shared/sharedBsd

@@ -0,0 +1,33 @@
+#! /bin/sh
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -Bshareable -Bforcearchive -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedDgux

@@ -0,0 +1,29 @@
+#! /bin/sh
+
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_BASE=`echo $LIBRARY_BASE | sed 's/.so/.sl/'`
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -G -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+
+
+
+

setup/shared/sharedHpux

@@ -0,0 +1,29 @@
+#! /bin/sh
+
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_BASE=`echo $LIBRARY_BASE | sed 's/.so/.sl/'`
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -Wl,+s -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+
+
+
+

setup/shared/sharedIrix

@@ -0,0 +1,45 @@
+#! /bin/sh
+# on Irix, position independent code is the default
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test ! -f /tmp/so_locations; then
+  if test -f /usr/lib/so_locations; then
+    cp /usr/lib/so_locations /tmp
+  else
+    touch /tmp/so_locations
+  fi
+fi
+chmod u+w /tmp/so_locations
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -Wl,-update_registry,/tmp/so_locations \
+    -Wl,-soname,$LIBRARY_NAME.$LIBRARY_MAJOR -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -shared -update_registry /tmp/so_locations \
+    -soname $LIBRARY_NAME.$LIBRARY_MAJOR -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedLinux

@@ -0,0 +1,34 @@
+#! /bin/sh
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+case $COMPILER in gcc*|*gcc)
+  $COMPILER -shared -Wl,-soname,$LIBRARY_NAME.$LIBRARY_MAJOR -o $LIBRARY_FILE $LIBRARY_OBJS
+  ;;
+*)
+  $COMPILER -shared -soname $LIBRARY_NAME.$LIBRARY_MAJOR -o $LIBRARY_FILE $LIBRARY_OBJS
+esac
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedOSF

@@ -0,0 +1,33 @@
+#! /bin/sh
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -Wl,-soname,$LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  $COMPILER -shared -soname $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedSolaris2

@@ -0,0 +1,33 @@
+#! /bin/sh
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -G -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedSunos4

@@ -0,0 +1,33 @@
+#! /bin/sh
+
+#LIBRARY_BASE=`echo $1 | sed 's/.a/.so/'`
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE.$LIBRARY_MAJOR.$LIBRARY_MINOR
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -assert pure-text -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+rm -f $LIBRARY_BASE.$LIBRARY_MAJOR
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR.$LIBRARY_MINOR $LIBRARY_BASE.$LIBRARY_MAJOR
+rm -f $LIBRARY_BASE
+ln -s $LIBRARY_NAME.$LIBRARY_MAJOR $LIBRARY_BASE
+
+
+
+

setup/shared/sharedSysV

@@ -0,0 +1,29 @@
+#! /bin/sh
+
+COMPILER=$1
+LIBRARY_BASE=$2
+LIBRARY_MAJOR=$3
+LIBRARY_MINOR=$4
+shift 3
+LIBRARY_OBJS=
+while (test $# -ne 1) do
+  shift;
+  LIBRARY_OBJS="$LIBRARY_OBJS $1sh";
+done
+
+LIBRARY_BASE=`echo $LIBRARY_BASE | sed 's/.so/.sl/'`
+LIBRARY_NAME=`basename $LIBRARY_BASE`
+LIBRARY_FILE=$LIBRARY_BASE
+
+echo "Creating shared library: $LIBRARY_FILE"
+
+if test "x$COMPILER" = xgcc ; then
+  gcc -shared -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+else
+  CC -G -h $LIBRARY_NAME -o $LIBRARY_FILE $LIBRARY_OBJS
+fi
+chmod a+x $LIBRARY_FILE
+
+
+
+

setup/substit.in

@@ -0,0 +1,48 @@
+s|*OS*|@OS@|g
+s|*MAKEINCLUDE*|@MAKEINCLUDE@|g
+s|*WXBASEDIR*|@WXBASEDIR@|g
+s|*PROFILE*|@PROFILE@|g
+s|*WXDEBUG*|@WXDEBUG@|g
+s|*WXDEBUG_DEFINE*|@WXDEBUG_DEFINE@|g
+s|*__WXDEBUG__*|@WXDEBUG@|g
+s|*OPTIMISE*|@OPTIMISE@|g
+s|*CC*|@CC@|g
+s|*CFLAGS*|@CFLAGS@|g
+s|*CPP*|@CPP@|g
+s|*CXX*|@CXX@|g
+s|*CXXFLAGS*|@CXXFLAGS@|g
+s|*CXXCPP*|@CXXCPP@|g
+s|*PICFLAGS*|@PICFLAGS@|g
+s|*CREATE_SHARED*|@CREATE_SHARED@|g
+s|*LEX*|@LEX@|g
+s|*LEXLIB*|@LEXLIB@|g
+s|*YACC*|@YACC@|g
+s|*RANLIB*|@RANLIB@|g
+s|*INSTALL*|@INSTALL@|g
+s|*INSTALL_PROGRAM*|@INSTALL_PROGRAM@|g
+s|*INSTALL_DATA*|@INSTALL_DATA@|g
+s|*AWK*|@AWK@|g
+s|*LN_S*|@LN_S@|g
+s|*prefix*|@prefix@|g
+s|*exec_prefix*|@exec_prefix@|g
+s|*bindir*|@bindir@|g
+s|*datadir*|@datadir@|g
+s|*infodir*|@infodir@|g
+s|*X_CFLAGS*|@X_CFLAGS@|g
+s|*X_LIBS*|@X_LIBS@|g
+s|*X_EXTRA_LIBS*|@X_EXTRA_LIBS@|g
+s|*X_PRE_LIBS*|@X_PRE_LIBS@|g
+s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
+s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
+s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
+s|*DL_LIBRARY*|@DL_LIBRARY@|g
+s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
+s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
+s|*OPENGL_LINK*|@OPENGL_LINK@|g
+s|*TOOLKIT*|@TOOLKIT@|g
+s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
+s|*THREADS*|@THREADS@|g
+s|*THREADS_LINK*|@THREADS_LINK@|g
+s|*EXTRA_LINK*|@EXTRA_LINK@|g
+s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
+s|*UNIX_THREAD*|@UNIX_THREAD@|g

src/Makefile

@@ -1 +1 @@
-include ../install/unix/setup/general/makeapp
+include ../setup/general/makeapp

src/common/object.cpp

@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
@@ -53,7 +53,7 @@ wxHashTable wxClassInfo::classTable(wxKEY_STRING);
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
@@ -61,7 +61,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
 	UnRef();
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
 	if (m_serialObj)
 	  delete m_serialObj;
 #endif

src/gtk.inc

@@ -54,6 +54,7 @@ LIB_CPP_SRC=\
  common/valtext.cpp \
  common/wxexpr.cpp \
 \
+ gtk/accel.cpp \
  gtk/app.cpp \
  gtk/bitmap.cpp \
  gtk/bmpbuttn.cpp \

src/gtk/accel.cpp

@@ -0,0 +1,80 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.cpp
+// Purpose:
+// Author:      Robert Roebling
+// Id:
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "accel.h"
+#endif
+
+#include "wx/accel.h"
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorTable
+//-----------------------------------------------------------------------------
+
+class wxAccelRefData: public wxObjectRefData
+{
+  public:
+  
+    wxAccelRefData(void);
+  
+    wxList m_accels;
+};
+
+wxAccelRefData::wxAccelRefData(void)
+{
+  m_accels.DeleteContents( TRUE );
+}
+
+//-----------------------------------------------------------------------------
+
+#define M_ACCELDATA ((wxAccelRefData *)m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)
+  
+wxAcceleratorTable::wxAcceleratorTable()
+{
+  m_refData = new wxAccelRefData();
+}
+
+wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
+{
+  m_refData = new wxAccelRefData();
+  for (int i = 0; i < n; i++)
+  {
+    M_ACCELDATA->m_accels.Append( (wxObject*)
+      new wxAcceleratorEntry( entries[n].GetFlags(), entries[n].GetKeyCode(), entries[n].GetCommand() ) );
+  }
+}
+
+wxAcceleratorTable::~wxAcceleratorTable()
+{
+}
+
+bool wxAcceleratorTable::Ok() const
+{
+  return (m_refData != NULL);
+}
+
+int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
+{
+  wxNode *node = M_ACCELDATA->m_accels.First();
+  while (node)
+  {
+    wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data();
+    if ((event.m_keyCode == entry->GetKeyCode()) &&
+        (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
+        (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
+        (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
+      return entry->GetCommand();
+    node = node->Next();
+  }
+  
+  return -1;
+}
+

src/gtk/data.cpp

@@ -13,7 +13,12 @@
 // #pragma implementation
 #endif
 
-#include "wx/wx.h"
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/window.h"
+#include "wx/dc.h"
+#include "wx/accel.h"
+#include "wx/postscrp.h"
 
 #define _MAXPATHLEN 500
 
@@ -108,14 +113,15 @@ wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
 // 'Null' objects
-wxBitmap wxNullBitmap;
+wxAcceleratorTable   wxNullAcceleratorTable;
-wxIcon   wxNullIcon;  
+wxBitmap   wxNullBitmap;
-wxCursor wxNullCursor;
+wxIcon     wxNullIcon;  
-wxPen    wxNullPen;
+wxCursor   wxNullCursor;
-wxBrush  wxNullBrush;
+wxPen      wxNullPen;
-wxFont   wxNullFont;
+wxBrush    wxNullBrush;
-wxColour wxNullColour;
+wxFont     wxNullFont;
-wxPalette wxNullPalette; 
+wxColour   wxNullColour;
+wxPalette  wxNullPalette; 
 
 // Default window names
 const char *wxButtonNameStr = "button";

src/gtk/window.cpp

@@ -191,6 +191,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
   
   bool ret = win->GetEventHandler()->ProcessEvent( event );
   
+  if (!ret)
+  {
+    int command = win->GetAcceleratorTable()->GetCommand( event );
+    if (command != -1)
+    {
+      wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+      ret = win->GetEventHandler()->ProcessEvent( command_event );
+    }
+  }
+  
   if (ret)
   {
     if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) 
@@ -1754,6 +1764,11 @@ bool wxWindow::TransferDataFromWindow(void)
   return TRUE;
 }
 
+void wxWindow::SetAcceleratorTable( const wxAcceleratorTable& accel )
+{
+  m_acceleratorTable = accel;
+}
+
 void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
   TransferDataToWindow();

src/gtk1/accel.cpp

@@ -0,0 +1,80 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.cpp
+// Purpose:
+// Author:      Robert Roebling
+// Id:
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "accel.h"
+#endif
+
+#include "wx/accel.h"
+
+//-----------------------------------------------------------------------------
+// wxAcceleratorTable
+//-----------------------------------------------------------------------------
+
+class wxAccelRefData: public wxObjectRefData
+{
+  public:
+  
+    wxAccelRefData(void);
+  
+    wxList m_accels;
+};
+
+wxAccelRefData::wxAccelRefData(void)
+{
+  m_accels.DeleteContents( TRUE );
+}
+
+//-----------------------------------------------------------------------------
+
+#define M_ACCELDATA ((wxAccelRefData *)m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)
+  
+wxAcceleratorTable::wxAcceleratorTable()
+{
+  m_refData = new wxAccelRefData();
+}
+
+wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
+{
+  m_refData = new wxAccelRefData();
+  for (int i = 0; i < n; i++)
+  {
+    M_ACCELDATA->m_accels.Append( (wxObject*)
+      new wxAcceleratorEntry( entries[n].GetFlags(), entries[n].GetKeyCode(), entries[n].GetCommand() ) );
+  }
+}
+
+wxAcceleratorTable::~wxAcceleratorTable()
+{
+}
+
+bool wxAcceleratorTable::Ok() const
+{
+  return (m_refData != NULL);
+}
+
+int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
+{
+  wxNode *node = M_ACCELDATA->m_accels.First();
+  while (node)
+  {
+    wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data();
+    if ((event.m_keyCode == entry->GetKeyCode()) &&
+        (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
+        (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
+        (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
+      return entry->GetCommand();
+    node = node->Next();
+  }
+  
+  return -1;
+}
+

src/gtk1/data.cpp

@@ -13,7 +13,12 @@
 // #pragma implementation
 #endif
 
-#include "wx/wx.h"
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/window.h"
+#include "wx/dc.h"
+#include "wx/accel.h"
+#include "wx/postscrp.h"
 
 #define _MAXPATHLEN 500
 
@@ -108,14 +113,15 @@ wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
 // 'Null' objects
-wxBitmap wxNullBitmap;
+wxAcceleratorTable   wxNullAcceleratorTable;
-wxIcon   wxNullIcon;  
+wxBitmap   wxNullBitmap;
-wxCursor wxNullCursor;
+wxIcon     wxNullIcon;  
-wxPen    wxNullPen;
+wxCursor   wxNullCursor;
-wxBrush  wxNullBrush;
+wxPen      wxNullPen;
-wxFont   wxNullFont;
+wxBrush    wxNullBrush;
-wxColour wxNullColour;
+wxFont     wxNullFont;
-wxPalette wxNullPalette; 
+wxColour   wxNullColour;
+wxPalette  wxNullPalette; 
 
 // Default window names
 const char *wxButtonNameStr = "button";

src/gtk1/window.cpp

@@ -191,6 +191,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
   
   bool ret = win->GetEventHandler()->ProcessEvent( event );
   
+  if (!ret)
+  {
+    int command = win->GetAcceleratorTable()->GetCommand( event );
+    if (command != -1)
+    {
+      wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+      ret = win->GetEventHandler()->ProcessEvent( command_event );
+    }
+  }
+  
   if (ret)
   {
     if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) 
@@ -1754,6 +1764,11 @@ bool wxWindow::TransferDataFromWindow(void)
   return TRUE;
 }
 
+void wxWindow::SetAcceleratorTable( const wxAcceleratorTable& accel )
+{
+  m_acceleratorTable = accel;
+}
+
 void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
   TransferDataToWindow();

template.mak

@@ -14,10 +14,10 @@
 
 # no need to edit below this line !!!!
 
-RULES_DIR=$(WXBASEDIR)/install/unix/setup/rules
+RULES_DIR=$(WXBASEDIR)/setup/rules
 RULES_GENERIC=$(RULES_DIR)/generic
-SETUP_DIR=$(WXBASEDIR)/install/unix/setup/$(OS)
+SETUP_DIR=$(WXBASEDIR)/setup/$(OS)
-SHARE_DIR=$(WXBASEDIR)/install/unix/setup/shared
+SHARE_DIR=$(WXBASEDIR)/setup/shared
 
 SRCDIR=$(WXBASEDIR)/src
 UTILS=$(WXBASEDIR)/utils