Update to 1.3.19, drop autoconf dependency, and allow building with a

python using pth.

7 files changed, 1563 insertions, 59 deletions

diff --git a/devel/swig-build/Makefile.common b/devel/swig-build/Makefile.common
index c3e922293cb..7cac5e38e70 100644
--- a/devel/swig-build/Makefile.common
+++ b/devel/swig-build/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/08/28 22:33:14 epg Exp $
 
 DISTNAME=       swig-${SWIG_VERSION}
 CATEGORIES=	devel
@@ -30,8 +30,3 @@ CONFIGURE_ARGS+=	--without-php4
 CONFIGURE_ARGS+=	--without-pike
 CONFIGURE_ARGS+=	--without-ruby
 CONFIGURE_ARGS+=	--without-tcl
-
-pre-configure:
-	cd ${WRKSRC} && ${AUTOCONF}
-
-.include "../../mk/autoconf.mk"
diff --git a/devel/swig-build/Makefile.version b/devel/swig-build/Makefile.version
index 6cacb755af8..59a24064299 100644
--- a/devel/swig-build/Makefile.version
+++ b/devel/swig-build/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+# $NetBSD: Makefile.version,v 1.2 2003/08/28 22:33:14 epg Exp $
 
-SWIG_VERSION=1.3.17
+SWIG_VERSION=1.3.19
diff --git a/devel/swig-build/PLIST b/devel/swig-build/PLIST
index fb09f392256..2b127a443c3 100644
--- a/devel/swig-build/PLIST
+++ b/devel/swig-build/PLIST
@@ -1,12 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/28 22:33:14 epg Exp $
 bin/swig
 lib/swig1.3/_std_deque.i
 lib/swig1.3/carrays.i
 lib/swig1.3/cdata.i
+lib/swig1.3/chicken/chicken.swg
+lib/swig1.3/chicken/chickenrun.swg
+lib/swig1.3/chicken/fragments.i
+lib/swig1.3/chicken/typemaps.i
 lib/swig1.3/cmalloc.i
 lib/swig1.3/common.swg
 lib/swig1.3/constraints.i
 lib/swig1.3/cpointer.i
+lib/swig1.3/csharp/csharp.swg
+lib/swig1.3/csharp/csharphead.swg
+lib/swig1.3/csharp/typemaps.i
 lib/swig1.3/cstring.i
 lib/swig1.3/exception.i
 lib/swig1.3/guile/cplusplus.i
@@ -19,16 +26,16 @@ lib/swig1.3/guile/list-vector.i
 lib/swig1.3/guile/pointer-in-out.i
 lib/swig1.3/guile/ports.i
 lib/swig1.3/guile/std_common.i
+lib/swig1.3/guile/std_map.i
 lib/swig1.3/guile/std_string.i
 lib/swig1.3/guile/std_vector.i
-lib/swig1.3/guile/stl.i
 lib/swig1.3/guile/typemaps.i
 lib/swig1.3/java/arrays_java.i
 lib/swig1.3/java/java.swg
 lib/swig1.3/java/javahead.swg
+lib/swig1.3/java/std_map.i
 lib/swig1.3/java/std_string.i
 lib/swig1.3/java/std_vector.i
-lib/swig1.3/java/stl.i
 lib/swig1.3/java/typemaps.i
 lib/swig1.3/java/various.i
 lib/swig1.3/math.i
@@ -36,12 +43,13 @@ lib/swig1.3/mzscheme/mzscheme.i
 lib/swig1.3/mzscheme/mzscheme.swg
 lib/swig1.3/mzscheme/mzschemedec.swg
 lib/swig1.3/mzscheme/std_common.i
+lib/swig1.3/mzscheme/std_map.i
 lib/swig1.3/mzscheme/std_string.i
 lib/swig1.3/mzscheme/std_vector.i
-lib/swig1.3/mzscheme/stl.i
 lib/swig1.3/mzscheme/typemaps.i
 lib/swig1.3/ocaml/carray.i
 lib/swig1.3/ocaml/cstring.i
+lib/swig1.3/ocaml/director.swg
 lib/swig1.3/ocaml/libswigocaml.h
 lib/swig1.3/ocaml/libswigocaml.swg
 lib/swig1.3/ocaml/mlheading.swg
@@ -53,24 +61,26 @@ lib/swig1.3/ocaml/std_common.i
 lib/swig1.3/ocaml/std_complex.i
 lib/swig1.3/ocaml/std_deque.i
 lib/swig1.3/ocaml/std_list.i
+lib/swig1.3/ocaml/std_map.i
 lib/swig1.3/ocaml/std_string.i
 lib/swig1.3/ocaml/std_vector.i
