Updates for building wxSWIG on Linux

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

diff --git a/wxPython/wxSWIG/.cvsignore b/wxPython/wxSWIG/.cvsignore
index f82ec85a5654487ece12def0b53936a7cbbe0cea..f8cb79daf75f50601caf71a12d58c676a7784768 100644 (file)
--- a/wxPython/wxSWIG/.cvsignore
+++ b/wxPython/wxSWIG/.cvsignore
@@ -1 +1,6 @@
+Makefile
+config.cache
+config.log
+config.status

 wxSWIG.dsp
 wxSWIG.dsp

+wxswig

diff --git a/wxPython/wxSWIG/Modules/.cvsignore b/wxPython/wxSWIG/Modules/.cvsignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/wxPython/wxSWIG/Modules/.cvsignore
@@ -0,0 +1 @@
+Makefile

diff --git a/wxPython/wxSWIG/Runtime/Makefile b/wxPython/wxSWIG/Runtime/Makefile
index 17f6489827277edededed738355a1d958b5ce624..2709801f4f1cbb3cc0ca431eba29bdc0892a5a45 100644 (file)
--- a/wxPython/wxSWIG/Runtime/Makefile
+++ b/wxPython/wxSWIG/Runtime/Makefile
@@ -11,12 +11,12 @@
 
 prefix      = /usr/local
 exec_prefix = ${prefix}
 
 prefix      = /usr/local
 exec_prefix = ${prefix}

-CC          = cc
+CC          = gcc

 AR          = ar
 RANLIB      = ranlib
 SO          = .so
 AR          = ar
 RANLIB      = ranlib
 SO          = .so

-CCSHARED    = 
-LDSHARED    = ld -G
+CCSHARED    = -fpic
+LDSHARED    = gcc -shared

 DYN_LIBS    = libswigtcl8$(SO) libswigtcl$(SO) libswigpl$(SO) libswigpy$(SO)
 STATIC_LIBS = libswigtcl8.a libswigtcl.a libswigpl.a libswigpy.a
 LIBS        = $(STATIC_LIBS) $(DYN_LIBS)
 DYN_LIBS    = libswigtcl8$(SO) libswigtcl$(SO) libswigpl$(SO) libswigpy$(SO)
 STATIC_LIBS = libswigtcl8.a libswigtcl.a libswigpl.a libswigpy.a
 LIBS        = $(STATIC_LIBS) $(DYN_LIBS)


@@ -54,7 +54,7 @@ clean::
 # Tcl runtime library
 # ----------------------------------------------------------------------
 
 # Tcl runtime library
 # ----------------------------------------------------------------------
 

-TCL_INCLUDE = -I/usr/local/include
+TCL_INCLUDE = -I/usr/include

 TCL_LIB     = -L/usr/local/lib
 
 # Tcl 7.x shared
 TCL_LIB     = -L/usr/local/lib
 
 # Tcl 7.x shared


@@ -87,8 +87,8 @@ tcl8_lib:
 # Python run-time library
 # ----------------------------------------------------------------------
 
 # Python run-time library
 # ----------------------------------------------------------------------
 

-PYTHON_INCLUDE= -DHAVE_CONFIG_H -I/usr/local/include/python1.5 -I/usr/local/lib/python1.5/config
-PYTHON_LIB    = /usr/local/lib/python1.5/config
+PYTHON_INCLUDE= -DHAVE_CONFIG_H -I/usr/local/include/Py -I/usr/local/lib/python/lib
+PYTHON_LIB    = /usr/local/lib/python/lib

 
 # Python shared
 
 
 # Python shared
 


@@ -108,7 +108,7 @@ py_lib:
 # Perl run-time library
 # ----------------------------------------------------------------------
 
 # Perl run-time library
 # ----------------------------------------------------------------------
 

-PERL5_INCLUDE= -I/usr/local/lib/perl5/5.00503/sun4-solaris/CORE
+PERL5_INCLUDE= -I/usr/lib/perl5/5.6.1/i386-linux/CORE

 
 # Perl shared
 
 
 # Perl shared
 

diff --git a/wxPython/wxSWIG/SWIG/.cvsignore b/wxPython/wxSWIG/SWIG/.cvsignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/wxPython/wxSWIG/SWIG/.cvsignore
@@ -0,0 +1 @@
+Makefile

diff --git a/wxPython/wxSWIG/SWIG/main.cxx b/wxPython/wxSWIG/SWIG/main.cxx
index 28ca20a17e2a1a5d5fbb070ec49a0ccd4f434ea6..d7ef8678a69e6ab84eb01f96fd5fda0cd09fd8b8 100644 (file)
--- a/wxPython/wxSWIG/SWIG/main.cxx
+++ b/wxPython/wxSWIG/SWIG/main.cxx
@@ -81,8 +81,10 @@ FILE  *swig_log;
 
 char *SwigLib;
 
 
 char *SwigLib;
 

-//char** __argv;
-//int    __argc;
+#ifndef MSDOS
+char** __argv;
+int    __argc;
+#endif

 
 int SWIG_main(int argc, char *argv[], Language *l, Documentation *d) {
 
 
 int SWIG_main(int argc, char *argv[], Language *l, Documentation *d) {
 


@@ -114,8 +116,10 @@ int SWIG_main(int argc, char *argv[], Language *l, Documentation *d) {
   f_init = 0;
   f_header = 0;
 
   f_init = 0;
   f_header = 0;
 

-  //__argc = argc;
-  //__argv = argv;
+#ifndef MSDOS
+  __argc = argc;
+  __argv = argv;
+#endif

   lang = l;
   doc = d;
   Status = 0;
   lang = l;
   doc = d;
   Status = 0;

diff --git a/wxPython/wxSWIG/configure b/wxPython/wxSWIG/configure
index 655a11d9f1cea1e99f298cf26a3afd61eeafb73b..ec170b450959423184e775fbbd3e88d36270b5e6 100755 (executable)
--- a/wxPython/wxSWIG/configure
+++ b/wxPython/wxSWIG/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.

-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 

 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation


@@ -75,6 +75,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=

+SHELL=${CONFIG_SHELL-/bin/sh}

 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 


@@ -358,7 +359,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)

-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"

     exit 0 ;;
 
   -with-* | --with-*)
     exit 0 ;;
 
   -with-* | --with-*)


