X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c98f04213ed354d0116092e87a30db5dc69c5709:/configure

diff --git a/configure b/configure
index 833cfc2bd8..792f25a624 100755
--- a/configure
+++ b/configure
@@ -14,85 +14,103 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --with-x                use the X Window System"
 ac_help="$ac_help
+**--with-gtk              use GTK"
+ac_help="$ac_help
+**--with-qt               use Qt"
+ac_help="$ac_help
+**--with-motif            use Motif/Lesstif"
+ac_help="$ac_help
 **--with-shared           create shared libraries"
 ac_help="$ac_help
-**--without-optimise      create unoptimised code"
+**--with-optimise         create optimised code"
 ac_help="$ac_help
-**--with-debug_flag       create code with DEBUG define set to 1"
+**--with-debug_flag       create code with WXDEBUG define set to 1"
 ac_help="$ac_help
-**--with-debug_info       create code with debuging information included"
+**--with-debug_info       create code with debuging information"
 ac_help="$ac_help
 **--with-mem_traing       create code with memory tracing"
 ac_help="$ac_help
-**--with-profile          create code with profiling information included"
+**--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/)"
 ac_help="$ac_help
-**--with-zlib          use zlib (LZW comression)"
+**--with-profile          create code with profiling information"
 ac_help="$ac_help
-**--with-gdk_imlib     use Raster's gdk_imlib (Image library)"
+**--with_apple_ieee	  use the Apple IEEE codec"
 ac_help="$ac_help
-**--with-libpng        use libpng (PNG image format)"
+**--with-zlib             use zlib for LZW comression"
 ac_help="$ac_help
-**--with-threads       use threads"
+**--with-gdk_imlib        use Raster's gdk_imlib (Image library)"
 ac_help="$ac_help
-**--with-opengl        use opengl (OpenGL or Mesa)"
+**--with-libpng           use libpng (PNG image format)"
 ac_help="$ac_help
-**--with-storable          use storable classes"
+**--with-odbc             use iODBC and wxODBC classes"
 ac_help="$ac_help
-**--with-autotrans         use gettext automatic translation"
+**--with-opengl           use OpenGL (or Mesa)"
 ac_help="$ac_help
-**--with-afmfonts         use Adobe Font Metric Font table"
+**--with-gauge            use wxGauge class"
 ac_help="$ac_help
-**--with-PS-normalized    use normalized PS fonts"
+**--with-scrollbar        use wxScrollbar class"
 ac_help="$ac_help
-**--with-rpc              use RPC"
+**--with-listctrl         use wxListCtrl class"
 ac_help="$ac_help
-**--with-wxresources      use wxresources"
+**--with-treectrl         use wxTreeCtrl class"
 ac_help="$ac_help
-**--with-prologio         use prologio"
+**--with-grid             use wxGrid class"
 ac_help="$ac_help
-**--with-postscript       use postscript-device-context"
+**--with-tab_dialog       use wxTabDia class"
 ac_help="$ac_help
-**--with-metafile         use metafile"
+**--with-notebook         use wxNotebook class"
 ac_help="$ac_help
-**--with-form             use form"
+**--with-timedate         use wxTime and wxDate classes"
 ac_help="$ac_help
-**--with-help             use help"
+**--with-fraction         use wxFraction class"
 ac_help="$ac_help
-**--with-ipc              use ipc"
+**--with-log              use logging system"
 ac_help="$ac_help
-**--with-enhanceddialog   use enhanced dialog"
+**--with-intl             use internationalization system"
 ac_help="$ac_help
-**--with-resources        use resources"
+**--with-config           use wxConfig class"
 ac_help="$ac_help
-**--with-clipboard        use clipboard"
+**--with-streams          use wxStream etc classes"
 ac_help="$ac_help
-**--with-timedate         use timedate"
+**--with-serial           use class serialization"
 ac_help="$ac_help
-**--with-fraction         use fraction"
+**--with-file             use wxFile class"
 ac_help="$ac_help
-**--with-constraints      use constraints"
+**--with-textfile         use wxTextFile class"
 ac_help="$ac_help
-**--with-toolbar          use toolbar"
+**--with-afmfonts         use Adobe Font Metric Font table"
 ac_help="$ac_help
-**--with-gauge            use gauge"
+**--with-PS-normalized    use normalized PS fonts"
 ac_help="$ac_help
-**--with-vlbox            use virtual list box"
+**--with-postscript       use wxPostscriptDC device context"
 ac_help="$ac_help
-**--with-scrollbar        use scrollbar"
+**--with-wxresources      use wxWindows's resources"
 ac_help="$ac_help
-**--with-docview          use document view architecture"
+**--with-prologio         use Prolog IO library"
 ac_help="$ac_help
-**--with-printarch        use printing architecture"
+**--with-rpc              use Prolog's remote procedure calls"
+ac_help="$ac_help
+**--with-ipc              use interprocess communication (wxSocket etc.)"
+ac_help="$ac_help
+**--with-resources        use X resources for saving information"
+ac_help="$ac_help
+**--with-clipboard        use wxClipboard classes"
 ac_help="$ac_help
-**--with-typetree         use typetree"
+**--with-dnd              use Drag'n'Drop classes"
+ac_help="$ac_help
+**--with-constraints      use layout-constraints system"
+ac_help="$ac_help
+**--with-mdi              use multiple document interface architecture"
+ac_help="$ac_help
+**--with-docview          use document view architecture"
 ac_help="$ac_help
-**--with-wxgraph          use wxgraph"
+**--with-printarch        use printing architecture"
 ac_help="$ac_help
-**--with-wxtree           use wxtree"
+**--with-gtk-prefix=PFX   Prefix where GTK is installed"
 ac_help="$ac_help
-  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
+**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed"
 ac_help="$ac_help
-  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
+**--without-threads       Force disabling threads "
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -650,12 +668,16 @@ SEARCH_INCLUDE="\
                               \
     /usr/include              \
     /usr/local/include        \
-    /usr/local/include/gtk    \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
+    /usr/local/include/gtk    \
+    /usr/X11R6/include/Xm     \
+    /usr/X11/include/Xm       \
+    /usr/include/qt           \
+                              \
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
@@ -668,7 +690,7 @@ SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \
 # 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:672: checking for $ac_word" >&5
+echo "configure:694: 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
@@ -697,7 +719,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:701: checking for $ac_word" >&5
+echo "configure:723: 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
@@ -745,7 +767,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:771: 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.
@@ -755,11 +777,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 781 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
@@ -779,12 +801,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:783: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:805: 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:788: checking whether we are using GNU C" >&5
+echo "configure:810: 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
@@ -793,7 +815,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:797: \"$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:819: \"$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
@@ -808,7 +830,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:812: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:834: 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
@@ -840,10 +862,10 @@ CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 if test "x$CC" != xcc; then
   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:844: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:866: checking whether $CC and cc understand -c and -o together" >&5
 else
   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:847: checking whether cc understands -c and -o together" >&5
+echo "configure:869: checking whether cc understands -c and -o together" >&5
 fi
 set dummy $CC; ac_cc="`echo $2 |
 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
@@ -855,16 +877,16 @@ else
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
       ac_try='cc -c conftest.c -o conftest.o 1>&5'