-lib/swig1.3/ocaml/stl.i
 lib/swig1.3/ocaml/typecheck.i
 lib/swig1.3/ocaml/typemaps.i
+lib/swig1.3/ocaml/typeregister.swg
 lib/swig1.3/perl5/Makefile.pl
+lib/swig1.3/perl5/noembed.h
 lib/swig1.3/perl5/perl5.swg
 lib/swig1.3/perl5/perlmain.i
 lib/swig1.3/perl5/perlrun.swg
+lib/swig1.3/perl5/std_map.i
 lib/swig1.3/perl5/std_string.i
 lib/swig1.3/perl5/std_vector.i
-lib/swig1.3/perl5/stl.i
 lib/swig1.3/perl5/typemaps.i
 lib/swig1.3/php4/php4.swg
 lib/swig1.3/php4/php4run.swg
+lib/swig1.3/php4/std_map.i
 lib/swig1.3/php4/std_string.i
 lib/swig1.3/php4/std_vector.i
-lib/swig1.3/php4/stl.i
 lib/swig1.3/php4/typemaps.i
 lib/swig1.3/php4/utils.i
 lib/swig1.3/pike/pike.swg
@@ -78,6 +88,7 @@ lib/swig1.3/pike/pikerun.swg
 lib/swig1.3/pointer.i
 lib/swig1.3/python/cstring.i
 lib/swig1.3/python/defarg.swg
+lib/swig1.3/python/director.swg
 lib/swig1.3/python/embed.i
 lib/swig1.3/python/embed15.i
 lib/swig1.3/python/fragments.i
@@ -87,9 +98,9 @@ lib/swig1.3/python/std_common.i
 lib/swig1.3/python/std_complex.i
 lib/swig1.3/python/std_deque.i
 lib/swig1.3/python/std_list.i
+lib/swig1.3/python/std_map.i
 lib/swig1.3/python/std_string.i
 lib/swig1.3/python/std_vector.i
-lib/swig1.3/python/stl.i
 lib/swig1.3/python/typemaps.i
 lib/swig1.3/ruby/Makefile.swig
 lib/swig1.3/ruby/embed.i
@@ -100,16 +111,18 @@ lib/swig1.3/ruby/rubydec.swg
 lib/swig1.3/ruby/rubydef.swg
 lib/swig1.3/ruby/rubyhead.swg
 lib/swig1.3/ruby/std_common.i
+lib/swig1.3/ruby/std_deque.i
+lib/swig1.3/ruby/std_map.i
 lib/swig1.3/ruby/std_string.i
 lib/swig1.3/ruby/std_vector.i
-lib/swig1.3/ruby/stl.i
 lib/swig1.3/ruby/typemaps.i
 lib/swig1.3/std_deque.i
+lib/swig1.3/stl.i
 lib/swig1.3/swig.swg
 lib/swig1.3/tcl/cstring.i
+lib/swig1.3/tcl/std_map.i
 lib/swig1.3/tcl/std_string.i
 lib/swig1.3/tcl/std_vector.i
-lib/swig1.3/tcl/stl.i
 lib/swig1.3/tcl/swigtcl8.swg
 lib/swig1.3/tcl/tcl8.swg
 lib/swig1.3/tcl/tclsh.i
@@ -125,4 +138,6 @@ lib/swig1.3/tcl/wish.i
 @dirrm lib/swig1.3/mzscheme
 @dirrm lib/swig1.3/java
 @dirrm lib/swig1.3/guile
+@dirrm lib/swig1.3/csharp
+@dirrm lib/swig1.3/chicken
 @dirrm lib/swig1.3
diff --git a/devel/swig-build/distinfo b/devel/swig-build/distinfo
index 614354340eb..759989744ad 100644
--- a/devel/swig-build/distinfo
+++ b/devel/swig-build/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+$NetBSD: distinfo,v 1.2 2003/08/28 22:33:14 epg Exp $
 
-SHA1 (swig-1.3.17.tar.gz) = 2252de9949410a6a0586bcdc85671a0060f3ed31
-Size (swig-1.3.17.tar.gz) = 1559991 bytes
-SHA1 (patch-aa) = 2718553f5aa9f0af8fa5756ce3c3b82c13045312
-SHA1 (patch-ab) = 7ba7ffed43bb3bc7e50d1aa79beb7cd5c844c97c
+SHA1 (swig-1.3.19.tar.gz) = d27fd1d271938d96d86d7f10c10bbf37353611df
+Size (swig-1.3.19.tar.gz) = 1778701 bytes
+SHA1 (patch-aa) = d505ff487b3aa7079d46cbab377a23b1d102603b
+SHA1 (patch-ab) = e3cf3d76885943dba9ec160a0e81ef4fb22fe837
+SHA1 (patch-ac) = 7ba7ffed43bb3bc7e50d1aa79beb7cd5c844c97c
diff --git a/devel/swig-build/patches/patch-aa b/devel/swig-build/patches/patch-aa
index ab70f931a15..e3c520d3c2a 100644
--- a/devel/swig-build/patches/patch-aa
+++ b/devel/swig-build/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+$NetBSD: patch-aa,v 1.2 2003/08/28 22:33:14 epg Exp $
 