@@ -528,9 +529,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cc_cross
 
 cross_compiling=$ac_cv_prog_cc_cross
 

+ac_exeext=
+ac_objext=o

 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then


@@ -549,7 +552,7 @@ fi
 # Set name for machine-dependent library files
 
 echo $ac_n "checking MACHDEP""... $ac_c" 1>&6
 # Set name for machine-dependent library files
 
 echo $ac_n "checking MACHDEP""... $ac_c" 1>&6

-echo "configure:553: checking MACHDEP" >&5
+echo "configure:556: checking MACHDEP" >&5

 if test -z "$MACHDEP"
 then
        if test -f /usr/lib/NextStep/software_version; then
 if test -z "$MACHDEP"
 then
        if test -f /usr/lib/NextStep/software_version; then


@@ -580,24 +583,25 @@ ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cxx_cross
 
 
 cross_compiling=$ac_cv_prog_cxx_cross
 
 

-for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl

 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

-echo "configure:593: checking for $ac_word" >&5
+echo "configure:596: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CXX="$ac_prog"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CXX="$ac_prog"


@@ -620,21 +624,23 @@ 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:624: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:628: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5

 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cxx_cross
 
 cross_compiling=$ac_cv_prog_cxx_cross
 

-cat > conftest.$ac_ext <<EOF
-#line 634 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 639 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-main(){return(0);}
+
+int main(){return(0);}

 EOF
 EOF

