slightly updated makefiles

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

diff --git a/Makefile.am b/Makefile.am
index 9761a0f6ce8d949e1cb787bfa3d0058eaeb2cf9c..cf2ae655785489c213f72e2c9e7351187d3e98e6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = src samples # utils user docs
+SUBDIRS = include src samples # utils user docs

 
 pkgdata_SCRIPTS = wx-config
 
 pkgdata_SCRIPTS = wx-config

diff --git a/Makefile.in b/Makefile.in
index 4ca364d4b67741b2d55d98b20066840d08fadc15..d3f3568379203c99950d7b9f650cde1d2a789011 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@


@@ -98,7 +99,7 @@ WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 YACC = @YACC@
 
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 YACC = @YACC@
 

-SUBDIRS = src samples # utils user docs
+SUBDIRS = include src samples # utils user docs

 
 pkgdata_SCRIPTS = wx-config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 
 pkgdata_SCRIPTS = wx-config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4


@@ -107,10 +108,10 @@ CONFIG_HEADER = ./${SETUPH_DIR}/setup.h
 CONFIG_CLEAN_FILES =  wx-config
 SCRIPTS =  $(pkgdata_SCRIPTS)
 
 CONFIG_CLEAN_FILES =  wx-config
 SCRIPTS =  $(pkgdata_SCRIPTS)
 

-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 config.guess \
-config.sub configure configure.in include/wx/unix/setup.h.in \
-include/wx/unix/stamp-h.in install-sh ltconfig ltmain.sh missing \
-mkinstalldirs wx-config.in
+DIST_COMMON =  Makefile.am Makefile.in acconfig.h aclocal.m4 \
+config.guess config.sub configure configure.in \
+include/wx/unix/setup.h.in include/wx/unix/stamp-h.in install-sh \
+ltconfig ltmain.sh missing mkinstalldirs wx-config.in

 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)


@@ -147,7 +148,7 @@ $(srcdir)/include/wx/unix/setup.h.in: $(srcdir)//stamp-h.in
                rm -f $(srcdir)//stamp-h.in; \
                $(MAKE) $(srcdir)//stamp-h.in; \
        else :; fi
                rm -f $(srcdir)//stamp-h.in; \
                $(MAKE) $(srcdir)//stamp-h.in; \
        else :; fi

-$(srcdir)//stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)//stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h

        cd $(top_srcdir) && $(AUTOHEADER)
        @echo timestamp > $(srcdir)//stamp-h.in 2> /dev/null
 
        cd $(top_srcdir) && $(AUTOHEADER)
        @echo timestamp > $(srcdir)//stamp-h.in 2> /dev/null
 

diff --git a/configure b/configure
index 090ca2b984cd0c503a602e21691c019a43d7dd89..90e9385e3b04fb68111ed016edeb7bd7d3144bda 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 #! /bin/sh
 

-# From configure.in Id
+# From configure.in Id: configure.in

 
 
 
 
 
 


@@ -204,7 +204,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-resources      use wxWindows resources"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-resources      use wxWindows resources"
 ac_help="$ac_help

-  --enable-xresources       use X resources for save (default for gtk+)"
+  --enable-xresources     use X resources for save (default for gtk+)"

 ac_help="$ac_help
   --enable-clipboard      use wxClipboard classes"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-clipboard      use wxClipboard classes"
 ac_help="$ac_help


@@ -242,7 +242,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-radiobtn       use wxRadioButton class"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-radiobtn       use wxRadioButton class"
 ac_help="$ac_help

-  --enable-sash       use wxSashWindow class"
+  --enable-sash           use wxSashWindow class"

 ac_help="$ac_help
   --enable-scrollbar      use wxScrollBar class and scrollable windows"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-scrollbar      use wxScrollBar class and scrollable windows"
 ac_help="$ac_help


@@ -252,7 +252,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-splitter       use wxSplitterWindow class"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-splitter       use wxSplitterWindow class"
 ac_help="$ac_help

-  --enable-statbmp        use wxStaticBitmap class"
+  --enable-statbmp         use wxStaticBitmap class"

 ac_help="$ac_help
   --enable-statbox       use wxStaticBox class"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-statbox       use wxStaticBox class"
 ac_help="$ac_help


@@ -262,7 +262,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-tabdialog        use wxTabControl class"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-tabdialog        use wxTabControl class"
 ac_help="$ac_help

-  --enable-toolbar        use wxToolBar class"
+  --enable-toolbar      use wxToolBar class"

 ac_help="$ac_help
   --enable-treectrl       use wxTreeCtrl class"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-treectrl       use wxTreeCtrl class"
 ac_help="$ac_help


@@ -274,7 +274,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-splines        use spline drawing code"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-splines        use spline drawing code"
 ac_help="$ac_help

-  --enable-validators      use wxValidator and derived classes"
+  --enable-validators     use wxValidator and derived classes"

 ac_help="$ac_help
   --enable-static[=PKGS]  build static libraries [default=no]"
 ac_help="$ac_help
 ac_help="$ac_help
   --enable-static[=PKGS]  build static libraries [default=no]"
 ac_help="$ac_help


@@ -1270,11 +1270,13 @@ if test "$USE_UNIX" = 1 ; then
 #define __UNIX__ 1
 EOF
 
 #define __UNIX__ 1
 EOF
 

+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
+  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"

 fi
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
 fi
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6

-echo "configure:1278: checking for gettext in -lc" >&5
+echo "configure:1280: checking for gettext in -lc" >&5

 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -1282,7 +1284,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1286 "configure"
+#line 1288 "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
 #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


@@ -1293,7 +1295,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
 gettext()
 ; return 0; }
 EOF

-if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -2340,7 +2342,7 @@ fi
 # 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
 # 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:2344: checking for $ac_word" >&5
+echo "configure:2346: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2370,7 +2372,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
   # 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:2374: checking for $ac_word" >&5
+echo "configure:2376: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2421,7 +2423,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:2425: checking for $ac_word" >&5
+echo "configure:2427: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2453,7 +2455,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:2457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2459: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -2464,12 +2466,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 2468 "configure"
+#line 2470 "configure"

 #include "confdefs.h"
 
 main(){return(0);}
 EOF
 #include "confdefs.h"
 
 main(){return(0);}
 EOF

-if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -2495,12 +2497,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: 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:2499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2501: 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 "$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:2504: checking whether we are using GNU C" >&5
+echo "configure:2506: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2509,7 +2511,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2513: \"$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:2515: \"$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
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no


@@ -2528,7 +2530,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6

-echo "configure:2532: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2534: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2563,7 +2565,7 @@ fi
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6