-      if { (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-	 test -f conftest.o && { (eval echo configure:868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+      if { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+	 test -f conftest.o && { (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
       then
         # cc works too.
         :
@@ -891,7 +913,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:895: checking how to run the C preprocessor" >&5
+echo "configure:917: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -906,13 +928,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 910 "configure"
+#line 932 "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:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -923,13 +945,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 927 "configure"
+#line 949 "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:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -953,13 +975,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:957: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:979: 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 963 "configure"
+#line 985 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -977,7 +999,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 981 "configure"
+#line 1003 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1006,7 +1028,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:1010: checking for $ac_word" >&5
+echo "configure:1032: 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
@@ -1037,7 +1059,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1041: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1063: 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.
@@ -1047,11 +1069,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1051 "configure"
+#line 1073 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
@@ -1077,12 +1099,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:1081: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1103: 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:1086: checking whether we are using GNU C++" >&5
+echo "configure:1108: 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
@@ -1091,7 +1113,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1095: \"$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:1117: \"$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
@@ -1106,7 +1128,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1110: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1132: 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
@@ -1134,7 +1156,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1138: checking how to run the C++ preprocessor" >&5
+echo "configure:1160: 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
@@ -1147,12 +1169,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1151 "configure"
+#line 1173 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1184,7 +1206,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
 # 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:1188: checking for $ac_word" >&5
+echo "configure:1210: 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
@@ -1214,7 +1236,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:1218: checking for $ac_word" >&5
+echo "configure:1240: 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
@@ -1271,7 +1293,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # 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:1275: checking for a BSD compatible install" >&5
+echo "configure:1297: 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
@@ -1322,7 +1344,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1326: checking whether ln -s works" >&5
+echo "configure:1348: 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
@@ -1348,7 +1370,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:1352: checking for $ac_word" >&5
+echo "configure:1374: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1400,7 @@ done
 
 
 echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:1382: checking "make for VPATH support"" >&5
+echo "configure:1404: checking "make for VPATH support"" >&5
 cat - << EOF > confMake
 check : file
 	cp \$? \$@
@@ -1408,7 +1430,7 @@ fi
 # 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:1412: checking for X" >&5
+echo "configure:1434: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1470,12 +1492,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1474 "configure"
+#line 1496 "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:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1544,14 +1566,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 1548 "configure"
+#line 1570 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -1657,17 +1679,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:1661: checking whether -R must be followed by a space" >&5
+echo "configure:1683: 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 1664 "configure"
+#line 1686 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -1683,14 +1705,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 1687 "configure"
+#line 1709 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -1722,7 +1744,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:1726: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:1748: 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
@@ -1730,7 +1752,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1734 "configure"
+#line 1756 "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
@@ -1741,7 +1763,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1763,7 +1785,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:1767: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:1789: 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
@@ -1771,7 +1793,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1775 "configure"
+#line 1797 "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
@@ -1782,7 +1804,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1811,12 +1833,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:1815: checking for gethostbyname" >&5
+echo "configure:1837: 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 1820 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1839,7 +1861,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -1860,7 +1882,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1864: checking for gethostbyname in -lnsl" >&5
+echo "configure:1886: 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
@@ -1868,7 +1890,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1872 "configure"
+#line 1894 "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
@@ -1879,7 +1901,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1909,12 +1931,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:1913: checking for connect" >&5
+echo "configure:1935: 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 1918 "configure"
+#line 1940 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -1937,7 +1959,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -1958,7 +1980,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1962: checking for connect in -lsocket" >&5
+echo "configure:1984: 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
@@ -1966,7 +1988,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1970 "configure"
+#line 1992 "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
@@ -1977,7 +1999,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2001,12 +2023,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:2005: checking for remove" >&5
+echo "configure:2027: 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 2010 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2029,7 +2051,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -2050,7 +2072,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2054: checking for remove in -lposix" >&5
+echo "configure:2076: 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
@@ -2058,7 +2080,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2062 "configure"
+#line 2084 "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
@@ -2069,7 +2091,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2093,12 +2115,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2097: checking for shmat" >&5
+echo "configure:2119: 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 2102 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2121,7 +2143,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -2142,7 +2164,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2146: checking for shmat in -lipc" >&5
+echo "configure:2168: 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
@@ -2150,7 +2172,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2154 "configure"
+#line 2176 "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
@@ -2161,7 +2183,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2194,7 +2216,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:2198: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2220: 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
@@ -2202,7 +2224,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2206 "configure"
+#line 2228 "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
@@ -2213,7 +2235,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2243,12 +2265,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2247: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2269: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2252 "configure"
+#line 2274 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2256,7 +2278,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -2281,7 +2303,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2285: checking for opendir in -ldir" >&5
+echo "configure:2307: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2289,7 +2311,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2293 "configure"
+#line 2315 "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
@@ -2300,7 +2322,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2322,7 +2344,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2326: checking for opendir in -lx" >&5
+echo "configure:2348: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2330,7 +2352,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2356 "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
@@ -2341,7 +2363,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2364,12 +2386,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2368: checking for ANSI C header files" >&5
+echo "configure:2390: 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 2373 "configure"
+#line 2395 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2377,7 +2399,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2394,7 +2416,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 2398 "configure"
+#line 2420 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2412,7 +2434,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 2416 "configure"
+#line 2438 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2433,7 +2455,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2459 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2444,7 +2466,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2468,12 +2490,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2472: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2494: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2477 "configure"
+#line 2499 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2489,7 +2511,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2511,17 +2533,17 @@ fi
 
 ac_safe=`echo "fcntl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for fcntl.h""... $ac_c" 1>&6
-echo "configure:2515: checking for fcntl.h" >&5
+echo "configure:2537: checking for fcntl.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 2520 "configure"
+#line 2542 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2544,17 +2566,17 @@ fi
 
 ac_safe=`echo "limits.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for limits.h""... $ac_c" 1>&6
-echo "configure:2548: checking for limits.h" >&5
+echo "configure:2570: checking for limits.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 2553 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 #include <limits.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2577,17 +2599,17 @@ fi
 
 ac_safe=`echo "sys/file.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/file.h""... $ac_c" 1>&6
-echo "configure:2581: checking for sys/file.h" >&5
+echo "configure:2603: checking for sys/file.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 2586 "configure"
+#line 2608 "configure"
 #include "confdefs.h"
 #include <sys/file.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2610,17 +2632,17 @@ fi
 
 ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
-echo "configure:2614: checking for sys/time.h" >&5
+echo "configure:2636: checking for sys/time.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 2619 "configure"
+#line 2641 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2643,17 +2665,50 @@ fi
 
 ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:2647: checking for unistd.h" >&5
+echo "configure:2669: checking for unistd.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 2652 "configure"
+#line 2674 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ac_safe=`echo "linux/joystick.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for linux/joystick.h""... $ac_c" 1>&6
+echo "configure:2702: checking for linux/joystick.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 2707 "configure"
+#include "confdefs.h"
+#include <linux/joystick.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2674,14 +2729,19 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+GTK_JOYSTICK=""
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
+  GTK_JOYSTICK="gtk/joystick.cpp"
+fi
+
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2680: checking for uid_t in sys/types.h" >&5
+echo "configure:2740: 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 2685 "configure"
+#line 2745 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2710,7 +2770,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2714: checking type of array argument to getgroups" >&5
+echo "configure:2774: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2718,7 +2778,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 2722 "configure"
+#line 2782 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -2743,7 +2803,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -2757,7 +2817,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 2761 "configure"
+#line 2821 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -2781,12 +2841,12 @@ EOF
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2785: checking for mode_t" >&5
+echo "configure:2845: 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 2790 "configure"
+#line 2850 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2814,12 +2874,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2818: checking for off_t" >&5
+echo "configure:2878: 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 2823 "configure"
+#line 2883 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2847,12 +2907,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2851: checking for pid_t" >&5
+echo "configure:2911: 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 2856 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2880,12 +2940,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2884: checking return type of signal handlers" >&5
+echo "configure:2944: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2889 "configure"
+#line 2949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2902,7 +2962,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2921,12 +2981,12 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2925: checking for size_t" >&5
+echo "configure:2985: 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 2930 "configure"
+#line 2990 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2954,12 +3014,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2958: checking for uid_t in sys/types.h" >&5
+echo "configure:3018: 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 2963 "configure"
+#line 3023 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2990,12 +3050,12 @@ fi
 
 
 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:2994: checking whether stat file-mode macros are broken" >&5
+echo "configure:3054: checking whether stat file-mode macros are broken" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2999 "configure"
+#line 3059 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3046,12 +3106,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3050: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3110: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3055 "configure"
+#line 3115 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3060,7 +3120,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3081,12 +3141,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:3085: checking for st_blksize in struct stat" >&5
+echo "configure:3145: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3090 "configure"
+#line 3150 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3094,7 +3154,7 @@ int main() {
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -3115,12 +3175,12 @@ EOF
 fi
  
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:3119: checking for st_blocks in struct stat" >&5
+echo "configure:3179: checking for st_blocks in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3124 "configure"
+#line 3184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3128,7 +3188,7 @@ int main() {
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:3132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -3151,12 +3211,12 @@ else
 fi
  
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:3155: checking for st_rdev in struct stat" >&5
+echo "configure:3215: checking for st_rdev in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3160 "configure"
+#line 3220 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -3164,7 +3224,7 @@ int main() {
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -3185,12 +3245,12 @@ EOF
 fi
  
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3189: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3249: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3254 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3198,7 +3258,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3219,12 +3279,12 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3223: checking for tm_zone in struct tm" >&5
+echo "configure:3283: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3228 "configure"
+#line 3288 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3232,7 +3292,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3252,12 +3312,12 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3256: checking for tzname" >&5
+echo "configure:3316: checking for tzname" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3261 "configure"
+#line 3321 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3267,7 +3327,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3291,12 +3351,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3295: checking for working const" >&5
+echo "configure:3355: 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 3300 "configure"
+#line 3360 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3345,7 +3405,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3366,21 +3426,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3370: checking for inline" >&5
+echo "configure:3430: 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 3377 "configure"
+#line 3437 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3406,14 +3466,14 @@ EOF
 esac
 
 echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3410: checking whether char is unsigned" >&5
+echo "configure:3470: checking whether char is unsigned" >&5
 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
 cat > conftest.$ac_ext <<EOF
-#line 3417 "configure"
+#line 3477 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -3435,7 +3495,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3439 "configure"
+#line 3499 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -3445,7 +3505,7 @@ main() {
   volatile char c = 255; exit(c < 0);
 }
 EOF
-if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_char_unsigned=yes
 else
@@ -3469,7 +3529,7 @@ EOF
 fi
 
 echo $ac_n "checking for long double""... $ac_c" 1>&6
-echo "configure:3473: checking for long double" >&5
+echo "configure:3533: checking for long double" >&5
 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3480,7 +3540,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3484 "configure"
+#line 3544 "configure"
 #include "confdefs.h"
 int main() {
 /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
@@ -3488,7 +3548,7 @@ long double foo = 0.0;
 /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
 exit(sizeof(long double) < sizeof(double)); }
 EOF
-if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_long_double=yes
 else
@@ -3513,14 +3573,14 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3517: checking whether byte ordering is bigendian" >&5
+echo "configure:3577: 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 3524 "configure"
+#line 3584 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3531,11 +3591,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3595: \"$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 3539 "configure"
+#line 3599 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3546,7 +3606,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3566,7 +3626,7 @@ if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3570 "configure"
+#line 3630 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3579,7 +3639,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -3604,7 +3664,7 @@ fi
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:3608: checking size of int *" >&5
+echo "configure:3668: checking size of int *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3612,7 +3672,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3616 "configure"
+#line 3676 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3623,7 +3683,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else
@@ -3643,7 +3703,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3647: checking size of int" >&5
+echo "configure:3707: 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
@@ -3651,7 +3711,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3655 "configure"
+#line 3715 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3662,7 +3722,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -3682,7 +3742,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3686: checking size of long" >&5
+echo "configure:3746: 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
@@ -3690,7 +3750,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3694 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3701,7 +3761,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -3723,8 +3783,9 @@ EOF
 
 
 
+
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3728: checking for long file names" >&5
+echo "configure:3789: checking for long file names" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3775,7 +3836,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:3779: checking for $ac_word" >&5
+echo "configure:3840: 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
@@ -3808,7 +3869,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:3812: checking for $ac_word" >&5
+echo "configure:3873: 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
@@ -3841,7 +3902,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3845: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3906: 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
@@ -3849,7 +3910,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3853 "configure"
+#line 3914 "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
@@ -3860,7 +3921,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3883,7 +3944,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3887: checking lex output file root" >&5
+echo "configure:3948: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3904,7 +3965,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:3908: checking whether yytext is a pointer" >&5
+echo "configure:3969: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3916,14 +3977,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 3920 "configure"
+#line 3981 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -3957,7 +4018,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:3961: checking host system type" >&5
+echo "configure:4022: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -3981,11 +4042,8 @@ canonical=$host
 configuration=$host_alias
 
 
-USE_GTK=1
 USE_UNIX=1
 
-TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
 
 USE_LINUX=
 USE_SGI=
@@ -4141,58 +4199,162 @@ touch ${OSTYPE}.system.cache.tmp
 touch ${OSTYPE}.system.cache
 
 
-DEFAULT_USE_SHARED=0
+DEFAULT_USE_GTK=1
+DEFAULT_USE_QT=0
+DEFAULT_USE_MOTIF=0
+
+DEFAULT_USE_SHARED=1
 DEFAULT_USE_OPTIMISE=1
 DEFAULT_USE_PROFILE=0
 DEFAULT_USE_DEBUG_FLAG=0
 DEFAULT_USE_DEBUG_INFO=0
 DEFAULT_USE_MEM_TRACING=0
+DEFAULT_USE_DMALLOC=0
+DEFAULT_USE_APPLE_IEEE=1
+DEFAULT_USE_IOSTREAMH=1
 
 DEFAULT_USE_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1
 DEFAULT_USE_LIBPNG=1
+DEFAULT_USE_ODBC=1
 
-DEFAULT_USE_STORABLE_CLASSES=1
-DEFAULT_USE_AUTOTRANS=1
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
-DEFAULT_WX_NORMALIZED_PS_FONTS=1
-
-DEFAULT_USE_IOSTREAMH=1
+DEFAULT_USE_GAUGE=1
+DEFAULT_USE_SCROLLBAR=1
+DEFAULT_USE_LISTCTRL=1
+DEFAULT_USE_TREECTRL=1
+DEFAULT_USE_GRID=1
+DEFAULT_USE_TAB_DIALOG=1
+DEFAULT_USE_NOTEBOOK=1
 
-DEFAULT_USE_THREADS=0
-DEFAULT_USE_THREADS_SGI=0
-DEFAULT_USE_THREADS_POSIX=0
-DEFAULT_USE_OPENGL=0
+DEFAULT_USE_TIMEDATE=1
+DEFAULT_USE_FRACTION=1
+DEFAULT_USE_LOG=1
+DEFAULT_USE_INTL=1
+DEFAULT_USE_CONFIG=1
+DEFAULT_USE_STREAMS=1
+DEFAULT_USE_SERIAL=1
+DEFAULT_USE_FILE=1
+DEFAULT_USE_TEXTFILE=1
 
+DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
+DEFAULT_WX_NORMALIZED_PS_FONTS=1
 DEFAULT_USE_POSTSCRIPT=1
+
 DEFAULT_USE_IPC=1
 DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
 DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_TOOLBAR=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
+DEFAULT_USE_CLIPBOARD=0
+DEFAULT_USE_DND=1
+
+DEFAULT_USE_MDI_ARCHITECTURE=1
 DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
 DEFAULT_USE_PRINTING_ARCHITECTURE=1
 
+DEFAULT_USE_PROLOGIO=1
+DEFAULT_USE_WX_RESOURCES=1
+DEFAULT_USE_RPC=0
+
+DEFAULT_USE_OPENGL=0
 DEFAULT_USE_METAFILE=0
-DEFAULT_USE_HELP=0
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_VLBOX=0
 DEFAULT_USE_WXGRAPH=0
 DEFAULT_USE_WXTREE=0
-DEFAULT_USE_ENHANCED_DIALOG=0
+DEFAULT_USE_HELP=0
+
+
+
+echo $ac_n "checking "for gtk"""... $ac_c" 1>&6
+echo "configure:4267: checking "for gtk"" >&5
+# Check whether --with-gtk or --without-gtk was given.
+if test "${with_gtk+set}" = set; then
+  withval="$with_gtk"
+  if test "x$with_gtk" = xyes; then
+  ac_cv_use_gtk='USE_GTK="1"'
+else
+  ac_cv_use_gtk='USE_GTK="0"'
+fi
+else
+  
+  LINE=`grep "USE_GTK" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_gtk='USE_GTK='$DEFAULT_USE_GTK
+
+fi
+
+eval "$ac_cv_use_gtk"
+echo $ac_cv_use_gtk >> ${OSTYPE}.system.cache.tmp
+if test "$USE_GTK" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo $ac_n "checking "for qt"""... $ac_c" 1>&6
+echo "configure:4297: checking "for qt"" >&5
+# Check whether --with-qt or --without-qt was given.
+if test "${with_qt+set}" = set; then
+  withval="$with_qt"
+  if test "x$with_qt" = xyes; then
+  ac_cv_use_qt='USE_QT="1"'
+else
+  ac_cv_use_qt='USE_QT="0"'
+fi
+else
+  
+  LINE=`grep "USE_QT" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_qt='USE_QT='$DEFAULT_USE_QT
+
+fi
+
+eval "$ac_cv_use_qt"
+echo $ac_cv_use_qt >> ${OSTYPE}.system.cache.tmp
+if test "$USE_QT" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo $ac_n "checking "for motif"""... $ac_c" 1>&6
+echo "configure:4327: checking "for motif"" >&5
+# Check whether --with-motif or --without-motif was given.
+if test "${with_motif+set}" = set; then
+  withval="$with_motif"
+  if test "x$with_motif" = xyes; then
+  ac_cv_use_motif='USE_MOTIF="1"'
+else
+  ac_cv_use_motif='USE_MOTIF="0"'
+fi
+else
+  
+  LINE=`grep "USE_MOTIF" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_motif='USE_MOTIF='$DEFAULT_USE_MOTIF
+
+fi
+
+eval "$ac_cv_use_motif"
+echo $ac_cv_use_motif >> ${OSTYPE}.system.cache.tmp
+if test "$USE_MOTIF" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-DEFAULT_USE_FORM=0
-DEFAULT_USE_PROLOGIO=0
-DEFAULT_USE_RPC=0
-DEFAULT_USE_WX_RESOURCES=1
 
 
 
 echo $ac_n "checking "for shared"""... $ac_c" 1>&6
-echo "configure:4196: checking "for shared"" >&5
+echo "configure:4358: checking "for shared"" >&5
 # Check whether --with-shared or --without-shared was given.
 if test "${with_shared+set}" = set; then
   withval="$with_shared"
@@ -4222,7 +4384,7 @@ fi
 
 
 echo $ac_n "checking "for optimise"""... $ac_c" 1>&6
-echo "configure:4226: checking "for optimise"" >&5
+echo "configure:4388: checking "for optimise"" >&5
 # Check whether --with-optimise or --without-optimise was given.
 if test "${with_optimise+set}" = set; then
   withval="$with_optimise"
@@ -4252,7 +4414,7 @@ fi
 
 
 echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6
-echo "configure:4256: checking "for debug_flag"" >&5
+echo "configure:4418: checking "for debug_flag"" >&5
 # Check whether --with-debug_flag or --without-debug_flag was given.
 if test "${with_debug_flag+set}" = set; then
   withval="$with_debug_flag"
@@ -4282,7 +4444,7 @@ fi
 
 
 echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6
-echo "configure:4286: checking "for debug_info"" >&5
+echo "configure:4448: checking "for debug_info"" >&5
 # Check whether --with-debug_info or --without-debug_info was given.
 if test "${with_debug_info+set}" = set; then
   withval="$with_debug_info"
@@ -4312,7 +4474,7 @@ fi
 
 
 echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6
-echo "configure:4316: checking "for mem_tracing"" >&5
+echo "configure:4478: checking "for mem_tracing"" >&5
 # Check whether --with-mem_tracing or --without-mem_tracing was given.
 if test "${with_mem_tracing+set}" = set; then
   withval="$with_mem_tracing"
@@ -4341,8 +4503,38 @@ fi
 
 
 
+echo $ac_n "checking "for dmalloc"""... $ac_c" 1>&6
+echo "configure:4508: checking "for dmalloc"" >&5
+# Check whether --with-dmalloc or --without-dmalloc was given.
+if test "${with_dmalloc+set}" = set; then
+  withval="$with_dmalloc"
+  if test "x$with_dmalloc" = xyes; then
+  ac_cv_use_dmalloc='USE_DMALLOC="1"'
+else
+  ac_cv_use_dmalloc='USE_DMALLOC="0"'
+fi
+else
+  
+  LINE=`grep "USE_DMALLOC" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_dmalloc='USE_DMALLOC='$DEFAULT_USE_DMALLOC
+
+fi
+
+eval "$ac_cv_use_dmalloc"
+echo $ac_cv_use_dmalloc >> ${OSTYPE}.system.cache.tmp
+if test "$USE_DMALLOC" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
 echo $ac_n "checking "for profile"""... $ac_c" 1>&6
-echo "configure:4346: checking "for profile"" >&5
+echo "configure:4538: checking "for profile"" >&5
 # Check whether --with-profile or --without-profile was given.
 if test "${with_profile+set}" = set; then
   withval="$with_profile"
@@ -4371,9 +4563,39 @@ fi
 
 
 
+echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6
+echo "configure:4568: checking "for apple_ieee"" >&5
+# Check whether --with-apple_ieee or --without-apple_ieee was given.
+if test "${with_apple_ieee+set}" = set; then
+  withval="$with_apple_ieee"
+  if test "x$with_apple_ieee" = xyes; then
+  ac_cv_use_apple_ieee='USE_APPLE_IEEE="1"'
+else
+  ac_cv_use_apple_ieee='USE_APPLE_IEEE="0"'
+fi
+else
+  
+  LINE=`grep "USE_APPLE_IEEE" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_apple_ieee='USE_APPLE_IEEE='$DEFAULT_USE_APPLE_IEEE
+
+fi
+
+eval "$ac_cv_use_apple_ieee"
+echo $ac_cv_use_apple_ieee >> ${OSTYPE}.system.cache.tmp
+if test "$USE_APPLE_IEEE" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
 
 echo $ac_n "checking "for zlib"""... $ac_c" 1>&6
-echo "configure:4377: checking "for zlib"" >&5
+echo "configure:4599: checking "for zlib"" >&5
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
@@ -4403,7 +4625,7 @@ fi
 
 
 echo $ac_n "checking "for gdk_imlib"""... $ac_c" 1>&6
-echo "configure:4407: checking "for gdk_imlib"" >&5
+echo "configure:4629: checking "for gdk_imlib"" >&5
 # Check whether --with-gdk_imlib or --without-gdk_imlib was given.
 if test "${with_gdk_imlib+set}" = set; then
   withval="$with_gdk_imlib"
@@ -4433,7 +4655,7 @@ fi
 
 
 echo $ac_n "checking "for libpng"""... $ac_c" 1>&6
-echo "configure:4437: checking "for libpng"" >&5
+echo "configure:4659: checking "for libpng"" >&5
 # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
   withval="$with_libpng"
@@ -4462,29 +4684,29 @@ fi
 
 
 
-echo $ac_n "checking "for threads"""... $ac_c" 1>&6
-echo "configure:4467: checking "for threads"" >&5
-# Check whether --with-threads or --without-threads was given.
-if test "${with_threads+set}" = set; then
-  withval="$with_threads"
-  if test "x$with_threads" = xyes; then
-  ac_cv_use_threads='USE_THREADS="1"'
+echo $ac_n "checking "for odbc"""... $ac_c" 1>&6
+echo "configure:4689: checking "for odbc"" >&5
+# Check whether --with-odbc or --without-odbc was given.
+if test "${with_odbc+set}" = set; then
+  withval="$with_odbc"
+  if test "x$with_odbc" = xyes; then
+  ac_cv_use_odbc='USE_ODBC="1"'
 else
-  ac_cv_use_threads='USE_THREADS="0"'
+  ac_cv_use_odbc='USE_ODBC="0"'
 fi
 else
   
-  LINE=`grep "USE_THREADS" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_ODBC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_threads='USE_THREADS='$DEFAULT_USE_THREADS
+  ac_cv_use_odbc='USE_ODBC='$DEFAULT_USE_ODBC
 
 fi
 
-eval "$ac_cv_use_threads"
-echo $ac_cv_use_threads >> ${OSTYPE}.system.cache.tmp
-if test "$USE_THREADS" = 1; then
+eval "$ac_cv_use_odbc"
+echo $ac_cv_use_odbc >> ${OSTYPE}.system.cache.tmp
+if test "$USE_ODBC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4493,7 +4715,7 @@ fi
 
 
 echo $ac_n "checking "for opengl"""... $ac_c" 1>&6
-echo "configure:4497: checking "for opengl"" >&5
+echo "configure:4719: checking "for opengl"" >&5
 # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
   withval="$with_opengl"
@@ -4523,29 +4745,29 @@ fi
 
 
 
-echo $ac_n "checking "for storable"""... $ac_c" 1>&6
-echo "configure:4528: checking "for storable"" >&5
-# Check whether --with-storable or --without-storable was given.
-if test "${with_storable+set}" = set; then
-  withval="$with_storable"
-  if test "x$with_storable" = xyes; then
-  ac_cv_use_storable='USE_STORABLE_CLASSES="1"'
+echo $ac_n "checking "for gauge"""... $ac_c" 1>&6
+echo "configure:4750: checking "for gauge"" >&5
+# Check whether --with-gauge or --without-gauge was given.
+if test "${with_gauge+set}" = set; then
+  withval="$with_gauge"
+  if test "x$with_gauge" = xyes; then
+  ac_cv_use_gauge='USE_GAUGE="1"'
 else
-  ac_cv_use_storable='USE_STORABLE_CLASSES="0"'
+  ac_cv_use_gauge='USE_GAUGE="0"'
 fi
 else
   
-  LINE=`grep "USE_STORABLE_CLASSES" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_GAUGE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_storable='USE_STORABLE_CLASSES='$DEFAULT_USE_STORABLE_CLASSES
+  ac_cv_use_gauge='USE_GAUGE='$DEFAULT_USE_GAUGE
 
 fi
 
-eval "$ac_cv_use_storable"
-echo $ac_cv_use_storable >> ${OSTYPE}.system.cache.tmp
-if test "$USE_STORABLE_CLASSES" = 1; then
+eval "$ac_cv_use_gauge"
+echo $ac_cv_use_gauge >> ${OSTYPE}.system.cache.tmp
+if test "$USE_GAUGE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4553,29 +4775,29 @@ fi
 
 
 
-echo $ac_n "checking "for autotrans"""... $ac_c" 1>&6
-echo "configure:4558: checking "for autotrans"" >&5
-# Check whether --with-autotrans or --without-autotrans was given.
-if test "${with_autotrans+set}" = set; then
-  withval="$with_autotrans"
-  if test "x$with_autotrans" = xyes; then
-  ac_cv_use_autotrans='USE_AUTOTRANS="1"'
+echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6
+echo "configure:4780: checking "for scrollbar"" >&5
+# Check whether --with-scrollbar or --without-scrollbar was given.
+if test "${with_scrollbar+set}" = set; then
+  withval="$with_scrollbar"
+  if test "x$with_scrollbar" = xyes; then
+  ac_cv_use_scrollbar='USE_SCROLLBAR="1"'
 else
-  ac_cv_use_autotrans='USE_AUTOTRANS="0"'
+  ac_cv_use_scrollbar='USE_SCROLLBAR="0"'
 fi
 else
   
-  LINE=`grep "USE_AUTOTRANS" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_SCROLLBAR" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_autotrans='USE_AUTOTRANS='$DEFAULT_USE_AUTOTRANS
+  ac_cv_use_scrollbar='USE_SCROLLBAR='$DEFAULT_USE_SCROLLBAR
 
 fi
 
-eval "$ac_cv_use_autotrans"
-echo $ac_cv_use_autotrans >> ${OSTYPE}.system.cache.tmp
-if test "$USE_AUTOTRANS" = 1; then
+eval "$ac_cv_use_scrollbar"
+echo $ac_cv_use_scrollbar >> ${OSTYPE}.system.cache.tmp
+if test "$USE_SCROLLBAR" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4583,29 +4805,29 @@ fi
 
 
 
-echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6
-echo "configure:4588: checking "for afmfonts"" >&5
-# Check whether --with-afmfonts or --without-afmfonts was given.
-if test "${with_afmfonts+set}" = set; then
-  withval="$with_afmfonts"
-  if test "x$with_afmfonts" = xyes; then
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="1"'
+echo $ac_n "checking "for listctrl"""... $ac_c" 1>&6
+echo "configure:4810: checking "for listctrl"" >&5
+# Check whether --with-listctrl or --without-listctrl was given.
+if test "${with_listctrl+set}" = set; then
+  withval="$with_listctrl"
+  if test "x$with_listctrl" = xyes; then
+  ac_cv_use_listctrl='USE_LISTCTRL="1"'
 else
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="0"'
+  ac_cv_use_listctrl='USE_LISTCTRL="0"'
 fi
 else
   
-  LINE=`grep "USE_AFM_FOR_POSTSCRIPT" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_LISTCTRL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT='$DEFAULT_USE_AFM_FOR_POSTSCRIPT
+  ac_cv_use_listctrl='USE_LISTCTRL='$DEFAULT_USE_LISTCTRL
 
 fi
 
-eval "$ac_cv_use_afmfonts"
-echo $ac_cv_use_afmfonts >> ${OSTYPE}.system.cache.tmp
-if test "$USE_AFM_FOR_POSTSCRIPT" = 1; then
+eval "$ac_cv_use_listctrl"
+echo $ac_cv_use_listctrl >> ${OSTYPE}.system.cache.tmp
+if test "$USE_LISTCTRL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4613,29 +4835,29 @@ fi
 
 
 
-echo $ac_n "checking "for normalized"""... $ac_c" 1>&6
-echo "configure:4618: checking "for normalized"" >&5
-# Check whether --with-normalized or --without-normalized was given.
-if test "${with_normalized+set}" = set; then
-  withval="$with_normalized"
-  if test "x$with_normalized" = xyes; then
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="1"'
+echo $ac_n "checking "for treectrl"""... $ac_c" 1>&6
+echo "configure:4840: checking "for treectrl"" >&5
+# Check whether --with-treectrl or --without-treectrl was given.
+if test "${with_treectrl+set}" = set; then
+  withval="$with_treectrl"
+  if test "x$with_treectrl" = xyes; then
+  ac_cv_use_treectrl='USE_TREECTRL="1"'
 else
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="0"'
+  ac_cv_use_treectrl='USE_TREECTRL="0"'
 fi
 else
   
-  LINE=`grep "WX_NORMALIZED_PS_FONTS" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_TREECTRL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS='$DEFAULT_WX_NORMALIZED_PS_FONTS
+  ac_cv_use_treectrl='USE_TREECTRL='$DEFAULT_USE_TREECTRL
 
 fi
 
-eval "$ac_cv_use_normalized"
-echo $ac_cv_use_normalized >> ${OSTYPE}.system.cache.tmp
-if test "$WX_NORMALIZED_PS_FONTS" = 1; then
+eval "$ac_cv_use_treectrl"
+echo $ac_cv_use_treectrl >> ${OSTYPE}.system.cache.tmp
+if test "$USE_TREECTRL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4643,29 +4865,29 @@ fi
 
 
 
-echo $ac_n "checking "for RPC"""... $ac_c" 1>&6
-echo "configure:4648: checking "for RPC"" >&5
-# Check whether --with-rpc or --without-rpc was given.
-if test "${with_rpc+set}" = set; then
-  withval="$with_rpc"
-  if test "x$with_rpc" = xyes; then
-  ac_cv_use_rpc='USE_RPC="1"'
+echo $ac_n "checking "for grid"""... $ac_c" 1>&6
+echo "configure:4870: checking "for grid"" >&5
+# Check whether --with-grid or --without-grid was given.
+if test "${with_grid+set}" = set; then
+  withval="$with_grid"
+  if test "x$with_grid" = xyes; then
+  ac_cv_use_grid='USE_GRID="1"'
 else
-  ac_cv_use_rpc='USE_RPC="0"'
+  ac_cv_use_grid='USE_GRID="0"'
 fi
 else
   
-  LINE=`grep "USE_RPC" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_GRID" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_rpc='USE_RPC='$DEFAULT_USE_RPC
+  ac_cv_use_grid='USE_GRID='$DEFAULT_USE_GRID
 
 fi
 
-eval "$ac_cv_use_rpc"
-echo $ac_cv_use_rpc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_RPC" = 1; then
+eval "$ac_cv_use_grid"
+echo $ac_cv_use_grid >> ${OSTYPE}.system.cache.tmp
+if test "$USE_GRID" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4673,29 +4895,29 @@ fi
 
 
 
-echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6
-echo "configure:4678: checking "for wxresources"" >&5
-# Check whether --with-wxresources or --without-wxresources was given.
-if test "${with_wxresources+set}" = set; then
-  withval="$with_wxresources"
-  if test "x$with_wxresources" = xyes; then
-  ac_cv_use_wxresources='USE_WX_RESOURCES="1"'
+echo $ac_n "checking "for tab_dialog"""... $ac_c" 1>&6
+echo "configure:4900: checking "for tab_dialog"" >&5
+# Check whether --with-tab_dialog or --without-tab_dialog was given.
+if test "${with_tab_dialog+set}" = set; then
+  withval="$with_tab_dialog"
+  if test "x$with_tab_dialog" = xyes; then
+  ac_cv_use_tab_dialog='USE_TAB_DIALOG="1"'
 else
-  ac_cv_use_wxresources='USE_WX_RESOURCES="0"'
+  ac_cv_use_tab_dialog='USE_TAB_DIALOG="0"'
 fi
 else
   
-  LINE=`grep "USE_WX_RESOURCES" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_TAB_DIALOG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_wxresources='USE_WX_RESOURCES='$DEFAULT_USE_WX_RESOURCES
+  ac_cv_use_tab_dialog='USE_TAB_DIALOG='$DEFAULT_USE_TAB_DIALOG
 
 fi
 
-eval "$ac_cv_use_wxresources"
-echo $ac_cv_use_wxresources >> ${OSTYPE}.system.cache.tmp
-if test "$USE_WX_RESOURCES" = 1; then
+eval "$ac_cv_use_tab_dialog"
+echo $ac_cv_use_tab_dialog >> ${OSTYPE}.system.cache.tmp
+if test "$USE_TAB_DIALOG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4703,29 +4925,29 @@ fi
 
 
 
-echo $ac_n "checking "for prologio"""... $ac_c" 1>&6
-echo "configure:4708: checking "for prologio"" >&5
-# Check whether --with-prologio or --without-prologio was given.
-if test "${with_prologio+set}" = set; then
-  withval="$with_prologio"
-  if test "x$with_prologio" = xyes; then
-  ac_cv_use_prologio='USE_PROLOGIO="1"'
+echo $ac_n "checking "for notebook"""... $ac_c" 1>&6
+echo "configure:4930: checking "for notebook"" >&5
+# Check whether --with-notebook or --without-notebook was given.
+if test "${with_notebook+set}" = set; then
+  withval="$with_notebook"
+  if test "x$with_notebook" = xyes; then
+  ac_cv_use_notebook='USE_NOTEBOOK="1"'
 else
-  ac_cv_use_prologio='USE_PROLOGIO="0"'
+  ac_cv_use_notebook='USE_NOTEBOOK="0"'
 fi
 else
   
-  LINE=`grep "USE_PROLOGIO" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_NOTEBOOK" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_prologio='USE_PROLOGIO='$DEFAULT_USE_PROLOGIO
+  ac_cv_use_notebook='USE_NOTEBOOK='$DEFAULT_USE_NOTEBOOK
 
 fi
 
-eval "$ac_cv_use_prologio"
-echo $ac_cv_use_prologio >> ${OSTYPE}.system.cache.tmp
-if test "$USE_PROLOGIO" = 1; then
+eval "$ac_cv_use_notebook"
+echo $ac_cv_use_notebook >> ${OSTYPE}.system.cache.tmp
+if test "$USE_NOTEBOOK" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4733,29 +4955,30 @@ fi
 
 
 
-echo $ac_n "checking "for postscript"""... $ac_c" 1>&6
-echo "configure:4738: checking "for postscript"" >&5
-# Check whether --with-postscript or --without-postscript was given.
-if test "${with_postscript+set}" = set; then
-  withval="$with_postscript"
-  if test "x$with_postscript" = xyes; then
-  ac_cv_use_postscript='USE_POSTSCRIPT="1"'
+
+echo $ac_n "checking "for timedate"""... $ac_c" 1>&6
+echo "configure:4961: checking "for timedate"" >&5
+# Check whether --with-timedate or --without-timedate was given.
+if test "${with_timedate+set}" = set; then
+  withval="$with_timedate"
+  if test "x$with_timedate" = xyes; then
+  ac_cv_use_timedate='USE_TIMEDATE="1"'
 else
-  ac_cv_use_postscript='USE_POSTSCRIPT="0"'
+  ac_cv_use_timedate='USE_TIMEDATE="0"'
 fi
 else
   
-  LINE=`grep "USE_POSTSCRIPT" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_TIMEDATE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_postscript='USE_POSTSCRIPT='$DEFAULT_USE_POSTSCRIPT
+  ac_cv_use_timedate='USE_TIMEDATE='$DEFAULT_USE_TIMEDATE
 
 fi
 
-eval "$ac_cv_use_postscript"
-echo $ac_cv_use_postscript >> ${OSTYPE}.system.cache.tmp
-if test "$USE_POSTSCRIPT" = 1; then
+eval "$ac_cv_use_timedate"
+echo $ac_cv_use_timedate >> ${OSTYPE}.system.cache.tmp
+if test "$USE_TIMEDATE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4763,29 +4986,29 @@ fi
 
 
 
-echo $ac_n "checking "for metafile"""... $ac_c" 1>&6
-echo "configure:4768: checking "for metafile"" >&5
-# Check whether --with-metafile or --without-metafile was given.
-if test "${with_metafile+set}" = set; then
-  withval="$with_metafile"
-  if test "x$with_metafile" = xyes; then
-  ac_cv_use_metafile='USE_METAFILE="1"'
+echo $ac_n "checking "for fraction"""... $ac_c" 1>&6
+echo "configure:4991: checking "for fraction"" >&5
+# Check whether --with-fraction or --without-fraction was given.
+if test "${with_fraction+set}" = set; then
+  withval="$with_fraction"
+  if test "x$with_fraction" = xyes; then
+  ac_cv_use_fraction='USE_FRACTION="1"'
 else
-  ac_cv_use_metafile='USE_METAFILE="0"'
+  ac_cv_use_fraction='USE_FRACTION="0"'
 fi
 else
   
-  LINE=`grep "USE_METAFILE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_FRACTION" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_metafile='USE_METAFILE='$DEFAULT_USE_METAFILE
+  ac_cv_use_fraction='USE_FRACTION='$DEFAULT_USE_FRACTION
 
 fi
 
-eval "$ac_cv_use_metafile"
-echo $ac_cv_use_metafile >> ${OSTYPE}.system.cache.tmp
-if test "$USE_METAFILE" = 1; then
+eval "$ac_cv_use_fraction"
+echo $ac_cv_use_fraction >> ${OSTYPE}.system.cache.tmp
+if test "$USE_FRACTION" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4793,29 +5016,29 @@ fi
 
 
 
-echo $ac_n "checking "for form"""... $ac_c" 1>&6
-echo "configure:4798: checking "for form"" >&5
-# Check whether --with-form or --without-form was given.
-if test "${with_form+set}" = set; then
-  withval="$with_form"
-  if test "x$with_form" = xyes; then
-  ac_cv_use_form='USE_FORM="1"'
+echo $ac_n "checking "for log"""... $ac_c" 1>&6
+echo "configure:5021: checking "for log"" >&5
+# Check whether --with-log or --without-log was given.
+if test "${with_log+set}" = set; then
+  withval="$with_log"
+  if test "x$with_log" = xyes; then
+  ac_cv_use_log='USE_LOG="1"'
 else
-  ac_cv_use_form='USE_FORM="0"'
+  ac_cv_use_log='USE_LOG="0"'
 fi
 else
   
-  LINE=`grep "USE_FORM" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_LOG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_form='USE_FORM='$DEFAULT_USE_FORM
+  ac_cv_use_log='USE_LOG='$DEFAULT_USE_LOG
 
 fi
 
-eval "$ac_cv_use_form"
-echo $ac_cv_use_form >> ${OSTYPE}.system.cache.tmp
-if test "$USE_FORM" = 1; then
+eval "$ac_cv_use_log"
+echo $ac_cv_use_log >> ${OSTYPE}.system.cache.tmp
+if test "$USE_LOG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4823,29 +5046,29 @@ fi
 
 
 
-echo $ac_n "checking "for help"""... $ac_c" 1>&6
-echo "configure:4828: checking "for help"" >&5
-# Check whether --with-help or --without-help was given.
-if test "${with_help+set}" = set; then
-  withval="$with_help"
-  if test "x$with_help" = xyes; then
-  ac_cv_use_help='USE_HELP="1"'
+echo $ac_n "checking "for intl"""... $ac_c" 1>&6
+echo "configure:5051: checking "for intl"" >&5
+# Check whether --with-intl or --without-intl was given.
+if test "${with_intl+set}" = set; then
+  withval="$with_intl"
+  if test "x$with_intl" = xyes; then
+  ac_cv_use_intl='USE_INTL="1"'
 else
-  ac_cv_use_help='USE_HELP="0"'
+  ac_cv_use_intl='USE_INTL="0"'
 fi
 else
   
-  LINE=`grep "USE_HELP" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_INTL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_help='USE_HELP='$DEFAULT_USE_HELP
+  ac_cv_use_intl='USE_INTL='$DEFAULT_USE_INTL
 
 fi
 
-eval "$ac_cv_use_help"
-echo $ac_cv_use_help >> ${OSTYPE}.system.cache.tmp
-if test "$USE_HELP" = 1; then
+eval "$ac_cv_use_intl"
+echo $ac_cv_use_intl >> ${OSTYPE}.system.cache.tmp
+if test "$USE_INTL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4853,29 +5076,29 @@ fi
 
 
 
-echo $ac_n "checking "for IPC"""... $ac_c" 1>&6
-echo "configure:4858: checking "for IPC"" >&5
-# Check whether --with-ipc or --without-ipc was given.
-if test "${with_ipc+set}" = set; then
-  withval="$with_ipc"
-  if test "x$with_ipc" = xyes; then
-  ac_cv_use_ipc='USE_IPC="1"'
+echo $ac_n "checking "for config"""... $ac_c" 1>&6
+echo "configure:5081: checking "for config"" >&5
+# Check whether --with-config or --without-config was given.
+if test "${with_config+set}" = set; then
+  withval="$with_config"
+  if test "x$with_config" = xyes; then
+  ac_cv_use_config='USE_CONFIG="1"'
 else
-  ac_cv_use_ipc='USE_IPC="0"'
+  ac_cv_use_config='USE_CONFIG="0"'
 fi
 else
   
-  LINE=`grep "USE_IPC" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_CONFIG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_ipc='USE_IPC='$DEFAULT_USE_IPC
+  ac_cv_use_config='USE_CONFIG='$DEFAULT_USE_CONFIG
 
 fi
 
-eval "$ac_cv_use_ipc"
-echo $ac_cv_use_ipc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_IPC" = 1; then
+eval "$ac_cv_use_config"
+echo $ac_cv_use_config >> ${OSTYPE}.system.cache.tmp
+if test "$USE_CONFIG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4883,29 +5106,29 @@ fi
 
 
 
-echo $ac_n "checking "for enhanced dialog"""... $ac_c" 1>&6
-echo "configure:4888: checking "for enhanced dialog"" >&5
-# Check whether --with-enhanceddialog or --without-enhanceddialog was given.
-if test "${with_enhanceddialog+set}" = set; then
-  withval="$with_enhanceddialog"
-  if test "x$with_enhanceddialog" = xyes; then
-  ac_cv_use_enhanceddialog='USE_ENHANCED_DIALOG="1"'
+echo $ac_n "checking "for streams"""... $ac_c" 1>&6
+echo "configure:5111: checking "for streams"" >&5
+# Check whether --with-streams or --without-streams was given.
+if test "${with_streams+set}" = set; then
+  withval="$with_streams"
+  if test "x$with_streams" = xyes; then
+  ac_cv_use_streams='USE_STREAMS="1"'
 else
-  ac_cv_use_enhanceddialog='USE_ENHANCED_DIALOG="0"'
+  ac_cv_use_streams='USE_STREAMS="0"'
 fi
 else
   
-  LINE=`grep "USE_ENHANCED_DIALOG" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_STREAMS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_enhanceddialog='USE_ENHANCED_DIALOG='$DEFAULT_USE_ENHANCED_DIALOG
+  ac_cv_use_streams='USE_STREAMS='$DEFAULT_USE_STREAMS
 
 fi
 
-eval "$ac_cv_use_enhanceddialog"
-echo $ac_cv_use_enhanceddialog >> ${OSTYPE}.system.cache.tmp
-if test "$USE_ENHANCED_DIALOG" = 1; then
+eval "$ac_cv_use_streams"
+echo $ac_cv_use_streams >> ${OSTYPE}.system.cache.tmp
+if test "$USE_STREAMS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4913,29 +5136,29 @@ fi
 
 
 
-echo $ac_n "checking "for resources"""... $ac_c" 1>&6
-echo "configure:4918: checking "for resources"" >&5
-# Check whether --with-resources or --without-resources was given.
-if test "${with_resources+set}" = set; then
-  withval="$with_resources"
-  if test "x$with_resources" = xyes; then
-  ac_cv_use_resources='USE_RESOURCES="1"'
+echo $ac_n "checking "for serial"""... $ac_c" 1>&6
+echo "configure:5141: checking "for serial"" >&5
+# Check whether --with-serial or --without-serial was given.
+if test "${with_serial+set}" = set; then
+  withval="$with_serial"
+  if test "x$with_serial" = xyes; then
+  ac_cv_use_serial='USE_SERIAL="1"'
 else
-  ac_cv_use_resources='USE_RESOURCES="0"'
+  ac_cv_use_serial='USE_SERIAL="0"'
 fi
 else
   
-  LINE=`grep "USE_RESOURCES" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_SERIAL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_resources='USE_RESOURCES='$DEFAULT_USE_RESOURCES
+  ac_cv_use_serial='USE_SERIAL='$DEFAULT_USE_SERIAL
 
 fi
 
-eval "$ac_cv_use_resources"
-echo $ac_cv_use_resources >> ${OSTYPE}.system.cache.tmp
-if test "$USE_RESOURCES" = 1; then
+eval "$ac_cv_use_serial"
+echo $ac_cv_use_serial >> ${OSTYPE}.system.cache.tmp
+if test "$USE_SERIAL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4943,29 +5166,29 @@ fi
 
 
 
-echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6
-echo "configure:4948: checking "for clipboard"" >&5
-# Check whether --with-clipboard or --without-clipboard was given.
-if test "${with_clipboard+set}" = set; then
-  withval="$with_clipboard"
-  if test "x$with_clipboard" = xyes; then
-  ac_cv_use_clipboard='USE_CLIPBOARD="1"'
+echo $ac_n "checking "for file"""... $ac_c" 1>&6
+echo "configure:5171: checking "for file"" >&5
+# Check whether --with-file or --without-file was given.
+if test "${with_file+set}" = set; then
+  withval="$with_file"
+  if test "x$with_file" = xyes; then
+  ac_cv_use_file='USE_FILE="1"'
 else
-  ac_cv_use_clipboard='USE_CLIPBOARD="0"'
+  ac_cv_use_file='USE_FILE="0"'
 fi
 else
   
-  LINE=`grep "USE_CLIPBOARD" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_FILE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_clipboard='USE_CLIPBOARD='$DEFAULT_USE_CLIPBOARD
+  ac_cv_use_file='USE_FILE='$DEFAULT_USE_FILE
 
 fi
 
-eval "$ac_cv_use_clipboard"
-echo $ac_cv_use_clipboard >> ${OSTYPE}.system.cache.tmp
-if test "$USE_CLIPBOARD" = 1; then
+eval "$ac_cv_use_file"
+echo $ac_cv_use_file >> ${OSTYPE}.system.cache.tmp
+if test "$USE_FILE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4973,29 +5196,29 @@ fi
 
 
 
-echo $ac_n "checking "for timedate"""... $ac_c" 1>&6
-echo "configure:4978: checking "for timedate"" >&5
-# Check whether --with-timedate or --without-timedate was given.
-if test "${with_timedate+set}" = set; then
-  withval="$with_timedate"
-  if test "x$with_timedate" = xyes; then
-  ac_cv_use_timedate='USE_TIMEDATE="1"'
+echo $ac_n "checking "for textfile"""... $ac_c" 1>&6
+echo "configure:5201: checking "for textfile"" >&5
+# Check whether --with-textfile or --without-textfile was given.
+if test "${with_textfile+set}" = set; then
+  withval="$with_textfile"
+  if test "x$with_textfile" = xyes; then
+  ac_cv_use_textfile='USE_TEXTFILE="1"'
 else
-  ac_cv_use_timedate='USE_TIMEDATE="0"'
+  ac_cv_use_textfile='USE_TEXTFILE="0"'
 fi
 else
   
-  LINE=`grep "USE_TIMEDATE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_TEXTFILE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_timedate='USE_TIMEDATE='$DEFAULT_USE_TIMEDATE
+  ac_cv_use_textfile='USE_TEXTFILE='$DEFAULT_USE_TEXTFILE
 
 fi
 
-eval "$ac_cv_use_timedate"
-echo $ac_cv_use_timedate >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TIMEDATE" = 1; then
+eval "$ac_cv_use_textfile"
+echo $ac_cv_use_textfile >> ${OSTYPE}.system.cache.tmp
+if test "$USE_TEXTFILE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5003,29 +5226,30 @@ fi
 
 
 
-echo $ac_n "checking "for fraction"""... $ac_c" 1>&6
-echo "configure:5008: checking "for fraction"" >&5
-# Check whether --with-fraction or --without-fraction was given.
-if test "${with_fraction+set}" = set; then
-  withval="$with_fraction"
-  if test "x$with_fraction" = xyes; then
-  ac_cv_use_fraction='USE_FRACTION="1"'
+
+echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6
+echo "configure:5232: checking "for afmfonts"" >&5
+# Check whether --with-afmfonts or --without-afmfonts was given.
+if test "${with_afmfonts+set}" = set; then
+  withval="$with_afmfonts"
+  if test "x$with_afmfonts" = xyes; then
+  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="1"'
 else
-  ac_cv_use_fraction='USE_FRACTION="0"'
+  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="0"'
 fi
 else
   
-  LINE=`grep "USE_FRACTION" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_AFM_FOR_POSTSCRIPT" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_fraction='USE_FRACTION='$DEFAULT_USE_FRACTION
+  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT='$DEFAULT_USE_AFM_FOR_POSTSCRIPT
 
 fi
 
-eval "$ac_cv_use_fraction"
-echo $ac_cv_use_fraction >> ${OSTYPE}.system.cache.tmp
-if test "$USE_FRACTION" = 1; then
+eval "$ac_cv_use_afmfonts"
+echo $ac_cv_use_afmfonts >> ${OSTYPE}.system.cache.tmp
+if test "$USE_AFM_FOR_POSTSCRIPT" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5033,29 +5257,29 @@ fi
 
 
 
-echo $ac_n "checking "for constrains"""... $ac_c" 1>&6
-echo "configure:5038: checking "for constrains"" >&5
-# Check whether --with-constraints or --without-constraints was given.
-if test "${with_constraints+set}" = set; then
-  withval="$with_constraints"
-  if test "x$with_constraints" = xyes; then
-  ac_cv_use_constraints='USE_CONSTRAINTS="1"'
+echo $ac_n "checking "for normalized"""... $ac_c" 1>&6
+echo "configure:5262: checking "for normalized"" >&5
+# Check whether --with-normalized or --without-normalized was given.
+if test "${with_normalized+set}" = set; then
+  withval="$with_normalized"
+  if test "x$with_normalized" = xyes; then
+  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="1"'
 else
-  ac_cv_use_constraints='USE_CONSTRAINTS="0"'
+  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="0"'
 fi
 else
   
-  LINE=`grep "USE_CONSTRAINTS" ${OSTYPE}.system.cache`
+  LINE=`grep "WX_NORMALIZED_PS_FONTS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_constraints='USE_CONSTRAINTS='$DEFAULT_USE_CONSTRAINTS
+  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS='$DEFAULT_WX_NORMALIZED_PS_FONTS
 
 fi
 
-eval "$ac_cv_use_constraints"
-echo $ac_cv_use_constraints >> ${OSTYPE}.system.cache.tmp
-if test "$USE_CONSTRAINTS" = 1; then
+eval "$ac_cv_use_normalized"
+echo $ac_cv_use_normalized >> ${OSTYPE}.system.cache.tmp
+if test "$WX_NORMALIZED_PS_FONTS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5063,29 +5287,29 @@ fi
 
 
 
-echo $ac_n "checking "for toolbar"""... $ac_c" 1>&6
-echo "configure:5068: checking "for toolbar"" >&5
-# Check whether --with-toolbar or --without-toolbar was given.
-if test "${with_toolbar+set}" = set; then
-  withval="$with_toolbar"
-  if test "x$with_toolbar" = xyes; then
-  ac_cv_use_toolbar='USE_TOOLBAR="1"'
+echo $ac_n "checking "for postscript"""... $ac_c" 1>&6
+echo "configure:5292: checking "for postscript"" >&5
+# Check whether --with-postscript or --without-postscript was given.
+if test "${with_postscript+set}" = set; then
+  withval="$with_postscript"
+  if test "x$with_postscript" = xyes; then
+  ac_cv_use_postscript='USE_POSTSCRIPT="1"'
 else
-  ac_cv_use_toolbar='USE_TOOLBAR="0"'
+  ac_cv_use_postscript='USE_POSTSCRIPT="0"'
 fi
 else
   
-  LINE=`grep "USE_TOOLBAR" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_POSTSCRIPT" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_toolbar='USE_TOOLBAR='$DEFAULT_USE_TOOLBAR
+  ac_cv_use_postscript='USE_POSTSCRIPT='$DEFAULT_USE_POSTSCRIPT
 
 fi
 
-eval "$ac_cv_use_toolbar"
-echo $ac_cv_use_toolbar >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TOOLBAR" = 1; then
+eval "$ac_cv_use_postscript"
+echo $ac_cv_use_postscript >> ${OSTYPE}.system.cache.tmp
+if test "$USE_POSTSCRIPT" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5093,29 +5317,30 @@ fi
 
 
 
-echo $ac_n "checking "for gauge"""... $ac_c" 1>&6
-echo "configure:5098: checking "for gauge"" >&5
-# Check whether --with-gauge or --without-gauge was given.
-if test "${with_gauge+set}" = set; then
-  withval="$with_gauge"
-  if test "x$with_gauge" = xyes; then
-  ac_cv_use_gauge='USE_GAUGE="1"'
+
+echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6
+echo "configure:5323: checking "for wxresources"" >&5
+# Check whether --with-wxresources or --without-wxresources was given.
+if test "${with_wxresources+set}" = set; then
+  withval="$with_wxresources"
+  if test "x$with_wxresources" = xyes; then
+  ac_cv_use_wxresources='USE_WX_RESOURCES="1"'
 else
-  ac_cv_use_gauge='USE_GAUGE="0"'
+  ac_cv_use_wxresources='USE_WX_RESOURCES="0"'
 fi
 else
   
-  LINE=`grep "USE_GAUGE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_WX_RESOURCES" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_gauge='USE_GAUGE='$DEFAULT_USE_GAUGE
+  ac_cv_use_wxresources='USE_WX_RESOURCES='$DEFAULT_USE_WX_RESOURCES
 
 fi
 
-eval "$ac_cv_use_gauge"
-echo $ac_cv_use_gauge >> ${OSTYPE}.system.cache.tmp
-if test "$USE_GAUGE" = 1; then
+eval "$ac_cv_use_wxresources"
+echo $ac_cv_use_wxresources >> ${OSTYPE}.system.cache.tmp
+if test "$USE_WX_RESOURCES" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5123,29 +5348,29 @@ fi
 
 
 
-echo $ac_n "checking "for vllist"""... $ac_c" 1>&6
-echo "configure:5128: checking "for vllist"" >&5
-# Check whether --with-vllist or --without-vllist was given.
-if test "${with_vllist+set}" = set; then
-  withval="$with_vllist"
-  if test "x$with_vllist" = xyes; then
-  ac_cv_use_vllist='USE_VLBOX="1"'
+echo $ac_n "checking "for prologio"""... $ac_c" 1>&6
+echo "configure:5353: checking "for prologio"" >&5
+# Check whether --with-prologio or --without-prologio was given.
+if test "${with_prologio+set}" = set; then
+  withval="$with_prologio"
+  if test "x$with_prologio" = xyes; then
+  ac_cv_use_prologio='USE_PROLOGIO="1"'
 else
-  ac_cv_use_vllist='USE_VLBOX="0"'
+  ac_cv_use_prologio='USE_PROLOGIO="0"'
 fi
 else
   
-  LINE=`grep "USE_VLBOX" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_PROLOGIO" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_vllist='USE_VLBOX='$DEFAULT_USE_VLBOX
+  ac_cv_use_prologio='USE_PROLOGIO='$DEFAULT_USE_PROLOGIO
 
 fi
 
-eval "$ac_cv_use_vllist"
-echo $ac_cv_use_vllist >> ${OSTYPE}.system.cache.tmp
-if test "$USE_VLBOX" = 1; then
+eval "$ac_cv_use_prologio"
+echo $ac_cv_use_prologio >> ${OSTYPE}.system.cache.tmp
+if test "$USE_PROLOGIO" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5153,29 +5378,29 @@ fi
 
 
 
-echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6
-echo "configure:5158: checking "for scrollbar"" >&5
-# Check whether --with-scrollbar or --without-scrollbar was given.
-if test "${with_scrollbar+set}" = set; then
-  withval="$with_scrollbar"
-  if test "x$with_scrollbar" = xyes; then
-  ac_cv_use_scrollbar='USE_SCROLLBAR="1"'
+echo $ac_n "checking "for RPC"""... $ac_c" 1>&6
+echo "configure:5383: checking "for RPC"" >&5
+# Check whether --with-rpc or --without-rpc was given.
+if test "${with_rpc+set}" = set; then
+  withval="$with_rpc"
+  if test "x$with_rpc" = xyes; then
+  ac_cv_use_rpc='USE_RPC="1"'
 else
-  ac_cv_use_scrollbar='USE_SCROLLBAR="0"'
+  ac_cv_use_rpc='USE_RPC="0"'
 fi
 else
   
-  LINE=`grep "USE_SCROLLBAR" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_RPC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_scrollbar='USE_SCROLLBAR='$DEFAULT_USE_SCROLLBAR
+  ac_cv_use_rpc='USE_RPC='$DEFAULT_USE_RPC
 
 fi
 
-eval "$ac_cv_use_scrollbar"
-echo $ac_cv_use_scrollbar >> ${OSTYPE}.system.cache.tmp
-if test "$USE_SCROLLBAR" = 1; then
+eval "$ac_cv_use_rpc"
+echo $ac_cv_use_rpc >> ${OSTYPE}.system.cache.tmp
+if test "$USE_RPC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5183,29 +5408,30 @@ fi
 
 
 
-echo $ac_n "checking "for docview"""... $ac_c" 1>&6
-echo "configure:5188: checking "for docview"" >&5
-# Check whether --with-docview or --without-docview was given.
-if test "${with_docview+set}" = set; then
-  withval="$with_docview"
-  if test "x$with_docview" = xyes; then
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="1"'
+
+echo $ac_n "checking "for IPC"""... $ac_c" 1>&6
+echo "configure:5414: checking "for IPC"" >&5
+# Check whether --with-ipc or --without-ipc was given.
+if test "${with_ipc+set}" = set; then
+  withval="$with_ipc"
+  if test "x$with_ipc" = xyes; then
+  ac_cv_use_ipc='USE_IPC="1"'
 else
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="0"'
+  ac_cv_use_ipc='USE_IPC="0"'
 fi
 else
   
-  LINE=`grep "USE_DOC_VIEW_ARCHITECTURE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_IPC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE='$DEFAULT_USE_DOC_VIEW_ARCHITECTURE
+  ac_cv_use_ipc='USE_IPC='$DEFAULT_USE_IPC
 
 fi
 
-eval "$ac_cv_use_docview"
-echo $ac_cv_use_docview >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1; then
+eval "$ac_cv_use_ipc"
+echo $ac_cv_use_ipc >> ${OSTYPE}.system.cache.tmp
+if test "$USE_IPC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5213,29 +5439,29 @@ fi
 
 
 
-echo $ac_n "checking "for printarch"""... $ac_c" 1>&6
-echo "configure:5218: checking "for printarch"" >&5
-# Check whether --with-printarch or --without-printarch was given.
-if test "${with_printarch+set}" = set; then
-  withval="$with_printarch"
-  if test "x$with_printarch" = xyes; then
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="1"'
+echo $ac_n "checking "for resources"""... $ac_c" 1>&6
+echo "configure:5444: checking "for resources"" >&5
+# Check whether --with-resources or --without-resources was given.
+if test "${with_resources+set}" = set; then
+  withval="$with_resources"
+  if test "x$with_resources" = xyes; then
+  ac_cv_use_resources='USE_RESOURCES="1"'
 else
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="0"'
+  ac_cv_use_resources='USE_RESOURCES="0"'
 fi
 else
   
-  LINE=`grep "USE_PRINTING_ARCHITECTURE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_RESOURCES" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE='$DEFAULT_USE_PRINTING_ARCHITECTURE
+  ac_cv_use_resources='USE_RESOURCES='$DEFAULT_USE_RESOURCES
 
 fi
 
-eval "$ac_cv_use_printarch"
-echo $ac_cv_use_printarch >> ${OSTYPE}.system.cache.tmp
-if test "$USE_PRINTING_ARCHITECTURE" = 1; then
+eval "$ac_cv_use_resources"
+echo $ac_cv_use_resources >> ${OSTYPE}.system.cache.tmp
+if test "$USE_RESOURCES" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5243,29 +5469,29 @@ fi
 
 
 
-echo $ac_n "checking "for typetree"""... $ac_c" 1>&6
-echo "configure:5248: checking "for typetree"" >&5
-# Check whether --with-typetree or --without-typetree was given.
-if test "${with_typetree+set}" = set; then
-  withval="$with_typetree"
-  if test "x$with_typetree" = xyes; then
-  ac_cv_use_typetree='USE_TYPETREE="1"'
-else
-  ac_cv_use_typetree='USE_TYPETREE="0"'
-fi
-else
-  
-  LINE=`grep "USE_TYPETREE" ${OSTYPE}.system.cache`
+echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6
+echo "configure:5474: checking "for clipboard"" >&5
+# Check whether --with-clipboard or --without-clipboard was given.
+if test "${with_clipboard+set}" = set; then
+  withval="$with_clipboard"
+  if test "x$with_clipboard" = xyes; then
+  ac_cv_use_clipboard='USE_CLIPBOARD="1"'
+else
+  ac_cv_use_clipboard='USE_CLIPBOARD="0"'
+fi
+else
+  
+  LINE=`grep "USE_CLIPBOARD" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_typetree='USE_TYPETREE='$DEFAULT_USE_TYPETREE
+  ac_cv_use_clipboard='USE_CLIPBOARD='$DEFAULT_USE_CLIPBOARD
 
 fi
 
-eval "$ac_cv_use_typetree"
-echo $ac_cv_use_typetree >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TYPETREE" = 1; then
+eval "$ac_cv_use_clipboard"
+echo $ac_cv_use_clipboard >> ${OSTYPE}.system.cache.tmp
+if test "$USE_CLIPBOARD" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5273,29 +5499,29 @@ fi
 
 
 
-echo $ac_n "checking "for wxgraph"""... $ac_c" 1>&6
-echo "configure:5278: checking "for wxgraph"" >&5
-# Check whether --with-wxgraph or --without-wxgraph was given.
-if test "${with_wxgraph+set}" = set; then
-  withval="$with_wxgraph"
-  if test "x$with_wxgraph" = xyes; then
-  ac_cv_use_wxgraph='USE_WXGRAPH="1"'
+echo $ac_n "checking "for dnd"""... $ac_c" 1>&6
+echo "configure:5504: checking "for dnd"" >&5
+# Check whether --with-dnd or --without-dnd was given.
+if test "${with_dnd+set}" = set; then
+  withval="$with_dnd"
+  if test "x$with_dnd" = xyes; then
+  ac_cv_use_dnd='USE_DND="1"'
 else
-  ac_cv_use_wxgraph='USE_WXGRAPH="0"'
+  ac_cv_use_dnd='USE_DND="0"'
 fi
 else
   
-  LINE=`grep "USE_WXGRAPH" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_DND" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_wxgraph='USE_WXGRAPH='$DEFAULT_USE_WXGRAPH
+  ac_cv_use_dnd='USE_DND='$DEFAULT_USE_DND
 
 fi
 
-eval "$ac_cv_use_wxgraph"
-echo $ac_cv_use_wxgraph >> ${OSTYPE}.system.cache.tmp
-if test "$USE_WXGRAPH" = 1; then
+eval "$ac_cv_use_dnd"
+echo $ac_cv_use_dnd >> ${OSTYPE}.system.cache.tmp
+if test "$USE_DND" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5303,29 +5529,29 @@ fi
 
 
 
-echo $ac_n "checking "for wxtree"""... $ac_c" 1>&6
-echo "configure:5308: checking "for wxtree"" >&5
-# Check whether --with-wxtree or --without-wxtree was given.
-if test "${with_wxtree+set}" = set; then
-  withval="$with_wxtree"
-  if test "x$with_wxtree" = xyes; then
-  ac_cv_use_wxtree='USE_WXTREE="1"'
+echo $ac_n "checking "for constrains"""... $ac_c" 1>&6
+echo "configure:5534: checking "for constrains"" >&5
+# Check whether --with-constraints or --without-constraints was given.
+if test "${with_constraints+set}" = set; then
+  withval="$with_constraints"
+  if test "x$with_constraints" = xyes; then
+  ac_cv_use_constraints='USE_CONSTRAINTS="1"'
 else
-  ac_cv_use_wxtree='USE_WXTREE="0"'
+  ac_cv_use_constraints='USE_CONSTRAINTS="0"'
 fi
 else
   
-  LINE=`grep "USE_WXTREE" ${OSTYPE}.system.cache`
+  LINE=`grep "USE_CONSTRAINTS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_wxtree='USE_WXTREE='$DEFAULT_USE_WXTREE
+  ac_cv_use_constraints='USE_CONSTRAINTS='$DEFAULT_USE_CONSTRAINTS
 
 fi
 
-eval "$ac_cv_use_wxtree"
-echo $ac_cv_use_wxtree >> ${OSTYPE}.system.cache.tmp
-if test "$USE_WXTREE" = 1; then
+eval "$ac_cv_use_constraints"
+echo $ac_cv_use_constraints >> ${OSTYPE}.system.cache.tmp
+if test "$USE_CONSTRAINTS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5334,80 +5560,417 @@ fi
 
 
 
-ZLIB=NONE
-if test "$USE_ZLIB" = 1 ; then
-  ZLIB="ZLIB"
+echo $ac_n "checking "for mdi"""... $ac_c" 1>&6
+echo "configure:5565: checking "for mdi"" >&5
+# Check whether --with-mdi or --without-mdi was given.
+if test "${with_mdi+set}" = set; then
+  withval="$with_mdi"
+  if test "x$with_mdi" = xyes; then
+  ac_cv_use_mdi='USE_MDI_ARCHITECTURE="1"'
+else
+  ac_cv_use_mdi='USE_MDI_ARCHITECTURE="0"'
+fi
+else
+  
+  LINE=`grep "USE_MDI_ARCHITECTURE" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_mdi='USE_MDI_ARCHITECTURE='$DEFAULT_USE_MDI_ARCHITECTURE
+
 fi
 
-GDK_IMLIB=NONE
-if test "$USE_GDK_IMLIB" = 1 ; then
-  GDK_IMLIB="GDK_IMLIB"
+eval "$ac_cv_use_mdi"
+echo $ac_cv_use_mdi >> ${OSTYPE}.system.cache.tmp
+if test "$USE_MDI_ARCHITECTURE" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-LIBPNG=NONE
-if test "$USE_LIBPNG" = 1 ; then
-  LIBPNG="LIBPNG"
+
+
+echo $ac_n "checking "for docview"""... $ac_c" 1>&6
+echo "configure:5595: checking "for docview"" >&5
+# Check whether --with-docview or --without-docview was given.
+if test "${with_docview+set}" = set; then
+  withval="$with_docview"
+  if test "x$with_docview" = xyes; then
+  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="1"'
+else
+  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="0"'
+fi
+else
+  
+  LINE=`grep "USE_DOC_VIEW_ARCHITECTURE" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE='$DEFAULT_USE_DOC_VIEW_ARCHITECTURE
+
+fi
+
+eval "$ac_cv_use_docview"
+echo $ac_cv_use_docview >> ${OSTYPE}.system.cache.tmp
+if test "$USE_DOC_VIEW_ARCHITECTURE" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo $ac_n "checking "for printarch"""... $ac_c" 1>&6
+echo "configure:5625: checking "for printarch"" >&5
+# Check whether --with-printarch or --without-printarch was given.
+if test "${with_printarch+set}" = set; then
+  withval="$with_printarch"
+  if test "x$with_printarch" = xyes; then
+  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="1"'
+else
+  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="0"'
+fi
+else
+  
+  LINE=`grep "USE_PRINTING_ARCHITECTURE" ${OSTYPE}.system.cache`
+  if test "x$LINE" != x ; then
+    eval "DEFAULT_$LINE"
+  fi
+  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE='$DEFAULT_USE_PRINTING_ARCHITECTURE
+
+fi
+
+eval "$ac_cv_use_printarch"
+echo $ac_cv_use_printarch >> ${OSTYPE}.system.cache.tmp
+if test "$USE_PRINTING_ARCHITECTURE" = 1; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+if test "$USE_UNIX" = 1 ; then
+  cat >> confdefs.h <<\EOF
+#define __UNIX__ 1
+EOF
+
+fi
+
+
+TOOLKIT=
+TOOLKIT_DEF=
+
+GUI_TK_INCLUDE=
+GUI_TK_LIBRARY=
+GUI_TK_LINK=
+
+MAKEINCLUDE=
+
+if test "$USE_GTK" = 1; then
+  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then
+  withval="$with_gtk_prefix"
+  gtk_config_prefix="$withval"
+else
+  gtk_config_prefix=""
 fi
 
-THREADS=NONE
-THREADS_LINK=
-if test "$USE_THREADS" = 1 ; then
-  case "$OS" in iris | IRIX | Irix5 | Irix6)
-    USE_THREADS_POSIX=0
-    USE_THREADS_SGI=1
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"
+else
+  gtk_config_exec_prefix=""
+fi
+
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  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:5705: 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
+  case "$GTK_CONFIG" in
+  /*)
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
   ;;
   *)
-    USE_THREADS_POSIX=1
-    USE_THREADS_SGI=0
-    THREADS_LINK=-lpthread
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
-  esac
-  THREADS="THREADS"
-  cat >> confdefs.h <<EOF
-#define USE_THREADS $USE_THREADS
-EOF
+esac
+fi
+GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+if test -n "$GTK_CONFIG"; then
+  echo "$ac_t""$GTK_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=0.99.7
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:5736: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5749 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   return !((gtk_major_version > major) ||
+   	    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ 	    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
 
-  cat >> confdefs.h <<EOF
-#define USE_THREADS_SGI $USE_THREADS_SGI
 EOF
+if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
 
-  cat >> confdefs.h <<EOF
-#define USE_THREADS_POSIX $USE_THREADS_POSIX
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes" 1>&6
+     
+       GUI_TK_INCLUDE="$GTK_CFLAGS"
+       GUI_TK_LIBRARY="$GTK_LIBS"
+       
+  else
+     echo "$ac_t""no" 1>&6
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     { echo "configure: error: Are gtk-config and the GTK in path and up-to-date?" 1>&2; exit 1; }
+  fi
+  
+  
+
+  cat >> confdefs.h <<\EOF
+#define __WXGTK__ 1
 EOF
 
+  TOOLKIT=GTK
+  TOOLKIT_DEF=__WXGTK__
+  MAKEINCLUDE=../gtk.inc
 fi
 
+if test "$USE_QT" = 1; then
+   echo $ac_n "checking for Qt includes""... $ac_c" 1>&6
+echo "configure:5814: checking for Qt includes" >&5
+   
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/qapp.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
 
+   if test "$ac_find_includes" != "" ; then
+     echo "$ac_t""found $ac_find_includes" 1>&6
+     echo $ac_n "checking for Qt library""... $ac_c" 1>&6
+echo "configure:5828: checking for Qt library" >&5
+     
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl; do
+      if test -f "$ac_dir/libqt.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
 
-STORABLE=NONE
-if test "$USE_STORABLE_CLASSES" = 1 ; then
-  STORABLE="STORABLE"
-  cat >> confdefs.h <<EOF
-#define USE_STORABLE_CLASSES $USE_STORABLE_CLASSES
+     if test "$ac_find_libraries" != "" ; then
+       
+  ac_path_to_include=$ac_find_includes
+  echo "$CHECK_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_include=""
+  else
+    ac_path_to_include="-I$ac_find_includes"    
+  fi
+
+       
+  echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"    
+  fi
+
+       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+       echo "$ac_t""found Qt at $ac_find_libraries" 1>&6
+     else
+       { echo "configure: error: no" 1>&2; exit 1; }
+     fi
+  else
+     { echo "configure: error: no" 1>&2; exit 1; }
+  fi
+  GUI_TK_LINK="-lXext -lX11 -lqt -lm"
+  cat >> confdefs.h <<\EOF
+#define __WXQT__ 1
 EOF
 
+  TOOLKIT=QT
+  TOOLKIT_DEF=__WXQT__
+  MAKEINCLUDE=../qt.inc
 fi
 
-AUTOTRANS=NONE
-if test "$USE_AUTOTRANS" = 1 ; then
-  AUTOTRANS="AUTOTRANS"
-  cat >> confdefs.h <<EOF
-#define USE_AUTOTRANS $USE_AUTOTRANS
+if test "$USE_MOTIF" = 1; then
+   echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
+echo "configure:5882: checking for Motif/Lesstif includes" >&5
+   
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/Xm.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
+
+   if test "$ac_find_includes" != "" ; then
+     echo "$ac_t""found $ac_find_includes" 1>&6
+     echo $ac_n "checking for Motif or Lesstif library""... $ac_c" 1>&6
+echo "configure:5896: checking for Motif or Lesstif library" >&5
+     
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl; do
+      if test -f "$ac_dir/libXm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+     if test "$ac_find_libraries" != "" ; then
+       
+  ac_path_to_include=$ac_find_includes
+  echo "$CHECK_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_include=""
+  else
+    ac_path_to_include="-I$ac_find_includes"    
+  fi
+
+       
+  echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"    
+  fi
+
+       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+       echo "$ac_t""found at $ac_find_libraries" 1>&6
+     else
+       { echo "configure: error: no" 1>&2; exit 1; }
+     fi
+  else
+     { echo "configure: error: no" 1>&2; exit 1; }
+  fi
+  GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
+  cat >> confdefs.h <<\EOF
+#define __WXMOTIF__ 1
 EOF
 
+  TOOLKIT=MOTIF
+  TOOLKIT_DEF=__WXMOTIF__
+  MAKEINCLUDE=../motif.inc
 fi
 
-DEBUG=
+if test "$TOOLKIT" = ""; then
+  { echo "configure: error: You must specify a toolkit: --with-gtk --with-qt --with-motif" 1>&2; exit 1; } 
+fi
+
+
+
+
+
+
+
+
+
+
+
+WXDEBUG=
 if test "$USE_DEBUG_INFO" = 1 ; then
-  DEBUG="-g"
+  WXDEBUG="-g -O0"
 fi
 
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define DEBUG $USE_DEBUG_FLAG
+#define WXDEBUG $USE_DEBUG_FLAG
 EOF
 
+  WXDEBUG_DEFINE="-D__WXDEBUG__"
+  
 fi
 
 if test "$USE_MEM_TRACING" = 1 ; then
@@ -5415,12 +5978,14 @@ if test "$USE_MEM_TRACING" = 1 ; then
 #define USE_MEMORY_TRACING $USE_MEM_TRACING
 EOF
 
-  cat >> confdefs.h <<EOF
-#define USE_GLOBAL_MEMORY_OPERATORS $USE_MEM_TRACING
-EOF
+  fi
 
+EXTRA_LINK=
+if test "$USE_DMALLOC" = 1 ; then
+  EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 
+
 PROFILE=
 if test "$USE_PROFILE" = 1 ; then
   PROFILE="-pg"
@@ -5445,224 +6010,278 @@ else
 fi
 
 
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  cat >> confdefs.h <<EOF
+#define USE_APPLE_IEEE $USE_APPLE_IEEE
+EOF
+
+fi
+
 USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
 cat >> confdefs.h <<EOF
 #define USE_IOSTREAMH $USE_IOSTREAMH
 EOF
 
 
-RPC=NONE
-if test "$USE_RPC" = 1 ; then
-  RPC="RPC"
+
+if test "$USE_ZLIB" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_RPC $USE_RPC
+#define USE_ZLIB $USE_ZLIB
 EOF
 
 fi
 
+if test "$USE_GDK_IMLIB" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_GDK_IMLIB $USE_GDK_IMLIB
+EOF
+
+fi
 
-WXRESOURCES=NONE
-if test "$USE_WX_RESOURCES" = 1 ; then
-  WXRESOURCES="WXRESOURCES"
+if test "$USE_LIBPNG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_WX_RESOURCES $USE_WX_RESOURCES
+#define USE_LIBPNG $USE_LIBPNG
 EOF
+ 
+fi
 
+if test "$USE_ODBC" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_ODBC $USE_ODBC
+EOF
+ 
 fi
 
 
-PROLOGIO=NONE
-PROLOGIOSRC=NONE
-if test "$USE_PROLOGIO" = 1 ; then
-  PROLOGIO="PROLOGIO"
-  PROLOGIOSRC="PROLOGIOSRC"
+if test "$USE_GAUGE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_PROLOGIO 1
+#define USE_GAUGE $USE_GAUGE
 EOF
 
 fi
 
+if test "$USE_SCROLLBAR" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_SCROLLBAR $USE_SCROLLBAR
+EOF
 
+fi
 
-POSTSCRIPTDC=NONE
-if test "$USE_POSTSCRIPT" = 1 ; then
-  POSTSCRIPTDC="POSTSCRIPTDC"
+if test "$USE_LISTCTRL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_POSTSCRIPT 1
+#define USE_LISTCTRL $USE_LISTCTRL
 EOF
 
 fi
 
+if test "$USE_TREECTRL" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_TREECTRL $USE_TREECTRL
+EOF
 
-METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
-  METAFILE="METAFILE"
+fi
+
+if test "$USE_GRID" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_METAFILE $USE_METAFILE
+#define USE_GRID $USE_GRID
 EOF
 
 fi
 
+if test "$USE_TAB_DIALOG" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_TAB_DIALOG $USE_TAB_DIALOG
+EOF
+
+fi
 
-FORM=NONE
-if test "$USE_FORM" = 1 ; then
-  FORM="FORM"
+if test "$USE_NOTEBOOK" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_FORM $USE_FORM
+#define USE_NOTEBOOK $USE_NOTEBOOK
 EOF
 
 fi
 
 
-HELP=NONE
-if test "$USE_HELP" = 1 ; then
-  HELP="HELP"
+if test "$USE_CONFIG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_HELP $USE_HELP
+#define USE_CONFIG $USE_CONFIG
 EOF
 
 fi
 
+if test "$USE_TIMEDATE" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_TIMEDATE $USE_TIMEDATE
+EOF
 
-IPC=NONE
-if test "$USE_IPC" = 1 ; then
-  IPC="IPC"
+fi
+
+if test "$USE_FRACTION" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_IPC 1
+#define USE_FRACTION $USE_FRACTION
 EOF
 
 fi
 
+if test "$USE_LOG" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_LOG $USE_LOG
+EOF
+
+fi
 
-ENHDIALOGBOX=NONE
-if test "$USE_ENHANCED_DIALOG" = 1 ; then
-  ENHDIALOGBOX="ENHDIALOGBOX"
+if test "$USE_INTL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_ENHANCED_DIALOG $USE_ENHANCED_DIALOG
+#define USE_INTL $USE_INTL
 EOF
 
 fi
 
+if test "$USE_STREAMS" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_STREAMS $USE_STREAMS
+EOF
 
-XRESOURCES=NONE
-if test "$USE_RESOURCES" = 1 ; then
-  XRESOURCES="XRESOURCES"
+fi
+
+if test "$USE_SERIAL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_RESOURCES $USE_RESOURCES
+#define USE_SERIAL $USE_SERIAL
 EOF
 
 fi
 
+if test "$USE_FILE" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_FILE $USE_FILE
+EOF
+
+fi
 
-CLIPBOARD=NONE
-if test "$USE_CLIPBOARD" = 1 ; then
-  CLIPBOARD="CLIPBOARD"
+if test "$USE_TEXTFILE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_CLIPBOARD $USE_CLIPBOARD
+#define USE_TEXTFILE $USE_TEXTFILE
 EOF
 
 fi
 
 
-CONSTRAINTS=NONE
-if test "$USE_CONSTRAINTS" = 1 ; then
-  CONSTRAINTS="CONSTRAINTS"
+if test "$USE_RPC" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_CONSTRAINTS $USE_CONSTRAINTS
+#define USE_RPC $USE_RPC
 EOF
 
 fi
 
+if test "$USE_WX_RESOURCES" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_WX_RESOURCES $USE_WX_RESOURCES
+EOF
+
+fi
 
-TIMEDATE=NONE
-if test "$USE_TIMEDATE" = 1 ; then
-  TIMEDATE="TIMEDATE"
+if test "$USE_PROLOGIO" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_TIMEDATE $USE_TIMEDATE
+#define USE_PROLOGIO 1
 EOF
 
 fi
 
 
-FRACTION=NONE
-if test "$USE_FRACTION" = 1 ; then
-  FRACTION="FRACTION"
+if test "$USE_POSTSCRIPT" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_FRACTION $USE_FRACTION
+#define USE_POSTSCRIPT 1
 EOF
 
 fi
 
+cat >> confdefs.h <<EOF
+#define USE_AFM_FOR_POSTSCRIPT $USE_AFM_FOR_POSTSCRIPT
+EOF
+
 
-TOOLBAR=NONE
-if test "$USE_TOOLBAR" = 1 ; then
-  TOOLBAR="TOOLBAR"
-  cat >> confdefs.h <<EOF
-#define USE_TOOLBAR $USE_TOOLBAR
+cat >> confdefs.h <<EOF
+#define WX_NORMALIZED_PS_FONTS $WX_NORMALIZED_PS_FONTS
 EOF
 
+
+
+if test "$USE_MDI_ARCHITECTURE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_XT_TOOLBAR $USE_XT_TOOLBAR
+#define USE_MDI_ARCHITECTURE $USE_MDI_ARCHITECTURE
 EOF
 
 fi
 
+if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_DOC_VIEW_ARCHITECTURE $USE_DOC_VIEW_ARCHITECTURE
+EOF
 
-GAUGE=NONE
-if test "$USE_GAUGE" = 1 ; then
-  GAUGE="GAUGE"
-  
+fi
+
+if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_GAUGE $USE_GAUGE
+#define USE_PRINTING_ARCHITECTURE $USE_PRINTING_ARCHITECTURE
 EOF
 
 fi
 
-VIRLISTBOX=NONE
-if test "$USE_VLBOX" = 1 ; then
-  VIRTLISTBOX="VIRLISTBOX"
+
+if test "$USE_IPC" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_VIRLISTBOX $USE_VIRLISTBOX
+#define USE_IPC 1
 EOF
 
 fi
 
+if test "$USE_RESOURCES" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_RESOURCES $USE_RESOURCES
+EOF
 
-SCROLLBAR=NONE
-if test "$USE_SCROLLBAR" = 1 ; then
-  SCROLLBAR="SCROLLBAR"
+fi
+
+if test "$USE_CLIPBOARD" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_SCROLLBAR $USE_SCROLLBAR
+#define USE_CLIPBOARD $USE_CLIPBOARD
 EOF
 
 fi
 
+if test "$USE_DND" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define USE_DND $USE_DND
+EOF
+
+fi
 
-DOCVIEW=NONE
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  DOCVIEW="DOCVIEW"
+if test "$USE_CONSTRAINTS" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_DOC_VIEW_ARCHITECTURE $USE_DOC_VIEW_ARCHITECTURE
+#define USE_CONSTRAINTS $USE_CONSTRAINTS
 EOF
 
 fi
 
 
-PRINTPREVIEW=NONE
-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  PRINTPREVIEW="PRINTPREVIEW"
+METAFILE=NONE
+if test "$USE_METAFILE" = 1 ; then
+  METAFILE="METAFILE"
   cat >> confdefs.h <<EOF
-#define USE_PRINTING_ARCHITECTURE $USE_PRINTING_ARCHITECTURE
+#define USE_METAFILE $USE_METAFILE
 EOF
 
 fi
 
 
-TYPETREE=NONE
-if test "$USE_TYPETREE" = 1 ; then
-  TYPETREE="TYPETREE"
+HELP=NONE
+if test "$USE_HELP" = 1 ; then
+  HELP="HELP"
   cat >> confdefs.h <<EOF
-#define USE_TYPETREE $USE_TYPETREE
+#define USE_HELP $USE_HELP
 EOF
 
 fi
@@ -5693,170 +6312,206 @@ if test "$USE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
-cat >> confdefs.h <<EOF
-#define USE_AFM_FOR_POSTSCRIPT $USE_AFM_FOR_POSTSCRIPT
-EOF
 
+DL_LIBRARY=-ldl
 
-cat >> confdefs.h <<EOF
-#define WX_NORMALIZED_PS_FONTS $WX_NORMALIZED_PS_FONTS
-EOF
 
 
 
-if test "$USE_UNIX" = 1 ; then
-  cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
-EOF
+USE_THREADS=1
+THREADS_LINK=""
+UNIX_THREAD=""
 
+# Check whether --with-threads or --without-threads was given.
+if test "${with_threads+set}" = set; then
+  withval="$with_threads"
+  USE_THREADS="$withval"
 fi
 
 
-GUI_TK_INCLUDE=
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+if test "$USE_THREADS" = "1"; then
+  UNIX_THREAD="gtk/threadno.cpp"
 
-if test "$USE_GTK" = 1; then
-  # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
+  
+  echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6
+echo "configure:6338: checking for pthread_create in -lpthread-0.7" >&5
+ac_lib_var=`echo pthread-0.7'_'pthread_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  gtk_config_prefix=""
-fi
+  ac_save_LIBS="$LIBS"
+LIBS="-lpthread-0.7  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6346 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_create();
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  gtk_config_exec_prefix=""
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+     UNIX_THREAD="gtk/threadpsx.cpp"
+     THREADS_LINK="-lpthread-0.7"
+  
+else
+  echo "$ac_t""no" 1>&6
 
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  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:5754: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+    ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
+echo "configure:6381: checking for sys/prctl.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$GTK_CONFIG" in
-  /*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
+  cat > conftest.$ac_ext <<EOF
+#line 6386 "configure"
+#include "confdefs.h"
+#include <sys/prctl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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
-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
-if test -n "$GTK_CONFIG"; then
-  echo "$ac_t""$GTK_CONFIG" 1>&6
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        UNIX_THREAD="gtk/threadsgi.cpp"
+    
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  min_gtk_version=0.99.7
-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5785: checking for GTK - version >= $min_gtk_version" >&5
-  no_gtk=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+
+        
+    echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6
+echo "configure:6417: checking for pthread_setcanceltype in -lpthread" >&5
+ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 5798 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lpthread  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6425 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_setcanceltype();
 
-#include <gtk/gtk.h>
-#include <stdio.h>
+int main() {
+pthread_setcanceltype()
+; return 0; }
+EOF
+if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-int 
-main ()
-{
-  int major, minor, micro;
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+       UNIX_THREAD="gtk/threadpsx.cpp"
+       THREADS_LINK="-lpthread"
+    
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
+  
+fi
 
-   return !((gtk_major_version > major) ||
-   	    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- 	    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
+  echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6
+echo "configure:6463: checking for pthread_setcanceltype in -lpthreads" >&5
+ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lpthreads  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6471 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_setcanceltype();
 
+int main() {
+pthread_setcanceltype()
+; return 0; }
 EOF
-if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  :
+if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-  else
-     no_gtk=yes
-  fi
-  if test "x$no_gtk" = x ; then
-     echo "$ac_t""yes" 1>&6
-     
-       GUI_TK_INCLUDE="$GTK_CFLAGS"
-       GUI_TK_LIBRARY="$GTK_LIBS"
-       
-  else
-     echo "$ac_t""no" 1>&6
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     { echo "configure: error: Are gtk-config and the GTK in path and up-to-date?" 1>&2; exit 1; }
-  fi
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   
+     UNIX_THREAD="gtk/threadpsx.cpp"
+     THREADS_LINK="-lpthreads"
   
-
-  cat >> confdefs.h <<\EOF
-#define __GTK__ 1
-EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
 
 fi
 
+if test -z "$UNIX_THREAD"; then
+  USE_THREADS=0
+fi
 
 
 
+cat >> confdefs.h <<\EOF
+#define USE_THREADS 1
+EOF
 
 
 
@@ -5867,7 +6522,7 @@ OPENGL_LINK=
 
 if test "$USE_OPENGL" = 1; then
     echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
-echo "configure:5871: checking for OpenGL includes" >&5
+echo "configure:6526: checking for OpenGL includes" >&5
   
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
@@ -5882,7 +6537,7 @@ for ac_dir in $SEARCH_INCLUDE;
     OPENGL_INCLUDE="-I$ac_find_includes"
     echo "$ac_t""found $ac_find_includes" 1>&6
         echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:5886: checking for OpenGL library" >&5
+echo "configure:6541: checking for OpenGL library" >&5
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -5969,29 +6624,6 @@ for ac_dir in $SEARCH_LIB;
   fi
 fi
 
-    if test "$USE_GDK_IMLIB" = 1; then
-      cat >> confdefs.h <<EOF
-#define USE_GDK_IMLIB $USE_GDK_IMLIB
-EOF
-
-    fi
-
-    if test "$USE_ZLIB" = 1; then
-      cat >> confdefs.h <<EOF
-#define USE_ZLIB $USE_ZLIB
-EOF
-
-    fi
-
-    if test "$USE_LIBPNG" = 1; then
-      cat >> confdefs.h <<EOF
-#define USE_LIBPNG $USE_LIBPNG
-EOF
- 
-    fi
-
-
-
 
 USE_GLX=$USE_OPENGL
 if test "$USE_OPENGL" != 1; then
@@ -6249,7 +6881,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "src/gtk/setup/substit include/wx/gtk/setup.h:src/gtk/setup/setup.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "./setup/substit ./include/wx/gtk/setup.h:./setup/setup.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -6294,6 +6926,7 @@ s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@GTK_JOYSTICK@%$GTK_JOYSTICK%g
 s%@LIBOBJS@%$LIBOBJS%g
 s%@YACC@%$YACC%g
 s%@LEX@%$LEX%g
@@ -6304,35 +6937,6 @@ s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@THREADS@%$THREADS%g
-s%@THREADS_LINK@%$THREADS_LINK%g
-s%@DEBUG@%$DEBUG%g
-s%@PROFILE@%$PROFILE%g
-s%@OPTIMISE@%$OPTIMISE%g
-s%@RPC@%$RPC%g
-s%@WXRESOURCES@%$WXRESOURCES%g
-s%@PROLOGIO@%$PROLOGIO%g
-s%@PROLOGIOSRC@%$PROLOGIOSRC%g
-s%@POSTSCRIPTDC@%$POSTSCRIPTDC%g
-s%@METAFILE@%$METAFILE%g
-s%@FORM@%$FORM%g
-s%@HELP@%$HELP%g
-s%@IPC@%$IPC%g
-s%@ENHDIALOGBOX@%$ENHDIALOGBOX%g
-s%@XRESOURCES@%$XRESOURCES%g
-s%@CLIPBOARD@%$CLIPBOARD%g
-s%@CONSTRAINTS@%$CONSTRAINTS%g
-s%@TIMEDATE@%$TIMEDATE%g
-s%@FRACTION@%$FRACTION%g
-s%@TOOLBAR@%$TOOLBAR%g
-s%@GAUGE@%$GAUGE%g
-s%@VIRLISTBOX@%$VIRLISTBOX%g
-s%@SCROLLBAR@%$SCROLLBAR%g
-s%@DOCVIEW@%$DOCVIEW%g
-s%@PRINTPREVIEW@%$PRINTPREVIEW%g
-s%@TYPETREE@%$TYPETREE%g
-s%@WXGRAPH@%$WXGRAPH%g
-s%@WXTREE@%$WXTREE%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
@@ -6341,6 +6945,19 @@ s%@GUI_TK_LIBRARY@%$GUI_TK_LIBRARY%g
 s%@GUI_TK_LINK@%$GUI_TK_LINK%g
 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
+s%@MAKEINCLUDE@%$MAKEINCLUDE%g
+s%@WXDEBUG@%$WXDEBUG%g
+s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
+s%@EXTRA_LINK@%$EXTRA_LINK%g
+s%@PROFILE@%$PROFILE%g
+s%@OPTIMISE@%$OPTIMISE%g
+s%@METAFILE@%$METAFILE%g
+s%@HELP@%$HELP%g
+s%@WXGRAPH@%$WXGRAPH%g
+s%@WXTREE@%$WXTREE%g
+s%@DL_LIBRARY@%$DL_LIBRARY%g
+s%@UNIX_THREAD@%$UNIX_THREAD%g
+s%@THREADS_LINK@%$THREADS_LINK%g
 s%@OPENGL_INCLUDE@%$OPENGL_INCLUDE%g
 s%@OPENGL_LIBRARY@%$OPENGL_LIBRARY%g
 s%@OPENGL_LINK@%$OPENGL_LINK%g
@@ -6389,7 +7006,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"src/gtk/setup/substit"}
+CONFIG_FILES=\${CONFIG_FILES-"./setup/substit"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -6470,7 +7087,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="include/wx/gtk/setup.h:src/gtk/setup/setup.hin"
+  CONFIG_HEADERS="./include/wx/gtk/setup.h:./setup/setup.hin"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -6560,7 +7177,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-src/gtk/setup/general/createall
+./setup/general/createall
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
@@ -6568,5 +7185,6 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
+
 mv ${OSTYPE}.system.cache.tmp ${OSTYPE}.system.cache