-if { (eval echo configure:638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:644: \"$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


@@ -648,18 +654,24 @@ else
   ac_cv_prog_cxx_works=no
 fi
 rm -fr conftest*
   ac_cv_prog_cxx_works=no
 fi
 rm -fr conftest*

+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross

 
 echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
 if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 
 echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
 if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6

-echo "configure:658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:670: 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:663: checking whether we are using GNU C++" >&5
+echo "configure:675: 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


@@ -668,7 +680,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:672: \"$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:684: \"$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


@@ -679,11 +691,15 @@ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 
 if test $ac_cv_prog_gxx = yes; then
   GXX=yes
 
 if test $ac_cv_prog_gxx = yes; then
   GXX=yes

-  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS=
-  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:687: checking whether ${CXX-g++} accepts -g" >&5
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:703: 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


@@ -698,30 +714,35 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
 fi
 
 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6

-  if test "$ac_test_CXXFLAGS" = set; then
-    CXXFLAGS="$ac_save_CXXFLAGS"
-  elif test $ac_cv_prog_cxx_g = yes; then
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then

     CXXFLAGS="-g -O2"
   else
     CXXFLAGS="-g -O2"
   else

-    CXXFLAGS="-O2"
+    CXXFLAGS="-g"

   fi
 else
   fi
 else

-  GXX=
-  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi

 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
 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

-echo "configure:717: checking for $ac_word" >&5
+echo "configure:737: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"


@@ -742,16 +763,17 @@ 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:746: checking for $ac_word" >&5
+echo "configure:767: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"

   ac_prog_rejected=no
   ac_prog_rejected=no

-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then


@@ -786,25 +808,61 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   echo "$ac_t""no" 1>&6
 fi
 

+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:818: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi

   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

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

 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cc_cross
 
 cross_compiling=$ac_cv_prog_cc_cross
 

-cat > conftest.$ac_ext <<EOF
-#line 804 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 861 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

+

 main(){return(0);}
 EOF
 main(){return(0);}
 EOF

-if { (eval echo configure:808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:866: \"$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


@@ -822,7 +880,7 @@ ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6


@@ -830,12 +888,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:834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:892: 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:839: checking whether we are using GNU C" >&5
+echo "configure:897: 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


@@ -844,7 +902,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:848: \"$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:906: \"$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


@@ -855,11 +913,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes

-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:863: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:925: 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


@@ -874,30 +936,35 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6

-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then

     CFLAGS="-g -O2"
   else
     CFLAGS="-g -O2"
   else

-    CFLAGS="-O2"
+    CFLAGS="-g"

   fi
 else
   fi
 else

-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi

 fi
 
 # 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
 fi
 
 # 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:893: checking for $ac_word" >&5
+echo "configure:959: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"


@@ -922,15 +989,16 @@ 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:926: checking for $ac_word" >&5
+echo "configure:993: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_AR="$ac_prog"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_AR="$ac_prog"


@@ -953,7 +1021,7 @@ test -n "$AR" || AR="ar"
 
 
 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:957: checking how to run the C++ preprocessor" >&5
+echo "configure:1025: 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


@@ -962,17 +1030,17 @@ else
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'

-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

 cross_compiling=$ac_cv_prog_cxx_cross
   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 970 "configure"
+#line 1038 "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:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then
   :
 else
 if test -z "$ac_err"; then
   :
 else


@@ -984,18 +1052,24 @@ else
 fi
 rm -f conftest*
   ac_cv_prog_CXXCPP="$CXXCPP"
 fi
 rm -f conftest*
   ac_cv_prog_CXXCPP="$CXXCPP"

+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross

 fi
 fi
 CXXCPP="$ac_cv_prog_CXXCPP"
 echo "$ac_t""$CXXCPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 fi
 fi
 CXXCPP="$ac_cv_prog_CXXCPP"
 echo "$ac_t""$CXXCPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:994: checking for ANSI C header files" >&5
+echo "configure:1068: 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 999 "configure"
+#line 1073 "configure"

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


@@ -1003,8 +1077,8 @@ 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:1007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes


@@ -1020,7 +1094,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 1024 "configure"
+#line 1098 "configure"

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


@@ -1038,7 +1112,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 1042 "configure"
+#line 1116 "configure"

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


@@ -1059,10 +1133,10 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
   :
 else
   cat > conftest.$ac_ext <<EOF

-#line 1063 "configure"
+#line 1137 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 #include "confdefs.h"
 #ifdef __cplusplus

-extern "C" void exit(int);
+extern "C" void exit(int) throw ();

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


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

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

 then
   :
 else
 then
   :
 else


@@ -1100,19 +1174,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6

-echo "configure:1104: checking for working alloca.h" >&5
+echo "configure:1178: checking for working alloca.h" >&5

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

-#line 1109 "configure"
+#line 1183 "configure"

 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF

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

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


@@ -1133,25 +1207,30 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6

-echo "configure:1137: checking for alloca" >&5
+echo "configure:1211: checking for alloca" >&5

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

-#line 1142 "configure"
+#line 1216 "configure"

 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else

-# if HAVE_ALLOCA_H
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca

 # else
 # else

-#  ifdef _AIX
- #pragma alloca
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>

 #  else
 #  else

-#   ifndef alloca /* predefined by HP cc +Olibcalls */
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */

 char *alloca ();
 char *alloca ();

+#    endif

 #   endif
 #  endif
 # endif
 #   endif
 #  endif
 # endif


@@ -1161,7 +1240,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF

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

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


@@ -1186,19 +1265,19 @@ if test $ac_cv_func_alloca_works = no; then
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.

-  ALLOCA=alloca.o
+  ALLOCA=alloca.${ac_objext}

   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
   cat >> confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6

-echo "configure:1197: checking whether alloca needs Cray hooks" >&5
+echo "configure:1276: checking whether alloca needs Cray hooks" >&5

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

-#line 1202 "configure"
+#line 1281 "configure"

 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray


@@ -1223,12 +1302,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:1227: checking for $ac_func" >&5
+echo "configure:1306: 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 1232 "configure"
+#line 1311 "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.  */


@@ -1254,7 +1333,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1337: \"$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


@@ -1281,7 +1360,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6

-echo "configure:1285: checking stack direction for C alloca" >&5
+echo "configure:1364: checking stack direction for C alloca" >&5

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


@@ -1289,10 +1368,10 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF

-#line 1293 "configure"
+#line 1372 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 #include "confdefs.h"
 #ifdef __cplusplus

-extern "C" void exit(int);
+extern "C" void exit(int) throw ();

 #endif
 find_stack_direction ()
 {
 #endif
 find_stack_direction ()
 {


@@ -1311,7 +1390,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
   exit (find_stack_direction() < 0);
 }
 EOF

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

 then
   ac_cv_c_stack_direction=1
 else
 then
   ac_cv_c_stack_direction=1
 else


@@ -1342,7 +1421,7 @@ EOF
 
 else
   cat >> confdefs.h <<\EOF
 
 else
   cat >> confdefs.h <<\EOF

-#define SWIG_LANG TCL
+#define SWIG_LANG PYTHON

 EOF
 
 fi
 EOF
 
 fi


@@ -1379,15 +1458,16 @@ 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:1383: checking for $ac_word" >&5
+echo "configure:1462: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YACC="$ac_prog"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YACC="$ac_prog"


@@ -1423,7 +1503,7 @@ fi
 # SO is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX
 echo $ac_n "checking SO""... $ac_c" 1>&6
 # SO is the extension of shared libraries `(including the dot!)
 # -- usually .so, .sl on HP-UX
 echo $ac_n "checking SO""... $ac_c" 1>&6

-echo "configure:1427: checking SO" >&5
+echo "configure:1507: checking SO" >&5

 if test -z "$SO"
 then
        case $ac_sys_system in
 if test -z "$SO"
 then
        case $ac_sys_system in


@@ -1436,7 +1516,7 @@ echo "$ac_t""$SO" 1>&6
 # LDSHARED is the ld *command* used to create shared library
 # -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5
 echo $ac_n "checking LDSHARED""... $ac_c" 1>&6
 # LDSHARED is the ld *command* used to create shared library
 # -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5
 echo $ac_n "checking LDSHARED""... $ac_c" 1>&6

-echo "configure:1440: checking LDSHARED" >&5
+echo "configure:1520: checking LDSHARED" >&5

 if test -z "$LDSHARED"
 then
        case $ac_sys_system/$ac_sys_release in
 if test -z "$LDSHARED"
 then
        case $ac_sys_system/$ac_sys_release in


@@ -1457,7 +1537,7 @@ echo "$ac_t""$LDSHARED" 1>&6
 # CCSHARED are the C *flags* used to create objects to go into a shared
 # library -- this is only needed for a few systems
 echo $ac_n "checking CCSHARED""... $ac_c" 1>&6
 # CCSHARED are the C *flags* used to create objects to go into a shared
 # library -- this is only needed for a few systems
 echo $ac_n "checking CCSHARED""... $ac_c" 1>&6

-echo "configure:1461: checking CCSHARED" >&5
+echo "configure:1541: checking CCSHARED" >&5

 if test -z "$CCSHARED"
 then
        case $ac_sys_system in
 if test -z "$CCSHARED"
 then
        case $ac_sys_system in


@@ -1475,7 +1555,7 @@ echo "$ac_t""$CCSHARED" 1>&6
 # the a few executables -- this is only needed for a few systems
 
 echo $ac_n "checking LINKFORSHARED""... $ac_c" 1>&6
 # the a few executables -- this is only needed for a few systems
 
 echo $ac_n "checking LINKFORSHARED""... $ac_c" 1>&6

-echo "configure:1479: checking LINKFORSHARED" >&5
+echo "configure:1559: checking LINKFORSHARED" >&5

 if test -z "$LINKFORSHARED"
 then
        case $ac_sys_system/$ac_sys_release in
 if test -z "$LINKFORSHARED"
 then
        case $ac_sys_system/$ac_sys_release in


@@ -1497,7 +1577,7 @@ echo ""
 
 # Check for specific libraries.   Used for SWIG examples
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 
 # Check for specific libraries.   Used for SWIG examples
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

-echo "configure:1501: checking for dlopen in -ldl" >&5
+echo "configure:1581: 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


@@ -1505,7 +1585,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 1509 "configure"
+#line 1589 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


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

-if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1603: \"$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


@@ -1547,7 +1627,7 @@ else
 fi
        # Dynamic linking for SunOS/Solaris and SYSV
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
 fi
        # Dynamic linking for SunOS/Solaris and SYSV
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6

-echo "configure:1551: checking for shl_load in -ldld" >&5
+echo "configure:1631: checking for shl_load in -ldld" >&5

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


@@ -1555,7 +1635,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1559 "configure"
+#line 1639 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -1569,7 +1649,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
 shl_load()
 ; return 0; }
 EOF

-if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1653: \"$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


@@ -1606,7 +1686,7 @@ fi
 if test "`uname -s`" != IRIX
 then
 echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
 if test "`uname -s`" != IRIX
 then
 echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6

-echo "configure:1610: checking for t_open in -lnsl" >&5
+echo "configure:1690: checking for t_open in -lnsl" >&5

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


@@ -1614,7 +1694,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 1618 "configure"
+#line 1698 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -1628,7 +1708,7 @@ int main() {
 t_open()
 ; return 0; }
 EOF
 t_open()
 ; return 0; }
 EOF

-if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1712: \"$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


@@ -1649,7 +1729,7 @@ else
 fi
  # SVR4
 echo $ac_n "checking for gethostbyname in -linet""... $ac_c" 1>&6
 fi
  # SVR4
 echo $ac_n "checking for gethostbyname in -linet""... $ac_c" 1>&6

-echo "configure:1653: checking for gethostbyname in -linet" >&5
+echo "configure:1733: checking for gethostbyname in -linet" >&5

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


@@ -1657,7 +1737,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet -lnsl $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-linet -lnsl $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1661 "configure"
+#line 1741 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


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

-if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1755: \"$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


@@ -1692,7 +1772,7 @@ else
 fi
  # Sequent
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
 fi
  # Sequent
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6

-echo "configure:1696: checking for socket in -lsocket" >&5
+echo "configure:1776: checking for socket in -lsocket" >&5

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


@@ -1700,7 +1780,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1704 "configure"
+#line 1784 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -1714,7 +1794,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
 socket()
 ; return 0; }
 EOF

-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1798: \"$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


@@ -1750,7 +1830,7 @@ fi
 fi
 
 echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6

-echo "configure:1754: checking for main in -lieee" >&5
+echo "configure:1834: checking for main in -lieee" >&5

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


@@ -1758,14 +1838,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lieee  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lieee  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1762 "configure"
+#line 1842 "configure"

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

-if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1849: \"$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


@@ -1786,7 +1866,7 @@ else
 fi
 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6

-echo "configure:1790: checking for crypt in -lcrypt" >&5
+echo "configure:1870: checking for crypt in -lcrypt" >&5

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


@@ -1794,7 +1874,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1798 "configure"
+#line 1878 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -1808,7 +1888,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
 crypt()
 ; return 0; }
 EOF