-echo "configure:2567: checking how to run the C preprocessor" >&5
+echo "configure:2569: checking how to run the C preprocessor" >&5

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=


@@ -2578,13 +2580,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF

-#line 2582 "configure"
+#line 2584 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -2595,13 +2597,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF

-#line 2599 "configure"
+#line 2601 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -2612,13 +2614,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF

-#line 2616 "configure"
+#line 2618 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -2645,13 +2647,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
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6

-echo "configure:2649: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2651: 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
 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 2655 "configure"
+#line 2657 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP


@@ -2669,7 +2671,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF

-#line 2673 "configure"
+#line 2675 "configure"

 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA


@@ -2705,7 +2707,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
 # 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:2709: checking for $ac_word" >&5
+echo "configure:2711: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2737,7 +2739,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:2741: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2743: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5

 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -2748,12 +2750,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 2752 "configure"
+#line 2754 "configure"

 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF

-if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -2779,12 +2781,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: 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:2783: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2785: 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 "$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:2788: checking whether we are using GNU C++" >&5
+echo "configure:2790: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2793,7 +2795,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2797: \"$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:2799: \"$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
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no


@@ -2812,7 +2814,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6

-echo "configure:2816: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2818: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2845,7 +2847,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6

-echo "configure:2849: checking how to run the C++ preprocessor" >&5
+echo "configure:2851: 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
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -2858,12 +2860,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF

-#line 2862 "configure"
+#line 2864 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:2867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -2901,7 +2903,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # 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:2905: checking for $ac_word" >&5
+echo "configure:2907: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2932,7 +2934,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
 # 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:2936: checking for $ac_word" >&5
+echo "configure:2938: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2972,7 +2974,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
 # 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:2976: checking for a BSD compatible install" >&5
+echo "configure:2978: 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
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -3026,7 +3028,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6

-echo "configure:3030: checking whether ln -s works" >&5
+echo "configure:3032: 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
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3050,7 +3052,7 @@ fi
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:3054: checking for $ac_word" >&5
+echo "configure:3056: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3079,7 +3081,7 @@ fi
 
 
 echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
 
 
 echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6

-echo "configure:3083: checking "make for VPATH support"" >&5
+echo "configure:3085: checking "make for VPATH support"" >&5

 cat - << EOF > confMake
 check : file
        cp \$? \$@
 cat - << EOF > confMake
 check : file
        cp \$? \$@


@@ -3108,7 +3110,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
 # 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:3112: checking for $ac_word" >&5
+echo "configure:3114: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3145,7 +3147,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
 # 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:3149: checking for $ac_word" >&5
+echo "configure:3151: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3178,7 +3180,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex""
 # 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
 # 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:3182: checking for $ac_word" >&5
+echo "configure:3184: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3212,7 +3214,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6

-echo "configure:3216: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3218: 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
 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


@@ -3220,7 +3222,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 3224 "configure"
+#line 3226 "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
 #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


@@ -3231,7 +3233,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
 yywrap()
 ; return 0; }
 EOF

-if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -3254,7 +3256,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6

-echo "configure:3258: checking lex output file root" >&5
+echo "configure:3260: 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
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3275,7 +3277,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
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6

-echo "configure:3279: checking whether yytext is a pointer" >&5
+echo "configure:3281: 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
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3287,14 +3289,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF

-#line 3291 "configure"
+#line 3293 "configure"

 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else


@@ -3363,7 +3365,7 @@ else
 fi
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6

-echo "configure:3367: checking build system type" >&5
+echo "configure:3369: checking build system type" >&5

 
 build_alias=$build
 case "$build_alias" in
 
 build_alias=$build
 case "$build_alias" in


@@ -3392,7 +3394,7 @@ ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6

-echo "configure:3396: checking for ld used by GCC" >&5
+echo "configure:3398: checking for ld used by GCC" >&5

   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.


@@ -3446,10 +3448,10 @@ echo "configure:3396: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6

-echo "configure:3450: checking for GNU ld" >&5
+echo "configure:3452: checking for GNU ld" >&5

 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6

-echo "configure:3453: checking for non-GNU ld" >&5
+echo "configure:3455: checking for non-GNU ld" >&5

 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -3485,7 +3487,7 @@ fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6

-echo "configure:3489: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:3491: checking if the linker ($LD) is GNU ld" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3501,7 +3503,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6

-echo "configure:3505: checking for BSD-compatible nm" >&5
+echo "configure:3507: checking for BSD-compatible nm" >&5

 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3537,7 +3539,7 @@ echo "$ac_t""$NM" 1>&6
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6

-echo "configure:3541: checking command to parse $NM output" >&5
+echo "configure:3543: checking command to parse $NM output" >&5

 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3600,10 +3602,10 @@ void nm_test_func(){}
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF

-if { (eval echo configure:3604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   # Now try to grab the symbols.
   ac_nlist=conftest.nm
   # Now try to grab the symbols.
   ac_nlist=conftest.nm

-  if { (eval echo configure:3607: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:3609: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then

 
     # Try sorting and uniquifying the output.
     if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
 
     # Try sorting and uniquifying the output.
     if sort "$ac_nlist" | uniq > "$ac_nlist"T; then


@@ -3661,7 +3663,7 @@ EOF
        ac_save_CFLAGS="$CFLAGS"
         LIBS="conftestm.$ac_objext"
        CFLAGS="$CFLAGS$no_builtin_flag"
        ac_save_CFLAGS="$CFLAGS"
         LIBS="conftestm.$ac_objext"
        CFLAGS="$CFLAGS$no_builtin_flag"

-        if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+        if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

           ac_pipe_works=yes
         else
           echo "configure: failed program was:" >&5
           ac_pipe_works=yes
         else
           echo "configure: failed program was:" >&5


@@ -3697,7 +3699,7 @@ fi
 echo "$ac_t""$ac_result" 1>&6
 
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
 echo "$ac_t""$ac_result" 1>&6
 
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6

-echo "configure:3701: checking for _ prefix in compiled symbols" >&5
+echo "configure:3703: checking for _ prefix in compiled symbols" >&5

 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3706,10 +3708,10 @@ cat > conftest.$ac_ext <<EOF
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF

-if { (eval echo configure:3710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   # Now try to grab the symbols.
   ac_nlist=conftest.nm
   # Now try to grab the symbols.
   ac_nlist=conftest.nm

-  if { (eval echo configure:3713: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:3715: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then

     # See whether the symbols have a leading underscore.
     if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
     # See whether the symbols have a leading underscore.
     if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes


@@ -3761,8 +3763,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.

-  echo '#line 3765 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:3766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 3767 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:3768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"


@@ -3783,19 +3785,19 @@ case "$host" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6

-echo "configure:3787: checking whether the C compiler needs -belf" >&5
+echo "configure:3789: checking whether the C compiler needs -belf" >&5

 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 3792 "configure"
+#line 3794 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else


@@ -3818,7 +3820,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:3822: checking for $ac_word" >&5
+echo "configure:3824: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3850,7 +3852,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:3854: checking for $ac_word" >&5
+echo "configure:3856: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3885,7 +3887,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:3889: checking for $ac_word" >&5
+echo "configure:3891: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3917,7 +3919,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:3921: checking for $ac_word" >&5
+echo "configure:3923: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -4098,7 +4100,7 @@ rm -f confcache
 # 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
 # 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:4102: checking for X" >&5
+echo "configure:4104: checking for X" >&5

 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then


@@ -4160,12 +4162,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF

-#line 4164 "configure"
+#line 4166 "configure"

 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:4169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -4234,14 +4236,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4238 "configure"
+#line 4240 "configure"

 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF

-if { (eval echo configure:4245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.


@@ -4347,17 +4349,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
     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:4351: checking whether -R must be followed by a space" >&5
+echo "configure:4353: checking whether -R must be followed by a space" >&5

       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF

-#line 4354 "configure"
+#line 4356 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:4361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_nospace=yes
 else
   rm -rf conftest*
   ac_R_nospace=yes
 else


@@ -4373,14 +4375,14 @@ rm -f conftest*
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF

-#line 4377 "configure"
+#line 4379 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:4384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_space=yes
 else
   rm -rf conftest*
   ac_R_space=yes
 else


@@ -4412,7 +4414,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
     # 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:4416: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4418: 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
 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


@@ -4420,7 +4422,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4424 "configure"
+#line 4426 "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
 #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


@@ -4431,7 +4433,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:4435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4453,7 +4455,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
 
     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:4457: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4459: 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
 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


@@ -4461,7 +4463,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4465 "configure"
+#line 4467 "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
 #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


@@ -4472,7 +4474,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4501,12 +4503,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
     # 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:4505: checking for gethostbyname" >&5
+echo "configure:4507: 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
 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 4510 "configure"
+#line 4512 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */


@@ -4529,7 +4531,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:4533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else


@@ -4550,7 +4552,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

-echo "configure:4554: checking for gethostbyname in -lnsl" >&5
+echo "configure:4556: 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
 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


@@ -4558,7 +4560,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4562 "configure"
+#line 4564 "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
 #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


@@ -4569,7 +4571,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4599,12 +4601,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
     # -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:4603: checking for connect" >&5
+echo "configure:4605: 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
 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 4608 "configure"
+#line 4610 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */


@@ -4627,7 +4629,7 @@ connect();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:4631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else


@@ -4648,7 +4650,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6

-echo "configure:4652: checking for connect in -lsocket" >&5
+echo "configure:4654: 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
 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


@@ -4656,7 +4658,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4660 "configure"
+#line 4662 "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
 #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


@@ -4667,7 +4669,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
 connect()
 ; return 0; }
 EOF

-if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4691,12 +4693,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6

-echo "configure:4695: checking for remove" >&5
+echo "configure:4697: 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
 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 4700 "configure"
+#line 4702 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */


@@ -4719,7 +4721,7 @@ remove();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else


@@ -4740,7 +4742,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6

-echo "configure:4744: checking for remove in -lposix" >&5
+echo "configure:4746: 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
 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


@@ -4748,7 +4750,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4752 "configure"
+#line 4754 "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
 #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


@@ -4759,7 +4761,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
 remove()
 ; return 0; }
 EOF

-if { (eval echo configure:4763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4783,12 +4785,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6

-echo "configure:4787: checking for shmat" >&5
+echo "configure:4789: 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
 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 4792 "configure"
+#line 4794 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */


@@ -4811,7 +4813,7 @@ shmat();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else


@@ -4832,7 +4834,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6

-echo "configure:4836: checking for shmat in -lipc" >&5
+echo "configure:4838: 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
 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


@@ -4840,7 +4842,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4844 "configure"
+#line 4846 "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
 #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


@@ -4851,7 +4853,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
 shmat()
 ; return 0; }
 EOF

-if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4884,7 +4886,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
   # 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:4888: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4890: 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
 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


@@ -4892,7 +4894,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 4896 "configure"
+#line 4898 "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
 #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


@@ -4903,7 +4905,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
 IceConnectionNumber()
 ; return 0; }
 EOF

-if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -4980,7 +4982,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # 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:4984: checking for $ac_word" >&5
+echo "configure:4986: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -5015,7 +5017,7 @@ fi
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:5019: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5021: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`


@@ -5028,7 +5030,7 @@ echo "configure:5019: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 5032 "configure"
+#line 5034 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -5052,7 +5054,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -5115,7 +5117,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   # 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:5119: checking for $ac_word" >&5
+echo "configure:5121: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -5150,7 +5152,7 @@ fi
 
   min_gtk_version=1.0.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.0.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:5154: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5156: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`


@@ -5163,7 +5165,7 @@ echo "configure:5154: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 5167 "configure"
+#line 5169 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -5187,7 +5189,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:5191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -5227,7 +5229,7 @@ fi
 
 if test "$wxUSE_MOTIF" = 1; then
     echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
 
 if test "$wxUSE_MOTIF" = 1; then
     echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6

-echo "configure:5231: checking for Motif/Lesstif includes" >&5
+echo "configure:5233: checking for Motif/Lesstif includes" >&5

     
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
     
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;


@@ -5246,7 +5248,7 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
 
     echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
     fi
 
     echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6

-echo "configure:5250: checking for Motif/Lesstif library" >&5
+echo "configure:5252: checking for Motif/Lesstif library" >&5

     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;


@@ -5289,7 +5291,7 @@ for ac_dir in $SEARCH_LIB;
     fi
 
     echo $ac_n "checking for Xt library""... $ac_c" 1>&6
     fi
 
     echo $ac_n "checking for Xt library""... $ac_c" 1>&6

-echo "configure:5293: checking for Xt library" >&5
+echo "configure:5295: checking for Xt library" >&5

     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;


@@ -5321,7 +5323,7 @@ for ac_dir in $SEARCH_LIB;
 
     XPM_LINK=""
     echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
 
     XPM_LINK=""
     echo $ac_n "checking for Xpm library""... $ac_c" 1>&6

-echo "configure:5325: checking for Xpm library" >&5
+echo "configure:5327: checking for Xpm library" >&5

     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
     
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;


@@ -5372,17 +5374,17 @@ for ac_hdr in strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:5376: checking for $ac_hdr" >&5
+echo "configure:5378: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 5381 "configure"
+#line 5383 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5412,17 +5414,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:5416: checking for $ac_hdr" >&5
+echo "configure:5418: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 5421 "configure"
+#line 5423 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5452,17 +5454,17 @@ for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:5456: checking for $ac_hdr" >&5
+echo "configure:5458: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 5461 "configure"
+#line 5463 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5492,17 +5494,17 @@ for ac_hdr in wcstr.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:5496: checking for $ac_hdr" >&5
+echo "configure:5498: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 5501 "configure"
+#line 5503 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5532,17 +5534,17 @@ for ac_hdr in fnmatch.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:5536: checking for $ac_hdr" >&5
+echo "configure:5538: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 5541 "configure"
+#line 5543 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5571,12 +5573,12 @@ done
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:5575: checking for ANSI C header files" >&5
+echo "configure:5577: 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
 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 5580 "configure"
+#line 5582 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -5584,7 +5586,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:5588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -5601,7 +5603,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
 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 5605 "configure"
+#line 5607 "configure"

 #include "confdefs.h"
 #include <string.h>
 EOF
 #include "confdefs.h"
 #include <string.h>
 EOF


@@ -5619,7 +5621,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
 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 5623 "configure"
+#line 5625 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 #include "confdefs.h"
 #include <stdlib.h>
 EOF


@@ -5640,7 +5642,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
   :
 else
   cat > conftest.$ac_ext <<EOF

-#line 5644 "configure"
+#line 5646 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')


@@ -5651,7 +5653,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
 exit (0); }
 
 EOF

-if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -5675,12 +5677,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6

-echo "configure:5679: checking for mode_t" >&5
+echo "configure:5681: 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
 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 5684 "configure"
+#line 5686 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -5708,12 +5710,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6

-echo "configure:5712: checking for off_t" >&5
+echo "configure:5714: 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
 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 5717 "configure"
+#line 5719 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -5741,12 +5743,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6

-echo "configure:5745: checking for pid_t" >&5
+echo "configure:5747: 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
 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 5750 "configure"
+#line 5752 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -5774,12 +5776,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6

-echo "configure:5778: checking for size_t" >&5
+echo "configure:5780: 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
 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 5783 "configure"
+#line 5785 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -5807,12 +5809,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6

-echo "configure:5811: checking for uid_t in sys/types.h" >&5
+echo "configure:5813: 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
 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 5816 "configure"
+#line 5818 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 #include "confdefs.h"
 #include <sys/types.h>
 EOF


@@ -5844,12 +5846,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6

-echo "configure:5848: checking for working const" >&5
+echo "configure:5850: 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
 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 5853 "configure"
+#line 5855 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {


@@ -5898,7 +5900,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:5902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_const=yes
 else
   rm -rf conftest*
   ac_cv_c_const=yes
 else


@@ -5919,21 +5921,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6

-echo "configure:5923: checking for inline" >&5
+echo "configure:5925: 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
 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 5930 "configure"
+#line 5932 "configure"

 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF

-if { (eval echo configure:5937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else


@@ -5960,7 +5962,7 @@ esac
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6

-echo "configure:5964: checking size of int *" >&5
+echo "configure:5966: 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
 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -5968,7 +5970,7 @@ else
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 5972 "configure"
+#line 5974 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -5979,7 +5981,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else
 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else


@@ -5999,7 +6001,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6

-echo "configure:6003: checking size of int" >&5
+echo "configure:6005: 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
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6007,7 +6009,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 6011 "configure"
+#line 6013 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -6018,7 +6020,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   ac_cv_sizeof_int=`cat conftestval`
 else
 then
   ac_cv_sizeof_int=`cat conftestval`
 else


@@ -6038,7 +6040,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6

-echo "configure:6042: checking size of long" >&5
+echo "configure:6044: 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
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6046,7 +6048,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 6050 "configure"
+#line 6052 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -6057,7 +6059,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   ac_cv_sizeof_long=`cat conftestval`
 else
 then
   ac_cv_sizeof_long=`cat conftestval`
 else


@@ -6077,7 +6079,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6

-echo "configure:6081: checking size of long long" >&5
+echo "configure:6083: checking size of long long" >&5

 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6085,7 +6087,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF

-#line 6089 "configure"
+#line 6091 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -6096,7 +6098,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:6100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else


@@ -6136,17 +6138,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:6140: checking for $ac_hdr" >&5
+echo "configure:6142: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 6145 "configure"
+#line 6147 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -6194,7 +6196,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6

-echo "configure:6198: checking if C++ compiler supports bool" >&5
+echo "configure:6200: checking if C++ compiler supports bool" >&5

 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6213,7 +6215,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
     
 else
   cat > conftest.$ac_ext <<EOF
     
 else
   cat > conftest.$ac_ext <<EOF

-#line 6217 "configure"
+#line 6219 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);


@@ -6227,7 +6229,7 @@ extern "C" void exit(int);
         }
       
 EOF
         }
       
 EOF

-if { (eval echo configure:6231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   
         cat >> confdefs.h <<\EOF
 then
   
         cat >> confdefs.h <<\EOF


@@ -6268,7 +6270,7 @@ EOF
 
 
   echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6
 
 
   echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6

-echo "configure:6272: checking if size_t and int are different types" >&5
+echo "configure:6274: checking if size_t and int are different types" >&5

 if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
 if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6287,7 +6289,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
     
 else
   cat > conftest.$ac_ext <<EOF
     
 else
   cat > conftest.$ac_ext <<EOF

-#line 6291 "configure"
+#line 6293 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);


@@ -6317,7 +6319,7 @@ extern "C" void exit(int);
         }
       
 EOF
         }
       
 EOF

-if { (eval echo configure:6321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   cat >> confdefs.h <<\EOF
 #define wxUSE_SIZE_T_STRING_OPERATOR 1
 then
   cat >> confdefs.h <<\EOF
 #define wxUSE_SIZE_T_STRING_OPERATOR 1


@@ -6348,7 +6350,7 @@ echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6
 
 
 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6

-echo "configure:6352: checking for wcslen in -lc" >&5
+echo "configure:6354: checking for wcslen in -lc" >&5

 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6356,7 +6358,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 6360 "configure"
+#line 6362 "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
 #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


@@ -6367,7 +6369,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:6371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -6393,7 +6395,7 @@ else
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6

-echo "configure:6397: checking for wcslen in -lw" >&5
+echo "configure:6399: checking for wcslen in -lw" >&5

 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6401,7 +6403,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 6405 "configure"
+#line 6407 "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
 #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


@@ -6412,7 +6414,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:6416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -6443,12 +6445,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6

-echo "configure:6447: checking for vprintf" >&5
+echo "configure:6449: checking for vprintf" >&5

 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6452 "configure"
+#line 6454 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */


@@ -6471,7 +6473,7 @@ vprintf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else


@@ -6495,12 +6497,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6

-echo "configure:6499: checking for _doprnt" >&5
+echo "configure:6501: checking for _doprnt" >&5

 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6504 "configure"
+#line 6506 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */


@@ -6523,7 +6525,7 @@ _doprnt();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else


@@ -6551,12 +6553,12 @@ fi
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:6555: checking for $ac_func" >&5
+echo "configure:6557: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6560 "configure"
+#line 6562 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -6579,7 +6581,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -6612,12 +6614,12 @@ done
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:6616: checking for $ac_func" >&5
+echo "configure:6618: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6621 "configure"
+#line 6623 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -6640,7 +6642,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -6669,12 +6671,12 @@ POSIX4_LINK=
 for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:6673: checking for $ac_func" >&5
+echo "configure:6675: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6678 "configure"
+#line 6680 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -6697,7 +6699,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -6722,7 +6724,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6

-echo "configure:6726: checking for nanosleep in -lposix4" >&5
+echo "configure:6728: checking for nanosleep in -lposix4" >&5

 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6730,7 +6732,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 6734 "configure"
+#line 6736 "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
 #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


@@ -6741,7 +6743,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
 nanosleep()
 ; return 0; }
 EOF

-if { (eval echo configure:6745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -6769,12 +6771,12 @@ else
     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:6773: checking for $ac_func" >&5
+echo "configure:6775: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6778 "configure"
+#line 6780 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -6797,7 +6799,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -6836,12 +6838,12 @@ done
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:6840: checking for $ac_func" >&5
+echo "configure:6842: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 6845 "configure"
+#line 6847 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -6864,7 +6866,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -6946,7 +6948,7 @@ THREADS_OBJ=""
 if test "$wxUSE_THREADS" = "yes"; then
     
                 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
 if test "$wxUSE_THREADS" = "yes"; then
     
                 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6

-echo "configure:6950: checking for pthread_create in -lpthread" >&5
+echo "configure:6952: checking for pthread_create in -lpthread" >&5

 ac_lib_var=`echo pthread'_'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
 ac_lib_var=`echo pthread'_'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


@@ -6954,7 +6956,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 6958 "configure"
+#line 6960 "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
 #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


@@ -6965,7 +6967,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -6988,7 +6990,7 @@ else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6

-echo "configure:6992: checking for pthread_create in -lc_r" >&5
+echo "configure:6994: checking for pthread_create in -lc_r" >&5

 ac_lib_var=`echo c_r'_'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
 ac_lib_var=`echo c_r'_'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


@@ -6996,7 +6998,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7000 "configure"
+#line 7002 "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
 #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


@@ -7007,7 +7009,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7031,17 +7033,17 @@ else
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6

-echo "configure:7035: checking for sys/prctl.h" >&5
+echo "configure:7037: 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
   cat > conftest.$ac_ext <<EOF
 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 7040 "configure"
+#line 7042 "configure"

 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -7089,7 +7091,6 @@ if test "$wxUSE_THREADS" = "yes"; then
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"

-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"

   LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
 
                             
   LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
 
                             


@@ -7097,17 +7098,17 @@ if test "$wxUSE_THREADS" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:7101: checking for $ac_hdr" >&5
+echo "configure:7102: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 7106 "configure"
+#line 7107 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -7135,7 +7136,7 @@ done
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:7139: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:7140: checking for sched_yield in -l$THREADS_LINK" >&5

 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7143,7 +7144,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7147 "configure"
+#line 7148 "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
 #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


@@ -7154,7 +7155,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:7158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7176,7 +7177,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6

-echo "configure:7180: checking for sched_yield in -l"posix4"" >&5
+echo "configure:7181: checking for sched_yield in -l"posix4"" >&5

 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7184,7 +7185,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7188 "configure"
+#line 7189 "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
 #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


@@ -7195,7 +7196,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7225,7 +7226,7 @@ fi
 
 
                 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
 
 
                 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:7229: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:7230: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5

 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7233,7 +7234,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7237 "configure"
+#line 7238 "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
 #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


@@ -7244,7 +7245,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF

-if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7266,7 +7267,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6

-echo "configure:7270: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
+echo "configure:7271: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5

 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7274,7 +7275,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l"posix4"  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7278 "configure"
+#line 7279 "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
 #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


@@ -7285,7 +7286,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF

-if { (eval echo configure:7289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7315,7 +7316,7 @@ fi
 
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:7319: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:7320: checking for pthread_cancel in -l$THREADS_LINK" >&5

 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7323,7 +7324,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7327 "configure"
+#line 7328 "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
 #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


@@ -7334,7 +7335,7 @@ int main() {
 pthread_cancel()
 ; return 0; }
 EOF
 pthread_cancel()
 ; return 0; }
 EOF

-if { (eval echo configure:7338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7360,13 +7361,13 @@ fi
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6

-echo "configure:7364: checking for pthread_cleanup_push/pop" >&5
+echo "configure:7365: checking for pthread_cleanup_push/pop" >&5

 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF

-#line 7370 "configure"
+#line 7371 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 #include "confdefs.h"
 #include <pthread.h>
 int main() {


@@ -7376,7 +7377,7 @@ int main() {
                  
 ; return 0; }
 EOF
                  
 ; return 0; }
 EOF

-if { (eval echo configure:7380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes
   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes


@@ -7521,17 +7522,17 @@ fi
 if test "$wxUSE_OPENGL" = "yes"; then
   ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
 if test "$wxUSE_OPENGL" = "yes"; then
   ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6

-echo "configure:7525: checking for GL/gl.h" >&5
+echo "configure:7526: checking for GL/gl.h" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 7530 "configure"
+#line 7531 "configure"

 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -7549,7 +7550,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
     echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
   echo "$ac_t""yes" 1>&6
   
     echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6

-echo "configure:7553: checking for glInitNames in -lGL" >&5
+echo "configure:7554: checking for glInitNames in -lGL" >&5

 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7557,7 +7558,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lGL wxUSE_OPENGL=0 $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lGL wxUSE_OPENGL=0 $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7561 "configure"
+#line 7562 "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
 #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


@@ -7568,7 +7569,7 @@ int main() {
 glInitNames()
 ; return 0; }
 EOF
 glInitNames()
 ; return 0; }
 EOF

-if { (eval echo configure:7572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7595,7 +7596,7 @@ else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6

-echo "configure:7599: checking for glInitNames in -lMesaGL" >&5
+echo "configure:7600: checking for glInitNames in -lMesaGL" >&5

 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7603,7 +7604,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7607 "configure"
+#line 7608 "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
 #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


@@ -7614,7 +7615,7 @@ int main() {
 glInitNames()
 ; return 0; }
 EOF
 glInitNames()
 ; return 0; }
 EOF

-if { (eval echo configure:7618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7771,6 +7772,7 @@ EOF
 
         LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
 
         LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"

+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"

     else
         echo "configure: warning: socket classes require --with-threads and won't be compiled without it" 1>&2
         wxUSE_SOCKETS=0
     else
         echo "configure: warning: socket classes require --with-threads and won't be compiled without it" 1>&2
         wxUSE_SOCKETS=0


@@ -7806,16 +7808,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
         echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
         echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6

-echo "configure:7810: checking the type of the third argument of getsockname" >&5
+echo "configure:7812: checking the type of the third argument of getsockname" >&5

     cat > conftest.$ac_ext <<EOF
     cat > conftest.$ac_ext <<EOF

-#line 7812 "configure"
+#line 7814 "configure"

 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF

-if { (eval echo configure:7819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T socklen_t
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T socklen_t


@@ -7826,14 +7828,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 7830 "configure"
+#line 7832 "configure"

 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 size_t len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 size_t len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF

-if { (eval echo configure:7837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T size_t
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T size_t


@@ -7844,14 +7846,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 7848 "configure"
+#line 7850 "configure"

 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 int len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 int len; getsockname(0, NULL, &len);
 ; return 0; }
 EOF

-if { (eval echo configure:7855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T int
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define SOCKLEN_T int


@@ -7886,17 +7888,17 @@ if test "$wxUSE_JOYSTICK" = 1; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:7890: checking for $ac_hdr" >&5
+echo "configure:7892: checking for $ac_hdr" >&5

 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 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 7895 "configure"
+#line 7897 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -7939,12 +7941,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
             for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
             for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:7943: checking for $ac_func" >&5
+echo "configure:7945: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 7948 "configure"
+#line 7950 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -7967,7 +7969,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:7971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -7992,7 +7994,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

-echo "configure:7996: checking for dlopen in -ldl" >&5
+echo "configure:7998: checking for dlopen in -ldl" >&5

 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -8000,7 +8002,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8004 "configure"
+#line 8006 "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
 #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


@@ -8011,7 +8013,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
 dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:8015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8040,12 +8042,12 @@ done
     for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:8044: checking for $ac_func" >&5
+echo "configure:8046: checking for $ac_func" >&5

 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 8049 "configure"
+#line 8051 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -8068,7 +8070,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -8520,12 +8522,6 @@ EOF
 fi
 
 
 fi
 
 

-if test "$wxUSE_WXTREE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_WXTREE 1
-EOF
-
-fi

 
 if test "$wxUSE_METAFILE" = "yes"; then
   cat >> confdefs.h <<\EOF
 
 if test "$wxUSE_METAFILE" = "yes"; then
   cat >> confdefs.h <<\EOF


@@ -8635,6 +8631,7 @@ LIBTOOL="$LIBTOOL --silent"
 
 
 
 
 
 

+

 
 SETUPH_DIR=include/wx/${TOOLKIT_DIR}
 mkdir -p ${SETUPH_DIR}
 
 SETUPH_DIR=include/wx/${TOOLKIT_DIR}
 mkdir -p ${SETUPH_DIR}


@@ -8643,7 +8640,7 @@ mkdir -p ${SETUPH_DIR}
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:8647: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:8644: checking whether ${MAKE-make} sets \${MAKE}" >&5

 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -8772,7 +8769,16 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "

-            Makefile src/Makefile wx-config
+            wx-config
+            Makefile src/Makefile
+            include/Makefile
+            include/wx/Makefile
+            include/wx/generic/Makefile
+            include/wx/gtk/Makefile
+            include/wx/motif/Makefile
+            include/wx/msw/Makefile
+            include/wx/protocol/Makefile
+            include/wx/unix/Makefile

             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile
             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile


@@ -8909,6 +8915,7 @@ s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
 s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
 s%@EXTRA_VPATH@%$EXTRA_VPATH%g
 s%@LTLIBOBJS@%$LTLIBOBJS%g
 s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
 s%@EXTRA_VPATH@%$EXTRA_VPATH%g
 s%@LTLIBOBJS@%$LTLIBOBJS%g

+s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g

 s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g
 s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g
 s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g


@@ -8955,7 +8962,16 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile wx-config
+CONFIG_FILES=\${CONFIG_FILES-"wx-config
+            Makefile src/Makefile
+            include/Makefile
+            include/wx/Makefile
+            include/wx/generic/Makefile
+            include/wx/gtk/Makefile
+            include/wx/motif/Makefile
+            include/wx/msw/Makefile
+            include/wx/protocol/Makefile
+            include/wx/unix/Makefile

             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile
             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile

diff --git a/configure.in b/configure.in
index 091bad732f36f778620ceb8838bd0e861d938f6c..e06a43a9d37f1b95dc2e3758aa70cac530f05042 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -148,6 +148,8 @@ esac
 if test "$USE_UNIX" = 1 ; then
   wxUSE_UNIX=yes
   AC_DEFINE(__UNIX__)
 if test "$USE_UNIX" = 1 ; then
   wxUSE_UNIX=yes
   AC_DEFINE(__UNIX__)

+  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
+  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"

 fi
 
 dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
 fi
 
 dnl Linux: test for libc5/glibc2: glibc2 has gettext() included


@@ -1144,7 +1146,6 @@ if test "$wxUSE_THREADS" = "yes"; then
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
   CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"

-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"

   LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
 
   dnl define autoconf macro to check for given function in both pthread and
   LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
 
   dnl define autoconf macro to check for given function in both pthread and


@@ -1421,6 +1422,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
         AC_DEFINE(wxUSE_SOCKETS)
         LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
         AC_DEFINE(wxUSE_SOCKETS)
         LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"

+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"

     else
         AC_MSG_WARN(socket classes require --with-threads and won't be compiled without it)
         wxUSE_SOCKETS=0
     else
         AC_MSG_WARN(socket classes require --with-threads and won't be compiled without it)
         wxUSE_SOCKETS=0


@@ -1804,9 +1806,10 @@ dnl ---------------------------------------------------------------------------
 dnl misc options
 dnl ---------------------------------------------------------------------------
 
 dnl misc options
 dnl ---------------------------------------------------------------------------
 

-if test "$wxUSE_WXTREE" = "yes"; then
-  AC_DEFINE(wxUSE_WXTREE)
-fi
+dnl TODO this is unused for now...
+dnl if test "$wxUSE_WXTREE" = "yes"; then
+dnl   AC_DEFINE(wxUSE_WXTREE)
+dnl fi

 
 if test "$wxUSE_METAFILE" = "yes"; then
   AC_DEFINE(wxUSE_METAFILE)
 
 if test "$wxUSE_METAFILE" = "yes"; then
   AC_DEFINE(wxUSE_METAFILE)


@@ -1916,6 +1919,7 @@ AC_SUBST(EXTRA_VPATH)
 AC_SUBST(LTLIBOBJS)
 
 dnl additional subdirectories where we will build
 AC_SUBST(LTLIBOBJS)
 
 dnl additional subdirectories where we will build

+AC_SUBST(INCLUDE_SUBDIRS)

 AC_SUBST(UTILS_SUBDIRS)
 AC_SUBST(DOCS_SUBDIRS)
 AC_SUBST(SAMPLES_SUBDIRS)
 AC_SUBST(UTILS_SUBDIRS)
 AC_SUBST(DOCS_SUBDIRS)
 AC_SUBST(SAMPLES_SUBDIRS)


@@ -1939,7 +1943,16 @@ dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_OUTPUT([
 dnl (the original file name may be overriden by appending another name after a
 dnl colon)
 AC_OUTPUT([

-            Makefile src/Makefile wx-config
+            wx-config
+            Makefile src/Makefile
+            include/Makefile
+            include/wx/Makefile
+            include/wx/generic/Makefile
+            include/wx/gtk/Makefile
+            include/wx/motif/Makefile
+            include/wx/msw/Makefile
+            include/wx/protocol/Makefile
+            include/wx/unix/Makefile

             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile
             samples/Makefile
             samples/bombs/Makefile
             samples/caret/Makefile

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 6470d0556d4a8d2876f8fe1f8ba551c719a6a93f..049d87056efdc42eba933f52802cef06cf43e1dc 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -7,3 +7,9 @@
 
 SUBDIRS = minimal \
  @SAMPLES_SUBDIRS@
 
 SUBDIRS = minimal \
  @SAMPLES_SUBDIRS@

+
+# do nothing during "make install" in the samples subdirectory (can't override
+# install because install-recursive is its dependency which is still built)
+install-recursive:
+       @true
+

diff --git a/samples/Makefile.in b/samples/Makefile.in
index f51aeefd9a8084b2acde857060377e230d18d0de..2a0068cb9b9171834aebf222a789c29c8d72e3e9 100644 (file)
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -79,6 +79,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@


@@ -316,6 +317,11 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

+# do nothing during "make install" in the samples subdirectory (can't override
+# install because install-recursive is its dependency which is still built)
+install-recursive:
+       @true
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/samples/bombs/Makefile.in b/samples/bombs/Makefile.in
index 8f8d77bfb7afbb0f5d5627deee790d3e4953d232..15d94228cfe4e3ffe6ceab2f64fbb59a67568f72 100644 (file)
--- a/samples/bombs/Makefile.in
+++ b/samples/bombs/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 9a29b6e072560366ef68564ff1446f4f7cdb32d6..af58f7a8afabd6767112b6c124f749ef81d37dff 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index 9f229d648d75f016c139f6c1575ef6922bb1154e..18bcdafca321165230ee9a6ee7f1dc349ce13a56 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 78ae9487427377b67d08bc17379b507d7232a97b..b7aab22bcf0c18ec4a45760486a664f0771b3cee 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 77de13a1ddcd5dcca274a1a2fa740de23d18e37a..01bed93182c193900d39533c33e9109cac6f3361 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index b4bdbe548ead122cc34081a4ac54ab8850c34798..d23abd9cf9afae98e31a848a7f151dc6fd5c6ee6 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 334530f7e31c70ad8e0ce2d029525a42b2c4b57a..42fc7a4db0b6440480304675faa370f12a225451 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 72c2869e174c622c4841a1d204cb9600b13d4782..f78debc8704da5248715d0598f45cd6cb418d661 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 252dbc42b3a9d34d6053ee9c7df48a3a3cd9eed8..4a3f62c85e0ed259ec51fe0dd62fcf8f62a80023 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index 7732e75e2250ae6a2002c4e43d8d8fc32b98eb3e..50241972616de7b258e09618b594e312f2444226 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index db2924a88fe4466c560c24915ffaed47a0c4b59f..cb64ee9a236dd181398fae30ff1e58c278b0f29c 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index 8cdb26d36b5c66eccab3b33b462cfa75511e1a56..9bc0eebb073a22d7dc430f4ec1af8815919c5a77 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/forty/Makefile.in b/samples/forty/Makefile.in
index a1c228e66d5b6941bb961eb34c59abb169eb3d35..5e013a69321b48a2892d873e6099b12151695ad1 100644 (file)
--- a/samples/forty/Makefile.in
+++ b/samples/forty/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/fractal/Makefile.in b/samples/fractal/Makefile.in
index ba428b50ff874d228cd1b97767290396e9f40c8c..b8000e0aff575fd78f9069562bd2c12f6b7292ed 100644 (file)
--- a/samples/fractal/Makefile.in
+++ b/samples/fractal/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index d5c2ff1809c78e18e7f7277c3b67408029255c56..ec09c948e34f8d4189134e6844ce10795fafdc07 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 0f667d9929ccc3c0534a9572b4f3e3be5830d8e7..c3727ef3725568c9f5218434cae6d7b355bdea5f 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 041570f06ea8139c0c2c2d60b2196e238b053f2e..dc5e8c6a8a45d80fada4ab93a43c0ea7663ecb07 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 67811aa2e4d1e3c80575832e6d2f3888d786fb3b..3ec03066b0e2ac3750a228847cacd6fa076cb23b 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 5192c3fd5bcee02eafeefab4d1b9bc87df8e9266..bb4956eb5c10f89bedf89afa9cb94453c771de02 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index e08df87f6ef2b5dbd8e740971772c37c9471ac93..851195f63317e5c1dc63b33041c335594d3e7435 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 998c06dd385e98fd23a564a34b1fb929e3e42a97..f662b65c11b02db8d7269ac733a769a28a498e87 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 2c1498ea70c57bbd59c727daacecb798a7e22208..296d499e8c0bb1edfea5f45dd8f13b789aed8ccb 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 3acb9445981f642249fdc96dad415112f7e4c5e7..775c9410ccb2b4568dceb5e090c3b68332a3aebe 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index c10d410c549548bdc2984508088379e63cd82f69..b271cd42c4801c5e6dbc0335d745234b9b51e43f 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 2cfbcfed85b992596c4b7e859c0c7e455d48af7a..8ce6b77acfdc2bb175c66c276788cb07d8bbf0d5 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index b85baa9f660fc9b920c0eb9fd33a6f73bebcb887..35ded1062856018a9633bc4574c060899457be41 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index f24f3de852a3be38ae34e9a08424d70469adf081..7fad650ab46a49769980ad21460855dde4ff2500 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 1093d9e1446f4e6dea44d8cf247442dcd4fe9960..260e6bb0968eecc8dddea7dfe374cacf738d7c85 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 06eb6defb2c67c145be0cdde3bac0743b951e887..bee2035379ab53fc8d5051839be95f4a17e6b351 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index 5a6277d8395696290a5f80b27c894b17f8abed6f..0d87d65c3a666a7ebb729f599939240e8ad6d4d1 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index 0a9f9595e6db61471dafaa162b4523a67e1200a9..cf7824605c43513865d221b68b81e04892694dba 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index ba43257fabe59d87859dc0fc2da56dda75d7a50c..378338cccde11ba9af6d9f1bbab7b6b42a86cb5d 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/proplist/Makefile.in b/samples/proplist/Makefile.in
index f42e89804619fac2e0442a15479730dd10df85f4..84464d4d4e75e7e22b58f916930cb9c5bbb5c3fd 100644 (file)
--- a/samples/proplist/Makefile.in
+++ b/samples/proplist/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 49ef3c30cf179710bc566608193f2acec6722865..f6a8ec70a62533ef262361e3f8c8ef9422f700e5 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/resource/Makefile.in b/samples/resource/Makefile.in
index c4bb26958772a9d18449acfebbdb8e82f2621dbc..96a9ec1ef1d2073fd3c3423ca370a50da76793b5 100644 (file)
--- a/samples/resource/Makefile.in
+++ b/samples/resource/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index d5e60aeab32eec2f14a78bdeacaa2c20441e6a06..82cf3e6736a1592d6a3bf9c181e00e72ba15dc6b 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index edfe42f1004c1e89f134b8603775b6d3f1986857..5f1b23e7d9aa727fdaf093b03270219b0da041ea 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 5c9a43076026c161c6c17ab7e50b2622af1b05b2..fbd7c8589bac139ee5e81f191eee434e5dc33ed6 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index 46b0be1eba39a722dbff6913f839563e92dcd2e7..f5d62db819a115fb25749e81e0db27e161ea6432 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 1e424368b2320e92874e432dade2f55068a9c666..4951eb224faddc78b3a2d841fb1633053748cf4e 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 87da7f7e0ce3a48c056f90e7013139645d931827..a97de78839cb00aab478994f75fc2591c5608a10 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index c3d079b2ac7e863927536e7e7b9be060f6759e0c..0a2931ed1fa69c876eb561a912384882a15e2a83 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 48da7e21f82acb8807495cd95bc8284122c081e1..fc52ece42ab320e4d6216df6a2e14032eeedd015 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index c4c6d0be50b9821ad56364ea7795ce4dce913a74..5f1efa50499190ae173093cbd5f20b21e0de117d 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index 9b76f62c842390456979e343ac7034ce06748b7f..812f343ded8740190d4ba1a495f362a195f513d7 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/wxpoem/Makefile.in b/samples/wxpoem/Makefile.in
index bcab994ee9fe29f5c60c01a3cb357202c25636c0..0374d1239022a2c2239995fe89c04bdf1050ff0c 100644 (file)
--- a/samples/wxpoem/Makefile.in
+++ b/samples/wxpoem/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/samples/wxsocket/Makefile.in b/samples/wxsocket/Makefile.in
index 1def64ff4e8f1fde2b43927dcc23d63552505279..ba7f4b4631dc015e5da52f9388ba9c8b381595bb 100644 (file)
--- a/samples/wxsocket/Makefile.in
+++ b/samples/wxsocket/Makefile.in
@@ -72,6 +72,7 @@ EXTRA_VPATH = @EXTRA_VPATH@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@

+INCLUDE_SUBDIRS = @INCLUDE_SUBDIRS@

 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@
 LD = @LD@
 LEX = @LEX@
 LIBS = @LIBS@

diff --git a/src/Makefile.in b/src/Makefile.in
index f0010d44bfe1196e6368132215a7abd1247af133..f21907c053761ba919d1d15f42477bf93f7565f7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -473,49 +473,6 @@ lexer.c: $(srcdir)/common/lexer.l
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 
        sed -e "s/unput/PROIO_unput/g"      > lexer.c
        @$(RM) lex.yy.c
 

-# the files which we install manually (the rest is done by automake)
-#install-data-local:
-#      @$(NORMAL_INSTALL)
-#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx
-#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/generic
-#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@
-#      $(mkinstalldirs) $(DESTDIR)$(includedir)/wx/protocol
-#      $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/include/wx
-#      @for p in $(top_srcdir)/include/wx/*.h $(top_srcdir)/include/wx/*.cpp; do \
-#        h=`basename $$p`; (set -x; \
-#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/$$h ); \
-#      done
-#      @for p in $(top_srcdir)/include/wx/generic/*.h ; do \
-#        h=`basename $$p`; (set -x; \
-#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/generic/$$h ); \
-#      done
-#      @for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.h ; do \
-#        h=`basename $$p`; (set -x; \
-#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
-#      done
-#      @if [ @TOOLKIT_DIR@ = msw ]; then \
-#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.cur \
-#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.ico \
-#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.bmp \
-#                 $(top_srcdir)/include/wx/@TOOLKIT_DIR@/*.rc ; do \
-#          h=`basename $$p`; (set -x; \
-#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/$$h ); \
-#        done; \
-#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/ctl3d/*.h ; do \
-#          h=`basename $$p`; (set -x; \
-#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/ctl3d/$$h ); \
-#        done; \
-#        for p in $(top_srcdir)/include/wx/@TOOLKIT_DIR@/gnuwin32/*.h ; do \
-#          h=`basename $$p`; (set -x; \
-#          $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@/gnuwin32/$$h ); \
-#        done; \
-#      fi
-#      @for p in $(top_srcdir)/include/wx/protocol/*.h ; do \
-#        h=`basename $$p`; (set -x; \
-#        $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/wx/protocol/$$h ); \
-#      done
-#      $(INSTALL_DATA) ../include/wx/@TOOLKIT_DIR@/setup.h $(DESTDIR)$(pkgdatadir)/include/wx/setup.h
-

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: