diff --git a/Makefile.in b/Makefile.in
index 9fce895bf7..ec430272cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -321,10 +321,18 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 	$(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
 
 # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
-#     but this seems to result in problems with libwx_gtk being linked in twice
+#     but this seems to result in problems with libwx_gtk being linked in twice.
+# RL: This is another example of why sonames exist, and what happens when you
+#     ignore them.  Broken linking like this is now an rc bug in Debian, so we
+#     add them back again (to SONAME_FLAGS_GL) in configure if --enable-soname
+#     is used.  Removing the explicit -L /usr/lib from LDFLAGS would probably
+#     help with the above problem, but building without the soname is broken in
+#     so many other ways that I'm not going to touch that case in 2.4 anymore
+#     if I can help it.
+#
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
+	$(SHARED_LD) $@ glcanvas.o $(SONAME_FLAGS_GL) $(LDFLAGS_GL) $(OPENGLLIBS) $(EXTRALIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)
@@ -1596,14 +1604,20 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 	@# in other dist targets.  Ugly and hardly portable but it
 	@# will run on any Debian box and that's enough for now.
 
-	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
-			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-			-print0 | xargs -0 rm -rf
+
+	find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+			   -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+			   -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+			   -o -name "*.bkl" -o -name "*.pro" -o -name "*.def"    \
+			   -o -name "*.vpj" -o -name "*.sc"                      \
+			   -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+			\) -print0 | xargs -0 rm -rf
 
 	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
 
-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+#debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+debian-native-dist: $(filter-out DEMOS_DIST,@GUIDIST@) MANUAL_DIST PYTHON_DIST
 	cp $(SRCDIR)/files.lst $(DISTDIR)/src
 
 debian-msw-dirs:
diff --git a/config.guess b/config.guess
index 9b1384be4b..51fab47709 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-11-30'
+timestamp='2004-03-12'
 
 # 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
@@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -195,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -219,6 +227,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -234,71 +245,70 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -321,6 +331,9 @@ EOF
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -338,6 +351,9 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -410,6 +426,9 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -450,8 +469,7 @@ EOF
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
@@ -535,8 +553,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -635,10 +652,20 @@ EOF
               }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -672,8 +699,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -731,21 +757,26 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -767,8 +798,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +812,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -801,17 +834,28 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -832,7 +876,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
@@ -852,7 +895,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
@@ -889,6 +931,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -946,9 +991,11 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -977,6 +1024,9 @@ EOF
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1048,7 +1098,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1146,7 +1196,11 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1159,7 +1213,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1200,6 +1254,12 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1320,8 +1380,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
diff --git a/config.sub b/config.sub
index 04baf3d80d..ba331039bb 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-01-03'
+timestamp='2004-03-12'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -228,14 +229,15 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -247,6 +249,7 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -257,11 +260,11 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -296,7 +299,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -304,8 +307,8 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -319,6 +322,7 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -329,11 +333,13 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -357,6 +363,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -371,6 +380,12 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -430,12 +445,20 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -735,6 +758,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -766,18 +793,24 @@ case $basic_machine in
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -836,6 +869,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -843,6 +880,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -917,14 +957,18 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -938,6 +982,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1027,13 +1075,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1106,19 +1154,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -microbsd*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1142,6 +1191,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1154,6 +1206,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1175,6 +1230,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1197,6 +1255,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1227,6 +1288,12 @@ case $os in
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-none)
 		;;
 	*)
@@ -1258,6 +1325,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1436,9 +1506,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
diff --git a/configure b/configure
index 64649256ac..a320726bbd 100755
--- a/configure
+++ b/configure
@@ -1106,26 +1106,26 @@ USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
-USE_LINUX=
-USE_GNU=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
 USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=
-USE_OPENBSD=
+USE_GNU=
+USE_HPUX=
+USE_LINUX=
 USE_NETBSD=
+USE_OPENBSD=
+USE_OSF=
+USE_SGI=
+USE_SOLARIS=
+USE_SUN=
+USE_SUNOS=
+USE_SVR4=
+USE_SYSV=
 USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
+USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
@@ -1181,12 +1181,8 @@ EOF
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-gnu* )
+  *-*-gnu* | *-*-k*bsd*-gnu )
     USE_GNU=1
-    cat >> confdefs.h <<\EOF
-#define __GNU__ 1
-EOF
-
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
@@ -1791,7 +1787,7 @@ done
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6
-echo "configure:1795: checking for --${enablestring:-enable}-gui" >&5
+echo "configure:1791: checking for --${enablestring:-enable}-gui" >&5
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -1834,7 +1830,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6
-echo "configure:1838: checking for --${enablestring:-enable}-universal" >&5
+echo "configure:1834: checking for --${enablestring:-enable}-universal" >&5
           no_cache=0
           # Check whether --enable-universal or --disable-universal was given.
 if test "${enable_universal+set}" = set; then
@@ -1928,7 +1924,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6
-echo "configure:1932: checking for --${enablestring:-enable}-nanox" >&5
+echo "configure:1928: checking for --${enablestring:-enable}-nanox" >&5
           no_cache=0
           # Check whether --enable-nanox or --disable-nanox was given.
 if test "${enable_nanox+set}" = set; then
@@ -1969,7 +1965,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
-echo "configure:1973: checking for --${enablestring:-enable}-gtk2" >&5
+echo "configure:1969: checking for --${enablestring:-enable}-gtk2" >&5
           no_cache=0
           # Check whether --enable-gtk2 or --disable-gtk2 was given.
 if test "${enable_gtk2+set}" = set; then
@@ -2009,7 +2005,7 @@ fi
 
 
           echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:2013: checking for --with-libpng" >&5
+echo "configure:2009: checking for --with-libpng" >&5
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -2060,7 +2056,7 @@ fi
         
 
           echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:2064: checking for --with-libjpeg" >&5
+echo "configure:2060: checking for --with-libjpeg" >&5
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -2111,7 +2107,7 @@ fi
         
 
           echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:2115: checking for --with-libtiff" >&5
+echo "configure:2111: checking for --with-libtiff" >&5
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -2162,7 +2158,7 @@ fi
         
 
           echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2166: checking for --with-opengl" >&5
+echo "configure:2162: checking for --with-opengl" >&5
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -2204,7 +2200,7 @@ fi
 
 
           echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2208: checking for --with-dmalloc" >&5
+echo "configure:2204: checking for --with-dmalloc" >&5
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -2243,7 +2239,7 @@ fi
         
 
           echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2247: checking for --with-regex" >&5
+echo "configure:2243: checking for --with-regex" >&5
           no_cache=0
           # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
@@ -2294,7 +2290,7 @@ fi
         
 
           echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2298: checking for --with-zlib" >&5
+echo "configure:2294: checking for --with-zlib" >&5
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -2345,7 +2341,7 @@ fi
         
 
           echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2349: checking for --with-odbc" >&5
+echo "configure:2345: checking for --with-odbc" >&5
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
@@ -2387,7 +2383,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
-echo "configure:2391: checking for --${enablestring:-enable}-shared" >&5
+echo "configure:2387: checking for --${enablestring:-enable}-shared" >&5
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -2427,7 +2423,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
-echo "configure:2431: checking for --${enablestring:-enable}-soname" >&5
+echo "configure:2427: checking for --${enablestring:-enable}-soname" >&5
           no_cache=0
           # Check whether --enable-soname or --disable-soname was given.
 if test "${enable_soname+set}" = set; then
@@ -2467,7 +2463,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
-echo "configure:2471: checking for --${enablestring:-enable}-optimise" >&5
+echo "configure:2467: checking for --${enablestring:-enable}-optimise" >&5
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
@@ -2507,7 +2503,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
-echo "configure:2511: checking for --${enablestring:-enable}-debug" >&5
+echo "configure:2507: checking for --${enablestring:-enable}-debug" >&5
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2548,7 +2544,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6
-echo "configure:2552: checking for --${enablestring:-enable}-precomp" >&5
+echo "configure:2548: checking for --${enablestring:-enable}-precomp" >&5
           no_cache=0
           # Check whether --enable-precomp or --disable-precomp was given.
 if test "${enable_precomp+set}" = set; then
@@ -2597,7 +2593,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
-echo "configure:2601: checking for --${enablestring:-enable}-debug_flag" >&5
+echo "configure:2597: checking for --${enablestring:-enable}-debug_flag" >&5
           no_cache=0
           # Check whether --enable-debug_flag or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
@@ -2637,7 +2633,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
-echo "configure:2641: checking for --${enablestring:-enable}-debug_info" >&5
+echo "configure:2637: checking for --${enablestring:-enable}-debug_info" >&5
           no_cache=0
           # Check whether --enable-debug_info or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
@@ -2677,7 +2673,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
-echo "configure:2681: checking for --${enablestring:-enable}-debug_gdb" >&5
+echo "configure:2677: checking for --${enablestring:-enable}-debug_gdb" >&5
           no_cache=0
           # Check whether --enable-debug_gdb or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
@@ -2717,7 +2713,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2721: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo "configure:2717: checking for --${enablestring:-enable}-debug_cntxt" >&5
           no_cache=0
           # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
@@ -2757,7 +2753,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
-echo "configure:2761: checking for --${enablestring:-enable}-mem_tracing" >&5
+echo "configure:2757: checking for --${enablestring:-enable}-mem_tracing" >&5
           no_cache=0
           # Check whether --enable-mem_tracing or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
@@ -2797,7 +2793,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6
-echo "configure:2801: checking for --${enablestring:-enable}-profile" >&5
+echo "configure:2797: checking for --${enablestring:-enable}-profile" >&5
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
@@ -2837,7 +2833,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
-echo "configure:2841: checking for --${enablestring:-enable}-no_rtti" >&5
+echo "configure:2837: checking for --${enablestring:-enable}-no_rtti" >&5
           no_cache=0
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
@@ -2877,7 +2873,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
-echo "configure:2881: checking for --${enablestring:-enable}-no_exceptions" >&5
+echo "configure:2877: checking for --${enablestring:-enable}-no_exceptions" >&5
           no_cache=0
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
@@ -2917,7 +2913,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6
-echo "configure:2921: checking for --${enablestring:-enable}-permissive" >&5
+echo "configure:2917: checking for --${enablestring:-enable}-permissive" >&5
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
@@ -2957,7 +2953,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
-echo "configure:2961: checking for --${enablestring:-enable}-no_deps" >&5
+echo "configure:2957: checking for --${enablestring:-enable}-no_deps" >&5
           no_cache=0
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
@@ -2998,7 +2994,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6
-echo "configure:3002: checking for --${enablestring:-enable}-compat20" >&5
+echo "configure:2998: checking for --${enablestring:-enable}-compat20" >&5
           no_cache=0
           # Check whether --enable-compat20 or --disable-compat20 was given.
 if test "${enable_compat20+set}" = set; then
@@ -3038,7 +3034,7 @@ fi
 
 	  enablestring=disable
           echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6
-echo "configure:3042: checking for --${enablestring:-enable}-compat22" >&5
+echo "configure:3038: checking for --${enablestring:-enable}-compat22" >&5
           no_cache=0
           # Check whether --enable-compat22 or --disable-compat22 was given.
 if test "${enable_compat22+set}" = set; then
@@ -3092,7 +3088,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
-echo "configure:3096: checking for --${enablestring:-enable}-intl" >&5
+echo "configure:3092: checking for --${enablestring:-enable}-intl" >&5
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
@@ -3132,7 +3128,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
-echo "configure:3136: checking for --${enablestring:-enable}-config" >&5
+echo "configure:3132: checking for --${enablestring:-enable}-config" >&5
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
@@ -3173,7 +3169,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6
-echo "configure:3177: checking for --${enablestring:-enable}-protocols" >&5
+echo "configure:3173: checking for --${enablestring:-enable}-protocols" >&5
           no_cache=0
           # Check whether --enable-protocols or --disable-protocols was given.
 if test "${enable_protocols+set}" = set; then
@@ -3213,7 +3209,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6
-echo "configure:3217: checking for --${enablestring:-enable}-ftp" >&5
+echo "configure:3213: checking for --${enablestring:-enable}-ftp" >&5
           no_cache=0
           # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
@@ -3253,7 +3249,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6
-echo "configure:3257: checking for --${enablestring:-enable}-http" >&5
+echo "configure:3253: checking for --${enablestring:-enable}-http" >&5
           no_cache=0
           # Check whether --enable-http or --disable-http was given.
 if test "${enable_http+set}" = set; then
@@ -3293,7 +3289,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6
-echo "configure:3297: checking for --${enablestring:-enable}-fileproto" >&5
+echo "configure:3293: checking for --${enablestring:-enable}-fileproto" >&5
           no_cache=0
           # Check whether --enable-fileproto or --disable-fileproto was given.
 if test "${enable_fileproto+set}" = set; then
@@ -3333,7 +3329,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6
-echo "configure:3337: checking for --${enablestring:-enable}-sockets" >&5
+echo "configure:3333: checking for --${enablestring:-enable}-sockets" >&5
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
@@ -3373,7 +3369,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
-echo "configure:3377: checking for --${enablestring:-enable}-ole" >&5
+echo "configure:3373: checking for --${enablestring:-enable}-ole" >&5
           no_cache=0
           # Check whether --enable-ole or --disable-ole was given.
 if test "${enable_ole+set}" = set; then
@@ -3413,7 +3409,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
-echo "configure:3417: checking for --${enablestring:-enable}-dataobj" >&5
+echo "configure:3413: checking for --${enablestring:-enable}-dataobj" >&5
           no_cache=0
           # Check whether --enable-dataobj or --disable-dataobj was given.
 if test "${enable_dataobj+set}" = set; then
@@ -3454,7 +3450,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6
-echo "configure:3458: checking for --${enablestring:-enable}-ipc" >&5
+echo "configure:3454: checking for --${enablestring:-enable}-ipc" >&5
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
@@ -3495,7 +3491,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6
-echo "configure:3499: checking for --${enablestring:-enable}-cmdline" >&5
+echo "configure:3495: checking for --${enablestring:-enable}-cmdline" >&5
           no_cache=0
           # Check whether --enable-cmdline or --disable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
@@ -3535,7 +3531,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6
-echo "configure:3539: checking for --${enablestring:-enable}-datetime" >&5
+echo "configure:3535: checking for --${enablestring:-enable}-datetime" >&5
           no_cache=0
           # Check whether --enable-datetime or --disable-datetime was given.
 if test "${enable_datetime+set}" = set; then
@@ -3575,7 +3571,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-timedate""... $ac_c" 1>&6
-echo "configure:3579: checking for --${enablestring:-enable}-timedate" >&5
+echo "configure:3575: checking for --${enablestring:-enable}-timedate" >&5
           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then
@@ -3615,7 +3611,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6
-echo "configure:3619: checking for --${enablestring:-enable}-stopwatch" >&5
+echo "configure:3615: checking for --${enablestring:-enable}-stopwatch" >&5
           no_cache=0
           # Check whether --enable-stopwatch or --disable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
@@ -3655,7 +3651,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6
-echo "configure:3659: checking for --${enablestring:-enable}-dialupman" >&5
+echo "configure:3655: checking for --${enablestring:-enable}-dialupman" >&5
           no_cache=0
           # Check whether --enable-dialupman or --disable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
@@ -3695,7 +3691,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
-echo "configure:3699: checking for --${enablestring:-enable}-apple_ieee" >&5
+echo "configure:3695: checking for --${enablestring:-enable}-apple_ieee" >&5
           no_cache=0
           # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
@@ -3735,7 +3731,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6
-echo "configure:3739: checking for --${enablestring:-enable}-timer" >&5
+echo "configure:3735: checking for --${enablestring:-enable}-timer" >&5
           no_cache=0
           # Check whether --enable-timer or --disable-timer was given.
 if test "${enable_timer+set}" = set; then
@@ -3775,7 +3771,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6
-echo "configure:3779: checking for --${enablestring:-enable}-wave" >&5
+echo "configure:3775: checking for --${enablestring:-enable}-wave" >&5
           no_cache=0
           # Check whether --enable-wave or --disable-wave was given.
 if test "${enable_wave+set}" = set; then
@@ -3815,7 +3811,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6
-echo "configure:3819: checking for --${enablestring:-enable}-fraction" >&5
+echo "configure:3815: checking for --${enablestring:-enable}-fraction" >&5
           no_cache=0
           # Check whether --enable-fraction or --disable-fraction was given.
 if test "${enable_fraction+set}" = set; then
@@ -3855,7 +3851,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6
-echo "configure:3859: checking for --${enablestring:-enable}-dynlib" >&5
+echo "configure:3855: checking for --${enablestring:-enable}-dynlib" >&5
           no_cache=0
           # Check whether --enable-dynlib or --disable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
@@ -3895,7 +3891,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6
-echo "configure:3899: checking for --${enablestring:-enable}-dynamicloader" >&5
+echo "configure:3895: checking for --${enablestring:-enable}-dynamicloader" >&5
           no_cache=0
           # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
 if test "${enable_dynamicloader+set}" = set; then
@@ -3935,7 +3931,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6
-echo "configure:3939: checking for --${enablestring:-enable}-longlong" >&5
+echo "configure:3935: checking for --${enablestring:-enable}-longlong" >&5
           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
@@ -3975,7 +3971,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6
-echo "configure:3979: checking for --${enablestring:-enable}-geometry" >&5
+echo "configure:3975: checking for --${enablestring:-enable}-geometry" >&5
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
@@ -4015,7 +4011,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6
-echo "configure:4019: checking for --${enablestring:-enable}-log" >&5
+echo "configure:4015: checking for --${enablestring:-enable}-log" >&5
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
@@ -4055,7 +4051,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6
-echo "configure:4059: checking for --${enablestring:-enable}-streams" >&5
+echo "configure:4055: checking for --${enablestring:-enable}-streams" >&5
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
@@ -4095,7 +4091,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6
-echo "configure:4099: checking for --${enablestring:-enable}-file" >&5
+echo "configure:4095: checking for --${enablestring:-enable}-file" >&5
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
@@ -4135,7 +4131,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6
-echo "configure:4139: checking for --${enablestring:-enable}-ffile" >&5
+echo "configure:4135: checking for --${enablestring:-enable}-ffile" >&5
           no_cache=0
           # Check whether --enable-ffile or --disable-ffile was given.
 if test "${enable_ffile+set}" = set; then
@@ -4175,7 +4171,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6
-echo "configure:4179: checking for --${enablestring:-enable}-textbuf" >&5
+echo "configure:4175: checking for --${enablestring:-enable}-textbuf" >&5
           no_cache=0
           # Check whether --enable-textbuf or --disable-textbuf was given.
 if test "${enable_textbuf+set}" = set; then
@@ -4215,7 +4211,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
-echo "configure:4219: checking for --${enablestring:-enable}-textfile" >&5
+echo "configure:4215: checking for --${enablestring:-enable}-textfile" >&5
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
@@ -4255,7 +4251,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
-echo "configure:4259: checking for --${enablestring:-enable}-fontmap" >&5
+echo "configure:4255: checking for --${enablestring:-enable}-fontmap" >&5
           no_cache=0
           # Check whether --enable-fontmap or --disable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
@@ -4295,7 +4291,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
-echo "configure:4299: checking for --${enablestring:-enable}-unicode" >&5
+echo "configure:4295: checking for --${enablestring:-enable}-unicode" >&5
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
@@ -4335,7 +4331,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
-echo "configure:4339: checking for --${enablestring:-enable}-mslu" >&5
+echo "configure:4335: checking for --${enablestring:-enable}-mslu" >&5
           no_cache=0
           # Check whether --enable-mslu or --disable-mslu was given.
 if test "${enable_mslu+set}" = set; then