---- configure.in.orig	Fri Nov 22 14:34:16 2002
+--- configure.in.orig	Sun Mar 23 17:47:23 2003
 +++ configure.in
-@@ -344,6 +344,8 @@ AC_ARG_WITH(tclincl,[  --with-tclincl=pa
+@@ -350,6 +350,8 @@ AC_ARG_WITH(tclincl,[  --with-tclincl=pa
  AC_ARG_WITH(tcllib,[  --with-tcllib=path      Set location of Tcl library directory],[
  	TCLLIB="-L$withval"], [TCLLIB=])
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  AC_MSG_CHECKING([for Tcl configuration])
  # First check to see if --with-tclconfig was specified.
  if test x"${with_tclconfig}" != x ; then
-@@ -430,6 +432,8 @@ CYGWIN*) TCLDYNAMICLINKING="$TCLLIB";;
+@@ -435,6 +437,8 @@ case $host in
  *)TCLDYNAMICLINKING="";;
  esac
  
@@ -20,16 +20,30 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  AC_SUBST(TCLINCLUDE)
  AC_SUBST(TCLLIB)
  AC_SUBST(TCLDYNAMICLINKING)
-@@ -469,6 +473,8 @@ AC_ARG_WITH(python,[  --with-python=path
+@@ -474,6 +478,8 @@ AC_ARG_WITH(python,[  --with-python=path
  
  # First figure out the name of the Python executable
  
 +if test "x${PYBIN}" != 'xno'; then
 +
  if test -z "$PYBIN"; then
- AC_CHECK_PROGS(PYTHON, $prefix/bin/python python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python)
+ AC_CHECK_PROGS(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python)
  else
-@@ -538,6 +544,7 @@ CYGWIN*) PYTHONDYNAMICLINKING="-L$PYLIB 
+@@ -503,11 +509,11 @@ if test -n "$PYTHON"; then
+ 
+     AC_MSG_CHECKING(for Python header files)
+     if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+-        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
++        PYINCLUDE="-I${BUILDLINK_DIR}/include -I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
+     fi
+     if test -z "$PYINCLUDE"; then
+         if test -r $PYPREFIX/include/Py/Python.h; then
+-            PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
++            PYINCLUDE="-I${BUILDLINK_DIR}/include -I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
+         fi
+     fi
+     AC_MSG_RESULT($PYINCLUDE)
+@@ -543,6 +549,7 @@ case $host in
  *)PYTHONDYNAMICLINKING="";;
  esac
  
@@ -37,7 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  
  AC_SUBST(PYINCLUDE)
  AC_SUBST(PYLIB)
-@@ -554,6 +561,8 @@ AC_ARG_WITH(perl5,[  --with-perl5=path  
+@@ -559,6 +566,8 @@ AC_ARG_WITH(perl5,[  --with-perl5=path  
  
  # First figure out what the name of Perl5 is
  
@@ -46,7 +60,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  if test -z "$PERLBIN"; then
  AC_CHECK_PROGS(PERL, perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 perl5 perl)
  else
-@@ -601,6 +610,8 @@ CYGWIN*) PERL5DYNAMICLINKING="-L$PERL5EX
+@@ -613,6 +622,8 @@ case $host in
  *)PERL5DYNAMICLINKING="";;
  esac
  
@@ -55,7 +69,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  AC_SUBST(PERL5EXT)
  AC_SUBST(PERL5DYNAMICLINKING)
  AC_SUBST(PERL5LIB)
-@@ -617,6 +628,8 @@ AC_SUBST(PERL5LIB)
+@@ -630,6 +641,8 @@ AC_SUBST(PERL5CCFLAGS)
  AC_ARG_WITH(java, [  --with-java=path        Set location of Java],[JAVABIN="$withval"], [JAVABIN=])
  AC_ARG_WITH(javac, [  --with-javac=path       Set location of Javac],[JAVACBIN="$withval"], [JAVACBIN=])
  
@@ -64,7 +78,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  if test -z "$JAVABIN" ; then
    AC_CHECK_PROGS(JAVA, java kaffe guavac)
  else
-@@ -679,6 +692,7 @@ CYGWIN*) JAVALIBRARYPREFIX="";;
+@@ -697,6 +710,7 @@ case $host in
  *)JAVALIBRARYPREFIX="lib";;
  esac
  
@@ -72,7 +86,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  
  AC_SUBST(JAVA)
  AC_SUBST(JAVAC)
-@@ -695,15 +709,17 @@ AC_SUBST(ROOT_DIR)ROOT_DIR=`pwd`
+@@ -711,15 +725,17 @@ AC_SUBST(JAVALIBRARYPREFIX)
  GUILEINCLUDE=
  GUILELIB=
  GUILELINK=
@@ -91,10 +105,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
 -
 -  AC_ARG_WITH(guile,[  --with-guile=path       Set location of Guile],[
 -	GUILEPACKAGE="$withval"], [GUILEPACKAGE=])
-   AC_ARG_WITH(guilencl,[  --with-guileincl=path   Set location of Guile include directory],[
+   AC_ARG_WITH(guileincl,[  --with-guileincl=path   Set location of Guile include directory],[
  	GUILEINCLUDE="$withval"], [GUILEINCLUDE=])
    AC_ARG_WITH(guilelib,[  --with-guilelib=path    Set location of Guile library directory],[
-@@ -754,6 +770,8 @@ if test -n "$GUILE_CONFIG" ; then
+@@ -770,6 +786,8 @@ if test -n "$GUILE_CONFIG" ; then
  
  fi # have GUILE_CONFIG
  
@@ -103,7 +117,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  AC_SUBST(GUILEINCLUDE)
  AC_SUBST(GUILELIB)
  AC_SUBST(GUILELINK)
-@@ -772,6 +790,8 @@ RUBYBIN=
+@@ -788,6 +806,8 @@ RUBYBIN=
  
  AC_ARG_WITH(ruby,[  --with-ruby=path        Set location of Ruby executable],[ RUBYBIN="$withval"], [RUBYBIN=])
  
@@ -112,7 +126,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  # First figure out what the name of Ruby is
  
  if test -z "$RUBYBIN"; then
-@@ -847,6 +867,7 @@ CYGWIN*)	RUBYDYNAMICLINKING="-L$RUBYLIB 
+@@ -863,6 +883,7 @@ case $host in
  *)		RUBYDYNAMICLINKING="";;
  esac
  
@@ -120,7 +134,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  
  AC_SUBST(RUBYINCLUDE)
  AC_SUBST(RUBYLIB)
-@@ -862,6 +883,8 @@ PHP4BIN=
+@@ -878,6 +899,8 @@ PHP4BIN=
  
  AC_ARG_WITH(php4,[  --with-php4=path	  Set location of PHP4 executable],[ PHP4BIN="$withval"], [PHP4BIN=])
  
@@ -129,7 +143,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  if test -z "$PHP4BIN"; then
  AC_CHECK_PROGS(PHP4, php, php4)
  else
-@@ -884,6 +907,8 @@ if test -z "$PHP4INC"; then
+@@ -900,6 +923,8 @@ if test -z "$PHP4INC"; then
  	AC_MSG_RESULT(not found)
  fi
  
@@ -138,16 +152,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  AC_SUBST(PHP4INC)
  
  # kludges to ease naming conventions conformance.
-@@ -899,6 +924,8 @@ AC_SUBST(PHP4INC)
- AC_ARG_WITH(ocaml,[  --with-ocaml=path	  Set location of ocaml executable],[ OCAMLBIN="$withval"], [OCAMLBIN=])
- AC_ARG_WITH(ocamlc,[  --with-ocamlc=path  Set location of ocamlc executable],[ OCAMLC="$withval"], [OCAMLC=])
+@@ -932,6 +957,8 @@ else
+ OCAMLFIND="$OCAMLFIND"
+ fi
  
 +if test "x${OCAMLBIN}" != 'xno'; then
 +
  AC_MSG_CHECKING(for Ocaml compiler)
  if test -z "$OCAMLC"; then
  AC_CHECK_PROGS(OCAMLC, ocamlc, ocamlc)
-@@ -926,6 +953,8 @@ if test -z "$OCAMLINC"; then
+@@ -967,6 +994,8 @@ if test -z "$OCAMLINC"; then
  	AC_MSG_RESULT(not found)
  fi
  
@@ -156,7 +170,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  export OCAMLINC
  export OCAMLBIN
  export OCAMLC
-@@ -941,6 +970,9 @@ AC_SUBST(OCAMLC)
+@@ -988,6 +1017,9 @@ AC_SUBST(OCAMLMKTOP)
  # Identify the name of the Pike executable
  PIKEBIN=
  AC_ARG_WITH(pike,[  --with-pike=path       Set location of Pike executable],[ PIKEBIN="$withval"], [PIKEBIN=])
@@ -166,7 +180,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
  if test -z "$PIKEBIN"; then
  	AC_CHECK_PROGS(PIKE, pike)
  else
-@@ -966,6 +998,8 @@ fi
+@@ -1013,6 +1045,8 @@ fi
  else
          AC_MSG_RESULT($PIKEINCLUDE)
  fi
diff --git a/devel/swig-build/patches/patch-ab b/devel/swig-build/patches/patch-ab
index 2731e64da4e..eb56cc9bc5c 100644
--- a/devel/swig-build/patches/patch-ab
+++ b/devel/swig-build/patches/patch-ab
@@ -1,13 +1,1479 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/05/25 08:52:37 epg Exp $
+$NetBSD: patch-ab,v 1.2 2003/08/28 22:33:14 epg Exp $
 
---- Makefile.in.orig	Thu Jan 30 16:51:34 2003
-+++ Makefile.in
-@@ -289,7 +289,7 @@ install-lib:
- 	    do							\
- 	    dst=$(DESTDIR)$(SWIG_LIB)/$$lang;			\
- 	    $(MKINSTDIRS) $$dst;				\
--	    ( cd $(srcdir)/Lib/$$lang;				\
-+	    ( set +e; cd $(srcdir)/Lib/$$lang;			\
- 	      doti="`ls *.i 2>/dev/null`";			\
- 	      dotswg="`ls *.swg 2>/dev/null`";			\
- 	      if [ -f extra-install.list ]; then		\
+--- configure.orig	Fri Mar 28 11:16:38 2003
++++ configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.54 for swig 1.3.19.
++# Generated by GNU Autoconf 2.57 for swig 1.3.19.
+ #
+ # Report bugs to <http://www.swig.org>.
+ #
+@@ -38,7 +38,10 @@ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+@@ -84,15 +87,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+-  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -945,7 +948,7 @@ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ swig configure 1.3.19
+-generated by GNU Autoconf 2.54
++generated by GNU Autoconf 2.57
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+@@ -960,7 +963,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by swig $as_me 1.3.19, which was
+-generated by GNU Autoconf 2.54.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1012,24 +1015,54 @@ _ACEOF
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
+ ac_sep=
+-for ac_arg
++ac_must_keep_next=false
++for ac_pass in 1 2
+ do
+-  case $ac_arg in
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n ) continue ;;
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+-    continue ;;
+-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-  esac
+-  ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-  # Get rid of the leading space.
+-  ac_sep=" "
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++        ac_must_keep_next=false # Got value, back to normal.
++      else
++        case $ac_arg in
++          *=* | --config-cache | -C | -disable-* | --disable-* \
++          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++          | -with-* | --with-* | -without-* | --without-* | --x)
++            case "$ac_configure_args0 " in
++              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++            esac
++            ;;
++          -* ) ac_must_keep_next=true ;;
++        esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
+ done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+@@ -1538,15 +1571,15 @@ fi
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
+ all:
+-	@echo 'ac_maketemp="${MAKE}"'
++	@echo 'ac_maketemp="$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+@@ -2026,8 +2059,10 @@ fi
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+@@ -2052,7 +2087,11 @@ ac_compiler=`set X $ac_compile; echo $2`
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2063,7 +2102,7 @@ main ()
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+@@ -2082,27 +2121,39 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ # Be careful to initialize this variable, since it used to be cached.
+ # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ ac_cv_exeext=
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    a.out ) # We found the default executable, but exeext='' is most
+-            # certainly right.
+-            break;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++        ;;
++    conftest.$ac_ext )
++        # This is the source file.
++        ;;
++    [ab].out )
++        # We found the default executable, but exeext='' is most
++        # certainly right.
++        break;;
++    *.* )
++        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++        # FIXME: I believe we export ac_cv_exeext for Libtool,
++        # but it would be cool to find out if it's true.  Does anybody
++        # maintain Libtool? --akim.
++        export ac_cv_exeext
++        break;;
++    * )
++        break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ { { echo "$as_me:$LINENO: error: C compiler cannot create executables
+-check \`config.log' for details." >&5
++See \`config.log' for more details." >&5
+ echo "$as_me: error: C compiler cannot create executables
+-check \`config.log' for details." >&2;}
++See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+@@ -2129,9 +2180,11 @@ if test "$cross_compiling" != yes; then
+ 	cross_compiling=yes
+     else
+ 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&5
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&2;}
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+   fi
+@@ -2139,7 +2192,7 @@ fi
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -2170,8 +2223,10 @@ for ac_file in conftest.exe conftest con
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2189,7 +2244,11 @@ if test "${ac_cv_objext+set}" = set; the
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2214,9 +2273,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2233,7 +2295,11 @@ if test "${ac_cv_c_compiler_gnu+set}" = 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2261,7 +2327,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2281,7 +2348,11 @@ if test "${ac_cv_prog_cc_g+set}" = set; 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2306,7 +2377,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2337,7 +2409,11 @@ else
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -2400,7 +2476,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext
+ done
+@@ -2451,7 +2528,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ $ac_declaration
+ int
+@@ -2477,13 +2558,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ continue
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
+ int
+ main ()
+@@ -2508,7 +2594,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+@@ -2521,7 +2608,8 @@ fi
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+@@ -2804,7 +2892,11 @@ if test "${ac_cv_cxx_compiler_gnu+set}" 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2832,7 +2924,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2852,7 +2945,11 @@ if test "${ac_cv_prog_cxx_g+set}" = set;
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -2877,7 +2974,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_cxx_g=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+@@ -2910,7 +3008,11 @@ for ac_declaration in \
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ $ac_declaration
+ int
+@@ -2936,13 +3038,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ continue
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
+ int
+ main ()
+@@ -2967,7 +3074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+@@ -3202,7 +3310,11 @@ if eval "test \"\${ac_cv_prog_cc_${ac_cc
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ int
+ main ()
+@@ -3361,12 +3473,22 @@ for ac_c_preproc_warn_flag in '' yes
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+                      Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -3389,7 +3511,8 @@ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -3399,7 +3522,11 @@ rm -f conftest.err conftest.$ac_ext
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -3423,7 +3550,8 @@ if test -z "$ac_cpp_err"; then
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -3452,12 +3580,22 @@ for ac_c_preproc_warn_flag in '' yes
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
+                      Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -3480,7 +3618,8 @@ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -3490,7 +3629,11 @@ rm -f conftest.err conftest.$ac_ext
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -3514,7 +3657,8 @@ if test -z "$ac_cpp_err"; then
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -3527,8 +3671,10 @@ rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -3561,43 +3707,54 @@ if test "${ac_cv_header_stdc+set}" = set
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_header_stdc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_header_stdc=no
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <string.h>
+ 
+ _ACEOF
+@@ -3615,7 +3772,11 @@ 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 <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ 
+ _ACEOF
+@@ -3636,13 +3797,18 @@ if test $ac_cv_header_stdc = yes; then
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #else
+-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
++# define ISLOWER(c) \
++                   (('a' <= (c) && (c) <= 'i') \
+                      || ('j' <= (c) && (c) <= 'r') \
+                      || ('s' <= (c) && (c) <= 'z'))
+ # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+@@ -3675,7 +3841,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+@@ -3889,7 +4056,11 @@ else
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3921,7 +4092,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dl_dlopen=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -3948,7 +4120,11 @@ else
+ LIBS="-ldld  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3980,7 +4156,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dld_shl_load=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4015,7 +4192,11 @@ else
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4047,7 +4228,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_nsl_t_open=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_nsl_t_open=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4068,7 +4250,11 @@ else
+ LIBS="-linet -lnsl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4100,7 +4286,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_inet_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_inet_gethostbyname=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4121,7 +4308,11 @@ else
+ LIBS="-lsocket $LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4153,7 +4344,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_socket_socket=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_socket_socket=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4178,7 +4370,11 @@ else
+ LIBS="-lswill  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4210,7 +4406,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_swill_swill_init=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_swill_swill_init=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4249,7 +4446,11 @@ else
+ LIBS="-lieee  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ 
+ int
+@@ -4275,7 +4476,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_ieee_main=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_ieee_main=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4296,7 +4498,11 @@ else
+ LIBS="-lcrypt  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4328,7 +4534,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_crypt_crypt=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_crypt_crypt=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4465,7 +4672,11 @@ if test "$ac_x_includes" = no; then
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/Intrinsic.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4489,7 +4700,8 @@ if test -z "$ac_cpp_err"; then
+ ac_x_includes=
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   for ac_dir in $ac_x_header_dirs; do
+   if test -r "$ac_dir/X11/Intrinsic.h"; then
+     ac_x_includes=$ac_dir
+@@ -4508,7 +4720,11 @@ if test "$ac_x_libraries" = no; then
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/Intrinsic.h>
+ int
+ main ()
+@@ -4535,7 +4751,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_x_libraries=
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ LIBS=$ac_save_LIBS
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+@@ -4585,7 +4802,11 @@ if test "$no_x" = ""; then
+     if test "$x_includes" = ""; then
+ 	cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/XIntrinsic.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4608,7 +4829,8 @@ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   not_really_there="yes"
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4624,7 +4846,11 @@ echo $ECHO_N "checking for X11 header fi
+     XINCLUDES="# no special path needed"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/Intrinsic.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4647,7 +4873,8 @@ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   XINCLUDES=""
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4705,7 +4932,11 @@ else
+ LIBS="-lXwindow  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4737,7 +4968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_cv_lib_Xwindow_XCreateWindow=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_Xwindow_XCreateWindow=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+@@ -4802,6 +5034,8 @@ else
+   TCLLIB=
+ fi;
+ 
++if test "x${with_tcl}" != 'xno'; then
++
+ echo "$as_me:$LINENO: checking for Tcl configuration" >&5
+ echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
+ # First check to see if --with-tclconfig was specified.
+@@ -4852,7 +5086,11 @@ echo $ECHO_N "checking for Tcl header fi
+ if test -z "$TCLINCLUDE"; then
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <tcl.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+@@ -4875,7 +5113,8 @@ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   TCLINCLUDE=""
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4928,6 +5167,8 @@ case $host in
+ *)TCLDYNAMICLINKING="";;
+ esac
+ 
++fi # test "x${with_tcl}" != 'xno'
++
+ 
+ 
+ 
+@@ -4974,6 +5215,8 @@ fi;
+ 
+ # First figure out the name of the Python executable
+ 
++if test "x${PYBIN}" != 'xno'; then
++
+ if test -z "$PYBIN"; then
+ for ac_prog in python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python
+ do
+@@ -5049,11 +5292,11 @@ echo "${ECHO_T}$PYVERSION" >&6
+     echo "$as_me:$LINENO: checking for Python header files" >&5
+ echo $ECHO_N "checking for Python header files... $ECHO_C" >&6
+     if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+-        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
++        PYINCLUDE="-I${BUILDLINK_DIR}/include -I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
+     fi
+     if test -z "$PYINCLUDE"; then
+         if test -r $PYPREFIX/include/Py/Python.h; then
+-            PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
++            PYINCLUDE="-I${BUILDLINK_DIR}/include -I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
+         fi
+     fi
+     echo "$as_me:$LINENO: result: $PYINCLUDE" >&5
+@@ -5093,6 +5336,7 @@ case $host in
+ *)PYTHONDYNAMICLINKING="";;
+ esac
+ 
++fi # test "x${PYBIN}" != 'xno'
+ 
+ 
+ 
+@@ -5116,6 +5360,8 @@ fi;
+ 
+ # First figure out what the name of Perl5 is
+ 
++if test "x${PERLBIN}" != 'xno'; then
++
+ if test -z "$PERLBIN"; then
+ for ac_prog in perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 perl5 perl
+ do
+@@ -5220,6 +5466,8 @@ case $host in
+ *)PERL5DYNAMICLINKING="";;
+ esac
+ 
++fi # test "x${PERLBIN}" != 'xno'
++
+ 
+ 
+ 
+@@ -5251,6 +5499,8 @@ else
+   JAVACBIN=
+ fi;
+ 
++if test "x${JAVABIN}" != 'xno'; then
++
+ if test -z "$JAVABIN" ; then
+   for ac_prog in java kaffe guavac
+ do
+@@ -5409,6 +5659,7 @@ case $host in
+ *)JAVALIBRARYPREFIX="lib";;
+ esac
+ 
++fi # test "x${JAVABIN}" != 'xno'
+ 
+ 
+ 
+@@ -5423,6 +5674,19 @@ esac
+ GUILEINCLUDE=
+ GUILELIB=
+ GUILELINK=
++GUILEPACKAGE=
++
++
++# Check whether --with-guile or --without-guile was given.
++if test "${with_guile+set}" = set; then
++  withval="$with_guile"
++
++	GUILEPACKAGE="$withval"
++else
++  GUILEPACKAGE=
++fi;
++
++if test "x${GUILEPACKAGE}" != 'xno'; then
+ 
+ # Extract the first word of "guile-config", so it can be a program name with args.
+ set dummy guile-config; ac_word=$2
+@@ -5466,17 +5730,6 @@ fi
+ 
+ if test -n "$GUILE_CONFIG" ; then
+ 
+-  GUILEPACKAGE=
+-
+-
+-# Check whether --with-guile or --without-guile was given.
+-if test "${with_guile+set}" = set; then
+-  withval="$with_guile"
+-
+-	GUILEPACKAGE="$withval"
+-else
+-  GUILEPACKAGE=
+-fi;
+ 
+ # Check whether --with-guileincl or --without-guileincl was given.
+ if test "${with_guileincl+set}" = set; then
+@@ -5547,6 +5800,8 @@ echo "${ECHO_T}not found" >&6
+ 
+ fi # have GUILE_CONFIG
+ 
++fi # test "x${GUILEPACKAGE}" != 'xno'
++
+ 
+ 
+ 
+@@ -5610,6 +5865,8 @@ else
+   RUBYBIN=
+ fi;
+ 
++if test "x${RUBYBIN}" != 'xno'; then
++
+ # First figure out what the name of Ruby is
+ 
+ if test -z "$RUBYBIN"; then
+@@ -5732,6 +5989,7 @@ case $host in
+ *)		RUBYDYNAMICLINKING="";;
+ esac
+ 
++fi # test "x${RUBYBIN}" != 'xno'
+ 
+ 
+ 
+@@ -5754,6 +6012,8 @@ else
+   PHP4BIN=
+ fi;
+ 
++if test "x${PHP4BIN}" != 'xno'; then
++
+ if test -z "$PHP4BIN"; then
+ for ac_prog in php
+ do
+@@ -5819,6 +6079,8 @@ if test -z "$PHP4INC"; then
+ echo "${ECHO_T}not found" >&6
+ fi
+ 
++fi # test "x${PHP4BIN}" != 'xno'
++
+ 
+ 
+ # kludges to ease naming conventions conformance.
+@@ -5968,6 +6230,8 @@ else
+ OCAMLFIND="$OCAMLFIND"
+ fi
+ 
++if test "x${OCAMLBIN}" != 'xno'; then
++
+ echo "$as_me:$LINENO: checking for Ocaml compiler" >&5
+ echo $ECHO_N "checking for Ocaml compiler... $ECHO_C" >&6
+ if test -z "$OCAMLC"; then
+@@ -6129,6 +6393,8 @@ if test -z "$OCAMLINC"; then
+ echo "${ECHO_T}not found" >&6
+ fi
+ 
++fi # test "x${OCAMLBIN}" != 'xno'
++
+ export OCAMLINC
+ export OCAMLBIN
+ export OCAMLC
+@@ -6157,6 +6423,9 @@ if test "${with_pike+set}" = set; then
+ else
+   PIKEBIN=
+ fi;
++
++if test "x${PIKEBIN}" != 'xno'; then
++
+ if test -z "$PIKEBIN"; then
+ 	for ac_prog in pike
+ do
+@@ -6233,6 +6502,8 @@ else
+ echo "${ECHO_T}$PIKEINCLUDE" >&6
+ fi
+ 
++fi # test "x${PIKEBIN}" != 'xno'; then
++
+ 
+ 
+ 
+@@ -6724,7 +6995,7 @@ _ACEOF
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
+-if cmp -s $cache_file confcache; then :; else
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
+@@ -6805,6 +7076,8 @@ cat >$CONFIG_STATUS <<_ACEOF
+ # configure, is in config.log if it exists.
+ 
+ debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+@@ -6839,7 +7112,10 @@ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+@@ -6885,15 +7161,15 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+-  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -7056,7 +7332,7 @@ _ASBOX
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by swig $as_me 1.3.19, which was
+-generated by GNU Autoconf 2.54.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -7096,6 +7372,7 @@ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+   --file=FILE[:TEMPLATE]
+@@ -7118,7 +7395,7 @@ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ swig config.status 1.3.19
+-configured by $0, generated by GNU Autoconf 2.54,
++configured by $0, generated by GNU Autoconf 2.57,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+@@ -7155,12 +7432,9 @@ do
+   case $ac_option in
+   # Handling of the options.
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+-_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+@@ -7182,6 +7456,9 @@ Try \`$0 --help' for more information." 
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+@@ -7196,6 +7473,20 @@ Try \`$0 --help' for more information." 
+   shift
+ done
+ 
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -7239,6 +7530,9 @@ if $ac_need_defaults; then
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+@@ -7247,17 +7541,17 @@ $debug ||
+ }
+ 
+ # Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
++
+ {
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM
++  tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+@@ -7810,7 +8104,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+   cat $tmp/in >>$tmp/config.h
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+@@ -8042,8 +8336,11 @@ ac_clean_files=$ac_clean_files_save
+ # need to make the FD available again.
+ if test "$no_create" != yes; then
+   ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
+-  $SHELL $CONFIG_STATUS || ac_cs_success=false
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
diff --git a/devel/swig-build/patches/patch-ac b/devel/swig-build/patches/patch-ac
new file mode 100644
index 00000000000..4db5ac6336e
--- /dev/null
+++ b/devel/swig-build/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/08/28 22:33:14 epg Exp $
+
+--- Makefile.in.orig	Thu Jan 30 16:51:34 2003
++++ Makefile.in
+@@ -289,7 +289,7 @@ install-lib:
+ 	    do							\
+ 	    dst=$(DESTDIR)$(SWIG_LIB)/$$lang;			\
+ 	    $(MKINSTDIRS) $$dst;				\
+-	    ( cd $(srcdir)/Lib/$$lang;				\
++	    ( set +e; cd $(srcdir)/Lib/$$lang;			\
+ 	      doti="`ls *.i 2>/dev/null`";			\
+ 	      dotswg="`ls *.swg 2>/dev/null`";			\
+ 	      if [ -f extra-install.list ]; then		\