-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1892: \"$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


@@ -1857,7 +1937,7 @@ fi
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
 # 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:1861: checking for X" >&5
+echo "configure:1941: 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


@@ -1919,13 +1999,13 @@ 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 1923 "configure"
+#line 2003 "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:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2008: \"$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*
   # We can compile using X headers with no special include directory.
 if test -z "$ac_err"; then
   rm -rf conftest*
   # We can compile using X headers with no special include directory.


@@ -1993,14 +2073,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 1997 "configure"
+#line 2077 "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:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2084: \"$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.


@@ -2090,13 +2170,13 @@ not_really_there=""
 if test "$no_x" = ""; then
     if test "$x_includes" = ""; then
        cat > conftest.$ac_ext <<EOF
 if test "$no_x" = ""; then
     if test "$x_includes" = ""; then
        cat > conftest.$ac_ext <<EOF

-#line 2094 "configure"
+#line 2174 "configure"

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

-{ (eval echo configure:2099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then
   :
 else
 if test -z "$ac_err"; then
   :
 else


@@ -2115,16 +2195,16 @@ rm -f conftest*
 fi
 if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
     echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
 fi
 if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
     echo $ac_n "checking for X11 header files""... $ac_c" 1>&6

-echo "configure:2119: checking for X11 header files" >&5
+echo "configure:2199: checking for X11 header files" >&5

     XINCLUDES="# no special path needed"
     cat > conftest.$ac_ext <<EOF
     XINCLUDES="# no special path needed"
     cat > conftest.$ac_ext <<EOF

-#line 2122 "configure"
+#line 2202 "configure"

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

-{ (eval echo configure:2127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then
   :
 else
 if test -z "$ac_err"; then
   :
 else


@@ -2159,7 +2239,7 @@ fi
 
 if test "$no_x" = yes; then
     echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
 
 if test "$no_x" = yes; then
     echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6

-echo "configure:2163: checking for X11 libraries" >&5
+echo "configure:2243: checking for X11 libraries" >&5

     XLIBSW=nope
     dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/X11R6/lib /usr/lib/X11R6 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
     for i in $dirs ; do
     XLIBSW=nope
     dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/lib/X11R4 /usr/X11R5/lib /usr/lib/X11R5 /usr/X11R6/lib /usr/lib/X11R6 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
     for i in $dirs ; do


@@ -2178,7 +2258,7 @@ else
 fi
 if test "$XLIBSW" = nope ; then
     echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6
 fi
 if test "$XLIBSW" = nope ; then
     echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6

-echo "configure:2182: checking for XCreateWindow in -lXwindow" >&5
+echo "configure:2262: checking for XCreateWindow in -lXwindow" >&5

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


@@ -2186,7 +2266,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXwindow  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lXwindow  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 2190 "configure"
+#line 2270 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -2200,7 +2280,7 @@ int main() {
 XCreateWindow()
 ; return 0; }
 EOF
 XCreateWindow()
 ; return 0; }
 EOF

-if { (eval echo configure:2204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2284: \"$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


@@ -2278,16 +2358,16 @@ if test "$TCLLIB" = nope; then
 fi
 
 echo $ac_n "checking for Tcl header files""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for Tcl header files""... $ac_c" 1>&6

-echo "configure:2282: checking for Tcl header files" >&5
+echo "configure:2362: checking for Tcl header files" >&5

 if test "$TCLINCLUDE" = nope; then
 cat > conftest.$ac_ext <<EOF
 if test "$TCLINCLUDE" = nope; then
 cat > conftest.$ac_ext <<EOF

-#line 2285 "configure"
+#line 2365 "configure"

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

-{ (eval echo configure:2290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

 if test -z "$ac_err"; then
   :
 else
 if test -z "$ac_err"; then
   :
 else


@@ -2317,7 +2397,7 @@ else
 fi
 
 echo $ac_n "checking for Tcl library""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for Tcl library""... $ac_c" 1>&6

-echo "configure:2321: checking for Tcl library" >&5
+echo "configure:2401: checking for Tcl library" >&5

 if test "$TCLLIB" = nope; then
 dirs="$prefix/lib /usr/local/lib /usr/lib /opt/local/lib /home/sci/local/lib"
 for i in $dirs ; do
 if test "$TCLLIB" = nope; then
 dirs="$prefix/lib /usr/local/lib /usr/lib /opt/local/lib /home/sci/local/lib"
 for i in $dirs ; do


@@ -2345,7 +2425,7 @@ fi
 PYINCLUDE=nope
 PYLIB=nope
 PYPACKAGE=nope
 PYINCLUDE=nope
 PYLIB=nope
 PYPACKAGE=nope

-PYLINK="-lModules -lPython -lObjects -lParser" 
+PYLINK="-lModules -lPython -lObjects -lParser"

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


@@ -2389,7 +2469,7 @@ fi
 
 
 echo $ac_n "checking for Python header files""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for Python header files""... $ac_c" 1>&6

-echo "configure:2393: checking for Python header files" >&5
+echo "configure:2473: checking for Python header files" >&5

 
 dirs="$PYINCLUDE $PYINCLUDE/python1.5 $PYINCLUDE/python1.4 $PYINCLUDE/Py $prefix/include/python1.5 $prefix/include/python1.4 /usr/local/include/python1.5 /usr/include/python1.5 /usr/local/include/python1.4 /usr/include/python1.4 $prefix/include/Py /usr/local/include/Py /usr/include/Py"
 for i in $dirs ; do
 
 dirs="$PYINCLUDE $PYINCLUDE/python1.5 $PYINCLUDE/python1.4 $PYINCLUDE/Py $prefix/include/python1.5 $prefix/include/python1.4 /usr/local/include/python1.5 /usr/include/python1.5 /usr/local/include/python1.4 /usr/include/python1.4 $prefix/include/Py /usr/local/include/Py /usr/include/Py"
 for i in $dirs ; do


@@ -2405,7 +2485,7 @@ if test "$PYINCLUDE" = nope; then
 fi
 
 echo $ac_n "checking for Python library""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for Python library""... $ac_c" 1>&6

-echo "configure:2409: checking for Python library" >&5
+echo "configure:2489: checking for Python library" >&5

 dirs="$PYLIB $PYLIB/config $PYLIB/lib $PYLIB/python1.5/config $PYLIB/python1.4/config $PYLIB/python/lib $prefix/lib/python1.5/config $prefix/lib/python1.4/config /usr/local/lib/python1.5/config /usr/lib/python1.5 /usr/local/lib/python1.4/config /usr/lib/python1.4 $prefix/lib/python/lib /usr/local/lib/python/lib /usr/lib/python/lib /home/sci/local/lib/python"
 
 for i in $dirs ; do
 dirs="$PYLIB $PYLIB/config $PYLIB/lib $PYLIB/python1.5/config $PYLIB/python1.4/config $PYLIB/python/lib $prefix/lib/python1.5/config $prefix/lib/python1.4/config /usr/local/lib/python1.5/config /usr/lib/python1.5 /usr/local/lib/python1.4/config /usr/lib/python1.4 $prefix/lib/python/lib /usr/local/lib/python/lib /usr/lib/python/lib /home/sci/local/lib/python"
 
 for i in $dirs ; do


@@ -2413,7 +2493,7 @@ for i in $dirs ; do
            echo "$ac_t""$i" 1>&6
            PYLIB="$i"
            PYINCLUDE="$PYINCLUDE -I$i"
            echo "$ac_t""$i" 1>&6
            PYLIB="$i"
            PYINCLUDE="$PYINCLUDE -I$i"

-            PYLINK="-lpython1.5"       
+            PYLINK="-lpython1.5"

            break
        fi
        if test -r $i/libPython.a; then
            break
        fi
        if test -r $i/libPython.a; then


@@ -2457,15 +2537,16 @@ 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:2461: checking for $ac_word" >&5
+echo "configure:2541: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$PERL"; then
   ac_cv_prog_PERL="$PERL" # Let the user override the test.
 else
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$PERL"; then
   ac_cv_prog_PERL="$PERL" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do

     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_PERL="$ac_prog"
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_PERL="$ac_prog"


@@ -2490,7 +2571,7 @@ else
 PERL="$PERLBIN"
 fi
 echo $ac_n "checking for Perl5 header files""... $ac_c" 1>&6
 PERL="$PERLBIN"
 fi
 echo $ac_n "checking for Perl5 header files""... $ac_c" 1>&6

-echo "configure:2494: checking for Perl5 header files" >&5
+echo "configure:2575: checking for Perl5 header files" >&5

 if test "$PERL" != nope; then
        PERL5DIR=`($PERL -e 'use Config; print $Config{archlib};') 2>/dev/null`
        if test "$PERL5DIR" != ""; then
 if test "$PERL" != nope; then
        PERL5DIR=`($PERL -e 'use Config; print $Config{archlib};') 2>/dev/null`
        if test "$PERL5DIR" != ""; then


@@ -2502,11 +2583,11 @@ if test "$PERL" != nope; then
                                PERL5EXT="$i"
                                break;
                        fi
                                PERL5EXT="$i"
                                break;
                        fi

-               done    
+               done

                if test "$PERL5EXT" = none; then
                        PERL5EXT="$PERL5DIR/CORE"
                        echo "$ac_t""could not locate perl.h...using $PERL5EXT" 1>&6
                if test "$PERL5EXT" = none; then
                        PERL5EXT="$PERL5DIR/CORE"
                        echo "$ac_t""could not locate perl.h...using $PERL5EXT" 1>&6

-               fi      
+               fi

        else
                echo "$ac_t""unable to determine perl5 configuration" 1>&6
                PERL5EXT=$PERL5DIR
        else
                echo "$ac_t""unable to determine perl5 configuration" 1>&6
                PERL5EXT=$PERL5DIR


@@ -2541,7 +2622,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |

-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in

   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).


@@ -2620,7 +2701,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)

-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"

     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;


@@ -2630,7 +2711,7 @@ done
 
 ac_given_srcdir=$srcdir
 
 
 ac_given_srcdir=$srcdir
 

-trap 'rm -fr `echo "Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile Makefile.template" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 


@@ -2639,9 +2720,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub

+s%@SHELL@%$SHELL%g

 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g

+s%@FFLAGS@%$FFLAGS%g

 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g


@@ -2726,7 +2809,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile Makefile.template"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile"}

 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/wxPython/wxSWIG/configure.in b/wxPython/wxSWIG/configure.in
index 1d9315b7e98502a2a1d457bb86491abf6a337c6a..48ea32a61b3ac98aa2afb73a2a1bd5f21242d96c 100644 (file)
--- a/wxPython/wxSWIG/configure.in
+++ b/wxPython/wxSWIG/configure.in
@@ -47,7 +47,7 @@ dnl Checks for library functions.
 
 AC_FUNC_ALLOCA
 AC_ARG_WITH(lang,[  --with-lang=LANG        Set SWIG target language (TCL,TCL8,PYTHON,PERL5,PERL4,GUILE)],[
 
 AC_FUNC_ALLOCA
 AC_ARG_WITH(lang,[  --with-lang=LANG        Set SWIG target language (TCL,TCL8,PYTHON,PERL5,PERL4,GUILE)],[

-       AC_DEFINE_UNQUOTED(SWIG_LANG,$withval)], [AC_DEFINE(SWIG_LANG,TCL)])
+       AC_DEFINE_UNQUOTED(SWIG_LANG,$withval)], [AC_DEFINE(SWIG_LANG,PYTHON)])

 
 AC_ARG_WITH(doc,[  --with-doc=DOC          Set SWIG target documentation method (ASCII,LATEX,HTML,NODOC)], [
        AC_DEFINE_UNQUOTED(SWIG_DOC,$withval)], [AC_DEFINE(SWIG_DOC,ASCII)])
 
 AC_ARG_WITH(doc,[  --with-doc=DOC          Set SWIG target documentation method (ASCII,LATEX,HTML,NODOC)], [
        AC_DEFINE_UNQUOTED(SWIG_DOC,$withval)], [AC_DEFINE(SWIG_DOC,ASCII)])


@@ -327,7 +327,7 @@ AC_SUBST(TCLLIB)
 PYINCLUDE=nope
 PYLIB=nope
 PYPACKAGE=nope
 PYINCLUDE=nope
 PYLIB=nope
 PYPACKAGE=nope

-PYLINK="-lModules -lPython -lObjects -lParser" 
+PYLINK="-lModules -lPython -lObjects -lParser"

 
 AC_ARG_WITH(py,[  --with-py=path          Set location of Python],[
        PYPACKAGE="$withval"], [PYPACKAGE=nope])
 
 AC_ARG_WITH(py,[  --with-py=path          Set location of Python],[
        PYPACKAGE="$withval"], [PYPACKAGE=nope])


@@ -372,7 +372,7 @@ for i in $dirs ; do
            AC_MSG_RESULT($i)
            PYLIB="$i"
            PYINCLUDE="$PYINCLUDE -I$i"
            AC_MSG_RESULT($i)
            PYLIB="$i"
            PYINCLUDE="$PYINCLUDE -I$i"

-            PYLINK="-lpython1.5"       
+            PYLINK="-lpython1.5"

            break
        fi
        if test -r $i/libPython.a; then
            break
        fi
        if test -r $i/libPython.a; then


@@ -420,11 +420,11 @@ if test "$PERL" != nope; then
                                PERL5EXT="$i"
                                break;
                        fi
                                PERL5EXT="$i"
                                break;
                        fi

-               done    
+               done

                if test "$PERL5EXT" = none; then
                        PERL5EXT="$PERL5DIR/CORE"
                        AC_MSG_RESULT(could not locate perl.h...using $PERL5EXT)
                if test "$PERL5EXT" = none; then
                        PERL5EXT="$PERL5DIR/CORE"
                        AC_MSG_RESULT(could not locate perl.h...using $PERL5EXT)

-               fi      
+               fi

        else
                AC_MSG_RESULT(unable to determine perl5 configuration)
                PERL5EXT=$PERL5DIR
        else
                AC_MSG_RESULT(unable to determine perl5 configuration)
                PERL5EXT=$PERL5DIR


@@ -436,7 +436,7 @@ if test "$PERL" != nope; then
 
 AC_SUBST(PERL5EXT)
 
 
 AC_SUBST(PERL5EXT)
 

-AC_OUTPUT(Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile Makefile.template)
+AC_OUTPUT(Makefile SWIG/Makefile Modules/Makefile Runtime/Makefile swig_lib/tcl/Makefile swig_lib/python/Makefile swig_lib/perl5/Makefile)

 
 
 
 
 
 

diff --git a/wxPython/wxSWIG/swig_lib/perl5/Makefile b/wxPython/wxSWIG/swig_lib/perl5/Makefile
deleted file mode 100644 (file)
index abadc85..0000000
--- a/wxPython/wxSWIG/swig_lib/perl5/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# ---------------------------------------------------------------
-# $Header$
-# SWIG Perl5 Makefile
-# 
-# This file can be used to build various Perl5 extensions with SWIG.
-# By default this file is set up for dynamic loading, but it can
-# be easily customized for static extensions by modifying various
-# portions of the file.
-#
-#        SRCS       = C source files
-#        CXXSRCS    = C++ source files
-#        OBJCSRCS   = Objective-C source files
-#        OBJS       = Additional .o files (compiled previously)
-#        INTERFACE  = SWIG interface file
-#        TARGET     = Name of target module or executable
-#
-# Many portions of this file were created by the SWIG configure
-# script and should already reflect your machine.
-#----------------------------------------------------------------
-
-SRCS          = 
-CXXSRCS       = 
-OBJCSRCS      = 
-OBJS          = 
-INTERFACE     = 
-WRAPFILE      = $(INTERFACE:.i=_wrap.c)
-WRAPOBJ       = $(INTERFACE:.i=_wrap.o)
-TARGET        = module.so # Use this kind of target for dynamic loading
-#TARGET        = myperl  # Use this target for static linking
-
-prefix        = /usr/local
-exec_prefix   = ${prefix}
-
-CC            = cc
-CXX           = CC
-OBJC          = cc -Wno-import # -Wno-import needed for gcc 
-CFLAGS        = 
-INCLUDE       =
-LIBS          =
-
-# SWIG Options
-#     SWIG      = location of the SWIG executable
-#     SWIGOPT   = SWIG compiler options
-#     SWIGCC    = Compiler used to compile the wrapper file
-
-SWIG          = $(exec_prefix)/bin/swig 
-SWIGOPT       = -perl5 
-SWIGCC        = $(CC) 
-
-# SWIG Library files.  Uncomment this to staticly rebuild Perl
-#SWIGLIB       = -static -lperlmain.i
-
-# Rules for creating .o files from source.
-
-COBJS         = $(SRCS:.c=.o)
-CXXOBJS       = $(CXXSRCS:.cxx=.o)
-OBJCOBJS      = $(OBJCSRCS:.m=.o)
-ALLOBJS       = $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(OBJS)
-
-# Command that will be used to build the final extension.
-BUILD         = $(SWIGCC)
-
-# Uncomment the following if you are using dynamic loading
-CCSHARED      = 
-BUILD         = ld -G
-
-# Uncomment the following if you are using dynamic loading with C++ and
-# need to provide additional link libraries (this is not always required).
-
-#DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-             -L/usr/local/lib -lg++ -lstdc++ -lgcc
-
-# X11 installation (possibly needed if using Perl-Tk)
-
-XLIB          = -L/usr/openwin/lib -lX11
-XINCLUDE      = -I/usr/openwin/include
-
-# Perl installation
-
-PERL_INCLUDE  = -I/usr/local/lib/perl5/5.00503/sun4-solaris/CORE
-PERL_LIB      = -L/usr/local/lib/perl5/5.00503/sun4-solaris/CORE -lperl 
-PERL_FLAGS    = -Dbool=char -Dexplicit=
-
-# Tcl installation.  If using Tk you might need this
-
-TCL_INCLUDE   = -I/usr/local/include
-TCL_LIB       = -L/usr/local/lib
-
-# Build libraries (needed for static builds)
-
-LIBM          = -lm
-LIBC          = 
-SYSLIBS       = $(LIBM) $(LIBC) -lsocket -lnsl -ldl 
-
-# Build options (uncomment only one these)
-
-#TK_LIB        = $(TCL_LIB) -ltcl -ltk $(XLIB)
-BUILD_LIBS    = $(LIBS) # Dynamic loading
-#BUILD_LIBS    = $(PERL_LIB) $(TK_LIB) $(LIBS) $(SYSLIBS)  # Static linking
-
-# Compilation rules for non-SWIG components
-
-.SUFFIXES: .c .cxx .m
-
-.c.o:
-       $(CC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-.cxx.o:
-       $(CXX) $(CCSHARED) $(CXXFLAGS) $(INCLUDE) -c $<
-
-.m.o:
-       $(OBJC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-
-# ----------------------------------------------------------------------
-# Rules for building the extension
-# ----------------------------------------------------------------------
-
-all: $(TARGET)
-
-# Convert the wrapper file into an object file
-
-$(WRAPOBJ) : $(WRAPFILE)
-       $(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(PERL_INCLUDE) $(PERL_FLAGS) $(WRAPFILE)
-
-$(WRAPFILE) : $(INTERFACE)
-       $(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
-
-$(TARGET): $(WRAPOBJ) $(ALLOBJS)
-       $(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)
-
-clean:
-       rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)
-
-
-
-
-
-

diff --git a/wxPython/wxSWIG/swig_lib/python/Makefile b/wxPython/wxSWIG/swig_lib/python/Makefile
deleted file mode 100644 (file)
index e8c5461..0000000
--- a/wxPython/wxSWIG/swig_lib/python/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# ---------------------------------------------------------------
-# $Header$
-# SWIG Python Makefile
-# 
-# This file can be used to build various Python extensions with SWIG.
-# By default this file is set up for dynamic loading, but it can
-# be easily customized for static extensions by modifying various
-# portions of the file.
-#
-#        SRCS       = C source files
-#        CXXSRCS    = C++ source files
-#        OBJCSRCS   = Objective-C source files
-#        OBJS       = Additional .o files (compiled previously)
-#        INTERFACE  = SWIG interface file
-#        TARGET     = Name of target module or executable
-#
-# Many portions of this file were created by the SWIG configure
-# script and should already reflect your machine.
-#----------------------------------------------------------------
-
-SRCS          = 
-CXXSRCS       = 
-OBJCSRCS      = 
-OBJS          = 
-INTERFACE     = 
-WRAPFILE      = $(INTERFACE:.i=_wrap.c)
-WRAPOBJ       = $(INTERFACE:.i=_wrap.o)
-TARGET        = module.so # Use this kind of target for dynamic loading
-#TARGET        = mypython  # Use this target for static linking
-
-prefix        = /usr/local
-exec_prefix   = ${prefix}
-
-CC            = cc
-CXX           = CC
-OBJC          = cc -Wno-import # -Wno-import needed for gcc 
-CFLAGS        = 
-INCLUDE       =
-LIBS          =
-
-# SWIG Options
-#     SWIG      = location of the SWIG executable
-#     SWIGOPT   = SWIG compiler options
-#     SWIGCC    = Compiler used to compile the wrapper file
-
-SWIG          = $(exec_prefix)/bin/swig 
-SWIGOPT       = -python 
-SWIGCC        = $(CC) 
-
-# SWIG Library files.  Uncomment if rebuilding the Python interpreter
-#SWIGLIB       = -lembed.i
-
-# Rules for creating .o files from source.
-
-COBJS         = $(SRCS:.c=.o)
-CXXOBJS       = $(CXXSRCS:.cxx=.o)
-OBJCOBJS      = $(OBJCSRCS:.m=.o)
-ALLOBJS       = $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(OBJS)
-
-# Command that will be used to build the final extension.
-BUILD         = $(SWIGCC)
-
-# Uncomment the following if you are using dynamic loading
-CCSHARED      = 
-BUILD         = ld -G
-
-# Uncomment the following if you are using dynamic loading with C++ and
-# need to provide additional link libraries (this is not always required).
-
-#DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-             -L/usr/local/lib -lg++ -lstdc++ -lgcc
-
-# X11 installation (needed if rebuilding Python + tkinter)
-
-XLIB          = -L/usr/openwin/lib -lX11
-XINCLUDE      = -I/usr/openwin/include
-
-# Python installation
-
-PY_INCLUDE    = -DHAVE_CONFIG_H -I/usr/local/include/python1.5 -I/usr/local/lib/python1.5/config 
-PY_LIB        = /usr/local/lib/python1.5/config
-
-# Tcl installation.  Needed if rebuilding Python with tkinter.
-
-TCL_INCLUDE   = -I/usr/local/include
-TCL_LIB       = -L/usr/local/lib
-
-# Build libraries (needed for static builds)
-
-LIBM          = -lm
-LIBC          = 
-SYSLIBS       = $(LIBM) $(LIBC) -lsocket -lnsl -ldl 
-
-# Build options (uncomment only one these)
-
-#TKINTER      = $(TCL_LIB) -ltk -ltcl $(XLIB)
-BUILD_LIBS    = $(LIBS) # Dynamic loading
-#BUILD_LIBS    = $(PY_LIB) -lpython1.5 $(TKINTER) $(LIBS) $(SYSLIBS)
-
-# Compilation rules for non-SWIG components
-
-.SUFFIXES: .c .cxx .m
-
-.c.o:
-       $(CC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-.cxx.o:
-       $(CXX) $(CCSHARED) $(CXXFLAGS) $(INCLUDE) -c $<
-
-.m.o:
-       $(OBJC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-
-# ----------------------------------------------------------------------
-# Rules for building the extension
-# ----------------------------------------------------------------------
-
-all: $(TARGET)
-
-# Convert the wrapper file into an object file
-
-$(WRAPOBJ) : $(WRAPFILE)
-       $(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDE) $(PY_INCLUDE) 
-
-$(WRAPFILE) : $(INTERFACE)
-       $(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
-
-$(TARGET): $(WRAPOBJ) $(ALLOBJS)
-       $(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)
-
-clean:
-       rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)
-
-
-
-

diff --git a/wxPython/wxSWIG/swig_lib/tcl/Makefile b/wxPython/wxSWIG/swig_lib/tcl/Makefile
deleted file mode 100644 (file)
index f24b05c..0000000
--- a/wxPython/wxSWIG/swig_lib/tcl/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-# ---------------------------------------------------------------
-# $Header$
-# SWIG Tcl/Tk Makefile
-# 
-# This file can be used to build various Tcl extensions with SWIG.
-# By default this file is set up for dynamic loading, but it can
-# be easily customized for static extensions by modifying various
-# portions of the file.  
-#
-#        SRCS       = C source files
-#        CXXSRCS    = C++ source files
-#        OBJCSRCS   = Objective-C source files
-#        OBJS       = Additional .o files (compiled previously)
-#        INTERFACE  = SWIG interface file
-#        TARGET     = Name of target module or executable
-#
-# Many portions of this file were created by the SWIG configure
-# script and should already reflect your machine. However, you
-# may need to modify the Makefile to reflect your specific
-# application.
-#----------------------------------------------------------------
-
-SRCS          = 
-CXXSRCS       = 
-OBJCSRCS      = 
-OBJS          = 
-INTERFACE     = 
-WRAPFILE      = $(INTERFACE:.i=_wrap.c)
-WRAPOBJ       = $(INTERFACE:.i=_wrap.o)
-TARGET        = module.so # Use this kind of target for dynamic loading
-#TARGET        = my_tclsh  # Use this target for static linking
-
-prefix        = /usr/local
-exec_prefix   = ${prefix}
-
-CC            = cc
-CXX           = CC
-OBJC          = cc -Wno-import # -Wno-import needed for gcc 
-CFLAGS        = 
-INCLUDE       =
-LIBS          =
-
-# SWIG Options
-#     SWIG      = location of the SWIG executable
-#     SWIGOPT   = SWIG compiler options
-#     SWIGCC    = Compiler used to compile the wrapper file
-
-SWIG          = $(exec_prefix)/bin/swig 
-SWIGOPT       = -tcl # use -tcl8 for Tcl 8.0
-SWIGCC        = $(CC) 
-
-# SWIG Library files.  Uncomment one of these for rebuilding tclsh or wish
-#SWIGLIB       = -ltclsh.i
-#SWIGLIB       = -lwish.i
-
-# Rules for creating .o files from source.
-
-COBJS         = $(SRCS:.c=.o)
-CXXOBJS       = $(CXXSRCS:.cxx=.o)
-OBJCOBJS      = $(OBJCSRCS:.m=.o)
-ALLOBJS       = $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(OBJS)
-
-# Command that will be used to build the final extension.
-BUILD         = $(SWIGCC)
-
-# Uncomment the following if you are using dynamic loading
-CCSHARED      = 
-BUILD         = ld -G
-
-# Uncomment the following if you are using dynamic loading with C++ and
-# need to provide additional link libraries (this is not always required).
-
-#DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-             -L/usr/local/lib -lg++ -lstdc++ -lgcc
-
-# X11 installation (needed to rebuild Tk extensions)
-
-XLIB          = -L/usr/openwin/lib -lX11
-XINCLUDE      = -I/usr/openwin/include
-
-# Tcl installation (where is Tcl/Tk located)
-
-TCL_INCLUDE   = -I/usr/local/include
-TCL_LIB       = -L/usr/local/lib
-
-# Build libraries (needed for static builds)
-
-LIBM          = -lm
-LIBC          = 
-SYSLIBS       = $(LIBM) $(LIBC) -lsocket -lnsl -ldl 
-
-# Build options (uncomment only one these)
-
-BUILD_LIBS    = $(LIBS) # Dynamic loading
-#BUILD_LIBS    = $(TCL_LIB) -ltcl $(LIBS) $(SYSLIBS) # tclsh  
-#BUILD_LIBS    = $(TCL_LIB) -ltk -ltcl $(XLIB) $(LIBS) $(SYSLIBS) # wish
-
-# Compilation rules for non-SWIG components
-
-.SUFFIXES: .c .cxx .m
-
-.c.o:
-       $(CC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-.cxx.o:
-       $(CXX) $(CCSHARED) $(CXXFLAGS) $(INCLUDE) -c $<
-
-.m.o:
-       $(OBJC) $(CCSHARED) $(CFLAGS) $(INCLUDE) -c $<
-
-
-# ----------------------------------------------------------------------
-# Rules for building the extension
-# ----------------------------------------------------------------------
-
-all: $(TARGET)
-
-# Convert the wrapper file into an object file
-
-$(WRAPOBJ) : $(WRAPFILE)
-       $(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDE) $(TCL_INCLUDE) 
-
-$(WRAPFILE) : $(INTERFACE)
-       $(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
-
-$(TARGET): $(WRAPOBJ) $(ALLOBJS)
-       $(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)
-
-clean:
-       rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)
-
-
-
-