@@ -4375,7 +4371,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
-echo "configure:4379: checking for --${enablestring:-enable}-wxprintfv" >&5
+echo "configure:4375: checking for --${enablestring:-enable}-wxprintfv" >&5
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
@@ -4415,7 +4411,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
-echo "configure:4419: checking for --${enablestring:-enable}-std_iostreams" >&5
+echo "configure:4415: checking for --${enablestring:-enable}-std_iostreams" >&5
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
@@ -4455,7 +4451,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
-echo "configure:4459: checking for --${enablestring:-enable}-filesystem" >&5
+echo "configure:4455: checking for --${enablestring:-enable}-filesystem" >&5
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
@@ -4495,7 +4491,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
-echo "configure:4499: checking for --${enablestring:-enable}-fs_inet" >&5
+echo "configure:4495: checking for --${enablestring:-enable}-fs_inet" >&5
           no_cache=0
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
@@ -4535,7 +4531,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
-echo "configure:4539: checking for --${enablestring:-enable}-fs_zip" >&5
+echo "configure:4535: checking for --${enablestring:-enable}-fs_zip" >&5
           no_cache=0
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
@@ -4575,7 +4571,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
-echo "configure:4579: checking for --${enablestring:-enable}-zipstream" >&5
+echo "configure:4575: checking for --${enablestring:-enable}-zipstream" >&5
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
@@ -4616,7 +4612,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
-echo "configure:4620: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo "configure:4616: checking for --${enablestring:-enable}-catch_segvs" >&5
           no_cache=0
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
@@ -4656,7 +4652,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
-echo "configure:4660: checking for --${enablestring:-enable}-snglinst" >&5
+echo "configure:4656: checking for --${enablestring:-enable}-snglinst" >&5
           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
@@ -4697,7 +4693,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
-echo "configure:4701: checking for --${enablestring:-enable}-mimetype" >&5
+echo "configure:4697: checking for --${enablestring:-enable}-mimetype" >&5
           no_cache=0
           # Check whether --enable-mimetype or --disable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
@@ -4737,7 +4733,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
-echo "configure:4741: checking for --${enablestring:-enable}-system_options" >&5
+echo "configure:4737: checking for --${enablestring:-enable}-system_options" >&5
           no_cache=0
           # Check whether --enable-system_options or --disable-system_options was given.
 if test "${enable_system_options+set}" = set; then
@@ -4778,7 +4774,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
-echo "configure:4782: checking for --${enablestring:-enable}-url" >&5
+echo "configure:4778: checking for --${enablestring:-enable}-url" >&5
           no_cache=0
           # Check whether --enable-url or --disable-url was given.
 if test "${enable_url+set}" = set; then
@@ -4818,7 +4814,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
-echo "configure:4822: checking for --${enablestring:-enable}-protocol" >&5
+echo "configure:4818: checking for --${enablestring:-enable}-protocol" >&5
           no_cache=0
           # Check whether --enable-protocol or --disable-protocol was given.
 if test "${enable_protocol+set}" = set; then
@@ -4858,7 +4854,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
-echo "configure:4862: checking for --${enablestring:-enable}-protocol_http" >&5
+echo "configure:4858: checking for --${enablestring:-enable}-protocol_http" >&5
           no_cache=0
           # Check whether --enable-protocol_http or --disable-protocol_http was given.
 if test "${enable_protocol_http+set}" = set; then
@@ -4898,7 +4894,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
-echo "configure:4902: checking for --${enablestring:-enable}-protocol_ftp" >&5
+echo "configure:4898: checking for --${enablestring:-enable}-protocol_ftp" >&5
           no_cache=0
           # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given.
 if test "${enable_protocol_ftp+set}" = set; then
@@ -4938,7 +4934,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
-echo "configure:4942: checking for --${enablestring:-enable}-protocol_file" >&5
+echo "configure:4938: checking for --${enablestring:-enable}-protocol_file" >&5
           no_cache=0
           # Check whether --enable-protocol_file or --disable-protocol_file was given.
 if test "${enable_protocol_file+set}" = set; then
@@ -4981,7 +4977,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
-echo "configure:4985: checking for --${enablestring:-enable}-threads" >&5
+echo "configure:4981: checking for --${enablestring:-enable}-threads" >&5
           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
@@ -5025,7 +5021,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
-echo "configure:5029: checking for --${enablestring:-enable}-docview" >&5
+echo "configure:5025: checking for --${enablestring:-enable}-docview" >&5
           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
@@ -5065,7 +5061,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
-echo "configure:5069: checking for --${enablestring:-enable}-help" >&5
+echo "configure:5065: checking for --${enablestring:-enable}-help" >&5
           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
@@ -5105,7 +5101,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:5109: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+echo "configure:5105: checking for --${enablestring:-enable}-mshtmlhelp" >&5
           no_cache=0
           # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
@@ -5145,7 +5141,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
-echo "configure:5149: checking for --${enablestring:-enable}-html" >&5
+echo "configure:5145: checking for --${enablestring:-enable}-html" >&5
           no_cache=0
           # Check whether --enable-html or --disable-html was given.
 if test "${enable_html+set}" = set; then
@@ -5185,7 +5181,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
-echo "configure:5189: checking for --${enablestring:-enable}-htmlhelp" >&5
+echo "configure:5185: checking for --${enablestring:-enable}-htmlhelp" >&5
           no_cache=0
           # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
@@ -5225,7 +5221,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
-echo "configure:5229: checking for --${enablestring:-enable}-constraints" >&5
+echo "configure:5225: checking for --${enablestring:-enable}-constraints" >&5
           no_cache=0
           # Check whether --enable-constraints or --disable-constraints was given.
 if test "${enable_constraints+set}" = set; then
@@ -5265,7 +5261,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
-echo "configure:5269: checking for --${enablestring:-enable}-printarch" >&5
+echo "configure:5265: checking for --${enablestring:-enable}-printarch" >&5
           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
@@ -5305,7 +5301,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
-echo "configure:5309: checking for --${enablestring:-enable}-mdi" >&5
+echo "configure:5305: checking for --${enablestring:-enable}-mdi" >&5
           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
@@ -5345,7 +5341,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
-echo "configure:5349: checking for --${enablestring:-enable}-loggui" >&5
+echo "configure:5345: checking for --${enablestring:-enable}-loggui" >&5
           no_cache=0
           # Check whether --enable-loggui or --disable-loggui was given.
 if test "${enable_loggui+set}" = set; then
@@ -5385,7 +5381,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
-echo "configure:5389: checking for --${enablestring:-enable}-logwin" >&5
+echo "configure:5385: checking for --${enablestring:-enable}-logwin" >&5
           no_cache=0
           # Check whether --enable-logwin or --disable-logwin was given.
 if test "${enable_logwin+set}" = set; then
@@ -5425,7 +5421,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
-echo "configure:5429: checking for --${enablestring:-enable}-logdialog" >&5
+echo "configure:5425: checking for --${enablestring:-enable}-logdialog" >&5
           no_cache=0
           # Check whether --enable-logdialog or --disable-logdialog was given.
 if test "${enable_logdialog+set}" = set; then
@@ -5466,7 +5462,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
-echo "configure:5470: checking for --${enablestring:-enable}-postscript" >&5
+echo "configure:5466: checking for --${enablestring:-enable}-postscript" >&5
           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
@@ -5509,7 +5505,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6
-echo "configure:5513: checking for --${enablestring:-enable}-prologio" >&5
+echo "configure:5509: checking for --${enablestring:-enable}-prologio" >&5
           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then
@@ -5549,7 +5545,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
-echo "configure:5553: checking for --${enablestring:-enable}-resources" >&5
+echo "configure:5549: checking for --${enablestring:-enable}-resources" >&5
           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then
@@ -5590,7 +5586,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6
-echo "configure:5594: checking for --${enablestring:-enable}-xresources" >&5
+echo "configure:5590: checking for --${enablestring:-enable}-xresources" >&5
           no_cache=0
           # Check whether --enable-xresources or --disable-xresources was given.
 if test "${enable_xresources+set}" = set; then
@@ -5632,7 +5628,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
-echo "configure:5636: checking for --${enablestring:-enable}-clipboard" >&5
+echo "configure:5632: checking for --${enablestring:-enable}-clipboard" >&5
           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
@@ -5672,7 +5668,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
-echo "configure:5676: checking for --${enablestring:-enable}-dnd" >&5
+echo "configure:5672: checking for --${enablestring:-enable}-dnd" >&5
           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
@@ -5712,7 +5708,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:5716: checking for --${enablestring:-enable}-metafile" >&5
+echo "configure:5712: checking for --${enablestring:-enable}-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -5753,7 +5749,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-treelayout""... $ac_c" 1>&6
-echo "configure:5757: checking for --${enablestring:-enable}-treelayout" >&5
+echo "configure:5753: checking for --${enablestring:-enable}-treelayout" >&5
           no_cache=0
           # Check whether --enable-treelayout or --disable-treelayout was given.
 if test "${enable_treelayout+set}" = set; then
@@ -5795,7 +5791,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
-echo "configure:5799: checking for --${enablestring:-enable}-controls" >&5
+echo "configure:5795: checking for --${enablestring:-enable}-controls" >&5
           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
@@ -5916,7 +5912,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
-echo "configure:5920: checking for --${enablestring:-enable}-accel" >&5
+echo "configure:5916: checking for --${enablestring:-enable}-accel" >&5
           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
@@ -5956,7 +5952,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
-echo "configure:5960: checking for --${enablestring:-enable}-button" >&5
+echo "configure:5956: checking for --${enablestring:-enable}-button" >&5
           no_cache=0
           # Check whether --enable-button or --disable-button was given.
 if test "${enable_button+set}" = set; then
@@ -5996,7 +5992,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
-echo "configure:6000: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo "configure:5996: checking for --${enablestring:-enable}-bmpbutton" >&5
           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
@@ -6036,7 +6032,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
-echo "configure:6040: checking for --${enablestring:-enable}-calendar" >&5
+echo "configure:6036: checking for --${enablestring:-enable}-calendar" >&5
           no_cache=0
           # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
@@ -6076,7 +6072,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
-echo "configure:6080: checking for --${enablestring:-enable}-caret" >&5
+echo "configure:6076: checking for --${enablestring:-enable}-caret" >&5
           no_cache=0
           # Check whether --enable-caret or --disable-caret was given.
 if test "${enable_caret+set}" = set; then
@@ -6116,7 +6112,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
-echo "configure:6120: checking for --${enablestring:-enable}-checkbox" >&5
+echo "configure:6116: checking for --${enablestring:-enable}-checkbox" >&5
           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
@@ -6156,7 +6152,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
-echo "configure:6160: checking for --${enablestring:-enable}-checklst" >&5
+echo "configure:6156: checking for --${enablestring:-enable}-checklst" >&5
           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
@@ -6196,7 +6192,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
-echo "configure:6200: checking for --${enablestring:-enable}-choice" >&5
+echo "configure:6196: checking for --${enablestring:-enable}-choice" >&5
           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
@@ -6236,7 +6232,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
-echo "configure:6240: checking for --${enablestring:-enable}-combobox" >&5
+echo "configure:6236: checking for --${enablestring:-enable}-combobox" >&5
           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
@@ -6276,7 +6272,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
-echo "configure:6280: checking for --${enablestring:-enable}-gauge" >&5
+echo "configure:6276: checking for --${enablestring:-enable}-gauge" >&5
           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then
@@ -6316,7 +6312,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
-echo "configure:6320: checking for --${enablestring:-enable}-grid" >&5
+echo "configure:6316: checking for --${enablestring:-enable}-grid" >&5
           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then
@@ -6356,7 +6352,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-newgrid""... $ac_c" 1>&6
-echo "configure:6360: checking for --${enablestring:-enable}-newgrid" >&5
+echo "configure:6356: checking for --${enablestring:-enable}-newgrid" >&5
           no_cache=0
           # Check whether --enable-newgrid or --disable-newgrid was given.
 if test "${enable_newgrid+set}" = set; then
@@ -6396,7 +6392,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
-echo "configure:6400: checking for --${enablestring:-enable}-imaglist" >&5
+echo "configure:6396: checking for --${enablestring:-enable}-imaglist" >&5
           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
@@ -6436,7 +6432,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
-echo "configure:6440: checking for --${enablestring:-enable}-listbox" >&5
+echo "configure:6436: checking for --${enablestring:-enable}-listbox" >&5
           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
@@ -6476,7 +6472,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
-echo "configure:6480: checking for --${enablestring:-enable}-listctrl" >&5
+echo "configure:6476: checking for --${enablestring:-enable}-listctrl" >&5
           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
@@ -6516,7 +6512,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
-echo "configure:6520: checking for --${enablestring:-enable}-notebook" >&5
+echo "configure:6516: checking for --${enablestring:-enable}-notebook" >&5
           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
@@ -6556,7 +6552,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-propsheet""... $ac_c" 1>&6
-echo "configure:6560: checking for --${enablestring:-enable}-propsheet" >&5
+echo "configure:6556: checking for --${enablestring:-enable}-propsheet" >&5
           no_cache=0
           # Check whether --enable-propsheet or --disable-propsheet was given.
 if test "${enable_propsheet+set}" = set; then
@@ -6596,7 +6592,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
-echo "configure:6600: checking for --${enablestring:-enable}-radiobox" >&5
+echo "configure:6596: checking for --${enablestring:-enable}-radiobox" >&5
           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
@@ -6636,7 +6632,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
-echo "configure:6640: checking for --${enablestring:-enable}-radiobtn" >&5
+echo "configure:6636: checking for --${enablestring:-enable}-radiobtn" >&5
           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
@@ -6676,7 +6672,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
-echo "configure:6680: checking for --${enablestring:-enable}-sash" >&5
+echo "configure:6676: checking for --${enablestring:-enable}-sash" >&5
           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
@@ -6716,7 +6712,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
-echo "configure:6720: checking for --${enablestring:-enable}-scrollbar" >&5
+echo "configure:6716: checking for --${enablestring:-enable}-scrollbar" >&5
           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
@@ -6756,7 +6752,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
-echo "configure:6760: checking for --${enablestring:-enable}-slider" >&5
+echo "configure:6756: checking for --${enablestring:-enable}-slider" >&5
           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
@@ -6796,7 +6792,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
-echo "configure:6800: checking for --${enablestring:-enable}-spinbtn" >&5
+echo "configure:6796: checking for --${enablestring:-enable}-spinbtn" >&5
           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
@@ -6836,7 +6832,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
-echo "configure:6840: checking for --${enablestring:-enable}-spinctrl" >&5
+echo "configure:6836: checking for --${enablestring:-enable}-spinctrl" >&5
           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
@@ -6876,7 +6872,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
-echo "configure:6880: checking for --${enablestring:-enable}-splitter" >&5
+echo "configure:6876: checking for --${enablestring:-enable}-splitter" >&5
           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
@@ -6916,7 +6912,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
-echo "configure:6920: checking for --${enablestring:-enable}-statbmp" >&5
+echo "configure:6916: checking for --${enablestring:-enable}-statbmp" >&5
           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
@@ -6956,7 +6952,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
-echo "configure:6960: checking for --${enablestring:-enable}-statbox" >&5
+echo "configure:6956: checking for --${enablestring:-enable}-statbox" >&5
           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
@@ -6996,7 +6992,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
-echo "configure:7000: checking for --${enablestring:-enable}-statline" >&5
+echo "configure:6996: checking for --${enablestring:-enable}-statline" >&5
           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
@@ -7036,7 +7032,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
-echo "configure:7040: checking for --${enablestring:-enable}-stattext" >&5
+echo "configure:7036: checking for --${enablestring:-enable}-stattext" >&5
           no_cache=0
           # Check whether --enable-stattext or --disable-stattext was given.
 if test "${enable_stattext+set}" = set; then
@@ -7076,7 +7072,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
-echo "configure:7080: checking for --${enablestring:-enable}-statusbar" >&5
+echo "configure:7076: checking for --${enablestring:-enable}-statusbar" >&5
           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
@@ -7116,7 +7112,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
-echo "configure:7120: checking for --${enablestring:-enable}-tabdialog" >&5
+echo "configure:7116: checking for --${enablestring:-enable}-tabdialog" >&5
           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
@@ -7156,7 +7152,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
-echo "configure:7160: checking for --${enablestring:-enable}-textctrl" >&5
+echo "configure:7156: checking for --${enablestring:-enable}-textctrl" >&5
           no_cache=0
           # Check whether --enable-textctrl or --disable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
@@ -7196,7 +7192,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
-echo "configure:7200: checking for --${enablestring:-enable}-togglebtn" >&5
+echo "configure:7196: checking for --${enablestring:-enable}-togglebtn" >&5
           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
@@ -7236,7 +7232,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
-echo "configure:7240: checking for --${enablestring:-enable}-toolbar" >&5
+echo "configure:7236: checking for --${enablestring:-enable}-toolbar" >&5
           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
@@ -7276,7 +7272,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
-echo "configure:7280: checking for --${enablestring:-enable}-tbarnative" >&5
+echo "configure:7276: checking for --${enablestring:-enable}-tbarnative" >&5
           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
@@ -7316,7 +7312,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
-echo "configure:7320: checking for --${enablestring:-enable}-tbarsmpl" >&5
+echo "configure:7316: checking for --${enablestring:-enable}-tbarsmpl" >&5
           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
@@ -7356,7 +7352,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
-echo "configure:7360: checking for --${enablestring:-enable}-treectrl" >&5
+echo "configure:7356: checking for --${enablestring:-enable}-treectrl" >&5
           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
@@ -7396,7 +7392,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
-echo "configure:7400: checking for --${enablestring:-enable}-tipwindow" >&5
+echo "configure:7396: checking for --${enablestring:-enable}-tipwindow" >&5
           no_cache=0
           # Check whether --enable-tipwindow or --disable-tipwindow was given.
 if test "${enable_tipwindow+set}" = set; then
@@ -7436,7 +7432,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
-echo "configure:7440: checking for --${enablestring:-enable}-popupwin" >&5
+echo "configure:7436: checking for --${enablestring:-enable}-popupwin" >&5
           no_cache=0
           # Check whether --enable-popupwin or --disable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
@@ -7478,7 +7474,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
-echo "configure:7482: checking for --${enablestring:-enable}-commondlg" >&5
+echo "configure:7478: checking for --${enablestring:-enable}-commondlg" >&5
           no_cache=0
           # Check whether --enable-commondlg or --disable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
@@ -7518,7 +7514,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
-echo "configure:7522: checking for --${enablestring:-enable}-choicedlg" >&5
+echo "configure:7518: checking for --${enablestring:-enable}-choicedlg" >&5
           no_cache=0
           # Check whether --enable-choicedlg or --disable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
@@ -7558,7 +7554,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
-echo "configure:7562: checking for --${enablestring:-enable}-coldlg" >&5
+echo "configure:7558: checking for --${enablestring:-enable}-coldlg" >&5
           no_cache=0
           # Check whether --enable-coldlg or --disable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
@@ -7598,7 +7594,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
-echo "configure:7602: checking for --${enablestring:-enable}-filedlg" >&5
+echo "configure:7598: checking for --${enablestring:-enable}-filedlg" >&5
           no_cache=0
           # Check whether --enable-filedlg or --disable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
@@ -7638,7 +7634,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
-echo "configure:7642: checking for --${enablestring:-enable}-finddlg" >&5
+echo "configure:7638: checking for --${enablestring:-enable}-finddlg" >&5
           no_cache=0
           # Check whether --enable-finddlg or --disable-finddlg was given.
 if test "${enable_finddlg+set}" = set; then
@@ -7678,7 +7674,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
-echo "configure:7682: checking for --${enablestring:-enable}-fontdlg" >&5
+echo "configure:7678: checking for --${enablestring:-enable}-fontdlg" >&5
           no_cache=0
           # Check whether --enable-fontdlg or --disable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
@@ -7718,7 +7714,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
-echo "configure:7722: checking for --${enablestring:-enable}-dirdlg" >&5
+echo "configure:7718: checking for --${enablestring:-enable}-dirdlg" >&5
           no_cache=0
           # Check whether --enable-dirdlg or --disable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
@@ -7758,7 +7754,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
-echo "configure:7762: checking for --${enablestring:-enable}-msgdlg" >&5
+echo "configure:7758: checking for --${enablestring:-enable}-msgdlg" >&5
           no_cache=0
           # Check whether --enable-msgdlg or --disable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
@@ -7798,7 +7794,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
-echo "configure:7802: checking for --${enablestring:-enable}-numberdlg" >&5
+echo "configure:7798: checking for --${enablestring:-enable}-numberdlg" >&5
           no_cache=0
           # Check whether --enable-numberdlg or --disable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
@@ -7838,7 +7834,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
-echo "configure:7842: checking for --${enablestring:-enable}-splash" >&5
+echo "configure:7838: checking for --${enablestring:-enable}-splash" >&5
           no_cache=0
           # Check whether --enable-splash or --disable-splash was given.
 if test "${enable_splash+set}" = set; then
@@ -7878,7 +7874,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
-echo "configure:7882: checking for --${enablestring:-enable}-textdlg" >&5
+echo "configure:7878: checking for --${enablestring:-enable}-textdlg" >&5
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
@@ -7918,7 +7914,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
-echo "configure:7922: checking for --${enablestring:-enable}-tipdlg" >&5
+echo "configure:7918: checking for --${enablestring:-enable}-tipdlg" >&5
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
@@ -7958,7 +7954,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
-echo "configure:7962: checking for --${enablestring:-enable}-progressdlg" >&5
+echo "configure:7958: checking for --${enablestring:-enable}-progressdlg" >&5
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
@@ -7998,7 +7994,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
-echo "configure:8002: checking for --${enablestring:-enable}-wizarddlg" >&5
+echo "configure:7998: checking for --${enablestring:-enable}-wizarddlg" >&5
           no_cache=0
           # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
@@ -8040,7 +8036,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
-echo "configure:8044: checking for --${enablestring:-enable}-menus" >&5
+echo "configure:8040: checking for --${enablestring:-enable}-menus" >&5
           no_cache=0
           # Check whether --enable-menus or --disable-menus was given.
 if test "${enable_menus+set}" = set; then
@@ -8080,7 +8076,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
-echo "configure:8084: checking for --${enablestring:-enable}-miniframe" >&5
+echo "configure:8080: checking for --${enablestring:-enable}-miniframe" >&5
           no_cache=0
           # Check whether --enable-miniframe or --disable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
@@ -8120,7 +8116,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
-echo "configure:8124: checking for --${enablestring:-enable}-tooltips" >&5
+echo "configure:8120: checking for --${enablestring:-enable}-tooltips" >&5
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
@@ -8160,7 +8156,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
-echo "configure:8164: checking for --${enablestring:-enable}-splines" >&5
+echo "configure:8160: checking for --${enablestring:-enable}-splines" >&5
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
@@ -8200,7 +8196,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
-echo "configure:8204: checking for --${enablestring:-enable}-validators" >&5
+echo "configure:8200: checking for --${enablestring:-enable}-validators" >&5
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
@@ -8240,7 +8236,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6
-echo "configure:8244: checking for --${enablestring:-enable}-busyinfo" >&5
+echo "configure:8240: checking for --${enablestring:-enable}-busyinfo" >&5
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
@@ -8280,7 +8276,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
-echo "configure:8284: checking for --${enablestring:-enable}-joystick" >&5
+echo "configure:8280: checking for --${enablestring:-enable}-joystick" >&5
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
@@ -8320,7 +8316,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:8324: checking for --${enablestring:-enable}-metafile" >&5
+echo "configure:8320: checking for --${enablestring:-enable}-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -8360,7 +8356,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
-echo "configure:8364: checking for --${enablestring:-enable}-dragimage" >&5
+echo "configure:8360: checking for --${enablestring:-enable}-dragimage" >&5
           no_cache=0
           # Check whether --enable-dragimage or --disable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
@@ -8402,7 +8398,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
-echo "configure:8406: checking for --${enablestring:-enable}-palette" >&5
+echo "configure:8402: checking for --${enablestring:-enable}-palette" >&5
           no_cache=0
           # Check whether --enable-palette or --disable-palette was given.
 if test "${enable_palette+set}" = set; then
@@ -8442,7 +8438,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
-echo "configure:8446: checking for --${enablestring:-enable}-image" >&5
+echo "configure:8442: checking for --${enablestring:-enable}-image" >&5
           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
@@ -8482,7 +8478,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
-echo "configure:8486: checking for --${enablestring:-enable}-gif" >&5
+echo "configure:8482: checking for --${enablestring:-enable}-gif" >&5
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
@@ -8522,7 +8518,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
-echo "configure:8526: checking for --${enablestring:-enable}-pcx" >&5
+echo "configure:8522: checking for --${enablestring:-enable}-pcx" >&5
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
@@ -8562,7 +8558,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
-echo "configure:8566: checking for --${enablestring:-enable}-iff" >&5
+echo "configure:8562: checking for --${enablestring:-enable}-iff" >&5
           no_cache=0
           # Check whether --enable-iff or --disable-iff was given.
 if test "${enable_iff+set}" = set; then
@@ -8602,7 +8598,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
-echo "configure:8606: checking for --${enablestring:-enable}-pnm" >&5
+echo "configure:8602: checking for --${enablestring:-enable}-pnm" >&5
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
@@ -8642,7 +8638,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
-echo "configure:8646: checking for --${enablestring:-enable}-xpm" >&5
+echo "configure:8642: checking for --${enablestring:-enable}-xpm" >&5
           no_cache=0
           # Check whether --enable-xpm or --disable-xpm was given.
 if test "${enable_xpm+set}" = set; then
@@ -8682,7 +8678,7 @@ fi
 
 	  enablestring=
           echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
-echo "configure:8686: checking for --${enablestring:-enable}-ico_cur" >&5
+echo "configure:8682: checking for --${enablestring:-enable}-ico_cur" >&5
           no_cache=0
           # Check whether --enable-ico_cur or --disable-ico_cur was given.
 if test "${enable_ico_cur+set}" = set; then
@@ -8722,7 +8718,7 @@ fi
 
 	  enablestring=disable
           echo $ac_n "checking for --${enablestring:-enable}-dynamic_dib""... $ac_c" 1>&6
-echo "configure:8726: checking for --${enablestring:-enable}-dynamic_dib" >&5
+echo "configure:8722: checking for --${enablestring:-enable}-dynamic_dib" >&5
           no_cache=0
           # Check whether --enable-dynamic_dib or --disable-dynamic_dib was given.
 if test "${enable_dynamic_dib+set}" = set; then
@@ -8762,7 +8758,7 @@ fi
 
 	  enablestring=disable
           echo $ac_n "checking for --${enablestring:-enable}-dynamic_ico_cur""... $ac_c" 1>&6
-echo "configure:8766: checking for --${enablestring:-enable}-dynamic_ico_cur" >&5
+echo "configure:8762: checking for --${enablestring:-enable}-dynamic_ico_cur" >&5
           no_cache=0
           # Check whether --enable-dynamic_ico_cur or --disable-dynamic_ico_cur was given.
 if test "${enable_dynamic_ico_cur+set}" = set; then
@@ -8821,7 +8817,7 @@ esac
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:8825: checking for toolkit" >&5
+echo "configure:8821: checking for toolkit" >&5
 
 if test "$wxUSE_GUI" = "yes"; then
 
@@ -8874,7 +8870,7 @@ if test "$wxUSE_GUI" = "yes"; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         fi
         if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+          toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
           echo "$ac_t""$toolkit_echo" 1>&6
         fi
       fi
@@ -9008,7 +9004,7 @@ CFLAGS=${CFLAGS:=}
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9012: checking for $ac_word" >&5
+echo "configure:9008: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9038,7 +9034,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9042: checking for $ac_word" >&5
+echo "configure:9038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9089,7 +9085,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9093: checking for $ac_word" >&5
+echo "configure:9089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9121,7 +9117,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:9125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:9121: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -9132,12 +9128,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 9136 "configure"
+#line 9132 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:9141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -9163,12 +9159,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:9167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9163: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:9172: checking whether we are using GNU C" >&5
+echo "configure:9168: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9177,7 +9173,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -9196,7 +9192,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:9200: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:9196: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9229,7 +9225,7 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:9233: checking how to run the C preprocessor" >&5
+echo "configure:9229: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -9244,13 +9240,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 9248 "configure"
+#line 9244 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -9261,13 +9257,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 9265 "configure"
+#line 9261 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -9278,13 +9274,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 9282 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -9310,13 +9306,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:9314: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9310: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 9320 "configure"
+#line 9316 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -9334,7 +9330,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 9338 "configure"
+#line 9334 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -9371,7 +9367,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9375: checking for $ac_word" >&5
+echo "configure:9371: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9403,7 +9399,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:9407: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:9403: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -9414,12 +9410,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 9418 "configure"
+#line 9414 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -9445,12 +9441,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:9449: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9445: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:9454: checking whether we are using GNU C++" >&5
+echo "configure:9450: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9459,7 +9455,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -9478,7 +9474,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:9482: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:9478: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9521,7 +9517,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9525: checking for $ac_word" >&5
+echo "configure:9521: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9552,7 +9548,7 @@ fi
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9556: checking for $ac_word" >&5
+echo "configure:9552: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9592,7 +9588,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:9596: checking for a BSD compatible install" >&5
+echo "configure:9592: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9668,7 +9664,7 @@ esac
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9672: checking for $ac_word" >&5
+echo "configure:9668: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9697,7 +9693,7 @@ fi
 
 
 echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
-echo "configure:9701: checking if make is GNU make" >&5
+echo "configure:9697: checking if make is GNU make" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9723,7 +9719,7 @@ fi
 
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
 echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
-echo "configure:9727: checking if make supports VPATH" >&5
+echo "configure:9723: checking if make supports VPATH" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9770,7 +9766,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9774: checking for $ac_word" >&5
+echo "configure:9770: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9804,7 +9800,7 @@ test -n "$YACC" || YACC="yacc"
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9808: checking for $ac_word" >&5
+echo "configure:9804: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9838,7 +9834,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:9842: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9838: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9846,7 +9842,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9850 "configure"
+#line 9846 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9857,7 +9853,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:9861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9881,7 +9877,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:9885: checking whether ln -s works" >&5
+echo "configure:9881: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9904,10 +9900,9 @@ fi
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
-            LIBS="$LIBS -lstdcpp"
       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
                               echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6
-echo "configure:9911: checking for drand48 in -lcExt" >&5
+echo "configure:9906: checking for drand48 in -lcExt" >&5
 ac_lib_var=`echo cExt'_'drand48 | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9915,7 +9910,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcExt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9919 "configure"
+#line 9914 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9926,7 +9921,7 @@ int main() {
 drand48()
 ; return 0; }
 EOF
-if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9948,17 +9943,18 @@ fi
 
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+	  CLEANRESPROGRAMOBJ=""
       fi
       echo $ac_n "checking for gcc 3 or later""... $ac_c" 1>&6
-echo "configure:9954: checking for gcc 3 or later" >&5
+echo "configure:9950: checking for gcc 3 or later" >&5
 if eval "test \"`echo '$''{'wx_cv_gcc3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
           cat > conftest.$ac_ext <<EOF
-#line 9960 "configure"
+#line 9956 "configure"
 #include "confdefs.h"
-#include <features.h>
+
 int main() {
 
                   #if (__GNUC__ < 3)
@@ -9967,7 +9963,7 @@ int main() {
               
 ; return 0; }
 EOF
-if { (eval echo configure:9971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                   wx_cv_gcc3=yes
@@ -10000,17 +9996,17 @@ if test "$wxUSE_MAC" != 1; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10004: checking for $ac_hdr" >&5
+echo "configure:10000: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10009 "configure"
+#line 10005 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10042,17 +10038,17 @@ for ac_hdr in stdlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10046: checking for $ac_hdr" >&5
+echo "configure:10042: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10051 "configure"
+#line 10047 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10082,17 +10078,17 @@ for ac_hdr in malloc.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10086: checking for $ac_hdr" >&5
+echo "configure:10082: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10091 "configure"
+#line 10087 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10122,17 +10118,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10126: checking for $ac_hdr" >&5
+echo "configure:10122: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10131 "configure"
+#line 10127 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10162,17 +10158,17 @@ for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10166: checking for $ac_hdr" >&5
+echo "configure:10162: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10171 "configure"
+#line 10167 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10204,17 +10200,17 @@ if test "$ac_cv_header_wchar_h" != "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10208: checking for $ac_hdr" >&5
+echo "configure:10204: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10213 "configure"
+#line 10209 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10246,17 +10242,17 @@ for ac_hdr in fnmatch.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10250: checking for $ac_hdr" >&5
+echo "configure:10246: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10255 "configure"
+#line 10251 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10287,12 +10283,12 @@ if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
     for ac_func in fnmatch
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10291: checking for $ac_func" >&5
+echo "configure:10287: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+#line 10292 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10315,7 +10311,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10345,17 +10341,17 @@ for ac_hdr in langinfo.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10349: checking for $ac_hdr" >&5
+echo "configure:10345: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10354 "configure"
+#line 10350 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10392,21 +10388,61 @@ esac
 
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-                for ac_hdr in X11/XKBlib.h
+                for ac_hdr in X11/Xlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10400: checking for $ac_hdr" >&5
+echo "configure:10396: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10405 "configure"
+#line 10401 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+        for ac_hdr in X11/XKBlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10436: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10441 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10437,12 +10473,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10441: checking for working const" >&5
+echo "configure:10477: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10446 "configure"
+#line 10482 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -10491,7 +10527,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:10495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -10512,21 +10548,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:10516: checking for inline" >&5
+echo "configure:10552: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 10523 "configure"
+#line 10559 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:10530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -10553,7 +10589,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:10557: checking size of char" >&5
+echo "configure:10593: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10561,9 +10597,10 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 10565 "configure"
+#line 10601 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10572,7 +10609,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -10592,7 +10629,7 @@ EOF
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10596: checking size of short" >&5
+echo "configure:10633: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10600,9 +10637,10 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 10604 "configure"
+#line 10641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10611,7 +10649,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -10631,7 +10669,7 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:10635: checking size of void *" >&5
+echo "configure:10673: checking size of void *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10639,9 +10677,10 @@ else
   ac_cv_sizeof_void_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10643 "configure"
+#line 10681 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10650,7 +10689,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -10670,7 +10709,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10674: checking size of int" >&5
+echo "configure:10713: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10678,9 +10717,10 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10682 "configure"
+#line 10721 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10689,7 +10729,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -10709,7 +10749,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10713: checking size of long" >&5
+echo "configure:10753: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10717,9 +10757,10 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10721 "configure"
+#line 10761 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10728,7 +10769,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -10747,11 +10788,51 @@ cat >> confdefs.h <<EOF
 EOF
 
 
+echo $ac_n "checking size of size_t""... $ac_c" 1>&6
+echo "configure:10793: checking size of size_t" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_size_t=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10801 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(size_t));
+  exit(0);
+}
+EOF
+if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_size_t=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_size_t=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_size_t" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+EOF
+
+
 
 case "${host}" in
     arm-*-linux* )
         echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10755: checking size of long long" >&5
+echo "configure:10836: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10759,9 +10840,10 @@ else
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 10763 "configure"
+#line 10844 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10770,7 +10852,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -10792,7 +10874,7 @@ EOF
     ;;
     *-hp-hpux* )
         echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10796: checking size of long long" >&5
+echo "configure:10878: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10800,9 +10882,10 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 10804 "configure"
+#line 10886 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10811,7 +10894,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -10836,7 +10919,7 @@ EOF
     ;;
     * )
         echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10840: checking size of long long" >&5
+echo "configure:10923: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10844,9 +10927,10 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 10848 "configure"
+#line 10931 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -10855,7 +10939,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -10877,7 +10961,7 @@ EOF
 esac
 
 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10881: checking size of wchar_t" >&5
+echo "configure:10965: checking size of wchar_t" >&5
 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10896,7 +10980,7 @@ else
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 10900 "configure"
+#line 10984 "configure"
 #include "confdefs.h"
 
             /* DJGPP only has fake wchar_t: */
@@ -10922,7 +11006,7 @@ else
             }
         
 EOF
-if { (eval echo configure:10926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   wx_cv_sizeof_wchar_t=`cat conftestval`
 else
@@ -10954,13 +11038,13 @@ if test "$enable_largefile" != no; then
             wx_largefile=no
     
     echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:10958: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:11042: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
           cat > conftest.$ac_ext <<EOF
-#line 10964 "configure"
+#line 11048 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
                           #include <sys/types.h>
@@ -10971,7 +11055,7 @@ typedef struct {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_file_offset_bits=64
 else
@@ -10998,13 +11082,13 @@ EOF
     if test "x$wx_largefile" != "xyes"; then
         
     echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:11002: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:11086: checking for _LARGE_FILES value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
           cat > conftest.$ac_ext <<EOF
-#line 11008 "configure"
+#line 11092 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
                           #include <sys/types.h>
@@ -11015,7 +11099,7 @@ typedef struct {
 
 ; return 0; }
 EOF
-if { (eval echo configure:11019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_large_files=1
 else
@@ -11042,7 +11126,7 @@ EOF
     fi
 
     echo $ac_n "checking if large file support is available""... $ac_c" 1>&6
-echo "configure:11046: checking if large file support is available" >&5
+echo "configure:11130: checking if large file support is available" >&5
     if test "x$wx_largefile" = "xyes"; then
         cat >> confdefs.h <<\EOF
 #define HAVE_LARGEFILE_SUPPORT 1
@@ -11063,14 +11147,14 @@ if test "x$wx_largefile" = "xyes"; then
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:11067: checking whether byte ordering is bigendian" >&5
+echo "configure:11151: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 11074 "configure"
+#line 11158 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -11081,11 +11165,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:11085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 11089 "configure"
+#line 11173 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -11096,7 +11180,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:11100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -11116,7 +11200,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 11120 "configure"
+#line 11204 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -11129,7 +11213,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:11133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -11157,7 +11241,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:11161: checking how to run the C++ preprocessor" >&5
+echo "configure:11245: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11170,12 +11254,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 11174 "configure"
+#line 11258 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -11219,17 +11303,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11223: checking for $ac_hdr" >&5
+echo "configure:11307: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11228 "configure"
+#line 11312 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11277,7 +11361,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:11281: checking if C++ compiler supports bool" >&5
+echo "configure:11365: checking if C++ compiler supports bool" >&5
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11292,7 +11376,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
-#line 11296 "configure"
+#line 11380 "configure"
 #include "confdefs.h"
 
       
@@ -11304,7 +11388,7 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:11308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
         wx_cv_cpp_bool=yes
@@ -11342,7 +11426,7 @@ EOF
 
 
   echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6
-echo "configure:11346: checking if C++ compiler supports the explicit keyword" >&5
+echo "configure:11430: checking if C++ compiler supports the explicit keyword" >&5
 if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11357,7 +11441,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 11361 "configure"
+#line 11445 "configure"
 #include "confdefs.h"
 
         class Foo { public: explicit Foo(int) {} };
@@ -11368,11 +11452,11 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:11372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
         cat > conftest.$ac_ext <<EOF
-#line 11376 "configure"
+#line 11460 "configure"
 #include "confdefs.h"
 
                 class Foo { public: explicit Foo(int) {} };
@@ -11385,7 +11469,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:11389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_explicit=no
 else
@@ -11543,15 +11627,15 @@ fi
 rm -f confcache
 
 
-if test "$USE_LINUX" = 1 || test "$USE_GNU" = 1 ; then
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
     echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:11549: checking for glibc 2.1 or later" >&5
+echo "configure:11633: checking for glibc 2.1 or later" >&5
 if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 11555 "configure"
+#line 11639 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -11562,7 +11646,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_lib_glibc21=yes
@@ -11610,17 +11694,17 @@ EOF
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
                         ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:11614: checking for regex.h" >&5
+echo "configure:11698: checking for regex.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11619 "configure"
+#line 11703 "configure"
 #include "confdefs.h"
 #include <regex.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11639,12 +11723,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   for ac_func in regcomp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11643: checking for $ac_func" >&5
+echo "configure:11727: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11648 "configure"
+#line 11732 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11667,7 +11751,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11727,24 +11811,63 @@ EOF
             system_zlib_h_ok="yes"
         else
                                                                                     echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
-echo "configure:11731: checking for zlib.h >= 1.1.4" >&5
+echo "configure:11815: checking for zlib.h >= 1.1.4" >&5
 if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
-                      ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+                      unset ac_cv_header_zlib_h
+                
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11824 "configure"
+#include "confdefs.h"
+                    
+                        #include <zlib.h>
+                        #include <stdio.h>
+
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                    ZLIB_VERSION[0] == '1' &&
+                                    (ZLIB_VERSION[2] > '1' ||
+                                    (ZLIB_VERSION[2] == '1' &&
+                                     ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
+                            exit(0);
+                        }
+                    
+EOF
+if { (eval echo configure:11843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_zlib_h=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_zlib_h=no
+fi
+rm -fr conftest*
+fi
+
+            
+fi
+
+echo "$ac_t""$ac_cv_header_zlib_h" 1>&6
+                                    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:11738: checking for zlib.h" >&5
+echo "configure:11861: checking for zlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11743 "configure"
+#line 11866 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11765,51 +11888,13 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-                
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11772 "configure"
-#include "confdefs.h"
-                    
-                        #include <zlib.h>
-                        #include <stdio.h>
-
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                    ZLIB_VERSION[0] == '1' &&
-                                    (ZLIB_VERSION[2] > '1' ||
-                                    (ZLIB_VERSION[2] == '1' &&
-                                     ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
-                            exit(0);
-                        }
-                    
-EOF
-if { (eval echo configure:11791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_header_zlib_h=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_zlib_h=no
-fi
-rm -fr conftest*
-fi
-
-            
-fi
-
-echo "$ac_t""$ac_cv_header_zlib_h" 1>&6
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
 
         if test "$system_zlib_h_ok" = "yes"; then
             echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:11813: checking for deflate in -lz" >&5
+echo "configure:11898: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11817,7 +11902,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11821 "configure"
+#line 11906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11828,7 +11913,7 @@ int main() {
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:11832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11889,24 +11974,60 @@ EOF
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
                                     echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
-echo "configure:11893: checking for png.h > 0.90" >&5
+echo "configure:11978: checking for png.h > 0.90" >&5
 if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
-                      ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+                      unset ac_cv_header_png_h
+                
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11987 "configure"
+#include "confdefs.h"
+                    
+                        #include <png.h>
+                        #include <stdio.h>
+
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                            exit(0);
+                        }
+                    
+EOF
+if { (eval echo configure:12003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_png_h=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_png_h=no
+fi
+rm -fr conftest*
+fi
+
+            
+fi
+
+echo "$ac_t""$ac_cv_header_png_h" 1>&6
+            ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:11900: checking for png.h" >&5
+echo "configure:12021: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11905 "configure"
+#line 12026 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11927,45 +12048,10 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-                
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11934 "configure"
-#include "confdefs.h"
-                    
-                        #include <png.h>
-                        #include <stdio.h>
-
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
-                    
-EOF
-if { (eval echo configure:11950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_header_png_h=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_png_h=no
-fi
-rm -fr conftest*
-fi
-
-            
-fi
-
-echo "$ac_t""$ac_cv_header_png_h" 1>&6
 
             if test "$ac_cv_header_png_h" = "yes"; then
                 echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:11969: checking for png_check_sig in -lpng" >&5
+echo "configure:12055: checking for png_check_sig in -lpng" >&5
 ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11973,7 +12059,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11977 "configure"
+#line 12063 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11984,7 +12070,7 @@ int main() {
 png_check_sig()
 ; return 0; }
 EOF
-if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12043,12 +12129,12 @@ EOF
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
                                                 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:12047: checking for jpeglib.h" >&5
+echo "configure:12133: checking for jpeglib.h" >&5
             if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12052 "configure"
+#line 12138 "configure"
 #include "confdefs.h"
 
                         #undef HAVE_STDLIB_H
@@ -12060,7 +12146,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:12064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_jpeglib_h=yes
 else
@@ -12078,7 +12164,7 @@ fi
 
             if test "$ac_cv_header_jpeglib_h" = "yes"; then
                 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:12082: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:12168: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12086,7 +12172,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12090 "configure"
+#line 12176 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12097,7 +12183,7 @@ int main() {
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:12101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12156,17 +12242,17 @@ EOF
         fi
         ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:12160: checking for tiffio.h" >&5
+echo "configure:12246: checking for tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12165 "configure"
+#line 12251 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12184,7 +12270,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
                 echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
-echo "configure:12188: checking for TIFFError in -ltiff" >&5
+echo "configure:12274: checking for TIFFError in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12192,7 +12278,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12196 "configure"
+#line 12282 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12203,7 +12289,7 @@ int main() {
 TIFFError()
 ; return 0; }
 EOF
-if { (eval echo configure:12207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12260,17 +12346,17 @@ if test "$USE_WIN32" = 1 ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12264: checking for $ac_hdr" >&5
+echo "configure:12350: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12269 "configure"
+#line 12355 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12298,17 +12384,17 @@ done
 
     ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:12302: checking for windows.h" >&5
+echo "configure:12388: checking for windows.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12307 "configure"
+#line 12393 "configure"
 #include "confdefs.h"
 #include <windows.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12334,13 +12420,13 @@ fi
 
 
         echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
-echo "configure:12338: checking if w32api has good enough MSIE support" >&5
+echo "configure:12424: checking if w32api has good enough MSIE support" >&5
 if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 12344 "configure"
+#line 12430 "configure"
 #include "confdefs.h"
 #include <w32api.h>
 int main() {
@@ -12356,7 +12442,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:12360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_w32api_win32_ie=yes
@@ -12392,6 +12478,7 @@ echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+    CLEANRESPROGRAMOBJ=${RESPROGRAMOBJ}
 
         WIN32INSTALL=win32install
 fi
@@ -12425,7 +12512,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
     if test "$wxUSE_GTK" = 1; then
         echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:12429: checking for GTK+ version" >&5
+echo "configure:12516: checking for GTK+ version" >&5
 
         gtk_version_cached=1
         if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
@@ -12466,7 +12553,7 @@ fi
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12470: checking for $ac_word" >&5
+echo "configure:12557: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12514,7 +12601,7 @@ fi
 
   min_gtk_version=2.0.0
   echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12518: checking for GTK+ - version >= $min_gtk_version" >&5
+echo "configure:12605: checking for GTK+ - version >= $min_gtk_version" >&5
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
@@ -12549,7 +12636,7 @@ echo "configure:12518: checking for GTK+ - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 12553 "configure"
+#line 12640 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12624,7 +12711,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -12658,7 +12745,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 12662 "configure"
+#line 12749 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12668,7 +12755,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
@@ -12750,7 +12837,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12754: checking for $ac_word" >&5
+echo "configure:12841: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12785,7 +12872,7 @@ fi
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12789: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12876: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -12808,7 +12895,7 @@ echo "configure:12789: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 12812 "configure"
+#line 12899 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12886,7 +12973,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:12890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -12920,7 +13007,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 12924 "configure"
+#line 13011 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12930,7 +13017,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:12934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -13020,7 +13107,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13024: checking for $ac_word" >&5
+echo "configure:13111: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13055,7 +13142,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:13059: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:13146: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -13078,7 +13165,7 @@ echo "configure:13059: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 13082 "configure"
+#line 13169 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -13156,7 +13243,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:13160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -13190,7 +13277,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 13194 "configure"
+#line 13281 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -13200,7 +13287,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:13204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -13283,7 +13370,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13287: checking for $ac_word" >&5
+echo "configure:13374: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13327,19 +13414,19 @@ fi
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
-echo "configure:13331: checking for pangoft2" >&5
+echo "configure:13418: checking for pangoft2" >&5
 
         if $PKG_CONFIG --exists "pangoft2" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:13338: checking PANGOFT2_CFLAGS" >&5
+echo "configure:13425: checking PANGOFT2_CFLAGS" >&5
             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
             echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
 
             echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
-echo "configure:13343: checking PANGOFT2_LIBS" >&5
+echo "configure:13430: checking PANGOFT2_LIBS" >&5
             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
             echo "$ac_t""$PANGOFT2_LIBS" 1>&6
         else
@@ -13384,12 +13471,12 @@ echo "configure:13343: checking PANGOFT2_LIBS" >&5
             for ac_func in poll
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13388: checking for $ac_func" >&5
+echo "configure:13475: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13393 "configure"
+#line 13480 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13412,7 +13499,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13446,7 +13533,7 @@ done
         GUIDIST=GTK_DIST
 
                 echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:13450: checking for gdk_im_open in -lgdk" >&5
+echo "configure:13537: checking for gdk_im_open in -lgdk" >&5
 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13454,7 +13541,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13458 "configure"
+#line 13545 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13465,7 +13552,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13492,7 +13579,7 @@ fi
 
     if test "$wxUSE_MGL" = 1; then
         echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:13496: checking for SciTech MGL library" >&5
+echo "configure:13583: checking for SciTech MGL library" >&5
         if test "x$MGL_ROOT" = x ; then
             echo "$ac_t""not found" 1>&6
             { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
@@ -13501,7 +13588,7 @@ echo "configure:13496: checking for SciTech MGL library" >&5
         fi
 
         echo $ac_n "checking for libmgl location""... $ac_c" 1>&6
-echo "configure:13505: checking for libmgl location" >&5
+echo "configure:13592: checking for libmgl location" >&5
                         case "${host}" in
             *-*-linux* )
               if test "x$wxUSE_SHARED" = xyes ; then
@@ -13557,7 +13644,7 @@ echo "configure:13505: checking for libmgl location" >&5
 
     if test "$wxUSE_MICROWIN" = 1; then
         echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
-echo "configure:13561: checking for MicroWindows" >&5
+echo "configure:13648: checking for MicroWindows" >&5
         if test "x$MICROWINDOWS" = x ; then
             echo "$ac_t""not found" 1>&6
             { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; }
@@ -13589,7 +13676,7 @@ echo "configure:13561: checking for MicroWindows" >&5
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:13593: checking for X" >&5
+echo "configure:13680: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -13651,12 +13738,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 13655 "configure"
+#line 13742 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13725,14 +13812,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13729 "configure"
+#line 13816 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:13736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -13838,17 +13925,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:13842: checking whether -R must be followed by a space" >&5
+echo "configure:13929: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 13845 "configure"
+#line 13932 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -13864,14 +13951,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 13868 "configure"
+#line 13955 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -13903,7 +13990,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:13907: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:13994: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13911,7 +13998,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13915 "configure"
+#line 14002 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13922,7 +14009,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13944,7 +14031,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:13948: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:14035: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13952,7 +14039,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13956 "configure"
+#line 14043 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13963,7 +14050,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:13967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13992,12 +14079,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:13996: checking for gethostbyname" >&5
+echo "configure:14083: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14001 "configure"
+#line 14088 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -14020,7 +14107,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -14041,7 +14128,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:14045: checking for gethostbyname in -lnsl" >&5
+echo "configure:14132: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14049,7 +14136,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14053 "configure"
+#line 14140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14060,7 +14147,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:14064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14090,12 +14177,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:14094: checking for connect" >&5
+echo "configure:14181: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14099 "configure"
+#line 14186 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -14118,7 +14205,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -14139,7 +14226,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:14143: checking for connect in -lsocket" >&5
+echo "configure:14230: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14147,7 +14234,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14151 "configure"
+#line 14238 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14158,7 +14245,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:14162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14182,12 +14269,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:14186: checking for remove" >&5
+echo "configure:14273: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14191 "configure"
+#line 14278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -14210,7 +14297,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -14231,7 +14318,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:14235: checking for remove in -lposix" >&5
+echo "configure:14322: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14239,7 +14326,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14243 "configure"
+#line 14330 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14250,7 +14337,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:14254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14274,12 +14361,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:14278: checking for shmat" >&5
+echo "configure:14365: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14283 "configure"
+#line 14370 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -14302,7 +14389,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -14323,7 +14410,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:14327: checking for shmat in -lipc" >&5
+echo "configure:14414: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14331,7 +14418,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+#line 14422 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14342,7 +14429,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:14346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14375,7 +14462,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:14379: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:14466: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14383,7 +14470,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14387 "configure"
+#line 14474 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14394,7 +14481,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:14398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14430,7 +14517,7 @@ fi
 
         if test "$wxUSE_NANOX" = "yes"; then
             echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
-echo "configure:14434: checking for MicroWindows/NanoX distribution" >&5
+echo "configure:14521: checking for MicroWindows/NanoX distribution" >&5
             if test "x$MICROWIN" = x ; then
                 echo "$ac_t""not found" 1>&6
                 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; }
@@ -14445,7 +14532,7 @@ EOF
 
         xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:14449: checking for Xpm library" >&5
+echo "configure:14536: checking for Xpm library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -14477,7 +14564,7 @@ EOF
             echo "$ac_t""found at $ac_find_libraries" 1>&6
         else
             cat > conftest.$ac_ext <<EOF
-#line 14481 "configure"
+#line 14568 "configure"
 #include "confdefs.h"
 
                     #include <X11/xpm.h>
@@ -14489,7 +14576,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:14493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     xpm_link=" -lXpm"
@@ -14521,7 +14608,7 @@ rm -f conftest*
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14525: checking for $ac_word" >&5
+echo "configure:14612: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14565,19 +14652,19 @@ fi
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for pangox""... $ac_c" 1>&6
-echo "configure:14569: checking for pangox" >&5
+echo "configure:14656: checking for pangox" >&5
 
         if $PKG_CONFIG --exists "pangox" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
-echo "configure:14576: checking PANGOX_CFLAGS" >&5
+echo "configure:14663: checking PANGOX_CFLAGS" >&5
             PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
             echo "$ac_t""$PANGOX_CFLAGS" 1>&6
 
             echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
-echo "configure:14581: checking PANGOX_LIBS" >&5
+echo "configure:14668: checking PANGOX_LIBS" >&5
             PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
             echo "$ac_t""$PANGOX_LIBS" 1>&6
         else
@@ -14616,7 +14703,7 @@ echo "configure:14581: checking PANGOX_LIBS" >&5
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14620: checking for $ac_word" >&5
+echo "configure:14707: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14660,19 +14747,19 @@ fi
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
-echo "configure:14664: checking for pangoft2" >&5
+echo "configure:14751: checking for pangoft2" >&5
 
         if $PKG_CONFIG --exists "pangoft2" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:14671: checking PANGOFT2_CFLAGS" >&5
+echo "configure:14758: checking PANGOFT2_CFLAGS" >&5
             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
             echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
 
             echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
-echo "configure:14676: checking PANGOFT2_LIBS" >&5
+echo "configure:14763: checking PANGOFT2_LIBS" >&5
             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
             echo "$ac_t""$PANGOFT2_LIBS" 1>&6
         else
@@ -14712,7 +14799,7 @@ echo "configure:14676: checking PANGOFT2_LIBS" >&5
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14716: checking for $ac_word" >&5
+echo "configure:14803: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14756,19 +14843,19 @@ fi
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for pangoxft""... $ac_c" 1>&6
-echo "configure:14760: checking for pangoxft" >&5
+echo "configure:14847: checking for pangoxft" >&5
 
         if $PKG_CONFIG --exists "pangoxft" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6
-echo "configure:14767: checking PANGOXFT_CFLAGS" >&5
+echo "configure:14854: checking PANGOXFT_CFLAGS" >&5
             PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`
             echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6
 
             echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6
-echo "configure:14772: checking PANGOXFT_LIBS" >&5
+echo "configure:14859: checking PANGOXFT_LIBS" >&5
             PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
             echo "$ac_t""$PANGOXFT_LIBS" 1>&6
         else
@@ -14820,17 +14907,17 @@ echo "configure:14772: checking PANGOXFT_LIBS" >&5
     if test "$wxUSE_WINE" = 1; then
         ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:14824: checking for windows.h" >&5
+echo "configure:14911: checking for windows.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14829 "configure"
+#line 14916 "configure"
 #include "confdefs.h"
 #include <windows.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14857,7 +14944,7 @@ fi
 
         xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:14861: checking for Xpm library" >&5
+echo "configure:14948: checking for Xpm library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -14885,7 +14972,7 @@ EOF
 
         mesa_link=
         echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:14889: checking for Mesa library" >&5
+echo "configure:14976: checking for Mesa library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -14935,17 +15022,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:14939: checking whether -R must be followed by a space" >&5
+echo "configure:15026: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 14942 "configure"
+#line 15029 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -14961,14 +15048,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 14965 "configure"
+#line 15052 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:14972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -15000,7 +15087,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:15004: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:15091: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15008,7 +15095,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15012 "configure"
+#line 15099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15019,7 +15106,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15041,7 +15128,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:15045: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:15132: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15049,7 +15136,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15053 "configure"
+#line 15140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15060,7 +15147,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15089,12 +15176,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:15093: checking for gethostbyname" >&5
+echo "configure:15180: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15098 "configure"
+#line 15185 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -15117,7 +15204,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -15138,7 +15225,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:15142: checking for gethostbyname in -lnsl" >&5
+echo "configure:15229: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15146,7 +15233,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15150 "configure"
+#line 15237 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15157,7 +15244,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15187,12 +15274,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:15191: checking for connect" >&5
+echo "configure:15278: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15196 "configure"
+#line 15283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -15215,7 +15302,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -15236,7 +15323,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:15240: checking for connect in -lsocket" >&5
+echo "configure:15327: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15244,7 +15331,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15248 "configure"
+#line 15335 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15255,7 +15342,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:15259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15279,12 +15366,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:15283: checking for remove" >&5
+echo "configure:15370: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15288 "configure"
+#line 15375 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -15307,7 +15394,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -15328,7 +15415,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:15332: checking for remove in -lposix" >&5
+echo "configure:15419: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15336,7 +15423,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15340 "configure"
+#line 15427 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15347,7 +15434,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:15351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15371,12 +15458,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:15375: checking for shmat" >&5
+echo "configure:15462: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15380 "configure"
+#line 15467 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -15399,7 +15486,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -15420,7 +15507,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:15424: checking for shmat in -lipc" >&5
+echo "configure:15511: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15428,7 +15515,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15432 "configure"
+#line 15519 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15439,7 +15526,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:15443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15472,7 +15559,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:15476: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:15563: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15480,7 +15567,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15484 "configure"
+#line 15571 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15491,7 +15578,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:15495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15526,7 +15613,7 @@ fi
         COMPILED_X_PROGRAM=0
 
         echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:15530: checking for Motif/Lesstif headers" >&5
+echo "configure:15617: checking for Motif/Lesstif headers" >&5
         
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include;
@@ -15555,7 +15642,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
             TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
         else
             cat > conftest.$ac_ext <<EOF
-#line 15559 "configure"
+#line 15646 "configure"
 #include "confdefs.h"
 
                     #include <Xm/Xm.h>
@@ -15567,7 +15654,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:15571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     echo "$ac_t""found in default search path" 1>&6
@@ -15588,7 +15675,7 @@ rm -f conftest*
 
         if test "$COMPILED_X_PROGRAM" = 0; then
             echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:15592: checking for Motif/Lesstif library" >&5
+echo "configure:15679: checking for Motif/Lesstif library" >&5
             
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -15619,7 +15706,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
                 CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
                 cat > conftest.$ac_ext <<EOF
-#line 15623 "configure"
+#line 15710 "configure"
 #include "confdefs.h"
 
                         #include <Xm/Xm.h>
@@ -15631,7 +15718,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:15635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         echo "$ac_t""found in default search path" 1>&6
@@ -15655,7 +15742,7 @@ rm -f conftest*
 
         xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:15659: checking for Xpm library" >&5
+echo "configure:15746: checking for Xpm library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -15691,7 +15778,7 @@ EOF
             CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
             cat > conftest.$ac_ext <<EOF
-#line 15695 "configure"
+#line 15782 "configure"
 #include "confdefs.h"
 
                     #include <X11/xpm.h>
@@ -15703,7 +15790,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:15707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     xpm_link=" -lXpm"
@@ -15730,13 +15817,13 @@ rm -f conftest*
         fi
 
         echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6
-echo "configure:15734: checking if we need -lXp and/or -lSM -lICE" >&5
+echo "configure:15821: checking if we need -lXp and/or -lSM -lICE" >&5
         libp_link=""
         libsm_ice_link=""
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then
-                for libsm_ice in " -lSM -lICE"; do
+                for libsm_ice in "" " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
@@ -15744,7 +15831,7 @@ echo "configure:15734: checking if we need -lXp and/or -lSM -lICE" >&5
                         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
                         cat > conftest.$ac_ext <<EOF
-#line 15748 "configure"
+#line 15835 "configure"
 #include "confdefs.h"
 
                                 #include <Xm/Xm.h>
@@ -15759,7 +15846,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:15763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
                                 libp_link="$libp"
@@ -15905,17 +15992,17 @@ if test "$wxUSE_OPENGL" = "yes"; then
     else
         ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:15909: checking for GL/gl.h" >&5
+echo "configure:15996: checking for GL/gl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15914 "configure"
+#line 16001 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15933,7 +16020,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
                 echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:15937: checking for -lGL" >&5
+echo "configure:16024: checking for -lGL" >&5
                 
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -15966,7 +16053,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
                 else
                     echo "$ac_t""no" 1>&6
                     echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:15970: checking for -lMesaGL" >&5
+echo "configure:16057: checking for -lMesaGL" >&5
                     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
@@ -16137,7 +16224,7 @@ if test "$wxUSE_SHARED" = "yes"; then
                         
     if test $found_versioning = no ; then
       echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6
-echo "configure:16141: checking if the linker accepts --version-script" >&5
+echo "configure:16228: checking if the linker accepts --version-script" >&5
 if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -16147,7 +16234,7 @@ else
   
         if { ac_try='
                 $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
+                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
           if test -s conftest.stderr ; then
               wx_cv_version_script=no
           else
@@ -16188,16 +16275,16 @@ echo "$ac_t""$wx_cv_version_script" 1>&6
         fi
       ;;
 
-      *-*-linux* | *-*-gnu* )
+      *-*-linux* )
         if test "$GCC" != "yes"; then
             echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:16195: checking for Intel compiler" >&5
+echo "configure:16282: checking for Intel compiler" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                 cat > conftest.$ac_ext <<EOF
-#line 16201 "configure"
+#line 16288 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -16208,7 +16295,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:16212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_prog_icc=yes
 else
@@ -16228,9 +16315,9 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
             fi
         fi
 
-        if test "$wxUSE_SONAME" = "yes" ; then
+                                                if test "$wxUSE_SONAME" = "yes" ; then
             SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL} -L\$(build_libdir) $WXCONFIG_LIBS"
                         WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
       ;;
@@ -16261,7 +16348,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
                                     # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16265: checking for $ac_word" >&5
+echo "configure:16352: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -16374,7 +16461,7 @@ if test "$wxUSE_MAC" = 1; then
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16378: checking for $ac_word" >&5
+echo "configure:16465: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -16404,7 +16491,7 @@ fi
     # Extract the first word of "DeRez", so it can be a program name with args.
 set dummy DeRez; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16408: checking for $ac_word" >&5
+echo "configure:16495: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -16444,12 +16531,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:16448: checking for ANSI C header files" >&5
+echo "configure:16535: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16453 "configure"
+#line 16540 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -16457,7 +16544,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -16474,7 +16561,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 16478 "configure"
+#line 16565 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -16492,7 +16579,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 16496 "configure"
+#line 16583 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -16513,7 +16600,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 16517 "configure"
+#line 16604 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -16524,7 +16611,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:16528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -16548,12 +16635,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:16552: checking for mode_t" >&5
+echo "configure:16639: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16557 "configure"
+#line 16644 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -16581,12 +16668,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:16585: checking for off_t" >&5
+echo "configure:16672: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16590 "configure"
+#line 16677 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -16614,12 +16701,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:16618: checking for pid_t" >&5
+echo "configure:16705: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16623 "configure"
+#line 16710 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -16647,12 +16734,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:16651: checking for size_t" >&5
+echo "configure:16738: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16656 "configure"
+#line 16743 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -16680,12 +16767,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:16684: checking for uid_t in sys/types.h" >&5
+echo "configure:16771: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16689 "configure"
+#line 16776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -16723,13 +16810,13 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:16727: checking if size_t is unsigned int" >&5
+echo "configure:16814: checking if size_t is unsigned int" >&5
 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                             cat > conftest.$ac_ext <<EOF
-#line 16733 "configure"
+#line 16820 "configure"
 #include "confdefs.h"
 #include <stddef.h>
 int main() {
@@ -16742,7 +16829,7 @@ int main() {
         
 ; return 0; }
 EOF
-if { (eval echo configure:16746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_size_t_is_uint=no
 else
@@ -16766,12 +16853,12 @@ EOF
 
 else
     echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:16770: checking if size_t is unsigned long" >&5
+echo "configure:16857: checking if size_t is unsigned long" >&5
 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16775 "configure"
+#line 16862 "configure"
 #include "confdefs.h"
 #include <stddef.h>
 int main() {
@@ -16784,7 +16871,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:16788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_size_t_is_ulong=no
 else
@@ -16818,13 +16905,13 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
 echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:16822: checking for pw_gecos in struct passwd" >&5
+echo "configure:16909: checking for pw_gecos in struct passwd" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 16828 "configure"
+#line 16915 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
@@ -16835,7 +16922,7 @@ int main() {
              
 ; return 0; }
 EOF
-if { (eval echo configure:16839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
@@ -16875,12 +16962,12 @@ EOF
     for ac_func in wcslen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16879: checking for $ac_func" >&5
+echo "configure:16966: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16884 "configure"
+#line 16971 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16903,7 +16990,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16931,7 +17018,7 @@ done
     if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then
             echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:16935: checking for wcslen in -lmsvcrt" >&5
+echo "configure:17022: checking for wcslen in -lmsvcrt" >&5
 ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16939,7 +17026,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmsvcrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16943 "configure"
+#line 17030 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16950,7 +17037,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:16954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16972,7 +17059,7 @@ fi
 
         else
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:16976: checking for wcslen in -lw" >&5
+echo "configure:17063: checking for wcslen in -lw" >&5
 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16980,7 +17067,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16984 "configure"
+#line 17071 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16991,7 +17078,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:16995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17027,12 +17114,12 @@ EOF
             for ac_func in wcsrtombs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17031: checking for $ac_func" >&5
+echo "configure:17118: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17036 "configure"
+#line 17123 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17055,7 +17142,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17095,12 +17182,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17099: checking for $ac_func" >&5
+echo "configure:17186: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17104 "configure"
+#line 17191 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17126,7 +17213,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17155,12 +17242,12 @@ if test "$wxUSE_UNICODE" = yes; then
         for ac_func in fputwc wprintf vswprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17159: checking for $ac_func" >&5
+echo "configure:17246: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17164 "configure"
+#line 17251 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17186,7 +17273,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17211,16 +17298,16 @@ fi
 done
 
                 echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
-echo "configure:17215: checking for _vsnwprintf" >&5
+echo "configure:17302: checking for _vsnwprintf" >&5
     cat > conftest.$ac_ext <<EOF
-#line 17217 "configure"
+#line 17304 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 &_vsnwprintf;
 ; return 0; }
 EOF
-if { (eval echo configure:17224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
                     cat >> confdefs.h <<\EOF
@@ -17272,7 +17359,7 @@ fi
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:17276: checking for iconv" >&5
+echo "configure:17363: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -17280,7 +17367,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 17284 "configure"
+#line 17371 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -17290,7 +17377,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:17294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -17302,7 +17389,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 17306 "configure"
+#line 17393 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -17312,7 +17399,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:17316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -17333,12 +17420,12 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
-echo "configure:17337: checking if iconv needs const" >&5
+echo "configure:17424: checking if iconv needs const" >&5
 if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17342 "configure"
+#line 17429 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17357,7 +17444,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:17361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_iconv_const="no"
 else
@@ -17402,12 +17489,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     for ac_func in sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17406: checking for $ac_func" >&5
+echo "configure:17493: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17411 "configure"
+#line 17498 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17430,7 +17517,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17471,13 +17558,13 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
       echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:17475: checking for sa_handler type" >&5
+echo "configure:17562: checking for sa_handler type" >&5
 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 17481 "configure"
+#line 17568 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int main() {
@@ -17489,7 +17576,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:17493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_type_sa_handler=int
@@ -17526,12 +17613,12 @@ fi
 for ac_func in mkstemp mktemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17530: checking for $ac_func" >&5
+echo "configure:17617: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17535 "configure"
+#line 17622 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17554,7 +17641,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17580,12 +17667,12 @@ done
 
 
 echo $ac_n "checking for statfs""... $ac_c" 1>&6
-echo "configure:17584: checking for statfs" >&5
+echo "configure:17671: checking for statfs" >&5
 if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17589 "configure"
+#line 17676 "configure"
 #include "confdefs.h"
 
              #if defined(__BSD__)
@@ -17606,7 +17693,7 @@ int main() {
         
 ; return 0; }
 EOF
-if { (eval echo configure:17610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
              wx_cv_func_statfs=yes
@@ -17634,12 +17721,12 @@ EOF
 
 else
     echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:17638: checking for statvfs" >&5
+echo "configure:17725: checking for statvfs" >&5
 if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17643 "configure"
+#line 17730 "configure"
 #include "confdefs.h"
 
                 #include <stddef.h>
@@ -17651,7 +17738,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:17655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                  wx_cv_func_statvfs=yes
@@ -17682,12 +17769,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
         echo $ac_n "checking for statvfs argument type""... $ac_c" 1>&6
-echo "configure:17686: checking for statvfs argument type" >&5
+echo "configure:17773: checking for statvfs argument type" >&5
 if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17691 "configure"
+#line 17778 "configure"
 #include "confdefs.h"
 
                     #include <sys/statvfs.h>
@@ -17703,7 +17790,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:17707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_type_statvfs_t=statvfs_t
@@ -17714,7 +17801,7 @@ else
   rm -rf conftest*
   
                     cat > conftest.$ac_ext <<EOF
-#line 17718 "configure"
+#line 17805 "configure"
 #include "confdefs.h"
 
                             #include <sys/statvfs.h>
@@ -17730,7 +17817,7 @@ int main() {
                         
 ; return 0; }
 EOF
-if { (eval echo configure:17734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                             wx_cv_type_statvfs_t="struct statvfs"
@@ -17786,12 +17873,12 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
     for ac_func in fcntl flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17790: checking for $ac_func" >&5
+echo "configure:17877: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17795 "configure"
+#line 17882 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17814,7 +17901,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17848,12 +17935,12 @@ fi
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17852: checking for $ac_func" >&5
+echo "configure:17939: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17857 "configure"
+#line 17944 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17876,7 +17963,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17904,12 +17991,12 @@ done
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17908: checking for $ac_func" >&5
+echo "configure:17995: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17913 "configure"
+#line 18000 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17932,7 +18019,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17979,12 +18066,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17983: checking for $ac_func" >&5
+echo "configure:18070: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17988 "configure"
+#line 18075 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18007,7 +18094,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18032,7 +18119,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:18036: checking for nanosleep in -lposix4" >&5
+echo "configure:18123: checking for nanosleep in -lposix4" >&5
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18040,7 +18127,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18044 "configure"
+#line 18131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18051,7 +18138,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:18055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18079,12 +18166,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18083: checking for $ac_func" >&5
+echo "configure:18170: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18088 "configure"
+#line 18175 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18107,7 +18194,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18150,12 +18237,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18154: checking for $ac_func" >&5
+echo "configure:18241: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18159 "configure"
+#line 18246 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18178,7 +18265,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18215,12 +18302,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18219: checking for $ac_func" >&5
+echo "configure:18306: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18224 "configure"
+#line 18311 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18246,7 +18333,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18283,12 +18370,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18287: checking for $ac_func" >&5
+echo "configure:18374: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18292 "configure"
+#line 18379 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18311,7 +18398,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18336,7 +18423,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:18340: checking for inet_addr in -lnsl" >&5
+echo "configure:18427: checking for inet_addr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18344,7 +18431,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18348 "configure"
+#line 18435 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18355,7 +18442,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:18359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18375,7 +18462,7 @@ else
   echo "$ac_t""no" 1>&6
 
                 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:18379: checking for inet_addr in -lresolv" >&5
+echo "configure:18466: checking for inet_addr in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18383,7 +18470,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18387 "configure"
+#line 18474 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18394,7 +18481,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:18398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18414,7 +18501,7 @@ else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
-echo "configure:18418: checking for inet_addr in -lsocket" >&5
+echo "configure:18505: checking for inet_addr in -lsocket" >&5
 ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18422,7 +18509,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18426 "configure"
+#line 18513 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18433,7 +18520,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:18437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18471,12 +18558,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18475: checking for $ac_func" >&5
+echo "configure:18562: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18480 "configure"
+#line 18567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18499,7 +18586,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18524,7 +18611,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:18528: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:18615: checking for inet_aton in -l$INET_LINK" >&5
 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18532,7 +18619,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18536 "configure"
+#line 18623 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18543,7 +18630,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:18547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18678,18 +18765,18 @@ if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
             case $flag in
                 none)
                     echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:18682: checking whether pthreads work without any flags" >&5
+echo "configure:18769: checking whether pthreads work without any flags" >&5
                     ;;
 
                 -*)
                     echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:18687: checking whether pthreads work with $flag" >&5
+echo "configure:18774: checking whether pthreads work with $flag" >&5
                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)
                     echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:18693: checking for the pthreads library -l$flag" >&5
+echo "configure:18780: checking for the pthreads library -l$flag" >&5
                     THREADS_LINK="-l$flag"
                     ;;
               esac
@@ -18700,14 +18787,14 @@ echo "configure:18693: checking for the pthreads library -l$flag" >&5
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
               cat > conftest.$ac_ext <<EOF
-#line 18704 "configure"
+#line 18791 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 pthread_create(0,0,0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:18711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   THREADS_OK=yes
 else
@@ -18736,7 +18823,7 @@ rm -f conftest*
           LIBS="$THREADS_LINK $LIBS"
 
           echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:18740: checking if more special flags are required for pthreads" >&5
+echo "configure:18827: checking if more special flags are required for pthreads" >&5
           flag=no
           case "${host}" in
             *-aix*)
@@ -18769,12 +18856,12 @@ echo "configure:18740: checking if more special flags are required for pthreads"
       for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18773: checking for $ac_func" >&5
+echo "configure:18860: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18778 "configure"
+#line 18865 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18797,7 +18884,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18826,17 +18913,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18830: checking for $ac_hdr" >&5
+echo "configure:18917: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18835 "configure"
+#line 18922 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -18864,12 +18951,12 @@ done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
           echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:18868: checking for sched_yield" >&5
+echo "configure:18955: checking for sched_yield" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18873 "configure"
+#line 18960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sched_yield(); below.  */
@@ -18892,7 +18979,7 @@ sched_yield();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sched_yield=yes"
 else
@@ -18914,7 +19001,7 @@ else
   echo "$ac_t""no" 1>&6
 
                 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:18918: checking for sched_yield in -lposix4" >&5
+echo "configure:19005: checking for sched_yield in -lposix4" >&5
 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18922,7 +19009,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18926 "configure"
+#line 19013 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18933,7 +19020,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:18937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18966,12 +19053,12 @@ fi
 
                                           HAVE_PRIOR_FUNCS=0
       echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
-echo "configure:18970: checking for pthread_attr_getschedpolicy" >&5
+echo "configure:19057: checking for pthread_attr_getschedpolicy" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18975 "configure"
+#line 19062 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_getschedpolicy(); below.  */
@@ -18994,7 +19081,7 @@ pthread_attr_getschedpolicy();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_getschedpolicy=yes"
 else
@@ -19009,12 +19096,12 @@ fi
 if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6
-echo "configure:19013: checking for pthread_attr_setschedparam" >&5
+echo "configure:19100: checking for pthread_attr_setschedparam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19018 "configure"
+#line 19105 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_setschedparam(); below.  */
@@ -19037,7 +19124,7 @@ pthread_attr_setschedparam();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_setschedparam=yes"
 else
@@ -19052,12 +19139,12 @@ fi
 if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6
-echo "configure:19056: checking for sched_get_priority_max" >&5
+echo "configure:19143: checking for sched_get_priority_max" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19061 "configure"
+#line 19148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sched_get_priority_max(); below.  */
@@ -19080,7 +19167,7 @@ sched_get_priority_max();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sched_get_priority_max=yes"
 else
@@ -19098,7 +19185,7 @@ if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:19102: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:19189: checking for sched_get_priority_max in -lposix4" >&5
 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19106,7 +19193,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19110 "configure"
+#line 19197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -19117,7 +19204,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:19121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19164,12 +19251,12 @@ EOF
       fi
 
       echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
-echo "configure:19168: checking for pthread_cancel" >&5
+echo "configure:19255: checking for pthread_cancel" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19173 "configure"
+#line 19260 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_cancel(); below.  */
@@ -19192,7 +19279,7 @@ pthread_cancel();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_cancel=yes"
 else
@@ -19217,13 +19304,13 @@ fi
 
 
       echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:19221: checking for pthread_cleanup_push/pop" >&5
+echo "configure:19308: checking for pthread_cleanup_push/pop" >&5
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 19227 "configure"
+#line 19314 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -19233,7 +19320,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:19237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_func_pthread_cleanup_push=yes
@@ -19261,13 +19348,13 @@ EOF
 
                                                 
       echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:19265: checking for pthread_mutexattr_t" >&5
+echo "configure:19352: checking for pthread_mutexattr_t" >&5
 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 19271 "configure"
+#line 19358 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -19277,7 +19364,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:19281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                wx_cv_type_pthread_mutexattr_t=yes
@@ -19304,13 +19391,13 @@ EOF
 
       else
                 echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:19308: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:19395: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 19314 "configure"
+#line 19401 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -19319,7 +19406,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:19323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_type_pthread_rec_mutex_init=yes
@@ -19354,7 +19441,7 @@ else
       case "${host}" in
         *-*-mingw32* )
                         echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
-echo "configure:19358: checking if compiler supports -mthreads" >&5
+echo "configure:19445: checking if compiler supports -mthreads" >&5
 if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -19362,14 +19449,14 @@ else
                     CFLAGS_OLD="$CFLAGS"
                     CFLAGS="$CFLAGS -mthreads"
                     cat > conftest.$ac_ext <<EOF
-#line 19366 "configure"
+#line 19453 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:19373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_cflags_mthread=yes
 else
@@ -19413,7 +19500,7 @@ EOF
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:19417: checking if -D_REENTRANT is needed" >&5
+echo "configure:19504: checking if -D_REENTRANT is needed" >&5
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
         echo "$ac_t""yes" 1>&6
@@ -19801,12 +19888,12 @@ if test "$wxUSE_DATETIME" = "yes"; then
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19805: checking for $ac_func" >&5
+echo "configure:19892: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19810 "configure"
+#line 19897 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19829,7 +19916,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19855,13 +19942,13 @@ done
 
 
             echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:19859: checking for timezone variable in <time.h>" >&5
+echo "configure:19946: checking for timezone variable in <time.h>" >&5
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
-#line 19865 "configure"
+#line 19952 "configure"
 #include "confdefs.h"
 
                                 #include <time.h>
@@ -19873,7 +19960,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:19877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                 wx_cv_var_timezone=timezone
@@ -19884,7 +19971,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
-#line 19888 "configure"
+#line 19975 "configure"
 #include "confdefs.h"
 
                                         #include <time.h>
@@ -19896,7 +19983,7 @@ int main() {
                                     
 ; return 0; }
 EOF
-if { (eval echo configure:19900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
@@ -19907,7 +19994,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
-#line 19911 "configure"
+#line 19998 "configure"
 #include "confdefs.h"
 
                                                 #include <time.h>
@@ -19919,7 +20006,7 @@ int main() {
                                             
 ; return 0; }
 EOF
-if { (eval echo configure:19923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                                 wx_cv_var_timezone=__timezone
@@ -19960,12 +20047,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19964: checking for $ac_func" >&5
+echo "configure:20051: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19969 "configure"
+#line 20056 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19988,7 +20075,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20015,13 +20102,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:20019: checking for tm_gmtoff in struct tm" >&5
+echo "configure:20106: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 20025 "configure"
+#line 20112 "configure"
 #include "confdefs.h"
 
                     #include <time.h>
@@ -20033,7 +20120,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:20037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
@@ -20062,12 +20149,12 @@ EOF
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20066: checking for $ac_func" >&5
+echo "configure:20153: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20071 "configure"
+#line 20158 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20090,7 +20177,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20117,7 +20204,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:20121: checking whether gettimeofday takes two arguments" >&5
+echo "configure:20208: checking whether gettimeofday takes two arguments" >&5
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -20132,7 +20219,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 20136 "configure"
+#line 20223 "configure"
 #include "confdefs.h"
 
                     #include <sys/time.h>
@@ -20145,7 +20232,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:20149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
@@ -20153,7 +20240,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 20157 "configure"
+#line 20244 "configure"
 #include "confdefs.h"
 
                         #include <sys/time.h>
@@ -20166,7 +20253,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:20170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
@@ -20221,12 +20308,12 @@ fi
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then
                 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:20225: checking for socket" >&5
+echo "configure:20312: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20230 "configure"
+#line 20317 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -20249,7 +20336,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -20268,7 +20355,7 @@ else
   echo "$ac_t""no" 1>&6
 
                 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:20272: checking for socket in -lsocket" >&5
+echo "configure:20359: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20276,7 +20363,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20280 "configure"
+#line 20367 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20287,7 +20374,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:20291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20324,7 +20411,7 @@ fi
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then
                 echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:20328: checking what is the type of the third argument of getsockname" >&5
+echo "configure:20415: checking what is the type of the third argument of getsockname" >&5
 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -20339,7 +20426,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
                 cat > conftest.$ac_ext <<EOF
-#line 20343 "configure"
+#line 20430 "configure"
 #include "confdefs.h"
 
                         #include <sys/types.h>
@@ -20352,7 +20439,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:20356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
@@ -20360,7 +20447,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 20364 "configure"
+#line 20451 "configure"
 #include "confdefs.h"
 
                             #include <sys/types.h>
@@ -20373,7 +20460,7 @@ int main() {
                         
 ; return 0; }
 EOF
-if { (eval echo configure:20377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
@@ -20381,7 +20468,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 20385 "configure"
+#line 20472 "configure"
 #include "confdefs.h"
 
                                 #include <sys/types.h>
@@ -20394,7 +20481,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:20398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
@@ -20466,17 +20553,17 @@ if test "$wxUSE_GUI" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:20470: checking for $ac_hdr" >&5
+echo "configure:20557: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20475 "configure"
+#line 20562 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:20567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -20530,12 +20617,12 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                                                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20534: checking for $ac_func" >&5
+echo "configure:20621: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20539 "configure"
+#line 20626 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20558,7 +20645,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20586,7 +20673,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:20590: checking for dlopen in -ldl" >&5
+echo "configure:20677: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20594,7 +20681,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20598 "configure"
+#line 20685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20605,7 +20692,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:20609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20634,12 +20721,12 @@ else
                                 for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20638: checking for $ac_func" >&5
+echo "configure:20725: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20643 "configure"
+#line 20730 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20662,7 +20749,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20690,7 +20777,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:20694: checking for dld in -lshl_load" >&5
+echo "configure:20781: checking for dld in -lshl_load" >&5
 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20698,7 +20785,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20702 "configure"
+#line 20789 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20709,7 +20796,7 @@ int main() {
 dld()
 ; return 0; }
 EOF
-if { (eval echo configure:20713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20748,12 +20835,12 @@ done
             for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20752: checking for $ac_func" >&5
+echo "configure:20839: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 20757 "configure"
+#line 20844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -20776,7 +20863,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:20780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -20801,7 +20888,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:20805: checking for dlerror in -ldl" >&5
+echo "configure:20892: checking for dlerror in -ldl" >&5
 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20809,7 +20896,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20813 "configure"
+#line 20900 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -20820,7 +20907,7 @@ int main() {
 dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:20824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -20897,7 +20984,7 @@ EOF
 
   if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
         echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
-echo "configure:20901: checking for main in -lunicows" >&5
+echo "configure:20988: checking for main in -lunicows" >&5
 ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20905,14 +20992,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lunicows  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 20909 "configure"
+#line 20996 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:20916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -21094,17 +21181,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:21098: checking for $ac_hdr" >&5
+echo "configure:21185: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 21103 "configure"
+#line 21190 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:21108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:21195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -21143,9 +21230,9 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6
-echo "configure:21147: checking if g++ requires -fvtable-thunks" >&5
+echo "configure:21234: checking if g++ requires -fvtable-thunks" >&5
             cat > conftest.$ac_ext <<EOF
-#line 21149 "configure"
+#line 21236 "configure"
 #include "confdefs.h"
 #include <windows.h>
                             #include <ole2.h>
@@ -21153,7 +21240,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:21157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:21244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -21214,17 +21301,17 @@ if test "$wxUSE_WINE" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:21218: checking for $ac_hdr" >&5
+echo "configure:21305: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 21223 "configure"
+#line 21310 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:21228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:21315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -21263,9 +21350,9 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6
-echo "configure:21267: checking if g++ requires -fvtable-thunks" >&5
+echo "configure:21354: checking if g++ requires -fvtable-thunks" >&5
             cat > conftest.$ac_ext <<EOF
-#line 21269 "configure"
+#line 21356 "configure"
 #include "confdefs.h"
 #include <windows.h>
                             #include <ole2.h>
@@ -21273,7 +21360,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:21277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:21364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -21682,6 +21769,11 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
         echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
         wxUSE_TOGGLEBTN=no
+    else
+        if test "$wxUSE_PM" = 1; then
+            echo "configure: warning: Toggle button not yet supported under PM... disabled" 1>&2
+            wxUSE_TOGGLEBTN=no
+        fi
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2
@@ -22138,12 +22230,12 @@ have_floor=0
 for ac_func in cos
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22142: checking for $ac_func" >&5
+echo "configure:22234: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 22147 "configure"
+#line 22239 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -22166,7 +22258,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:22170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -22193,12 +22285,12 @@ done
 for ac_func in floor
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22197: checking for $ac_func" >&5
+echo "configure:22289: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 22202 "configure"
+#line 22294 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -22221,7 +22313,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:22225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -22246,7 +22338,7 @@ fi
 done
 
 echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
-echo "configure:22250: checking if floating point functions link without -lm" >&5
+echo "configure:22342: checking if floating point functions link without -lm" >&5
 if test "$have_cos" = 1 -a "$have_floor" = 1; then
     echo "$ac_t""yes" 1>&6
 else
@@ -22258,12 +22350,12 @@ else
     for ac_func in sin
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22262: checking for $ac_func" >&5
+echo "configure:22354: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 22267 "configure"
+#line 22359 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -22286,7 +22378,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:22290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -22313,12 +22405,12 @@ done
     for ac_func in ceil
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22317: checking for $ac_func" >&5
+echo "configure:22409: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 22322 "configure"
+#line 22414 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -22341,7 +22433,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:22345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -22366,7 +22458,7 @@ fi
 done
 
     echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
-echo "configure:22370: checking if floating point functions link with -lm" >&5
+echo "configure:22462: checking if floating point functions link with -lm" >&5
     if test "$have_sin" = 1 -a "$have_ceil" = 1; then
         echo "$ac_t""yes" 1>&6
     else
@@ -22516,10 +22608,11 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
+
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:22523: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:22616: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -22824,6 +22917,7 @@ s%@EXTRADEFS@%$EXTRADEFS%g
 s%@WX_VERSION_TAG@%$WX_VERSION_TAG%g
 s%@RESFLAGS@%$RESFLAGS%g
 s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
+s%@CLEANRESPROGRAMOBJ@%$CLEANRESPROGRAMOBJ%g
 s%@WX_RESOURCES_MACOSX_ASCII@%$WX_RESOURCES_MACOSX_ASCII%g
 s%@WX_RESOURCES_MACOSX_DATA@%$WX_RESOURCES_MACOSX_DATA%g
 s%@MACOSX_BUNDLE@%$MACOSX_BUNDLE%g
@@ -23186,7 +23280,7 @@ if test "$no_recursion" != yes; then
       fi
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
diff --git a/configure.in b/configure.in
index 7c56f9c11d..41f5421395 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ dnl ------------------------------------------------------------------------
 dnl Check platform (host system)
 dnl ------------------------------------------------------------------------
 
-dnl assume Unix
+dnl OS (assume Unix)
 USE_UNIX=1
 USE_OS2=0
 USE_WIN32=0
@@ -64,26 +64,36 @@ USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
-USE_LINUX=
-USE_GNU=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
+dnl Unix kind
 USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
+dnl any BSD
 USE_BSD=
+dnl a.k.a. Mac OS X
 USE_DARWIN=
 USE_FREEBSD=
-USE_OPENBSD=
+dnl GNU/Hurd
+USE_GNU=
+USE_HPUX=
+USE_LINUX=
 USE_NETBSD=
+USE_OPENBSD=
+dnl OSF/1 (obsolete?)
+USE_OSF=
+USE_SGI=
+dnl Solaris ("SunOS" >= 5)
+USE_SOLARIS=
+dnl SunOS or Solaris
+USE_SUN=
+dnl old/real SunOS (obsolete)
+USE_SUNOS=
+dnl SysV R4
+USE_SVR4=
+dnl any System V
+USE_SYSV=
 USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
+USE_ALPHA=
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 dnl _REENTRANT" and it's easier to just define this symbol for these platforms
@@ -145,9 +155,8 @@ case "${host}" in
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-gnu* )
+  *-*-gnu* | *-*-k*bsd*-gnu )
     USE_GNU=1
-    AC_DEFINE(__GNU__)
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
@@ -1136,7 +1145,7 @@ if test "$wxUSE_GUI" = "yes"; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         fi
         if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
+          toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
           AC_MSG_RESULT($toolkit_echo)
         fi
       fi
@@ -1448,7 +1457,13 @@ esac
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
         dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/XKBlib.h)
+        AC_CHECK_HEADERS(X11/Xlib.h)
+        AC_CHECK_HEADERS([X11/XKBlib.h], [], [], 
+                         [
+                          #if HAVE_X11_XLIB_H
+                            #include <X11/Xlib.h>
+                          #endif
+                         ])
     fi
 fi
 
@@ -1469,6 +1484,7 @@ AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(size_t, 4)
 
 case "${host}" in
     arm-*-linux* )
@@ -1649,7 +1665,7 @@ dnl check for glibc version
 dnl
 dnl VZ: I have no idea why had this check been there originally, but now
 dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 || test "$USE_GNU" = 1 ; then
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
         AC_TRY_COMPILE([#include <features.h>],
             [
@@ -1780,10 +1796,13 @@ if test "$wxUSE_ZLIB" != "no" ; then
                     ],
                     ac_cv_header_zlib_h=`cat conftestval`,
                     ac_cv_header_zlib_h=no,
-                    dnl cross-compiling: test if we have any zlib.h
-                    [AC_CHECK_HEADER(zlib.h)]
+                    dnl cross-compiling: don't have an answer, try later
+                    unset ac_cv_header_zlib_h
                 )]
             )
+            dnl If the test above did not come up with a value (e.g. cross
+            dnl compiling) then this should give a definitive answer
+            AC_CHECK_HEADER(zlib.h)
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
@@ -1855,10 +1874,11 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                     ],
                     ac_cv_header_png_h=`cat conftestval`,
                     ac_cv_header_png_h=no,
-                    dnl cross-compiling: test if we have any png.h
-                    [AC_CHECK_HEADER(png.h)]
+                    dnl cross-compiling: test (later) if we have any png.h
+                    unset ac_cv_header_png_h
                 )]
             )
+            AC_CHECK_HEADER(png.h)
 
             if test "$ac_cv_header_png_h" = "yes"; then
                 AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
@@ -2547,7 +2567,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then
-                for libsm_ice in " -lSM -lICE"; do
+                for libsm_ice in "" " -lSM -lICE"; do
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
@@ -2925,7 +2945,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
 
-      *-*-linux* | *-*-gnu* )
+      *-*-linux* )
         if test "$GCC" != "yes"; then
             AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
             [
@@ -2944,9 +2964,14 @@ if test "$wxUSE_SHARED" = "yes"; then
             fi
         fi
 
+        dnl Building ELF shared libraries without an soname by default and
+        dnl including /usr/lib explicitly in the linker path causes all sorts
+        dnl of grief.  We try to undo at least some of the wrongness that has
+        dnl propagated from that here when sonames are enabled by reinserting
+        dnl the arguments to declare the dependency on symbols in the main lib.
         if test "$wxUSE_SONAME" = "yes" ; then
             SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL} -L\$(build_libdir) $WXCONFIG_LIBS"
             dnl substitute this in makelib.env for the contrib libs
             WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
diff --git a/contrib/utils/wxrcedit/preview.cpp b/contrib/utils/wxrcedit/preview.cpp
index a7ffa2eacd..2b5973a211 100644
--- a/contrib/utils/wxrcedit/preview.cpp
+++ b/contrib/utils/wxrcedit/preview.cpp
@@ -197,7 +197,7 @@ void PreviewFrame::Preview(wxXmlNode *node, wxXmlDocument *orig_doc)
 
 void PreviewFrame::PreviewMenu()
 {
-    wxMenuBar *mbar;
+    wxMenuBar *mbar = NULL;
 
     if (XmlGetClass(m_Node) == _T("wxMenuBar"))
         mbar = m_RC->LoadMenuBar(m_Node->GetPropVal(_T("name"), _T("-1")));
diff --git a/debian/README.Debian b/debian/README.Debian
index 1075a65747..4437b34938 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,7 +24,7 @@ wxwin-examples		wxWindows and wxPython demos and samples (source)
 wxwin-i18n		message catalogs for native language support
 
 
-	The following three can be built from the source package
+	The following binaries can be built from the source package
 	with the mingw32 cross compiler, but are not currently
 	distributed by Debian.  If you feel that should change,
 	please file a bug against the wxwindows2.4 package, or
@@ -44,9 +44,28 @@ libwxbase-msw-dev	mingw32-cross wxBase libs.
 libwxbase-msw-dbg	mingw32-cross wxBase (debug) libs.
 wxwin-headers-msw	extra headers needed for wxMSW.
 
-libwxgtk-univ		wxUniversal for Gtk.  NOTE this package is obsolete
-			and will be replaced by wxX11 and wxX11-univ at
-			some future time.
+	You can build all of these extra packages using the binary-cross
+	target in debian/rules.
+
+
+	It is also possible to build a libwxgtk-dbg-python package.
+	There are some limitations (like this package cannot be installed
+	concurrently with the release version), but some developers may
+	find such a thing useful in any case.  It will transparently
+	replace the release package for installed apps that depend on the
+	release package, but should NEVER be used when preparing packages
+	for upload.  This package may be created from the source using the
+	binary-dbg-py target in debian/rules.  (note that doing this will
+	also destroy any release build that exists in the same tree, they
+	cannot coexist there either yet)
+
+
+	Finally, because all of these packages can take quite some time to
+	build, the source package supports the use of distcc.  The package
+	builds will automatically parallelise to suit the number of hosts
+	you have listed in DISTCC_HOSTS.  This will work for both native
+	and cross builds of the c++ libraries, if you have the relevant
+	compilers on all your build hosts.
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
diff --git a/debian/README.examples b/debian/README.examples
index 80c6278664..e9beaf70e9 100644
--- a/debian/README.examples
+++ b/debian/README.examples
@@ -1,5 +1,5 @@
 
-These examples are provided as extended documentation for the wxWidgets
+These examples are provided as extended documentation for the wxWindows
 package.  If you wish to actually run them rather than just browse them
 as documents you should copy them into a working directory elsewhere
 first.  Note that some of them will attempt to write to the current
diff --git a/debian/changelog b/debian/changelog
index 006a156cc8..a9002f9fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+wxwindows2.4 (2.4.2.5) unstable; urgency=medium
+
+  * Medium urgency to keep things moving for the libtiff fudge.
+  * Switch to dhv4, libtiff4.
+  * Fix menu quoting.
+  * Whittled down on some of the build config scripts that weren't
+    really earning their weight.
+  * Check for DISTCC_HOSTS and set the number of make -j jobs according
+    to the number of hosts it contains.
+  * Purge the .pyc from site-packages/wx too.  They are generated on
+    site at install time.
+  * Includes type correctness fix for 64bit arch's.  Closes: #197661
+  * Merged patches from Robert Millan for HURD/K*BSD support back from
+    cvs head.  Closes: #217726
+  * Store the python version we preconfigure virgin source with, then
+    people don't need the default python package installed to build
+    from source, just the packages declared in the build-deps.  Fix
+    the -python postinst to use this when byte compiling too.
+    Closes: #259128  (and fixes #258529)
+  * Added README.examples to explain that these examples are extended
+    documentation for coders, rather than trial apps for users.
+    Closes: #212894
+  * Dropped the examples from the demos subdir, the samples cover a lot
+    more ground than they used to and are generally more up to date,
+    it's also no longer hard to find a broad range of real applications
+    with source.  Provided more external pointers in the README.
+    Closes: #258530 after discussion with the submitter.  This is a bit
+    less c++ for your python, but I'm not convinced yet that either half
+    is such a burden on the other as to warrant an extra package here
+    at this stage.
+  * Fix linking of wxgtk_gl to include the proper dependency on wxgtk.
+    Remove suggestion of libgl1, by declaring the full library dependency
+    we now automatically insist on it.  Closes: #262027
+  * Include wxrc and wxrcedit in contrib-dev.  Added a simple man page
+    and a menu entry for wxrcedit.  Closes: #261811
+  * Update gl sample makefiles to use --gl-libs.  Thanks to Rich Walker
+    for picking this up.  Closes: #246169
+  * Enable the building of a libwxgtk-dbg-python package, but do not
+    build and upload it by default at this stage.  Closes: #220568
+  * Does not fix #239782, sorry.
+
+ -- Ron Lee <ron@debian.org>  Wed, 28 Jul 2004 03:21:42 +0930
+
 wxwindows2.4 (2.4.2.4) unstable; urgency=low
 
   * Modified build scripts to use pythonX.Y instead of python(>=X.Y)
diff --git a/debian/control.in b/debian/control.in
index d755609266..773a1743f0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,9 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1.1
 
 Package: libwxbase=V
 Architecture: any
@@ -68,7 +68,6 @@ Package: libwxgtk=V
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: libgl1
 Replaces: wxgtk2.1
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
  wxWindows is a class library for C++ providing GUI (Graphical User
@@ -83,7 +82,7 @@ Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev, wxgtk2.1-dev
 Provides: libwxgtk-dev
@@ -210,18 +209,27 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
  This package contains examples of using the wxWindows toolkit in
  C++ and with the wxPython language binding.
 
-Package: libwxgtk=V-univ
+Package: libwxgtk=V-dbg-python
 Architecture: any
-Section: libs
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev, ${shlibs:Depends}
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
+Section: python
+Depends: =PY, ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
+Conflicts: libwxgtk=V-python
+Replaces: libwxgtk=V-python
+Provides: libwxgtk=V-python
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
  wxWindows is a class library for C++ providing GUI (Graphical User
  Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
- This package is built to use the wxUNIVERSAL widget set instead of
- native gtk widgets.
+ This package provides a Python binding to the wxGTK debug library.
+ It is useful for developers as many common errors may be caught.
+ Unfortunately it cannot be installed at the same time as the release
+ packages, but it will replace them for other applications that require
+ wxPython.  You should _never_ upload packages to Debian that depend upon
+ this package explicitly, use the libwxgtk=V-python package instead.
+ .
+ If you wish to use xrced you'll also need the python-xml package installed.
 
 Package: libwxbase-msw=V-dev
 Architecture: i386
@@ -275,3 +283,17 @@ Provides: wxwin-headers-msw
 Description: Extra wxWindows headers for mingw32msvc-cross
  Headers required by the wxWindows mingw32msvc-cross libraries.
 
+Package: libwxgtk=V-univ
+Architecture: any
+Section: libs
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev, ${shlibs:Depends}
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package is built to use the wxUNIVERSAL widget set instead of
+ native gtk widgets.
+
+
diff --git a/debian/libwxbase-dbg.dirs b/debian/libwxbase-dbg.dirs
deleted file mode 100644
index c5ba0318f3..0000000000
--- a/debian/libwxbase-dbg.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/based-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-
diff --git a/debian/libwxbase-dbg.postinst b/debian/libwxbase-dbg.postinst
index 2aae1122d4..b6c9d158f2 100644
--- a/debian/libwxbase-dbg.postinst
+++ b/debian/libwxbase-dbg.postinst
@@ -3,9 +3,5 @@ set -e
 
 update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
 
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
 #DEBHELPER#
 
diff --git a/debian/libwxbase-dev.dirs b/debian/libwxbase-dev.dirs
deleted file mode 100644
index adecdf7a7e..0000000000
--- a/debian/libwxbase-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/wx/include/base-=V/wx
-usr/share/man/man1
diff --git a/debian/libwxbase.dirs b/debian/libwxbase.dirs
deleted file mode 100644
index f5b3beeb43..0000000000
--- a/debian/libwxbase.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-
diff --git a/debian/libwxbase.postinst b/debian/libwxbase.postinst
deleted file mode 100644
index 881b6e24e2..0000000000
--- a/debian/libwxbase.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk-contrib-dev.dirs b/debian/libwxgtk-contrib-dev.dirs
deleted file mode 100644
index 7e033b0c69..0000000000
--- a/debian/libwxgtk-contrib-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/
-
diff --git a/debian/libwxgtk-contrib-dev.menu b/debian/libwxgtk-contrib-dev.menu
new file mode 100644
index 0000000000..95566ea24a
--- /dev/null
+++ b/debian/libwxgtk-contrib-dev.menu
@@ -0,0 +1,3 @@
+?package(libwxgtk=V-contrib-dev):needs="X11" section="Apps/Programming"\
+  title="wxrcedit" command="/usr/bin/wxrcedit"
+
diff --git a/debian/libwxgtk-contrib.dirs b/debian/libwxgtk-contrib.dirs
deleted file mode 100644
index 7e033b0c69..0000000000
--- a/debian/libwxgtk-contrib.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/
-
diff --git a/debian/libwxgtk-contrib.postinst b/debian/libwxgtk-contrib.postinst
deleted file mode 100644
index 881b6e24e2..0000000000
--- a/debian/libwxgtk-contrib.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk-dbg-python.menu b/debian/libwxgtk-dbg-python.menu
new file mode 100644
index 0000000000..630e83a0c3
--- /dev/null
+++ b/debian/libwxgtk-dbg-python.menu
@@ -0,0 +1,7 @@
+?package(libwxgtk=V-dbg-python):needs="X11" section="Apps/Programming"\
+  title="pycrust" command="/usr/bin/pycrust"
+?package(libwxgtk=V-dbg-python):needs="X11" section="Apps/Programming"\
+  title="pyshell" command="/usr/bin/pyshell"
+?package(libwxgtk=V-dbg-python):needs="X11" section="Apps/Programming"\
+  title="xrced" command="/usr/bin/xrced"
+
diff --git a/debian/libwxgtk-dbg-python.prerm b/debian/libwxgtk-dbg-python.prerm
new file mode 100644
index 0000000000..c58c90229c
--- /dev/null
+++ b/debian/libwxgtk-dbg-python.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+PACKAGE="libwxgtk=V-dbg-python"
+dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
+
+#DEBHELPER#
+
diff --git a/debian/libwxgtk-dbg.dirs b/debian/libwxgtk-dbg.dirs
deleted file mode 100644
index f20b3d0ecb..0000000000
--- a/debian/libwxgtk-dbg.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtkd-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-
diff --git a/debian/libwxgtk-dbg.postinst b/debian/libwxgtk-dbg.postinst
index d5c1795ebf..dbcb88df23 100644
--- a/debian/libwxgtk-dbg.postinst
+++ b/debian/libwxgtk-dbg.postinst
@@ -3,9 +3,5 @@ set -e
 
 update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
 
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
 #DEBHELPER#
 
diff --git a/debian/libwxgtk-dev.dirs b/debian/libwxgtk-dev.dirs
deleted file mode 100644
index 32b01a1202..0000000000
--- a/debian/libwxgtk-dev.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtk-=V/wx
-usr/share/man/man1
-
diff --git a/debian/libwxgtk-python.menu b/debian/libwxgtk-python.menu
index a5f8285fbc..2d967defb2 100644
--- a/debian/libwxgtk-python.menu
+++ b/debian/libwxgtk-python.menu
@@ -1,7 +1,7 @@
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\
+?package(libwxgtk=V-python):needs="X11" section="Apps/Programming"\
   title="xrced" command="/usr/bin/xrced"
 
diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst
index 440a4ac991..d3b70adfeb 100644
--- a/debian/libwxgtk-python.postinst
+++ b/debian/libwxgtk-python.postinst
@@ -5,8 +5,8 @@ set -e
 WXPYTHONDIR="/usr/lib/=PY/site-packages/wxPython"
 
 if [ "$1" = "configure" ]; then
-	python /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
-	python -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
 fi
 
 #DEBHELPER#
diff --git a/debian/libwxgtk-python.prerm b/debian/libwxgtk-python.prerm
index 03d602c2d3..bf5a62b36c 100644
--- a/debian/libwxgtk-python.prerm
+++ b/debian/libwxgtk-python.prerm
@@ -3,11 +3,7 @@
 set -e
 
 PACKAGE="libwxgtk=V-python"
-
-dpkg --listfiles $PACKAGE |
-	awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
-	xargs rm -f >&2
-
+dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
 #DEBHELPER#
 
diff --git a/debian/libwxgtk-univ.dirs b/debian/libwxgtk-univ.dirs
deleted file mode 100644
index 4fb8eed3a5..0000000000
--- a/debian/libwxgtk-univ.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtkuniv-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-
diff --git a/debian/libwxgtk-univ.links b/debian/libwxgtk-univ.links
deleted file mode 100644
index 4c0b43be12..0000000000
--- a/debian/libwxgtk-univ.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkuniv-=V-config.1.gz
-
diff --git a/debian/libwxgtk-univ.postinst b/debian/libwxgtk-univ.postinst
deleted file mode 100644
index 2b87484262..0000000000
--- a/debian/libwxgtk-univ.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkuniv-=V-config 50
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk-univ.prerm b/debian/libwxgtk-univ.prerm
deleted file mode 100644
index 867ac76c25..0000000000
--- a/debian/libwxgtk-univ.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxgtkuniv-=V-config
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk.dirs b/debian/libwxgtk.dirs
deleted file mode 100644
index f7077cffb4..0000000000
--- a/debian/libwxgtk.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/share
diff --git a/debian/libwxgtk.postinst b/debian/libwxgtk.postinst
deleted file mode 100644
index 881b6e24e2..0000000000
--- a/debian/libwxgtk.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-
diff --git a/debian/rules b/debian/rules
index 2398b48429..792aa1b8a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file to build packages from wxWindows CVS source
+# debian/rules file to build packages from wx CVS source
 #
 # Sculpted 13/2/2000 by Ron Lee <ron@debian.org> from new and
 # variously stolen code :-)
@@ -7,152 +7,167 @@
 # Joey Hess and others.
 
 #export DH_VERBOSE=1
-export DH_COMPAT=2
 export DH_OPTIONS
 
-release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
-python_ver:=python$(shell python -c "import sys;print sys.version[:3]")
+ifdef DISTCC_HOSTS
 
-cross_host=i586-mingw32msvc
-cross_build=$(shell ./config.guess)
+ #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
+ # Nearly as fast, but doesn't raise the room temperature
+ # or saturate the build machines quite so much.
+  JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
+  FAST_MAKE  = $(MAKE) -j $(JOB_COUNT)
 
-config_cache=../config_deb.cache
-config_cache_cross=../config_deb_cross.cache
+else
+
+  FAST_MAKE = $(MAKE)
+
+endif
+
+-include debian/python-version
+
+release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+
+cross_host  = i586-mingw32msvc
+cross_build = $(shell ./config.guess)
+
+config_cache       = ../config_deb.cache
+config_cache_cross = ../config_deb_cross.cache
 
 # Packages to build:
-package_wxbase_lib=libwxbase$(release)
-package_wxbase_dev=libwxbase$(release)-dev
-package_wxbase_dbg=libwxbase$(release)-dbg
-package_gtk_lib=libwxgtk$(release)
-package_gtk_dev=libwxgtk$(release)-dev
-package_gtk_dbg=libwxgtk$(release)-dbg
-package_gtk_py=libwxgtk$(release)-python
-package_gtk_contrib=libwxgtk$(release)-contrib
-package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
-package_headers=wxwin$(release)-headers
-package_i18n=wxwin$(release)-i18n
-package_doc=wxwin$(release)-doc
-package_examples=wxwin$(release)-examples
+package_wxbase_lib      = libwxbase$(release)
+package_wxbase_dev      = libwxbase$(release)-dev
+package_wxbase_dbg      = libwxbase$(release)-dbg
+package_gtk_lib         = libwxgtk$(release)
+package_gtk_dev         = libwxgtk$(release)-dev
+package_gtk_dbg         = libwxgtk$(release)-dbg
+package_gtk_py          = libwxgtk$(release)-python
+package_gtk_contrib     = libwxgtk$(release)-contrib
+package_gtk_contrib_dev = libwxgtk$(release)-contrib-dev
+package_headers         = wxwin$(release)-headers
+package_i18n            = wxwin$(release)-i18n
+package_doc             = wxwin$(release)-doc
+package_examples        = wxwin$(release)-examples
 
-package_gtk_univ=libwxgtk$(release)-univ
+package_gtk_dbg_py      = libwxgtk$(release)-dbg-python
 
-package_wxbase_msw_dev=libwxbase-msw$(release)-dev
-package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
-package_msw_dev=libwxmsw$(release)-dev
-package_msw_dbg=libwxmsw$(release)-dbg
-package_headers_msw=wxwin$(release)-headers-msw
+package_gtk_univ        = libwxgtk$(release)-univ
+
+package_wxbase_msw_dev  = libwxbase-msw$(release)-dev
+package_wxbase_msw_dbg  = libwxbase-msw$(release)-dbg
+package_msw_dev         = libwxmsw$(release)-dev
+package_msw_dbg         = libwxmsw$(release)-dbg
+package_headers_msw     = wxwin$(release)-headers-msw
 
 # Build directories:
-objdir_wxbase_shared=objs_wxbase_sh
-objdir_wxbase_static=objs_wxbase_st
-objdir_wxbase_debug=objs_wxbase_d
-objdir_gtk_shared=objs_gtk_sh
-objdir_gtk_static=objs_gtk_st
-objdir_gtk_debug=objs_gtk_d
-objdir_gtk_install=objs_gtk_install
-objdir_gtk_contrib_install=objs_gtk_contrib_install
-objdir_doc_cruft=objs_doc_con
-objdir_doc=docs/wxWindows-manual.html
-objdir_examples=docs/examples
-objdir_i18n=locale
+objdir_wxbase_shared       = objs_wxbase_sh
+objdir_wxbase_static       = objs_wxbase_st
+objdir_wxbase_debug        = objs_wxbase_d
+objdir_gtk_shared          = objs_gtk_sh
+objdir_gtk_static          = objs_gtk_st
+objdir_gtk_debug           = objs_gtk_d
+objdir_gtk_install         = objs_gtk_install
+objdir_gtk_contrib_install = objs_gtk_contrib_install
+objdir_doc_cruft           = objs_doc_con
+objdir_doc                 = docs/wxWindows-manual.html
+objdir_examples            = docs/examples
+objdir_i18n                = locale
 
-objdir_gtk_univ=objs_gtk_univ
-objdir_univ_install=objs_univ_install
+objdir_gtk_univ            = objs_gtk_univ
+objdir_univ_install        = objs_univ_install
 
-objdir_wxbase_msw_shared=objs_wxbase_msw_sh
-objdir_wxbase_msw_static=objs_wxbase_msw_st
-objdir_wxbase_msw_dbg=objs_wxbase_msw_d
-objdir_msw_shared=objs_msw_sh
-objdir_msw_static=objs_msw_st
-objdir_msw_dbg=objs_msw_d
+objdir_wxbase_msw_shared   = objs_wxbase_msw_sh
+objdir_wxbase_msw_static   = objs_wxbase_msw_st
+objdir_wxbase_msw_dbg      = objs_wxbase_msw_d
+objdir_msw_shared          = objs_msw_sh
+objdir_msw_static          = objs_msw_st
+objdir_msw_dbg             = objs_msw_d
 
-objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
-	$(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
-	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
-	$(objdir_examples)                                                     \
-	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
-	$(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
-	$(objdir_msw_dbg)
+objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
+	  $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
+	  $(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
+	  $(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
+	  $(objdir_examples)                                                     \
+	  $(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
+	  $(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
+	  $(objdir_msw_dbg)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
 #	it's pulled out of the wxGtk shared lib package.
 
 # Build stamps:
-build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
-                  build-wxbase-debug-stamp build-gtk-shared-stamp \
-                  build-gtk-static-stamp build-gtk-debug-stamp \
-                  build-contrib-shared-stamp build-contrib-static-stamp \
-                  build-gtk-py-stamp build-i18n-stamp
+build_arch_stamps = build-wxbase-shared-stamp build-wxbase-static-stamp \
+                    build-wxbase-debug-stamp build-gtk-shared-stamp \
+                    build-gtk-static-stamp build-gtk-debug-stamp \
+                    build-contrib-shared-stamp build-contrib-static-stamp \
+                    build-gtk-py-stamp build-i18n-stamp
 
 # disable gtk-univ build, we'll  replace it with x11-univ later.
 #		  build-gtk-univ-stamp
 
-build_indep_stamps=build-examples-stamp build-doc-stamp
+build_indep_stamps = build-examples-stamp build-doc-stamp
 
-build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
-		   build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
-		   build-msw-static-stamp build-msw-dbg-stamp
+build_cross_stamps = build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
+		     build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
+		     build-msw-static-stamp build-msw-dbg-stamp
 
-build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
+build_stamps_native = $(build_arch_stamps) $(build_indep_stamps)
 
-build_stamps=$(build_stamps_native) $(build_cross_stamps)
+build_stamps = $(build_stamps_native) $(build_cross_stamps)
 
 # Install targets:
-install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
-                 install-gtk-lib install-gtk-dev install-gtk-dbg \
-                 install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
-                 install-headers install-i18n
+install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
+                   install-gtk-lib install-gtk-dev install-gtk-dbg \
+                   install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
+                   install-headers install-i18n
 
 # disable gtk-univ build, we'll  replace it with x11-univ later.
 #                install-gtk-univ
 
-install_all_indep=install-examples install-doc
+install_all_indep = install-examples install-doc
 
-install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
+install_all_cross = install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
 
-install_all_native=$(install_all_arch) $(install_all_indep)
+install_all_native = $(install_all_arch) $(install_all_indep)
 
-install_all=$(install_all_native) $(install_all_cross)
+install_all = $(install_all_native) $(install_all_cross)
 
 
-wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
-                --prefix=$(shell pwd) \
+wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config          \
+                --prefix=$(shell pwd)                            \
                 --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config       \
+                --prefix=$(shell pwd)                            \
+                --exec-prefix=$(shell pwd)/$(objdir_gtk_debug)
+
 
 # The Rules:
 
-debian/control: debian/control.in
+debian/python-version:
+	echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
+
+debian/control: $(addprefix debian/,control.in python-version)
 	sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
 
 control-files-stamp: debian/control
 	dh_testdir
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_wxbase_lib).$$f"; \
-		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dev).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
 			> debian/$(package_wxbase_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dbg).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
 			> debian/$(package_wxbase_dbg).$$f; \
 	done;
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_gtk_lib).$$f"; \
-		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in links postinst prerm; do \
 		echo "generating control file $(package_gtk_dev).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
 			> debian/$(package_gtk_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in links postinst prerm; do \
 		echo "generating control file $(package_gtk_dbg).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
 			> debian/$(package_gtk_dbg).$$f; \
@@ -162,23 +177,12 @@ control-files-stamp: debian/control
 		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
 			> debian/$(package_gtk_py).$$f; \
 	done;
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_gtk_contrib).$$f"; \
-		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
-	done;
-	@for f in dirs; do \
+	@for f in menu; do \
 		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
-		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-contrib-dev.$$f \
+			> debian/$(package_gtk_contrib_dev).$$f; \
 	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_headers).$$f"; \
-		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
-	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_i18n).$$f"; \
-		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
-	done;
-	@for f in dirs docs doc-base; do \
+	@for f in docs doc-base; do \
 		echo "generating control file $(package_doc).$$f"; \
 		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
 			> debian/$(package_doc).$$f; \
@@ -187,6 +191,16 @@ control-files-stamp: debian/control
 		echo "generating control file $(package_examples).$$f"; \
 		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
 	done;
+	@for f in dirs docs postinst; do \
+		echo "generating control file $(package_gtk_dbg_py).$$f"; \
+		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
+			> debian/$(package_gtk_dbg_py).$$f; \
+	done;
+	@for f in menu prerm; do \
+		echo "generating control file $(package_gtk_dbg_py).$$f"; \
+		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g' < debian/libwxgtk-dbg-python.$$f \
+			> debian/$(package_gtk_dbg_py).$$f; \
+	done;
 	@for f in dirs links postinst prerm; do \
 		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
@@ -212,11 +226,6 @@ control-files-stamp: debian/control
 		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
 			> debian/$(package_headers_msw).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_gtk_univ).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
-			> debian/$(package_gtk_univ).$$f; \
-	done;
 	touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
@@ -245,7 +254,7 @@ configure-wxbase-shared-stamp:
 
 build-wxbase-shared-stamp: configure-wxbase-shared-stamp
 	dh_testdir
-	cd $(objdir_wxbase_shared) && $(MAKE)
+	cd $(objdir_wxbase_shared) && $(FAST_MAKE)
 	touch $@
 
 configure-wxbase-static-stamp:
@@ -262,7 +271,7 @@ configure-wxbase-static-stamp:
 
 build-wxbase-static-stamp: configure-wxbase-static-stamp
 	dh_testdir
-	cd $(objdir_wxbase_static) && $(MAKE)
+	cd $(objdir_wxbase_static) && $(FAST_MAKE)
 	touch $@
 
 configure-wxbase-debug-stamp:
@@ -280,7 +289,7 @@ configure-wxbase-debug-stamp:
 
 build-wxbase-debug-stamp: configure-wxbase-debug-stamp
 	dh_testdir
-	cd $(objdir_wxbase_debug) && $(MAKE)
+	cd $(objdir_wxbase_debug) && $(FAST_MAKE)
 	touch $@
 
 configure-gtk-shared-stamp:
@@ -302,7 +311,7 @@ configure-gtk-shared-stamp:
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
 	dh_testdir
-	cd $(objdir_gtk_shared) && $(MAKE)
+	cd $(objdir_gtk_shared) && $(FAST_MAKE)
 	touch $@
 
 configure-gtk-static-stamp:
@@ -324,7 +333,7 @@ configure-gtk-static-stamp:
 
 build-gtk-static-stamp: configure-gtk-static-stamp
 	dh_testdir
-	cd $(objdir_gtk_static) && $(MAKE)
+	cd $(objdir_gtk_static) && $(FAST_MAKE)
 	touch $@
 
 configure-gtk-debug-stamp:
@@ -347,7 +356,7 @@ configure-gtk-debug-stamp:
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
 	dh_testdir
-	cd $(objdir_gtk_debug) && $(MAKE)
+	cd $(objdir_gtk_debug) && $(FAST_MAKE)
 	touch $@
 
 configure-gtk-univ-stamp:
@@ -370,22 +379,28 @@ configure-gtk-univ-stamp:
 
 build-gtk-univ-stamp: configure-gtk-univ-stamp
 	dh_testdir
-	cd $(objdir_gtk_univ) && $(MAKE)
+	cd $(objdir_gtk_univ) && $(FAST_MAKE)
 	touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
-	cd $(objdir_gtk_shared)/contrib/src \
-		&& $(MAKE)
+	cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
+	cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
+	cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
 	touch $@
 
 build-contrib-static-stamp: build-gtk-static-stamp
 	dh_testdir
-	cd $(objdir_gtk_static)/contrib/src \
-		&& $(MAKE)
+	cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
 	touch $@
 
-build-gtk-py-stamp: build-gtk-shared-stamp
+purge-dbg-py:
+	@if [ ! -e build-gtk-py-stamp ]; then				\
+		$(MAKE) -f debian/rules clean-py;			\
+	fi
+	$(RM) build-gtk-dbg-py-stamp
+
+build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
 	dh_testdir
 	touch docs/lgpl.txt
 	cd wxPython \
@@ -395,8 +410,9 @@ build-gtk-py-stamp: build-gtk-shared-stamp
 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/utils/tex2rtf/src \
-		&& $(MAKE)
+		&& $(FAST_MAKE)
 	rm -rf $(objdir_doc)
+	rm -rf $(objdir_doc_cruft)
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
@@ -418,19 +434,18 @@ build-examples-stamp: build-gtk-shared-stamp
 	rm -f $(objdir_examples)/samples/Makefile
 	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
 
-	cp -a demos $(objdir_examples)
+	cd $(objdir_examples)/samples					\
+		&& mv Makefile.in Makefile 				\
+		&& rm -f configure* 					\
+		&& find -name 'Makefile.in' -exec rm -f '{}' ';' 	\
+		&& for d in $$(find -type d); do 			\
+			if [ -f $$d/makefile.unx ]; then 		\
+				mv $$d/makefile.unx $$d/Makefile; 	\
+			fi; 						\
+		done
+
 	cp -a wxPython/demo $(objdir_examples)/wxPython
-	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
-		(cd $$d \
-			&& mv Makefile.in Makefile \
-			&& rm -f configure* \
-			&& find -name 'Makefile.in' -exec rm -f '{}' ';' \
-			&& for f in $$(find -type d); do \
-				if [ -f $$f/makefile.unx ]; then \
-					mv $$f/makefile.unx $$f/Makefile; \
-				fi; \
-			done) \
-	done;
+
 	touch $@
 
 build-i18n-stamp: build-gtk-shared-stamp
@@ -444,6 +459,19 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@
 
+purge-release-py:
+	@if [ ! -e build-gtk-dbg-py-stamp ]; then			\
+		$(MAKE) -f debian/rules clean-py;			\
+	fi
+	$(RM) build-gtk-py-stamp
+
+build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
+	dh_testdir
+	touch docs/lgpl.txt
+	cd wxPython \
+		&& $(python_ver) ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig-dbg)'
+	touch $@
+
 configure-wxbase-msw-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_shared)
@@ -457,7 +485,7 @@ configure-wxbase-msw-shared-stamp:
 
 build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
 	dh_testdir
-	cd $(objdir_wxbase_msw_shared) && $(MAKE)
+	cd $(objdir_wxbase_msw_shared) && $(FAST_MAKE)
 	touch $@
 
 configure-wxbase-msw-static-stamp:
@@ -474,7 +502,7 @@ configure-wxbase-msw-static-stamp:
 
 build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
 	dh_testdir
-	cd $(objdir_wxbase_msw_static) && $(MAKE)
+	cd $(objdir_wxbase_msw_static) && $(FAST_MAKE)
 	touch $@
 
 # Note this builds dll only, since wxmsw static debug is > 130MB !
@@ -492,7 +520,7 @@ configure-wxbase-msw-dbg-stamp:
 
 build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
 	dh_testdir
-	cd $(objdir_wxbase_msw_dbg) && $(MAKE)
+	cd $(objdir_wxbase_msw_dbg) && $(FAST_MAKE)
 	touch $@
 
 configure-msw-shared-stamp:
@@ -507,7 +535,7 @@ configure-msw-shared-stamp:
 
 build-msw-shared-stamp: configure-msw-shared-stamp
 	dh_testdir
-	cd $(objdir_msw_shared) && $(MAKE)
+	cd $(objdir_msw_shared) && $(FAST_MAKE)
 	touch $@
 
 configure-msw-static-stamp:
@@ -523,7 +551,7 @@ configure-msw-static-stamp:
 
 build-msw-static-stamp: configure-msw-static-stamp
 	dh_testdir
-	cd $(objdir_msw_static) && $(MAKE)
+	cd $(objdir_msw_static) && $(FAST_MAKE)
 	touch $@
 
 configure-msw-dbg-stamp:
@@ -539,19 +567,11 @@ configure-msw-dbg-stamp:
 
 build-msw-dbg-stamp: configure-msw-dbg-stamp
 	dh_testdir
-	cd $(objdir_msw_dbg) && $(MAKE)
+	cd $(objdir_msw_dbg) && $(FAST_MAKE)
 	touch $@
 
 
-clean: debian/control
-	dh_testdir
-	dh_testroot
-
-	rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
-	rm -f docs/lgpl.txt
-	rm -f docs/latex/wx/manual.bb
-	rm -f $(objdir_i18n)/*.mo
-
+clean-py:
 	cd wxPython \
 		&& rm -rf licence \
 		&& rm -rf build \
@@ -565,6 +585,15 @@ clean: debian/control
 # its not enough by itself to get the tree properly clean again.
 #		&& ./setup.py clean
 
+clean: debian/control clean-py
+	dh_testdir
+	dh_testroot
+
+	rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
+	rm -f docs/lgpl.txt
+	rm -f docs/latex/wx/manual.bb
+	rm -f $(objdir_i18n)/*.mo
+
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -579,12 +608,14 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
-	rm -f debian/$(package_gtk_univ).*
+
+	rm -f debian/$(package_gtk_dbg_py).*
 	rm -f debian/$(package_wxbase_msw_dev).*
 	rm -f debian/$(package_wxbase_msw_dbg).*
 	rm -f debian/$(package_msw_dev).*
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
+	rm -f debian/$(package_gtk_univ).*
 
 install_arch: build_arch $(install_all_arch)
 
@@ -613,7 +644,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs usr/share/lintian/overrides
 	dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config 	usr/bin
 	dh_install $(objdir_wxbase_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
@@ -649,7 +680,7 @@ install-gtk-dbg: build-gtk-debug-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs usr/share/lintian/overrides
 	dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
@@ -677,7 +708,7 @@ install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_contrib_install)/lib/*.so.* 	usr/lib
+	dh_install $(objdir_gtk_contrib_install)/lib/*.so.* 		usr/lib
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
 install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
@@ -685,10 +716,17 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_contrib_install)/include 	usr
-	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
-		   $(objdir_gtk_static)/lib/*.a 		usr/lib
+	dh_install $(objdir_gtk_contrib_install)/include 		usr
+	dh_install $(objdir_gtk_contrib_install)/lib/*.so 		usr/lib
+	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- 				\
+		   $(objdir_gtk_static)/lib/*.a 			usr/lib
+
+	dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc		usr/bin
+	dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit	usr/bin
+
+	dh_installman debian/wxrc-tools.1
+	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1	\
+		usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -701,7 +739,7 @@ install-gtk-py: build-gtk-py-stamp
 			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr 	\
 			      WX_CONFIG='$(wxconfig)'
 
-	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
+	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages	\
 		-name '*.py?' -exec rm '{}' ';'
 
 	dh_installman debian/wxPython-tools.1
@@ -761,6 +799,35 @@ install-examples: build-examples-stamp
 	dh_clean -k
 	dh_installdirs
 
+install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
+install-gtk-dbg-py: build-gtk-dbg-py-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cd wxPython 								    \
+		&& $(python_ver) ./setup.py install 				    \
+			      --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr    \
+			      WX_CONFIG='$(wxconfig-dbg)'
+
+	find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages	\
+		-name '*.py?' -exec rm '{}' ';'
+
+	dh_installman debian/wxPython-tools.1
+	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+
+	# This is rather bogus, its included in the main copyright file now though.
+	rm -f debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
+
 install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
 install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
 	dh_testdir
@@ -841,7 +908,14 @@ binary-common:
 
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -N$(package_gtk_py) -V
+
+	@# Don't do this for the dbg-py special build because dh_makeshlibs
+	@# will crap out if it is called with no packages to act on.
+	@if [ "x$(DH_OPTIONS)" != "-p$(package_gtk_dbg_py)" ]; then	\
+		echo "dh_makeshlibs -N$(package_gtk_py) -V";		\
+		dh_makeshlibs -N$(package_gtk_py) -V;			\
+	fi
+
 	dh_installdeb
 	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
 	dh_gencontrol
@@ -865,6 +939,7 @@ binary-arch: build_arch install_arch
 # Build all packages target.
 binary: binary-arch binary-indep
 
+
 # This is a special target for building the wxMSW-cross packages.
 # It's not currently called during the official package build run
 # but may be run separately to build the extra packages.
@@ -876,6 +951,12 @@ binary-cross: control-files-stamp $(install_all_cross)
 		binary-common
 
 
+# Build wxPython against libwxgtk-dbg.  This package will conflict
+# with the release build one, but may be useful to some people.
+binary-dbg-py: control-files-stamp install-gtk-dbg-py
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg_py)" binary-common
+
+
 ############################################################################
 #
 # Some rules to build a subset of the complete list of packages that can be
@@ -919,13 +1000,18 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
 
 
-.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
-        binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
-	binary-wxbase-dbg binary-doc binary-cross \
-	install install_arch install-wxbase-lib \
-        install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
-        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
-        install-gtk-py install-headers install-i18n install-doc install-examples \
-	install-wxbase-msw-dev install-msw-dev install-headers-msw \
+.PHONY: build build_all build_arch					\
+	clean clean-py purge-release-py purge-dbg-py			\
+	binary-indep binary-arch binary binary-common 			\
+	binary-gtk binary-gtk-dev binary-gtk-dbg			\
+	binary-wxbase binary-wxbase-dev binary-wxbase-dbg		\
+	binary-doc binary-cross binary-dbg-py				\
+	install install_arch						\
+	install-wxbase-lib install-wxbase-dev install-wxbase-dbg	\
+	install-gtk-lib install-gtk-dev install-gtk-dbg			\
+	install-gtk-contrib install-gtk-contrib-dev			\
+	install-gtk-py install-gtk-dbg-py				\
+	install-headers install-i18n install-doc install-examples	\
+	install-wxbase-msw-dev install-msw-dev install-headers-msw	\
 	install-wxbase-msw-dbg install-msw-dbg
 
diff --git a/debian/wx-config.1 b/debian/wx-config.1
index fd9f478c19..68adb1cd17 100644
--- a/debian/wx-config.1
+++ b/debian/wx-config.1
@@ -1,6 +1,6 @@
 .TH wx\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows"
 .SH NAME
-wx-config \- generate compile time info for wxWindows
+wx-config \- generate compile time requirements for wxWindows applications
 .SH SYNOPSIS
 .nh
 .B wxbase\-config
@@ -8,7 +8,10 @@ wx-config \- generate compile time info for wxWindows
 .B wxgtk\-config
 .HP
 .B wx\-config
-[\-\-version] [\-\-libs] [\-\-cflags] [\-\-cc] [\-\-cxx] [\-\-ld]
+[\-\-version]
+[\-\-libs] [\-\-gl\-libs]
+[\-\-cppflags] [\-\-cflags] [\-\-cxxflags]
+[\-\-cc] [\-\-cxx] [\-\-ld]
 [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP]
 .SH DESCRIPTION
 \fIwx\-config\fP is a tool to determine the compiler and linker
@@ -26,29 +29,36 @@ mechanism.
 .SH OPTIONS
 .l
 \fIwx\-config\fP accepts the following options:
-.TP 8
+.TP 15
 .B  \-\-version
 What to
 .B ALWAYS
 include in a bug report.
-.br
-( But of course you already knew that ... )
-.TP 8
+.TP 15
 .B  \-\-libs
-Generate linker flags for a \fIwxWindows\fP program.
-.TP 8
+Output linker parameters for a \fIwxWindows\fP application.
+.TP 15
+.B  \-\-gl-libs
+Output linker parameters for a \fIwxWindows\fP application that uses the glcanvas.
+.TP 15
+.B  \-\-cppflags
+Output parameters required by the C preprocessor for wxWindows applications.
+.TP 15
 .B  \-\-cflags
-Generate compiler flags for the same.
-.TP 8
+Output parameters required by the C compiler for wxWindows applications.
+.TP 15
+.B  \-\-cxxflags
+Output parameters required by the C++ compiler for wxWindows applications.
+.TP 15
 .B  \-\-cc
 Output the name of the C compiler \fB$(CC)\fP.
-.TP 8
+.TP 15
 .B  \-\-cxx
 Output the name of the C++ compiler \fB$(CXX)\fP.
-.TP 8
+.TP 15
 .B  \-\-ld
-Output the Linker command \fB$(LD)\fP.
-.TP 8
+Output the linker command \fB$(LD)\fP.
+.TP 15
 .B  \-\-prefix=PREFIX
 If specified, use PREFIX instead of the installation prefix that \fIwxWindows\fP
 was built with when computing the output for the \-\-cflags and
@@ -60,7 +70,7 @@ before any \-\-libs or \-\-cflags options.
 .HP
 (Translation:  this is the root path to the \fIwxWindows\fP headers \-\- [Ron])
 .hy
-.TP 8
+.TP 15
 .B  \-\-exec\-prefix=PREFIX
 If specified, use PREFIX instead of the installation exec prefix that
 \fIwxWindows\fP was built with when computing the output for the \-\-cflags
@@ -77,8 +87,8 @@ and \-\-libs options.  This option must be specified before any
 .SH COPYRIGHT
 This manpage was copied whole\-heartedly from the \fBgtk\-config\fP(1) manpage
 by Brian Bassett <brianb@debian.org> for the Debian GNU/Linux distribution of
-wxGTK.  It was then updated to include new options and otherwise bastardised
-generally by Ron Lee <ron@debian.org>
+wxGTK.  It was subsequently updated to include new options and otherwise
+bastardised generally by Ron Lee <ron@debian.org>
 
 The original gtk\-config manpage copyright:
 
diff --git a/debian/wxrc-tools.1 b/debian/wxrc-tools.1
new file mode 100644
index 0000000000..5c6153a54f
--- /dev/null
+++ b/debian/wxrc-tools.1
@@ -0,0 +1,17 @@
+.TH wxrc\-tools 1 "30 Jul 2004" "Debian GNU/Linux" "wxWindows"
+.SH NAME
+wxrc \- command line compiler for wx xml resources.
+.br
+wxrced \- graphical editing tool for wx xml resource files.
+
+.SH DESCRIPTION
+The real documentation for these tools (what of it that exists) is available
+in the wxWindows manual, which is packaged in html format in the wxwin2.4-doc
+package and installed in /usr/share/doc/wxwin2.4-doc/wxWindows-manual.html on
+Debian systems.
+
+.SH COPYRIGHT
+This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
+distribution of wxWindows.  It may be freely distributed by anyone insane enough
+to find it useful.
+
diff --git a/debian/wxwin-doc.dirs b/debian/wxwin-doc.dirs
deleted file mode 100644
index c0a85e9e29..0000000000
--- a/debian/wxwin-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc-base
diff --git a/debian/wxwin-examples.examples b/debian/wxwin-examples.examples
index 76daa91bce..c015b128b8 100644
--- a/debian/wxwin-examples.examples
+++ b/debian/wxwin-examples.examples
@@ -1,3 +1,4 @@
-docs/examples/demos
+debian/README.examples
 docs/examples/samples
 docs/examples/wxPython
+
diff --git a/debian/wxwin-headers.dirs b/debian/wxwin-headers.dirs
deleted file mode 100644
index d3e1cff74a..0000000000
--- a/debian/wxwin-headers.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/wx
-usr/share/man/man1
-
diff --git a/debian/wxwin-i18n.dirs b/debian/wxwin-i18n.dirs
deleted file mode 100644
index d10fb40c7b..0000000000
--- a/debian/wxwin-i18n.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/locale
-
diff --git a/samples/opengl/cube/makefile.unx b/samples/opengl/cube/makefile.unx
index 6c2b07cdc1..308670c0da 100644
--- a/samples/opengl/cube/makefile.unx
+++ b/samples/opengl/cube/makefile.unx
@@ -9,10 +9,6 @@
 #
 # Makefile for cube example (UNIX).
 
-OPENGL_LIBS=-lGL -lGLU
-#if you have old Mesa, try this:
-#OPENGL_LIBS=-lMesaGL -lMesaGLU
-
 PROGRAM=cube
 
 CXX = $(shell wx-config --cxx)
@@ -29,7 +25,7 @@ OBJECTS = $(PROGRAM).o
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --gl-libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)
diff --git a/samples/opengl/isosurf/makefile.unx b/samples/opengl/isosurf/makefile.unx
index c0bce39941..84fcc7949b 100644
--- a/samples/opengl/isosurf/makefile.unx
+++ b/samples/opengl/isosurf/makefile.unx
@@ -9,10 +9,6 @@
 #
 # Makefile for isosurf example (UNIX).
 
-OPENGL_LIBS=-lGL -lGLU
-#if you have old Mesa, try this:
-#OPENGL_LIBS=-lMesaGL -lMesaGLU
-
 PROGRAM=isosurf
 
 CXX = $(shell wx-config --cxx)
@@ -29,7 +25,7 @@ OBJECTS = $(PROGRAM).o
 all: $(PROGRAM) isosurf.dat
 
 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --gl-libs`
 
 clean: 
 	rm -f *.o $(PROGRAM)
diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx
index bc26127d08..15e3ebaaa1 100644
--- a/samples/opengl/penguin/makefile.unx
+++ b/samples/opengl/penguin/makefile.unx
@@ -7,17 +7,13 @@
 #
 # Makefile for penguin example (UNIX).
 
-OPENGL_LIBS=-lGL -lGLU
-#if you have old Mesa, try this:
-#OPENGL_LIBS=-lMesaGL -lMesaGLU
-
 CC = $(shell wx-config --cc)
 CXX = $(shell wx-config --cxx)
 
 Penguin: penguin.o trackball.o lw.o
 	$(CXX) -o Penguin \
 	penguin.o trackball.o lw.o \
-	`wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
+	`wx-config --gl-libs`
 
 penguin.o: penguin.cpp
 	$(CXX) `wx-config --cxxflags` -I../../gtk -c penguin.cpp
diff --git a/wxPython/wxPython/lib/newevent.py b/wxPython/wxPython/lib/newevent.py
index a6c828d919..ae2807d90d 100644
--- a/wxPython/wxPython/lib/newevent.py
+++ b/wxPython/wxPython/lib/newevent.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Easy generation of new events classes and binder functions"""
 
 __author__ = "Miki Tebeka <tebeka@cs.bgu.ac.il>"