Changeset 1cb879 in git

Timestamp:

Jan 27, 2011, 10:50:28 PM (13 years ago)

Author:

Alexander Dreyer <dreyer@…>

Branches:

(u'spielwiese', '73c62e0961bcfc8f1a00420b41eec2ea3c0ef6e9')

Children:

1879f22456661161123888e861ef334514b8bd20

Parents:

a563a0dc0a8a549c10112615472e0db61d6b9aca

Message:

Merge branch 'master' of git+ssh://dreyer@git.berlios.de/gitroot/singular

git-svn-id: file:///usr/local/Singular/svn/trunk@13805 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/Makefile.in (modified) (13 diffs)
• Singular/configure (modified) (223 diffs)
• Singular/configure.in (modified) (3 diffs)
• Singular/grammar.cc (modified) (146 diffs)
• Singular/grammar.y (modified) (2 diffs)
• Singular/ipassign.cc (modified) (1 diff)
• Singular/ipid.cc (modified) (1 diff)
• Singular/iplib.cc (modified) (2 diffs)
• Singular/mod2.h.in (modified) (2 diffs)
• Singular/pyobject.cc (added)
• Singular/pyobject_setup.cc (added)
• Singular/pyobject_setup.h (added)
• Singular/silink.cc (modified) (1 diff)
• Singular/tesths.cc (modified) (2 diffs)
• Tst/Short/pyobject.res.gz.uu (added)
• Tst/Short/pyobject.stat (added)
• Tst/Short/pyobject.tst (added)
• Tst/regress.cmd (modified) (1 diff)
• doc/pyobject.doc (added)

Singular/Makefile.in

@@ -15 +15 @@
 EXEC_EXT                = @EXEC_EXT@
 HAVE_PLURAL             = @PLURAL@
+
+##
+## Python related stuff
+##
+HAVE_PYTHON             = @HAVE_PYTHON_VALUE@
+PYTHON_CPPFLAGS         = @PYTHON_CPPFLAGS@
+PYTHON_LDFLAGS          = @PYTHON_LDFLAGS@
+PYTHON_SITE_PKG         = @PYTHON_SITE_PKG@
+PYTHON_EXTRA_LIBS       = @PYTHON_EXTRA_LIBS@
+PYTHON_EXTRA_LDFLAGS    = @PYTHON_EXTRA_LDFLAGS@
+
+# Note: compiler(!) flags for linking to python
+PYTHON_LINKFLAGS        = ${PYTHON_LDFLAGS} ${PYTHON_EXTRA_LIBS} ${PYTHON_EXTRA_LDFLAGS}
+
 ##
 ## various paths
@@ -56 +70 @@
 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I.. -I@prefix@
 ifneq ($(SINGUNAME),ix86-Win)
-CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@
+CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@ ${PYTHON_CPPFLAGS}
 else
 ## Dirs after @CPPFLAGS@ are for PySingular
@@ -87 +101 @@
 
 LD_LIBC         = -lc
-STATIC_LDFLAGS  = @STATIC_LDFLAGS@
+STATIC_LDFLAGS  = ${PYTHON_LINKFLAGS} @STATIC_LDFLAGS@
 # under cygwin, do not explicitly link against -lm, for it is the cygwin
 # lib -- if you really want to do this, use -lm as the _last_ thing on the
@@ -114 +128 @@
 
 SO_SUFFIX = so
+MODULE_SUFFIX = so
+
 #LIBSINGULAR_FLAGS = -export-dynamic 
 LIBSINGULAR_LD = $(CXX)
@@ -120 +136 @@
 ifeq ($(SINGUNAME),ix86Mac-darwin)
 SO_SUFFIX        = dylib
+MODULE_SUFFIX    = bundle
 LIBSINGULAR_FLAGS = -single_module
 LIBSINGULAR_LD = $(LD)
@@ -127 +144 @@
 MACOSX_DEPLOYMENT_TARGET=10.4
 SO_SUFFIX        = dylib
+MODULE_SUFFIX    = bundle
 LIBSINGULAR_FLAGS = -single_module
 LIBSINGULAR_LD = $(LD)
@@ -133 +151 @@
 ifeq ($(SINGUNAME),ix86-Win)
 SO_SUFFIX = dll
+MODULE_SUFFIX    = dll
 LIBSINGULAR_FLAGS = -shared
 LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc  -lhtmlhelp
@@ -139 +158 @@
 ifeq ($(SINGUNAME),ix86-SunOS)
 SO_SUFFIX  = so
+MODULE_SUFFIX    = so
 LIBSINGULAR_FLAGS = -shared
 LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
@@ -159 +179 @@
 DL_KERNEL       = @DL_KERNEL@
 GLIBC_DYN_FIX= @GLIBC_DYN_FIX@
+endif
+
+
+ifeq (${HAVE_PYTHON},1)
+PYOBJECT_MODULE = pyobject.${MODULE_SUFFIX}
+else
+PYOBJECT_MODULE = 
 endif
 
@@ -191 +218 @@
     MinorProcessor.cc \
     MinorInterface.cc \
-    bigintm.cc
+    bigintm.cc pyobject_setup.cc 
 
 # stuff for MP
@@ -259 +286 @@
 OBJS    := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
 DBMSR_SO= dbmsr.so
-DL_LIBS := $(DBMSR_SO)
+DL_LIBS := $(DBMSR_SO) ${PYOBJECT_MODULE}
 ifeq ($(HAVE_MPSR), 1)
 MPSR_SO =       mpsr.so
-DL_LIBS :=      $(DL_LIBS) $(MPSR_SO)
+DL_LIBS :=      $(DL_LIBS) $(MPSR_SO) ${PYOBJECT_MODULE}
 endif
 else
@@ -332 +359 @@
         sleep 1
         echo "#define HAVE_STATIC" > static.h
+        rm -f pyobject_setup.o
         (cd ../kernel;rm -f mod_raw.o;${MAKE} LD_STATIC=1 depend install-bindist;cd ../Singular)
         ${MAKE} LD_STATIC=1 S_EXT="-static" depend Singular-static
@@ -454 +482 @@
         $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
 
+# dynamic module for python bject support
+pyobject.${MODULE_SUFFIX}: pyobject.dl_o
+        @echo "build dynamic module pyobject..."
+        $(CXX) ${SLDFLAGS} ${PYTHON_LINKFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
+
 src: scanner.cc grammar.h grammar.cc libparse.cc
 

Singular/configure

@@ -20 +20 @@
 ac_help="$ac_help
   --with-readline=[dynamic,static,no]
-                          do use dynamic/static/no readline for fancy display"
+                        do use dynamic/static/no readline for fancy display"
+ac_help="$ac_help
+  --with-python=[PYTHON,no]     uses PYTHON as python executable, default is python"
 ac_help="$ac_help
   --without-Boost         do not use Boost "
@@ -564 +566 @@
 
 
+
+
+
 echo $ac_n "checking CPU for singular""... $ac_c" 1>&6
-echo "configure:568: checking CPU for singular" >&5
+echo "configure:573: checking CPU for singular" >&5
 ac_cv_singcpuname=`uname -m`
 echo "$ac_t""$ac_cv_singcpuname" 1>&6
 
 echo $ac_n "checking uname for singular""... $ac_c" 1>&6
-echo "configure:573: checking uname for singular" >&5
+echo "configure:578: checking uname for singular" >&5
 if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -762 +767 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:765: checking for $ac_word" >&5
+echo "configure:770: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -792 +797 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:795: checking for $ac_word" >&5
+echo "configure:800: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -843 +848 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:846: checking for $ac_word" >&5
+echo "configure:851: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -875 +880 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -886 +891 @@
 cat > conftest.$ac_ext << EOF
 
-#line 889 "configure"
+#line 894 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:899: \"$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.
@@ -917 +922 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:920: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:925: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:925: checking whether we are using GNU C" >&5
+echo "configure:930: 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
@@ -931 +936 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:934: \"$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:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -950 +955 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:953: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:958: 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
@@ -982 +987 @@
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:985: checking how to run the C preprocessor" >&5
+echo "configure:990: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -997 +1002 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1000 "configure"
+#line 1005 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1003 +1008 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1011: \"$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
@@ -1014 +1019 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1017 "configure"
+#line 1022 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1020 +1025 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1028: \"$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
@@ -1031 +1036 @@
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1034 "configure"
+#line 1039 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -1037 +1042 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1045: \"$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
@@ -1066 +1071 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1069: checking for $ac_word" >&5
+echo "configure:1074: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1098 +1103 @@
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1101: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1106: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
@@ -1109 +1114 @@
 cat > conftest.$ac_ext << EOF
 
-#line 1112 "configure"
+#line 1117 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1122: \"$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.
@@ -1140 +1145 @@
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1143: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1148: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1148: checking whether we are using GNU C++" >&5
+echo "configure:1153: 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
@@ -1154 +1159 @@
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1157: \"$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:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
@@ -1173 +1178 @@
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1176: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1181: 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
@@ -1235 +1240 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1238: checking for a BSD compatible install" >&5
+echo "configure:1243: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1288 +1293 @@
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1291: checking for AIX" >&5
+echo "configure:1296: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1293 "configure"
+#line 1298 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1316 +1321 @@
 #                       other:       CC=cc   CXX=c++
 echo $ac_n "checking gcc version""... $ac_c" 1>&6
-echo "configure:1319: checking gcc version" >&5
+echo "configure:1324: checking gcc version" >&5
 if eval "test \"`echo '$''{'ac_cv_c_cpp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1348 +1353 @@
   # check whether gcc accepts --no-rtti
   echo $ac_n "checking whether gcc accepts --no-rtti""... $ac_c" 1>&6
-echo "configure:1351: checking whether gcc accepts --no-rtti" >&5
+echo "configure:1356: checking whether gcc accepts --no-rtti" >&5
   CXXFLAGS="${CXXFLAGS} --no-rtti"
   if eval "test \"`echo '$''{'ac_cv_cxx_have_rtti'+set}'`\" = set"; then
@@ -1354 +1359 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1357 "configure"
+#line 1362 "configure"
 #include "confdefs.h"
 
@@ -1361 +1366 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cxx_have_rtti=yes
@@ -1384 +1389 @@
 # check whether gcc accepts --no-exceptions
   echo $ac_n "checking whether gcc accepts --no-exceptions""... $ac_c" 1>&6
-echo "configure:1387: checking whether gcc accepts --no-exceptions" >&5
+echo "configure:1392: checking whether gcc accepts --no-exceptions" >&5
   CXXFLAGS="${CXXFLAGS} --no-exceptions"
   if eval "test \"`echo '$''{'ac_cv_cxx_have_exceptions'+set}'`\" = set"; then
@@ -1390 +1395 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1393 "configure"
+#line 1398 "configure"
 #include "confdefs.h"
 
@@ -1397 +1402 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_cxx_have_exceptions=yes
@@ -1435 +1440 @@
 then
   echo $ac_n "checking whether compiler accepts -pipe""... $ac_c" 1>&6
-echo "configure:1438: checking whether compiler accepts -pipe" >&5
+echo "configure:1443: checking whether compiler accepts -pipe" >&5
   temp_cflags="${CFLAGS}"
   CFLAGS="${CFLAGS} -pipe"
@@ -1442 +1447 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
+#line 1450 "configure"
 #include "confdefs.h"
 
@@ -1449 +1454 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cxx_have_pipe=yes
@@ -1476 +1481 @@
 # Customize CFLAGS
 echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
-echo "configure:1479: checking whether _AIX is defined" >&5
+echo "configure:1484: checking whether _AIX is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
+#line 1489 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1540 +1545 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1543: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1548: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -1623 +1628 @@
 if test "${with_lex+set}" != set; then
   echo $ac_n "checking for flex""... $ac_c" 1>&6
-echo "configure:1626: checking for flex" >&5
+echo "configure:1631: checking for flex" >&5
     cmd="egrep [2-9]\.[5-9]"
     if eval "test \"`echo '$''{'ac_cv_prog_flex'+set}'`\" = set"; then
@@ -1655 +1660 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
+echo "configure:1663: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1695 +1700 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1698: checking for $ac_word" >&5
+echo "configure:1703: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1730 +1735 @@
 # ln -s
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1733: checking whether ln -s works" >&5
+echo "configure:1738: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1756 +1761 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1759: checking for $ac_word" >&5
+echo "configure:1764: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1786 +1791 @@
 
 
+# python
+if test "${with_python+set}" != set; then
+  PYTHON_EXE="no"
+else
+  if test "${with_python}" = yes; then 
+    PYTHON_EXE="python"
+  else
+    PYTHON_EXE="${with_python}"
+  fi
+fi
+
+if test "${PYTHON_EXE}" = no; then
+  echo "configure: warning: building without python support" 1>&2
+else
+  # Extract the first word of "$PYTHON_EXE", so it can be a program name with args.
+set dummy $PYTHON_EXE; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1811: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PYTHON" in
+  /*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  ?:/*)                  
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a dos path.
+  ;;
+  *)
+  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_path_PYTHON="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+PYTHON="$ac_cv_path_PYTHON"
+if test -n "$PYTHON"; then
+  echo "$ac_t""$PYTHON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$PYTHON"; then
+    echo "configure: warning: Cannot find $PYTHON_EXE in your system path - skipping python support" 1>&2
+  else
+    
+        #
+        # Allow the use of a (user set) custom python version
+        #
+        PYTHON_VERSION=">= '2.4'"
+        PYTHON=""${PYTHON}""
+
+        #
+        # Check for a version of Python >= 2.1.0
+        #
+        echo $ac_n "checking for a version of Python >= '2.1.0'""... $ac_c" 1>&6
+echo "configure:1857: checking for a version of Python >= '2.1.0'" >&5
+        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                        ver = string.split(sys.version)[0]; \
+                        print ver >= '2.1.0'"`
+        if test "$ac_supports_python_ver" != "True"; then
+                if test -z "$PYTHON_NOVERSIONCHECK"; then
+                        echo "$ac_t""no" 1>&6
+                        { echo "configure: error: 
+This version of the AC@&t@_PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+" 1>&2; exit 1; }
+                else
+                        echo "$ac_t""skip at user request" 1>&6
+                fi
+        else
+                echo "$ac_t""yes" 1>&6
+        fi
+
+        #
+        # if the macro parameter ``version'' is set, honour it
+        #
+        if test -n ">= '2.4'"; then
+                echo $ac_n "checking for a version of Python >= '2.4'""... $ac_c" 1>&6
+echo "configure:1885: checking for a version of Python >= '2.4'" >&5
+                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                        ver = string.split(sys.version)[0]; print ver >= '2.4'"`
+                if test "$ac_supports_python_ver" = "True"; then
+                   echo "$ac_t""yes" 1>&6
+                else
+                        echo "$ac_t""no" 1>&6
+                        { echo "configure: error: this package requires Python >= '2.4'.
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See ``configure --help'' for reference.
+" 1>&2; exit 1; }
+                        PYTHON_VERSION=""
+                fi
+        fi
+
+        #
+        # Check if you have distutils, else fail
+        #
+        echo $ac_n "checking for the distutils Python package""... $ac_c" 1>&6
+echo "configure:1905: checking for the distutils Python package" >&5
+        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+        if test -z "$ac_distutils_result"; then
+                echo "$ac_t""yes" 1>&6
+        else
+                echo "$ac_t""no" 1>&6
+                { echo "configure: error: cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result" 1>&2; exit 1; }
+                PYTHON_VERSION=""
+        fi
+
+        #
+        # Check for Python include path
+        #
+        echo $ac_n "checking for Python include path""... $ac_c" 1>&6
+echo "configure:1921: checking for Python include path" >&5
+        if test -z "$PYTHON_CPPFLAGS"; then
+                python_path=`$PYTHON -c "import distutils.sysconfig; \
+                                print distutils.sysconfig.get_python_inc();"`
+                if test -n "${python_path}"; then
+                        python_path="-I$python_path"
+                fi
+                PYTHON_CPPFLAGS=$python_path
+        fi
+        echo "$ac_t""$PYTHON_CPPFLAGS" 1>&6
+        
+
+        #
+        # Check for Python library path
+        #
+        echo $ac_n "checking for Python library path""... $ac_c" 1>&6
+echo "configure:1937: checking for Python library path" >&5
+        if test -z "$PYTHON_LDFLAGS"; then
+                # (makes two attempts to ensure we've got a version number
+                # from the interpreter)
+                py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        print join(get_config_vars('VERSION'))"`
+                if test "$py_version" == "None"; then
+                        if test -n "$PYTHON_VERSION"; then
+                                py_version=$PYTHON_VERSION
+                        else
+                                py_version=`$PYTHON -c "import sys; \
+                                        print sys.version[:3]"`
+                        fi
+                fi
+
+                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        from os import path; \
+                        print '-L' + get_python_lib(0,1), \
+                        '-L' + path.dirname(get_python_lib(0,1)), \
+                        '-lpython';"`$py_version
+        fi
+        echo "$ac_t""$PYTHON_LDFLAGS" 1>&6
+        
+
+        #
+        # Check for site packages
+        #
+        echo $ac_n "checking for Python site-packages path""... $ac_c" 1>&6
+echo "configure:1967: checking for Python site-packages path" >&5
+        if test -z "$PYTHON_SITE_PKG"; then
+                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+print distutils.sysconfig.get_python_lib(0,0);"`
+        fi
+        echo "$ac_t""$PYTHON_SITE_PKG" 1>&6
+        
+
+        #
+        # libraries which must be linked in when embedding
+        #
+        echo $ac_n "checking python extra libraries""... $ac_c" 1>&6
+echo "configure:1979: checking python extra libraries" >&5
+        if test -z "$PYTHON_EXTRA_LIBS"; then
+           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+conf = distutils.sysconfig.get_config_var; \
+print conf('LOCALMODLIBS'), conf('LIBS')"`
+        fi
+        echo "$ac_t""$PYTHON_EXTRA_LIBS" 1>&6
+        
+
+        #
+        # linking flags needed when embedding
+        #
+        echo $ac_n "checking python extra linking flags""... $ac_c" 1>&6
+echo "configure:1992: checking python extra linking flags" >&5
+        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+                        conf = distutils.sysconfig.get_config_var; \
+                        print conf('LINKFORSHARED')"`
+        fi
+        echo "$ac_t""$PYTHON_EXTRA_LDFLAGS" 1>&6
+        
+
+        #
+        # final check to see if everything compiles alright
+        #
+        echo $ac_n "checking consistency of all components of python development environment""... $ac_c" 1>&6
+echo "configure:2005: checking consistency of all components of python development environment" >&5
+#       AC_LANG_PUSH([C])
+        # save current global flags
+        ac_save_LIBS_for_python="${LIBS}"
+        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+        ac_save_CPPFLAGS_for_python="${CPPFLAGS}"
+        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+        cat > conftest.$ac_ext <<EOF
+#line 2013 "configure"
+#include "confdefs.h"
+
+                #include <Python.h>
+        
+int main() {
+
+                Py_Initialize();
+        
+; return 0; }
+EOF
+if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  pythonexists=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  pythonexists=no
+fi
+rm -f conftest*
+
+        echo "$ac_t""$pythonexists" 1>&6
+
+        if test ! "$pythonexists" = "yes"; then
+           { echo "configure: error: 
+  Could not link test program to Python. Maybe the main Python library has been
+  installed in some non-standard library path. If so, pass it to configure,
+  via the LDFLAGS environment variable.
+  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
+  ============================================================================
+   ERROR!
+   You probably have to install the development version of the Python package
+   for your distribution.  The exact name of this package varies among them.
+  ============================================================================
+           " 1>&2; exit 1; }
+          PYTHON_VERSION=""
+        else
+          cat >> confdefs.h <<\EOF
+#define HAVE_PYTHON 1
+EOF
+
+          HAVE_PYTHON_VALUE=1
+                
+        fi
+#       AC_LANG_POP
+        # turn back to default flags
+        CPPFLAGS="$ac_save_CPPFLAGS_for_python"
+        LIBS="$ac_save_LIBS_for_python"
+
+        #
+        # all done!
+        #
+
+  fi
+fi
+
 # lib checks
 # under cygwin, we should not explicitly link with -lm, except for
@@ -1791 +2072 @@
 if test "$ac_cv_singuname" != ix86-Win; then
 echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
-echo "configure:1794: checking for atof in -lm" >&5
+echo "configure:2075: checking for atof in -lm" >&5
 ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1799 +2080 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1802 "configure"
+#line 2083 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1810 +2091 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2094: \"$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"
@@ -1839 +2120 @@
 fi
 echo $ac_n "checking for  in -lnsl""... $ac_c" 1>&6
-echo "configure:1842: checking for  in -lnsl" >&5
+echo "configure:2123: checking for  in -lnsl" >&5
 ac_lib_var=`echo nsl'_' | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1847 +2128 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 2131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1858 +2139 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2142: \"$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"
@@ -1886 +2167 @@
 
 echo $ac_n "checking for  in -lsocket""... $ac_c" 1>&6
-echo "configure:1889: checking for  in -lsocket" >&5
+echo "configure:2170: checking for  in -lsocket" >&5
 ac_lib_var=`echo socket'_' | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1894 +2175 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1897 "configure"
+#line 2178 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1905 +2186 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2189: \"$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"
@@ -1936 +2217 @@
 
 echo $ac_n "checking for setenv in -lbsd""... $ac_c" 1>&6
-echo "configure:1939: checking for setenv in -lbsd" >&5
+echo "configure:2220: checking for setenv in -lbsd" >&5
 ac_lib_var=`echo bsd'_'setenv | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1944 +2225 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1947 "configure"
+#line 2228 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1955 +2236 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2239: \"$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"
@@ -1983 +2264 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1986: checking for listen in -lsocket" >&5
+echo "configure:2267: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1991 +2272 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1994 "configure"
+#line 2275 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2002 +2283 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2286: \"$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"
@@ -2030 +2311 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2033: checking for gethostbyname in -lnsl" >&5
+echo "configure:2314: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2038 +2319 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2041 "configure"
+#line 2322 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2049 +2330 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2333: \"$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"
@@ -2081 +2362 @@
         HPUX*)
           echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:2084: checking for shl_load in -ldld" >&5
+echo "configure:2365: 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
@@ -2089 +2370 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2092 "configure"
+#line 2373 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2100 +2381 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2384: \"$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"
@@ -2139 +2420 @@
         *Linux*)
           echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2142: checking for dlopen in -ldl" >&5
+echo "configure:2423: 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
@@ -2147 +2428 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2150 "configure"
+#line 2431 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2158 +2439 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2442: \"$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"
@@ -2206 +2487 @@
         SunOS-5)
           echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2209: checking for dlopen in -ldl" >&5
+echo "configure:2490: 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
@@ -2214 +2495 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2217 "configure"
+#line 2498 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2225 +2506 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2509: \"$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"
@@ -2265 +2546 @@
         ppcMac-darwin)
           echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2268: checking for dlopen in -ldl" >&5
+echo "configure:2549: 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
@@ -2273 +2554 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2276 "configure"
+#line 2557 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2284 +2565 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2568: \"$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"
@@ -2323 +2604 @@
         ix86Mac-darwin)
           echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2326: checking for dlopen in -ldl" >&5
+echo "configure:2607: 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
@@ -2331 +2612 @@
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2615 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2342 +2623 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2626: \"$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"
@@ -2381 +2662 @@
         ix86-freebsd)
           echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:2384: checking for dlopen in -lc" >&5
+echo "configure:2665: checking for dlopen in -lc" >&5
 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2389 +2670 @@
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2673 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2400 +2681 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2684: \"$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"
@@ -2447 +2728 @@
 # heder file checks
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2450: checking for ANSI C header files" >&5
+echo "configure:2731: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2455 "configure"
+#line 2736 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2460 +2741 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2744: \"$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
@@ -2477 +2758 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2480 "configure"
+#line 2761 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -2495 +2776 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2498 "configure"
+#line 2779 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2516 +2797 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2800 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2527 +2808 @@
 
 EOF
-if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -2554 +2835 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2557: checking for $ac_hdr" >&5
+echo "configure:2838: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2562 "configure"
+#line 2843 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2848: \"$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
@@ -2598 +2879 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2601: checking for $ac_hdr" >&5
+echo "configure:2882: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2606 "configure"
+#line 2887 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2892: \"$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
@@ -2637 +2918 @@
 # typedefs, structures
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2640: checking for working const" >&5
+echo "configure:2921: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2645 "configure"
+#line 2926 "configure"
 #include "confdefs.h"
 
@@ -2691 +2972 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2712 +2993 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2715: checking for inline" >&5
+echo "configure:2996: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2719 +3000 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2722 "configure"
+#line 3003 "configure"
 #include "confdefs.h"
 
@@ -2726 +3007 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2752 +3033 @@
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2755: checking for size_t" >&5
+echo "configure:3036: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2760 "configure"
+#line 3041 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2785 +3066 @@
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2788: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3069: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2793 "configure"
+#line 3074 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2798 +3079 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2819 +3100 @@
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2822: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3103: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2827 "configure"
+#line 3108 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2833 +3114 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2858 +3139 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2861: checking for working alloca.h" >&5
+echo "configure:3142: 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
-#line 2866 "configure"
+#line 3147 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2870 +3151 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2891 +3172 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2894: checking for alloca" >&5
+echo "configure:3175: 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
-#line 2899 "configure"
+#line 3180 "configure"
 #include "confdefs.h"
 
@@ -2924 +3205 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2956 +3237 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2959: checking whether alloca needs Cray hooks" >&5
+echo "configure:3240: 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
-#line 2964 "configure"
+#line 3245 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2986 +3267 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2989: checking for $ac_func" >&5
+echo "configure:3270: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2994 "configure"
+#line 3275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3014 +3295 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3298: \"$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"
@@ -3041 +3322 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:3044: checking stack direction for C alloca" >&5
+echo "configure:3325: 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
@@ -3049 +3330 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3052 "configure"
+#line 3333 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -3068 +3349 @@
 }
 EOF
-if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3352: \"$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
@@ -3091 +3372 @@
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:3094: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:3375: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3097 +3378 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 3100 "configure"
+#line 3381 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -3115 +3396 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 3118 "configure"
+#line 3399 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -3140 +3421 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3143: checking for $ac_hdr" >&5
+echo "configure:3424: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3429 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3434: \"$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
@@ -3179 +3460 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3182: checking for $ac_func" >&5
+echo "configure:3463: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3468 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3207 +3488 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3491: \"$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"
@@ -3232 +3513 @@
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3235: checking for working mmap" >&5
+echo "configure:3516: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3240 +3521 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3243 "configure"
+#line 3524 "configure"
 #include "confdefs.h"
 
@@ -3380 +3661 @@
 
 EOF
-if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
@@ -3403 +3684 @@
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3406: checking return type of signal handlers" >&5
+echo "configure:3687: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3411 "configure"
+#line 3692 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3425 +3706 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -3444 +3725 @@
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:3447: checking for vprintf" >&5
+echo "configure:3728: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3452 "configure"
+#line 3733 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3472 +3753 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -3496 +3777 @@
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:3499: checking for _doprnt" >&5
+echo "configure:3780: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3504 "configure"
+#line 3785 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3524 +3805 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -3550 +3831 @@
 
 echo $ac_n "checking for library containing setenv""... $ac_c" 1>&6
-echo "configure:3553: checking for library containing setenv" >&5
+echo "configure:3834: checking for library containing setenv" >&5
 if eval "test \"`echo '$''{'ac_cv_search_setenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3557 +3838 @@
 ac_cv_search_setenv="no"
 cat > conftest.$ac_ext <<EOF
-#line 3560 "configure"
+#line 3841 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3568 +3849 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setenv="none required"
@@ -3579 +3860 @@
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3582 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3590 +3871 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setenv="-l$i"
@@ -3614 +3895 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3617: checking for $ac_func" >&5
+echo "configure:3898: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3622 "configure"
+#line 3903 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -3642 +3923 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3926: \"$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"
@@ -3692 +3973 @@
 # check for a peculiar constructor initialization
 echo $ac_n "checking whether explicit C++ constructor calls are allowed""... $ac_c" 1>&6
-echo "configure:3695: checking whether explicit C++ constructor calls are allowed" >&5
+echo "configure:3976: checking whether explicit C++ constructor calls are allowed" >&5
 
 ac_ext=C
@@ -3705 +3986 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3708 "configure"
+#line 3989 "configure"
 #include "confdefs.h"
 
@@ -3723 +4004 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_explicit_const=yes
@@ -3752 +4033 @@
 # sprintf returns number of printed chars
 echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
-echo "configure:3755: checking whether vsprintf returns number of printed chars" >&5
+echo "configure:4036: checking whether vsprintf returns number of printed chars" >&5
 if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3760 +4041 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3763 "configure"
+#line 4044 "configure"
 #include "confdefs.h"
 #include <stdio.h>
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-if { (eval echo configure:3768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_returns_n_of_chars=yes
@@ -3791 +4072 @@
 # determine ALIGN_8
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:3794: checking size of char" >&5
+echo "configure:4075: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3799 +4080 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3802 "configure"
+#line 4083 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3810 +4091 @@
 }
 EOF
-if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
@@ -3830 +4111 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3833: checking size of short" >&5
+echo "configure:4114: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3838 +4119 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3841 "configure"
+#line 4122 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3849 +4130 @@
 }
 EOF
-if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
@@ -3869 +4150 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3872: checking size of int" >&5
+echo "configure:4153: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3877 +4158 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3880 "configure"
+#line 4161 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3888 +4169 @@
 }
 EOF
-if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
@@ -3908 +4189 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3911: checking size of long" >&5
+echo "configure:4192: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3916 +4197 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3919 "configure"
+#line 4200 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3927 +4208 @@
 }
 EOF
-if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -3947 +4228 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:3950: checking size of void*" >&5
+echo "configure:4231: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3955 +4236 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3958 "configure"
+#line 4239 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3966 +4247 @@
 }
 EOF
-if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3986 +4267 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3989: checking size of double" >&5
+echo "configure:4270: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3994 +4275 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3997 "configure"
+#line 4278 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4005 +4286 @@
 }
 EOF
-if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
@@ -4025 +4306 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4028: checking whether byte ordering is bigendian" >&5
+echo "configure:4309: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4032 +4313 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4035 "configure"
+#line 4316 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -4043 +4324 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4050 "configure"
+#line 4331 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -4058 +4339 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -4078 +4359 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 4081 "configure"
+#line 4362 "configure"
 #include "confdefs.h"
 main () {
@@ -4091 +4372 @@
 }
 EOF
-if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -4149 +4430 @@
 fi
 
+# Check whether --with-python or --without-python was given.
+if test "${with_python+set}" = set; then
+  withval="$with_python"
+  :
+fi
+
 # Check whether --with-Boost or --without-Boost was given.
 if test "${with_Boost+set}" = set; then
@@ -4239 +4526 @@
 
 echo $ac_n "checking whether to use dynamic linking""... $ac_c" 1>&6
-echo "configure:4242: checking whether to use dynamic linking" >&5
+echo "configure:4529: checking whether to use dynamic linking" >&5
 if test "$with_dl" != no && test "$ac_lib_dl" = yes; then
   cat >> confdefs.h <<\EOF
@@ -4252 +4539 @@
 
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:4255: checking for tgetent in -lncurses" >&5
+echo "configure:4542: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4260 +4547 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4263 "configure"
+#line 4550 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4271 +4558 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4561: \"$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"
@@ -4298 +4585 @@
 \
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:4301: checking for tgetent in -lcurses" >&5
+echo "configure:4588: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4306 +4593 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4309 "configure"
+#line 4596 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4317 +4604 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4607: \"$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"
@@ -4344 +4631 @@
 \
   echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:4347: checking for tgetent in -ltermcap" >&5
+echo "configure:4634: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4352 +4639 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4355 "configure"
+#line 4642 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4363 +4650 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4653: \"$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"
@@ -4412 +4699 @@
 
    echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
-echo "configure:4415: checking for rl_abort in -lreadline" >&5
+echo "configure:4702: checking for rl_abort in -lreadline" >&5
 ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4420 +4707 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4423 "configure"
+#line 4710 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4434 +4721 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4724: \"$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"
@@ -4462 +4749 @@
 
    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:4465: checking how to run the C++ preprocessor" >&5
+echo "configure:4752: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
@@ -4475 +4762 @@
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 4478 "configure"
+#line 4765 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4770: \"$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
@@ -4508 +4795 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4511: checking for $ac_hdr" >&5
+echo "configure:4798: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4516 "configure"
+#line 4803 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4808: \"$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
@@ -4547 +4834 @@
       test "$ac_cv_header_readline_readline_h" = yes; then
      echo $ac_n "checking whether readline.h is ok""... $ac_c" 1>&6
-echo "configure:4550: checking whether readline.h is ok" >&5
+echo "configure:4837: checking whether readline.h is ok" >&5
      if eval "test \"`echo '$''{'ac_cv_header_readline_readline_h_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4555 "configure"
+#line 4842 "configure"
 #include "confdefs.h"
 #include<unistd.h>
@@ -4565 +4852 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_readline_readline_h_ok="yes"
@@ -4581 +4868 @@
 #not ok -- try once more with explicitly declaring everything
       echo $ac_n "checking whether or not we nevertheless can use readline""... $ac_c" 1>&6
-echo "configure:4584: checking whether or not we nevertheless can use readline" >&5
+echo "configure:4871: checking whether or not we nevertheless can use readline" >&5
       if eval "test \"`echo '$''{'ac_cv_have_readline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4589 "configure"
+#line 4876 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4620 +4907 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_readline="yes"
@@ -4659 +4946 @@
 
 echo $ac_n "checking which readline to use""... $ac_c" 1>&6
-echo "configure:4662: checking which readline to use" >&5
+echo "configure:4949: checking which readline to use" >&5
 if test "$ac_cv_with_readline" = dynamic; then
   echo "$ac_t""dynamic" 1>&6
@@ -4679 +4966 @@
 # gmp, MP, MPT, factory, libfac
 echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:4682: checking for main in -lgmp" >&5
+echo "configure:4969: checking for main in -lgmp" >&5
 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4687 +4974 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4690 "configure"
+#line 4977 "configure"
 #include "confdefs.h"
 
@@ -4694 +4981 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4984: \"$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"
@@ -4723 +5010 @@
 SAVE_LIBS=$LIBS
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:4726: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:5013: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4731 +5018 @@
 LIBS="-lMP $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4734 "configure"
+#line 5021 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4742 +5029 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5032: \"$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"
@@ -4770 +5057 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:4773: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:5060: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4778 +5065 @@
 LIBS="-lMPT $MP_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4781 "configure"
+#line 5068 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4789 +5076 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5079: \"$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"
@@ -4818 +5105 @@
 LIBS=$SAVE_LIBS
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:4821: checking for atof in -lsingcf" >&5
+echo "configure:5108: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4826 +5113 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4829 "configure"
+#line 5116 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4837 +5124 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5127: \"$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"
@@ -4865 +5152 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:4868: checking for atof in -lsingfac" >&5
+echo "configure:5155: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4873 +5160 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4876 "configure"
+#line 5163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4884 +5171 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5174: \"$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"
@@ -4912 +5199 @@
 
 echo $ac_n "checking for omTestAddr in -lomalloc""... $ac_c" 1>&6
-echo "configure:4915: checking for omTestAddr in -lomalloc" >&5
+echo "configure:5202: checking for omTestAddr in -lomalloc" >&5
 ac_lib_var=`echo omalloc'_'omTestAddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4920 +5207 @@
 LIBS="-lomalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4923 "configure"
+#line 5210 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4931 +5218 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5221: \"$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"
@@ -4959 +5246 @@
 
 echo $ac_n "checking for main in -lomalloc_ndebug""... $ac_c" 1>&6
-echo "configure:4962: checking for main in -lomalloc_ndebug" >&5
+echo "configure:5249: checking for main in -lomalloc_ndebug" >&5
 ac_lib_var=`echo omalloc_ndebug'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4967 +5254 @@
 LIBS="-lomalloc_ndebug  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4970 "configure"
+#line 5257 "configure"
 #include "confdefs.h"
 
@@ -4974 +5261 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5264: \"$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"
@@ -5002 +5289 @@
 
 echo $ac_n "checking for main in -lntl""... $ac_c" 1>&6
-echo "configure:5005: checking for main in -lntl" >&5
+echo "configure:5292: checking for main in -lntl" >&5
 ac_lib_var=`echo ntl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5010 +5297 @@
 LIBS="-lntl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5013 "configure"
+#line 5300 "configure"
 #include "confdefs.h"
 
@@ -5017 +5304 @@
 ; return 0; }
 EOF
-if { (eval echo configure:5020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5307: \"$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"
@@ -5050 +5337 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5053: checking for $ac_hdr" >&5
+echo "configure:5340: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 5345 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5350: \"$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
@@ -5088 +5375 @@
 
 echo $ac_n "checking whether to use Boost""... $ac_c" 1>&6
-echo "configure:5091: checking whether to use Boost" >&5
+echo "configure:5378: checking whether to use Boost" >&5
 if test "$with_Boost" != no; then
   echo "$ac_t""yes" 1>&6
@@ -5103 +5390 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5106: checking for $ac_hdr" >&5
+echo "configure:5393: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5111 "configure"
+#line 5398 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5403: \"$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
@@ -5149 +5436 @@
   echo "$ac_t""no" 1>&6
   echo $ac_n "checking whether to use std::vector""... $ac_c" 1>&6
-echo "configure:5152: checking whether to use std::vector" >&5
+echo "configure:5439: checking whether to use std::vector" >&5
   if test "$with_stdvec" != yes; then
     echo "$ac_t""no" 1>&6
@@ -5198 +5485 @@
 SAVE_LIBS=$LIBS
 echo $ac_n "checking for __stack_chk_fail_local in -lc_nonshared""... $ac_c" 1>&6
-echo "configure:5201: checking for __stack_chk_fail_local in -lc_nonshared" >&5
+echo "configure:5488: checking for __stack_chk_fail_local in -lc_nonshared" >&5
 ac_lib_var=`echo c_nonshared'_'__stack_chk_fail_local | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5206 +5493 @@
 LIBS="-lc_nonshared  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5209 "configure"
+#line 5496 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5217 +5504 @@
 ; return 0; }
 EOF
-if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5507: \"$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"
@@ -5247 +5534 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:5250: checking which apint package to use" >&5
+echo "configure:5537: checking which apint package to use" >&5
 if test "${with_apint}" != gmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -5268 +5555 @@
 fi
 
-echo $ac_n "checking gfan lib""... $ac_c" 1>&6
+echo $ac_n "checking gfanlib""... $ac_c" 1>&6
+echo "configure:5559: checking gfanlib" >&5
 if test "$enable_gfanlib" = yes; then
-  echo "yes"
-  NEED_LIBS="${NEED_LIBS} -lcddgmp -lgfan"
-else
-  echo "no"
+  echo "$ac_t""yes" 1>&6
+  NEED_LIBS="${NEED_LIBS} -lgfan -lcddgmp"
+else
+  echo "$ac_t""can not build with gfan lib" 1>&6
 fi
 
 echo $ac_n "checking whether to use libsvd""... $ac_c" 1>&6
-echo "configure:5272: checking whether to use libsvd" >&5
+echo "configure:5568: checking whether to use libsvd" >&5
 if test "$with_svd" = yes; then
   echo "$ac_t""yes" 1>&6
@@ -5292 +5580 @@
 #
 echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
-echo "configure:5287: checking whether to have MP" >&5
+echo "configure:5583: checking whether to have MP" >&5
 if test "${with_MP}" != yes && test "${with_MP}" != no; then
   if (test "${will_have_gmp}" = yes) && \
@@ -5327 +5615 @@
 
 echo $ac_n "checking whether to have NTL""... $ac_c" 1>&6
-echo "configure:5322: checking whether to have NTL" >&5
+echo "configure:5618: checking whether to have NTL" >&5
 if test "${with_NTL}" = yes ; then
   echo "$ac_t""yes" 1>&6
@@ -5336 +5624 @@
 
 echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
-echo "configure:5331: checking whether to have factory" >&5
+echo "configure:5627: checking whether to have factory" >&5
 if test "${with_factory}" != yes && test "${with_factory}" != no; then
   if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
@@ -5367 +5655 @@
 
 echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
-echo "configure:5362: checking whether to have libfac" >&5
+echo "configure:5658: checking whether to have libfac" >&5
 if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
   if (test "${will_have_factory}" = yes) && \
@@ -5402 +5690 @@
 
 echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
-echo "configure:5397: checking whether to have dbm links" >&5
+echo "configure:5693: checking whether to have dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -5414 +5702 @@
 
 echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
-echo "configure:5409: checking whether to have dynamic modules" >&5
+echo "configure:5705: checking whether to have dynamic modules" >&5
 if test "$with_dynamic_modules" = no || test "$ac_have_dl" != yes; then
   echo "$ac_t""no" 1>&6
@@ -5426 +5714 @@
 
 echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
-echo "configure:5421: checking whether to have dynamic kernel" >&5
+echo "configure:5717: checking whether to have dynamic kernel" >&5
 if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
   DL_KERNEL=1
@@ -5436 +5724 @@
 
 echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
-echo "configure:5431: checking whether to have Plural" >&5
+echo "configure:5727: checking whether to have Plural" >&5
 if test "$with_Plural" != no && test "$enable_Plural" != no; then
   cat >> confdefs.h <<\EOF
@@ -5450 +5738 @@
 
 echo $ac_n "checking whether to have ratGB""... $ac_c" 1>&6
-echo "configure:5445: checking whether to have ratGB" >&5
+echo "configure:5741: checking whether to have ratGB" >&5
 if test "$with_ratGB" != yes && test "$enable_ratGB" != yes; then
   echo "$ac_t""no" 1>&6
@@ -5630 +5918 @@
 s%@LN_S@%$LN_S%g
 s%@PERL@%$PERL%g
+s%@PYTHON@%$PYTHON%g
+s%@PYTHON_CPPFLAGS@%$PYTHON_CPPFLAGS%g
+s%@PYTHON_LDFLAGS@%$PYTHON_LDFLAGS%g
+s%@PYTHON_SITE_PKG@%$PYTHON_SITE_PKG%g
+s%@PYTHON_EXTRA_LIBS@%$PYTHON_EXTRA_LIBS%g
+s%@PYTHON_EXTRA_LDFLAGS@%$PYTHON_EXTRA_LDFLAGS%g
+s%@HAVE_PYTHON_VALUE@%$HAVE_PYTHON_VALUE%g
 s%@LD_DYN_FLAGS@%$LD_DYN_FLAGS%g
 s%@SFLAGS@%$SFLAGS%g

Singular/configure.in

@@ -3 +3 @@
 AC_CONFIG_HEADER(mod2.h)
 AC_CONFIG_HEADER(../kernel/mod2.h)
+
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl check for python (see AC_PYTHON_DEVEL in newer autoconf versions)
+dnl
+AC_DEFUN([AC_PYTHON_DEVEL_SINGULAR],[
+        #
+        # Allow the use of a (user set) custom python version
+        #
+        PYTHON_VERSION="$1"
+        PYTHON="$2"
+
+        #
+        # Check for a version of Python >= 2.1.0
+        #
+        AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                        ver = string.split(sys.version)[[0]]; \
+                        print ver >= '2.1.0'"`
+        if test "$ac_supports_python_ver" != "True"; then
+                if test -z "$PYTHON_NOVERSIONCHECK"; then
+                        AC_MSG_RESULT([no])
+                        AC_MSG_ERROR([
+This version of the AC@&t@_PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+])
+                else
+                        AC_MSG_RESULT([skip at user request])
+                fi
+        else
+                AC_MSG_RESULT([yes])
+        fi
+
+        #
+        # if the macro parameter ``version'' is set, honour it
+        #
+        if test -n "$1"; then
+                AC_MSG_CHECKING([for a version of Python $1])
+                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+                        ver = string.split(sys.version)[[0]]; print ver $1"`
+                if test "$ac_supports_python_ver" = "True"; then
+                   AC_MSG_RESULT([yes])
+                else
+                        AC_MSG_RESULT([no])
+                        AC_MSG_ERROR([this package requires Python $1.
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See ``configure --help'' for reference.
+])
+                        PYTHON_VERSION=""
+                fi
+        fi
+
+        #
+        # Check if you have distutils, else fail
+        #
+        AC_MSG_CHECKING([for the distutils Python package])
+        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+        if test -z "$ac_distutils_result"; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                AC_MSG_ERROR([cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result])
+                PYTHON_VERSION=""
+        fi
+
+        #
+        # Check for Python include path
+        #
+        AC_MSG_CHECKING([for Python include path])
+        if test -z "$PYTHON_CPPFLAGS"; then
+                python_path=`$PYTHON -c "import distutils.sysconfig; \
+                                print distutils.sysconfig.get_python_inc();"`
+                if test -n "${python_path}"; then
+                        python_path="-I$python_path"
+                fi
+                PYTHON_CPPFLAGS=$python_path
+        fi
+        AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+        AC_SUBST([PYTHON_CPPFLAGS])
+
+        #
+        # Check for Python library path
+        #
+        AC_MSG_CHECKING([for Python library path])
+        if test -z "$PYTHON_LDFLAGS"; then
+                # (makes two attempts to ensure we've got a version number
+                # from the interpreter)
+                py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        print join(get_config_vars('VERSION'))"`
+                if test "$py_version" == "[None]"; then
+                        if test -n "$PYTHON_VERSION"; then
+                                py_version=$PYTHON_VERSION
+                        else
+                                py_version=`$PYTHON -c "import sys; \
+                                        print sys.version[[:3]]"`
+                        fi
+                fi
+
+                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+                        from string import join; \
+                        from os import path; \
+                        print '-L' + get_python_lib(0,1), \
+                        '-L' + path.dirname(get_python_lib(0,1)), \
+                        '-lpython';"`$py_version
+        fi
+        AC_MSG_RESULT([$PYTHON_LDFLAGS])
+        AC_SUBST([PYTHON_LDFLAGS])
+
+        #
+        # Check for site packages
+        #
+        AC_MSG_CHECKING([for Python site-packages path])
+        if test -z "$PYTHON_SITE_PKG"; then
+                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+print distutils.sysconfig.get_python_lib(0,0);"`
+        fi
+        AC_MSG_RESULT([$PYTHON_SITE_PKG])
+        AC_SUBST([PYTHON_SITE_PKG])
+
+        #
+        # libraries which must be linked in when embedding
+        #
+        AC_MSG_CHECKING(python extra libraries)
+        if test -z "$PYTHON_EXTRA_LIBS"; then
+           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+conf = distutils.sysconfig.get_config_var; \
+print conf('LOCALMODLIBS'), conf('LIBS')"`
+        fi
+        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+        AC_SUBST(PYTHON_EXTRA_LIBS)
+
+        #
+        # linking flags needed when embedding
+        #
+        AC_MSG_CHECKING(python extra linking flags)
+        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+                        conf = distutils.sysconfig.get_config_var; \
+                        print conf('LINKFORSHARED')"`
+        fi
+        AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+        AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+        #
+        # final check to see if everything compiles alright
+        #
+        AC_MSG_CHECKING([consistency of all components of python development environment])
+#       AC_LANG_PUSH([C])
+        # save current global flags
+        ac_save_LIBS_for_python="${LIBS}"
+        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+        ac_save_CPPFLAGS_for_python="${CPPFLAGS}"
+        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+        AC_TRY_LINK([
+                #include <Python.h>
+        ],[
+                Py_Initialize();
+        ],[pythonexists=yes],[pythonexists=no])
+
+        AC_MSG_RESULT([$pythonexists])
+
+        if test ! "$pythonexists" = "yes"; then
+           AC_MSG_ERROR([
+  Could not link test program to Python. Maybe the main Python library has been
+  installed in some non-standard library path. If so, pass it to configure,
+  via the LDFLAGS environment variable.
+  Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
+  ============================================================================
+   ERROR!
+   You probably have to install the development version of the Python package
+   for your distribution.  The exact name of this package varies among them.
+  ============================================================================
+           ])
+          PYTHON_VERSION=""
+        else
+          AC_DEFINE(HAVE_PYTHON)
+          HAVE_PYTHON_VALUE=1
+          AC_SUBST(HAVE_PYTHON_VALUE)      
+        fi
+#       AC_LANG_POP
+        # turn back to default flags
+        CPPFLAGS="$ac_save_CPPFLAGS_for_python"
+        LIBS="$ac_save_LIBS_for_python"
+
+        #
+        # all done!
+        #
+])
+
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -380 +577 @@
 
 AC_CHECK_PROGS(PERL, perl5 perl)
+
+# python
+if test "${with_python+set}" != set; then
+dnl Default value here!
+  PYTHON_EXE="no"
+else
+  if test "${with_python}" = yes; then 
+    PYTHON_EXE="python"
+  else
+    PYTHON_EXE="${with_python}"
+  fi
+fi
+
+if test "${PYTHON_EXE}" = no; then
+  AC_MSG_WARN(building without python support)
+else
+  AC_PATH_PROG([PYTHON],[$PYTHON_EXE])
+  if test -z "$PYTHON"; then
+    AC_MSG_WARN([Cannot find $PYTHON_EXE in your system path - skipping python support])
+  else
+    AC_PYTHON_DEVEL_SINGULAR(>= '2.4', "${PYTHON}")
+  fi
+fi
 
 dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -622 +842 @@
   readline,
   [  --with-readline=[dynamic,static,no]
-                          do use dynamic/static/no readline for fancy display])
+                        do use dynamic/static/no readline for fancy display])
+AC_ARG_WITH(
+  python,
+  [  --with-python=[PYTHON,no]     uses PYTHON as python executable, default is python])
 AC_ARG_WITH(
   Boost,

Singular/grammar.cc

@@ -743 +743 @@
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1969
+#define YYLAST   1971
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  145
+#define YYNTOKENS  146
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  44
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  168
+#define YYNRULES  169
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  373
+#define YYNSTATES  375
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
@@ -768 +768 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,   138,     2,
-     142,   143,   140,   130,   136,   131,     2,   132,     2,     2,
+     142,   143,   140,   130,   136,   131,   144,   132,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,   139,   137,
      128,   127,   129,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   133,     2,   134,   135,     2,   144,     2,     2,     2,
+       2,   133,     2,   134,   135,     2,   145,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -813 +813 @@
       21,    24,    26,    28,    30,    32,    34,    36,    38,    40,
       43,    45,    47,    49,    51,    53,    55,    57,    59,    61,
-      64,    66,    68,    72,    76,    81,    85,    87,    89,    91,
-      96,   100,   102,   104,   106,   110,   117,   122,   127,   132,
-     136,   141,   146,   150,   155,   162,   171,   178,   187,   192,
-     197,   204,   209,   216,   225,   234,   238,   243,   252,   257,
-     266,   271,   280,   285,   289,   295,   296,   302,   305,   307,
-     310,   313,   317,   321,   325,   329,   333,   337,   341,   345,
-     349,   353,   356,   359,   362,   365,   367,   371,   373,   375,
-     378,   381,   384,   387,   396,   399,   408,   411,   415,   418,
-     420,   422,   428,   430,   432,   437,   439,   443,   445,   449,
-     451,   452,   457,   461,   464,   468,   471,   474,   478,   483,
-     488,   493,   498,   503,   508,   513,   518,   523,   530,   537,
-     544,   551,   558,   565,   572,   579,   583,   585,   594,   597,
-     600,   602,   604,   607,   610,   612,   618,   621,   627,   629,
-     631,   635,   641,   645,   649,   654,   657,   660,   665
+      64,    66,    68,    72,    76,    80,    85,    89,    91,    93,
+      95,   100,   104,   106,   108,   110,   114,   121,   126,   131,
+     136,   140,   145,   150,   154,   159,   166,   175,   182,   191,
+     196,   201,   208,   213,   220,   229,   238,   242,   247,   256,
+     261,   270,   275,   284,   289,   293,   299,   300,   306,   309,
+     311,   314,   317,   321,   325,   329,   333,   337,   341,   345,
+     349,   353,   357,   360,   363,   366,   369,   371,   375,   377,
+     379,   382,   385,   388,   391,   400,   403,   412,   415,   419,
+     422,   424,   426,   432,   434,   436,   441,   443,   447,   449,
+     453,   455,   456,   461,   465,   468,   472,   475,   478,   482,
+     487,   492,   497,   502,   507,   512,   517,   522,   527,   534,
+     541,   548,   555,   562,   569,   576,   583,   587,   589,   598,
+     601,   604,   606,   608,   611,   614,   616,   622,   625,   631,
+     633,   635,   639,   645,   649,   653,   658,   661,   664,   669
 };
 
@@ -832 +832 @@
 static const yytype_int16 yyrhs[] =
 {
-     146,     0,    -1,    -1,   146,   147,    -1,   148,    -1,   150,
-     137,    -1,   162,   137,    -1,   188,    -1,   122,    -1,   137,
-      -1,     1,   137,    -1,   183,    -1,   184,    -1,   149,    -1,
-     185,    -1,   186,    -1,   170,    -1,   172,    -1,   173,    -1,
-     101,   110,    -1,   151,    -1,   174,    -1,   175,    -1,   176,
-      -1,   187,    -1,   178,    -1,   179,    -1,   181,    -1,   182,
-      -1,   159,   153,    -1,   113,    -1,   160,    -1,   152,    11,
-     152,    -1,   152,   142,   143,    -1,   152,   142,   153,   143,
-      -1,   133,   153,   134,    -1,   111,    -1,   126,    -1,   163,
-      -1,    14,   142,   154,   143,    -1,   153,   136,   154,    -1,
-     154,    -1,   158,    -1,   152,    -1,   142,   153,   143,    -1,
-     154,   133,   154,   136,   154,   134,    -1,   154,   133,   154,
-     134,    -1,    98,   142,   154,   143,    -1,    99,   142,   153,
-     143,    -1,    99,   142,   143,    -1,   100,   142,   154,   143,
-      -1,   161,   142,   153,   143,    -1,   161,   142,   143,    -1,
-      90,   142,   154,   143,    -1,    91,   142,   154,   136,   154,
-     143,    -1,    92,   142,   154,   136,   154,   136,   154,   143,
-      -1,    95,   142,   154,   136,   154,   143,    -1,    95,   142,
-     154,   136,   154,   136,   154,   143,    -1,    93,   142,   154,
-     143,    -1,    94,   142,   154,   143,    -1,    93,   142,   154,
-     136,   154,   143,    -1,    96,   142,   154,   143,    -1,    96,
-     142,   154,   136,   154,   143,    -1,    94,   142,   154,   136,
-     154,   136,   154,   143,    -1,    96,   142,   154,   136,   154,
-     136,   154,   143,    -1,    97,   142,   143,    -1,    97,   142,
-     153,   143,    -1,    19,   142,   154,   136,   154,   136,   154,
-     143,    -1,    19,   142,   154,   143,    -1,    13,   142,   154,
-     136,   154,   136,   154,   143,    -1,    13,   142,   154,   143,
-      -1,    15,   142,   164,   136,   164,   136,   168,   143,    -1,
-      15,   142,   154,   143,    -1,   156,   154,   157,    -1,   156,
-     154,   127,   154,   157,    -1,    -1,   118,   142,   155,   154,
-     143,    -1,   119,   142,    -1,   143,    -1,   154,    10,    -1,
-     154,     7,    -1,   154,   130,   154,    -1,   154,   131,   154,
-      -1,   154,   132,   154,    -1,   154,   135,   154,    -1,   154,
-     128,   154,    -1,   154,   138,   154,    -1,   154,     9,   154,
-      -1,   154,     4,   154,    -1,   154,     3,   154,    -1,   154,
-     139,   154,    -1,     8,   154,    -1,   131,   154,    -1,   162,
-     169,    -1,   153,   127,    -1,   112,    -1,   144,   154,   144,
-      -1,    17,    -1,    20,    -1,    98,   152,    -1,    99,   152,
-      -1,   100,   152,    -1,   161,   152,    -1,    19,   152,   133,
-     154,   134,   133,   154,   134,    -1,    19,   152,    -1,    13,
-     152,   133,   154,   134,   133,   154,   134,    -1,    13,   152,
-      -1,   162,   136,   152,    -1,    14,   152,    -1,   109,    -1,
-     154,    -1,   142,   154,   136,   153,   143,    -1,   112,    -1,
-     165,    -1,   165,   142,   153,   143,    -1,   166,    -1,   166,
-     136,   167,    -1,   166,    -1,   142,   167,   143,    -1,   127,
-      -1,    -1,   128,   163,   171,   137,    -1,   103,   109,   137,
-      -1,   103,   137,    -1,   101,   109,   137,    -1,   102,   153,
-      -1,   104,   152,    -1,   175,   136,   152,    -1,   106,   142,
-      98,   143,    -1,   106,   142,    99,   143,    -1,   106,   142,
-     100,   143,    -1,   106,   142,   161,   143,    -1,   106,   142,
-      15,   143,    -1,   106,   142,    19,   143,    -1,   106,   142,
-      13,   143,    -1,   106,   142,    14,   143,    -1,   106,   142,
-     152,   143,    -1,   106,   142,   152,   136,    98,   143,    -1,
-     106,   142,   152,   136,    99,   143,    -1,   106,   142,   152,
-     136,   100,   143,    -1,   106,   142,   152,   136,   161,   143,
-      -1,   106,   142,   152,   136,    15,   143,    -1,   106,   142,
-     152,   136,    19,   143,    -1,   106,   142,   152,   136,    13,
-     143,    -1,   106,   142,   152,   136,    14,   143,    -1,   106,
-     142,   143,    -1,    15,    -1,   177,   152,   169,   164,   136,
-     164,   136,   168,    -1,   177,   152,    -1,   126,   163,    -1,
-     107,    -1,    40,    -1,   180,   154,    -1,   108,   154,    -1,
-     153,    -1,   121,   142,   154,   143,   110,    -1,   117,   110,
-      -1,   121,   142,   154,   143,   115,    -1,   115,    -1,   116,
-      -1,   123,   109,   110,    -1,   120,   109,   109,   109,   110,
-      -1,    14,   160,   110,    -1,   114,   109,   110,    -1,   114,
-     109,   109,   110,    -1,   125,   162,    -1,   125,   154,    -1,
-     124,   142,   153,   143,    -1,   124,   142,   143,    -1
+     147,     0,    -1,    -1,   147,   148,    -1,   149,    -1,   151,
+     137,    -1,   163,   137,    -1,   189,    -1,   122,    -1,   137,
+      -1,     1,   137,    -1,   184,    -1,   185,    -1,   150,    -1,
+     186,    -1,   187,    -1,   171,    -1,   173,    -1,   174,    -1,
+     101,   110,    -1,   152,    -1,   175,    -1,   176,    -1,   177,
+      -1,   188,    -1,   179,    -1,   180,    -1,   182,    -1,   183,
+      -1,   160,   154,    -1,   113,    -1,   161,    -1,   153,    11,
+     153,    -1,   153,   144,   153,    -1,   153,   142,   143,    -1,
+     153,   142,   154,   143,    -1,   133,   154,   134,    -1,   111,
+      -1,   126,    -1,   164,    -1,    14,   142,   155,   143,    -1,
+     154,   136,   155,    -1,   155,    -1,   159,    -1,   153,    -1,
+     142,   154,   143,    -1,   155,   133,   155,   136,   155,   134,
+      -1,   155,   133,   155,   134,    -1,    98,   142,   155,   143,
+      -1,    99,   142,   154,   143,    -1,    99,   142,   143,    -1,
+     100,   142,   155,   143,    -1,   162,   142,   154,   143,    -1,
+     162,   142,   143,    -1,    90,   142,   155,   143,    -1,    91,
+     142,   155,   136,   155,   143,    -1,    92,   142,   155,   136,
+     155,   136,   155,   143,    -1,    95,   142,   155,   136,   155,
+     143,    -1,    95,   142,   155,   136,   155,   136,   155,   143,
+      -1,    93,   142,   155,   143,    -1,    94,   142,   155,   143,
+      -1,    93,   142,   155,   136,   155,   143,    -1,    96,   142,
+     155,   143,    -1,    96,   142,   155,   136,   155,   143,    -1,
+      94,   142,   155,   136,   155,   136,   155,   143,    -1,    96,
+     142,   155,   136,   155,   136,   155,   143,    -1,    97,   142,
+     143,    -1,    97,   142,   154,   143,    -1,    19,   142,   155,
+     136,   155,   136,   155,   143,    -1,    19,   142,   155,   143,
+      -1,    13,   142,   155,   136,   155,   136,   155,   143,    -1,
+      13,   142,   155,   143,    -1,    15,   142,   165,   136,   165,
+     136,   169,   143,    -1,    15,   142,   155,   143,    -1,   157,
+     155,   158,    -1,   157,   155,   127,   155,   158,    -1,    -1,
+     118,   142,   156,   155,   143,    -1,   119,   142,    -1,   143,
+      -1,   155,    10,    -1,   155,     7,    -1,   155,   130,   155,
+      -1,   155,   131,   155,    -1,   155,   132,   155,    -1,   155,
+     135,   155,    -1,   155,   128,   155,    -1,   155,   138,   155,
+      -1,   155,     9,   155,    -1,   155,     4,   155,    -1,   155,
+       3,   155,    -1,   155,   139,   155,    -1,     8,   155,    -1,
+     131,   155,    -1,   163,   170,    -1,   154,   127,    -1,   112,
+      -1,   145,   155,   145,    -1,    17,    -1,    20,    -1,    98,
+     153,    -1,    99,   153,    -1,   100,   153,    -1,   162,   153,
+      -1,    19,   153,   133,   155,   134,   133,   155,   134,    -1,
+      19,   153,    -1,    13,   153,   133,   155,   134,   133,   155,
+     134,    -1,    13,   153,    -1,   163,   136,   153,    -1,    14,
+     153,    -1,   109,    -1,   155,    -1,   142,   155,   136,   154,
+     143,    -1,   112,    -1,   166,    -1,   166,   142,   154,   143,
+      -1,   167,    -1,   167,   136,   168,    -1,   167,    -1,   142,
+     168,   143,    -1,   127,    -1,    -1,   128,   164,   172,   137,
+      -1,   103,   109,   137,    -1,   103,   137,    -1,   101,   109,
+     137,    -1,   102,   154,    -1,   104,   153,    -1,   176,   136,
+     153,    -1,   106,   142,    98,   143,    -1,   106,   142,    99,
+     143,    -1,   106,   142,   100,   143,    -1,   106,   142,   162,
+     143,    -1,   106,   142,    15,   143,    -1,   106,   142,    19,
+     143,    -1,   106,   142,    13,   143,    -1,   106,   142,    14,
+     143,    -1,   106,   142,   153,   143,    -1,   106,   142,   153,
+     136,    98,   143,    -1,   106,   142,   153,   136,    99,   143,
+      -1,   106,   142,   153,   136,   100,   143,    -1,   106,   142,
+     153,   136,   162,   143,    -1,   106,   142,   153,   136,    15,
+     143,    -1,   106,   142,   153,   136,    19,   143,    -1,   106,
+     142,   153,   136,    13,   143,    -1,   106,   142,   153,   136,
+      14,   143,    -1,   106,   142,   143,    -1,    15,    -1,   178,
+     153,   170,   165,   136,   165,   136,   169,    -1,   178,   153,
+      -1,   126,   164,    -1,   107,    -1,    40,    -1,   181,   155,
+      -1,   108,   155,    -1,   154,    -1,   121,   142,   155,   143,
+     110,    -1,   117,   110,    -1,   121,   142,   155,   143,   115,
+      -1,   115,    -1,   116,    -1,   123,   109,   110,    -1,   120,
+     109,   109,   109,   110,    -1,    14,   161,   110,    -1,   114,
+     109,   110,    -1,   114,   109,   109,   110,    -1,   125,   163,
+      -1,   125,   155,    -1,   124,   142,   154,   143,    -1,   124,
+     142,   143,    -1
 };
 
@@ -904 +905 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   357,   357,   359,   393,   394,   396,   398,   402,   407,
-     409,   460,   461,   462,   463,   464,   465,   466,   467,   471,
-     474,   475,   476,   477,   478,   479,   480,   481,   482,   485,
-     492,   497,   501,   505,   509,   522,   550,   574,   580,   586,
-     593,   604,   610,   615,   616,   617,   621,   625,   629,   633,
-     637,   641,   645,   649,   653,   657,   661,   665,   669,   673,
-     677,   681,   685,   689,   693,   697,   701,   705,   709,   713,
-     717,   721,   725,   729,   733,   751,   750,   768,   776,   785,
-     789,   793,   797,   801,   805,   809,   813,   817,   821,   825,
-     829,   833,   840,   847,   848,   867,   868,   880,   880,   885,
-     890,   895,   899,   903,   919,   923,   939,   953,   974,   982,
-     986,   987,  1001,  1009,  1018,  1063,  1064,  1073,  1074,  1080,
-    1093,  1092,  1100,  1105,  1112,  1120,  1132,  1148,  1167,  1171,
-    1175,  1180,  1184,  1188,  1192,  1196,  1200,  1205,  1211,  1217,
-    1223,  1229,  1235,  1241,  1247,  1259,  1266,  1270,  1308,  1318,
-    1331,  1331,  1334,  1406,  1412,  1441,  1454,  1471,  1480,  1485,
-    1493,  1505,  1524,  1535,  1555,  1579,  1585,  1597,  1604
+       0,   358,   358,   360,   394,   395,   397,   399,   403,   408,
+     410,   461,   462,   463,   464,   465,   466,   467,   468,   472,
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   486,
+     493,   498,   502,   506,   510,   514,   527,   555,   579,   585,
+     591,   598,   609,   615,   620,   621,   622,   626,   630,   634,
+     638,   642,   646,   650,   654,   658,   662,   666,   670,   674,
+     678,   682,   686,   690,   694,   698,   702,   706,   710,   714,
+     718,   722,   726,   730,   734,   738,   756,   755,   773,   781,
+     790,   794,   798,   802,   806,   810,   814,   818,   822,   826,
+     830,   834,   838,   845,   852,   853,   872,   873,   885,   885,
+     890,   895,   900,   904,   908,   924,   928,   944,   958,   979,
+     987,   991,   992,  1006,  1014,  1023,  1068,  1069,  1078,  1079,
+    1085,  1098,  1097,  1105,  1110,  1117,  1125,  1137,  1153,  1172,
+    1176,  1180,  1185,  1189,  1193,  1197,  1201,  1205,  1210,  1216,
+    1222,  1228,  1234,  1240,  1246,  1252,  1264,  1271,  1275,  1313,
+    1323,  1336,  1336,  1339,  1411,  1417,  1446,  1459,  1476,  1485,
+    1490,  1498,  1510,  1529,  1540,  1560,  1584,  1590,  1602,  1609
 };
 #endif
@@ -954 +955 @@
   "SYS_BREAK", "WHILE_CMD", "RETURN", "PARAMETER", "SYSVAR", "'='", "'<'",
   "'>'", "'+'", "'-'", "'/'", "'['", "']'", "'^'", "','", "';'", "'&'",
-  "':'", "'*'", "UMINUS", "'('", "')'", "'`'", "$accept", "lines",
+  "':'", "'*'", "UMINUS", "'('", "')'", "'.'", "'`'", "$accept", "lines",
   "pprompt", "flowctrl", "example_dummy", "command", "assign", "elemexpr",
   "exprlist", "expr", "@1", "quote_start", "quote_end", "expr_arithmetic",
@@ -985 +986 @@
      375,   376,   377,   378,   379,   380,   381,    61,    60,    62,
       43,    45,    47,    91,    93,    94,    44,    59,    38,    58,
-      42,   382,    40,    41,    96
+      42,   382,    40,    41,    46,    96
 };
 # endif
@@ -992 +993 @@
 static const yytype_uint8 yyr1[] =
 {
-       0,   145,   146,   146,   147,   147,   147,   147,   147,   147,
-     147,   148,   148,   148,   148,   148,   148,   148,   148,   149,
-     150,   150,   150,   150,   150,   150,   150,   150,   150,   151,
-     152,   152,   152,   152,   152,   152,   152,   152,   152,   152,
-     153,   153,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   154,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   154,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   154,   154,   154,   154,   155,   154,   156,   157,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   159,   159,   160,   160,   161,   161,   162,
-     162,   162,   162,   162,   162,   162,   162,   162,   162,   163,
-     164,   164,   165,   166,   166,   167,   167,   168,   168,   169,
-     171,   170,   172,   172,   173,   174,   175,   175,   176,   176,
-     176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
-     176,   176,   176,   176,   176,   176,   177,   178,   178,   179,
-     180,   180,   181,   182,   182,   183,   183,   183,   183,   183,
-     184,   185,   186,   186,   186,   187,   187,   188,   188
+       0,   146,   147,   147,   148,   148,   148,   148,   148,   148,
+     148,   149,   149,   149,   149,   149,   149,   149,   149,   150,
+     151,   151,   151,   151,   151,   151,   151,   151,   151,   152,
+     153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
+     153,   154,   154,   155,   155,   155,   155,   155,   155,   155,
+     155,   155,   155,   155,   155,   155,   155,   155,   155,   155,
+     155,   155,   155,   155,   155,   155,   155,   155,   155,   155,
+     155,   155,   155,   155,   155,   155,   156,   155,   157,   158,
+     159,   159,   159,   159,   159,   159,   159,   159,   159,   159,
+     159,   159,   159,   159,   160,   160,   161,   161,   162,   162,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     164,   165,   165,   166,   167,   167,   168,   168,   169,   169,
+     170,   172,   171,   173,   173,   174,   175,   176,   176,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   178,   179,   179,
+     180,   181,   181,   182,   183,   183,   184,   184,   184,   184,
+     184,   185,   186,   187,   187,   187,   188,   188,   189,   189
 };
 
@@ -1017 +1018 @@
        2,     1,     1,     1,     1,     1,     1,     1,     1,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       1,     1,     3,     3,     4,     3,     1,     1,     1,     4,
-       3,     1,     1,     1,     3,     6,     4,     4,     4,     3,
-       4,     4,     3,     4,     6,     8,     6,     8,     4,     4,
-       6,     4,     6,     8,     8,     3,     4,     8,     4,     8,
-       4,     8,     4,     3,     5,     0,     5,     2,     1,     2,
-       2,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     2,     2,     2,     2,     1,     3,     1,     1,     2,
-       2,     2,     2,     8,     2,     8,     2,     3,     2,     1,
-       1,     5,     1,     1,     4,     1,     3,     1,     3,     1,
-       0,     4,     3,     2,     3,     2,     2,     3,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     6,     6,     6,
-       6,     6,     6,     6,     6,     3,     1,     8,     2,     2,
-       1,     1,     2,     2,     1,     5,     2,     5,     1,     1,
-       3,     5,     3,     3,     4,     2,     2,     4,     3
+       1,     1,     3,     3,     3,     4,     3,     1,     1,     1,
+       4,     3,     1,     1,     1,     3,     6,     4,     4,     4,
+       3,     4,     4,     3,     4,     6,     8,     6,     8,     4,
+       4,     6,     4,     6,     8,     8,     3,     4,     8,     4,
+       8,     4,     8,     4,     3,     5,     0,     5,     2,     1,
+       2,     2,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     2,     2,     2,     2,     1,     3,     1,     1,
+       2,     2,     2,     2,     8,     2,     8,     2,     3,     2,
+       1,     1,     5,     1,     1,     4,     1,     3,     1,     3,
+       1,     0,     4,     3,     2,     3,     2,     2,     3,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     6,     6,
+       6,     6,     6,     6,     6,     6,     3,     1,     8,     2,
+       2,     1,     1,     2,     2,     1,     5,     2,     5,     1,
+       1,     3,     5,     3,     3,     4,     2,     2,     4,     3
 };
 
@@ -1038 +1039 @@
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,     0,     0,     0,     0,   146,    97,     0,
-      98,   151,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   150,     0,
-     109,    36,    95,    30,     0,   158,   159,     0,     0,     0,
-       0,     0,     8,     0,     0,     0,    37,     0,     0,     0,
-       9,     0,     0,     3,     4,    13,     0,    20,    43,   154,
-      41,     0,    42,     0,    31,     0,     0,    38,    16,    17,
+       2,     0,     1,     0,     0,     0,     0,   147,    98,     0,
+      99,   152,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   151,     0,
+     110,    37,    96,    30,     0,   159,   160,     0,     0,     0,
+       0,     0,     8,     0,     0,     0,    38,     0,     0,     0,
+       9,     0,     0,     3,     4,    13,     0,    20,    44,   155,
+      42,     0,    43,     0,    31,     0,     0,    39,    16,    17,
       18,    21,    22,    23,     0,    25,    26,     0,    27,    28,
       11,    12,    14,    15,    24,     7,    10,     0,     0,     0,
-       0,     0,     0,     0,    37,    91,     0,     0,   106,     0,
-     108,    31,     0,     0,   104,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    99,     0,   100,     0,   101,     0,
-      19,   125,     0,   123,   126,     0,   153,     0,   156,    75,
-      77,     0,     0,     0,     0,     0,   166,   165,   149,   120,
-      92,     0,     0,     0,     5,     0,     0,    94,     0,     0,
-       0,    80,     0,    79,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    29,     0,   102,   119,     0,     6,    93,
-       0,   148,   152,     0,     0,     0,   162,     0,   110,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    65,
-       0,     0,    49,     0,     0,   124,   122,     0,     0,     0,
-       0,     0,     0,     0,   145,     0,     0,     0,   163,     0,
-       0,     0,   160,   168,     0,     0,    35,    44,    96,    32,
-      33,     0,    40,    89,    88,    87,    85,    81,    82,    83,
-       0,    84,    86,    90,     0,    78,    73,    52,     0,   107,
-     127,     0,     0,    70,     0,    39,    41,    72,     0,     0,
-      68,     0,    53,     0,     0,     0,    58,     0,    59,     0,
-       0,    61,    66,    47,    48,    50,   134,   135,   132,   133,
-     128,   129,   130,     0,   136,   131,   164,     0,     0,     0,
-     167,   121,    34,    46,     0,     0,    51,   110,     0,     0,
+       0,     0,     0,     0,    38,    92,     0,     0,   107,     0,
+     109,    31,     0,     0,   105,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   100,     0,   101,     0,   102,     0,
+      19,   126,     0,   124,   127,     0,   154,     0,   157,    76,
+      78,     0,     0,     0,     0,     0,   167,   166,   150,   121,
+      93,     0,     0,     0,     5,     0,     0,     0,    95,     0,
+       0,     0,    81,     0,    80,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    29,     0,   103,   120,     0,     6,
+      94,     0,   149,   153,     0,     0,     0,   163,     0,   111,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    76,
-     161,   155,   157,     0,    74,     0,     0,     0,     0,     0,
-       0,     0,    54,     0,    60,     0,     0,    56,     0,    62,
-     143,   144,   141,   142,   137,   138,   139,   140,    45,     0,
-       0,     0,   111,   112,     0,   113,   117,     0,     0,     0,
-       0,     0,     0,     0,     0,    69,   105,   115,     0,     0,
-      71,    67,   103,    55,    63,    57,    64,   147,     0,   118,
-       0,   116,   114
+      66,     0,     0,    50,     0,     0,   125,   123,     0,     0,
+       0,     0,     0,     0,     0,   146,     0,     0,     0,   164,
+       0,     0,     0,   161,   169,     0,     0,    36,    45,    97,
+      32,    34,     0,    33,    41,    90,    89,    88,    86,    82,
+      83,    84,     0,    85,    87,    91,     0,    79,    74,    53,
+       0,   108,   128,     0,     0,    71,     0,    40,    42,    73,
+       0,     0,    69,     0,    54,     0,     0,     0,    59,     0,
+      60,     0,     0,    62,    67,    48,    49,    51,   135,   136,
+     133,   134,   129,   130,   131,     0,   137,   132,   165,     0,
+       0,     0,   168,   122,    35,    47,     0,     0,    52,   111,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    77,   162,   156,   158,     0,    75,     0,     0,     0,
+       0,     0,     0,     0,    55,     0,    61,     0,     0,    57,
+       0,    63,   144,   145,   142,   143,   138,   139,   140,   141,
+      46,     0,     0,     0,   112,   113,     0,   114,   118,     0,
+       0,     0,     0,     0,     0,     0,     0,    70,   106,   116,
+       0,     0,    72,    68,   104,    56,    64,    58,    65,   148,
+       0,   119,     0,   117,   115
 };
 
@@ -1082 +1083 @@
 {
       -1,     1,    53,    54,    55,    56,    57,    58,   142,    60,
-     209,    61,   236,    62,    63,    64,    96,    66,    67,   179,
-     345,   346,   358,   347,   169,    68,   215,    69,    70,    71,
+     210,    61,   238,    62,    63,    64,    96,    66,    67,   180,
+     347,   348,   360,   349,   170,    68,   216,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
       82,    83,    84,    85
@@ -1090 +1091 @@
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -335
+#define YYPACT_NINF -334
 static const yytype_int16 yypact[] =
 {
-    -335,   281,  -335,  -132,  1199,   822,   848,  -129,  -335,   899,
-    -335,  -335,  -123,  -115,  -104,   -73,   -68,   -64,   -55,   -53,
-    1751,  1779,  1798,   -24,  1199,  -108,  1825,   -50,  -335,  1199,
-    -335,  -335,  -335,  -335,   -28,  -335,  -335,   -51,   -38,   -37,
-       0,   -34,  -335,    13,   -26,  1255,    39,    39,  1199,  1199,
-    -335,  1199,  1199,  -335,  -335,  -335,    12,  -335,    -5,  -101,
-    1678,  1199,  -335,  1199,  -335,  1817,   -83,  -335,  -335,  -335,
-    -335,  -335,    24,  -335,  1825,  -335,  -335,  1199,  -335,  -335,
-    -335,  -335,  -335,  -335,  -335,  -335,  -335,    40,    45,  -129,
-      51,    52,    54,    55,  -335,    36,    60,  1199,     9,  1199,
-      -5,    88,  1314,  1199,    20,  1199,  1199,  1199,  1199,  1199,
-    1199,  1199,   904,  1199,    -5,   969,    -5,  1199,    -5,    70,
-    -335,    74,    72,  -335,    -5,  1756,  1678,   -11,  -335,  -335,
-    -335,    46,  1199,   104,  1025,   848,  1678,    77,  -335,  -335,
-      36,   -61,  -127,     8,  -335,  1825,  1084,  -335,  1199,  1199,
-    1199,  -335,  1199,  -335,  1199,  1199,  1199,  1199,  1199,  1199,
-    1199,  1199,    73,    74,  1140,    -5,  -335,  1825,  -335,  -335,
-    1825,    -8,  1678,    87,  1199,   426,  -335,  1199,   456,    85,
-     103,  1199,   495,  1368,  1380,   181,   319,  1412,   344,  -335,
-    -106,   509,  -335,   -94,   523,  -335,  -335,    81,   -42,    86,
-      89,    94,    97,   101,  -335,   107,   102,   118,  -335,  1199,
-     138,   563,  -335,  -335,   -86,   111,  -335,  -335,  -335,  -335,
-    -335,   -76,  1678,  1690,   446,   446,    26,    48,    48,    36,
-    1353,    -3,  1702,    48,  1199,  -335,  -335,  -335,   -75,    -5,
-      -5,  1314,  1199,  -335,  1427,  -335,  1439,  -335,  1314,  1199,
-    -335,  1456,  -335,  1199,  1199,  1199,  -335,  1199,  -335,  1199,
-    1199,  -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,
-    -335,  -335,  -335,   424,  -335,  -335,  -335,   593,   141,   -59,
-    -335,  -335,  -335,  -335,  1199,   607,  -335,  1678,   117,  1468,
-     121,  1199,   119,  1517,   123,   660,  1529,   674,  1605,   358,
-     412,   114,   115,   120,   122,   125,   126,   127,   131,  -335,
-    -335,  -335,  -335,  1617,  -335,  1314,  1199,  1199,   -72,  -110,
-    1199,  1199,  -335,  1199,  -335,  1199,  1199,  -335,  1199,  -335,
-    -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,   128,
-     700,  1629,  -335,  -335,   149,   134,  -335,   136,   744,  1666,
-     758,   772,   811,   837,  -110,  -335,  -335,   147,   142,  1199,
-    -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,   149,  -335,
-     -71,  -335,  -335
+    -334,   283,  -334,  -136,  1271,   961,  1016,   -78,  -334,  1651,
+    -334,  -334,   -73,   -71,   -67,   -62,   -60,   -59,   -58,   -57,
+    1752,  1757,  1801,   -83,  1271,  -103,   221,   -56,  -334,  1271,
+    -334,  -334,  -334,  -334,   -54,  -334,  -334,   -23,   -53,   -52,
+     -12,   -42,  -334,    -8,   -38,  1327,    -4,    -4,  1271,  1271,
+    -334,  1271,  1271,  -334,  -334,  -334,   -30,  -334,     0,  -122,
+    1703,  1271,  -334,  1271,  -334,  1826,  -117,  -334,  -334,  -334,
+    -334,  -334,   -26,  -334,   221,  -334,  -334,  1271,  -334,  -334,
+    -334,  -334,  -334,  -334,  -334,  -334,  -334,   -29,   -24,   -78,
+     -20,     6,    16,    44,  -334,    22,    50,  1271,    28,  1271,
+       0,     2,  1386,  1271,    61,  1271,  1271,  1271,  1271,  1271,
+    1271,  1271,   908,  1271,     0,  1041,     0,  1271,     0,   -21,
+    -334,   -17,    26,  -334,     0,  1775,  1703,   -50,  -334,  -334,
+    -334,    25,  1271,    85,  1097,  1016,  1703,    62,  -334,  -334,
+      22,   -69,  -101,    21,  -334,   221,  1156,   221,  -334,  1271,
+    1271,  1271,  -334,  1271,  -334,  1271,  1271,  1271,  1271,  1271,
+    1271,  1271,  1271,    99,   -17,  1212,     0,  -334,   221,  -334,
+    -334,   221,    57,  1703,   178,  1271,   497,  -334,  1271,   511,
+      66,   315,  1271,   525,  1405,  1425,   346,   360,  1440,   414,
+    -334,  -100,   565,  -334,   -98,   589,  -334,  -334,    63,  -102,
+      65,    67,    75,    80,    82,  -334,    47,    90,    94,  -334,
+    1271,   106,   603,  -334,  -334,   -92,   102,  -334,  -334,  -334,
+      92,  -334,   -90,  -334,  1703,  1715,    81,    81,   155,    89,
+      89,    22,   950,    -3,     8,    89,  1271,  -334,  -334,  -334,
+     -87,     0,     0,  1386,  1271,  -334,  1452,  -334,  1464,  -334,
+    1386,  1271,  -334,  1484,  -334,  1271,  1271,  1271,  -334,  1271,
+    -334,  1271,  1271,  -334,  -334,  -334,  -334,  -334,  -334,  -334,
+    -334,  -334,  -334,  -334,  -334,   766,  -334,  -334,  -334,   662,
+     131,   -94,  -334,  -334,  -334,  -334,  1271,   676,  -334,  1703,
+     108,  1499,   112,  1271,   110,  1511,   114,   702,  1542,   740,
+    1601,   428,   452,   105,   107,   109,   113,   115,   116,   117,
+     120,  -334,  -334,  -334,  -334,  1648,  -334,  1386,  1271,  1271,
+     -86,  -109,  1271,  1271,  -334,  1271,  -334,  1271,  1271,  -334,
+    1271,  -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,
+    -334,   119,   754,  1679,  -334,  -334,   137,   111,  -334,   121,
+     768,  1691,   813,   839,   853,   905,  -109,  -334,  -334,   129,
+     123,  1271,  -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,
+     137,  -334,   -82,  -334,  -334
 };
 
@@ -1136 +1137 @@
 static const yytype_int16 yypgoto[] =
 {
-    -335,  -335,  -335,  -335,  -335,  -335,  -335,    19,    -1,    18,
-    -335,  -335,   -23,  -335,  -335,   278,     7,   241,    56,  -227,
-    -335,  -334,   -81,   -66,   132,  -335,  -335,  -335,  -335,  -335,
-    -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,  -335,
-    -335,  -335,  -335,  -335
+    -334,  -334,  -334,  -334,  -334,  -334,  -334,    72,    -1,    18,
+    -334,  -334,   -36,  -334,  -334,   251,     7,   222,    27,  -241,
+    -334,  -333,   -99,   -84,    98,  -334,  -334,  -334,  -334,  -334,
+    -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,  -334,
+    -334,  -334,  -334,  -334
 };
 
@@ -1150 +1151 @@
 static const yytype_int16 yytable[] =
 {
-      59,   122,   343,   145,   151,    86,   145,   153,    65,   148,
-     357,   149,   150,   102,   288,   151,   217,   152,   153,   105,
-     145,   292,    95,   121,    98,   100,   147,   106,   104,   123,
-     148,   145,   344,   151,   357,   148,   153,   262,   107,   114,
-     116,   118,   148,   151,   166,   124,   153,   126,   141,   264,
-     148,   311,    65,   167,   168,   151,   312,   280,   153,   128,
-     148,   148,   163,   136,   148,   148,   140,   282,   286,   108,
-     143,   342,   372,   216,   109,   148,   149,   150,   110,   162,
-     151,   127,   152,   153,   165,   119,   120,   111,   339,   112,
-     149,   150,   125,   171,   151,   172,   152,   153,   207,   208,
-      99,   267,   138,   139,   129,   130,   149,   150,   132,   131,
-     151,   190,   152,   153,   193,   173,   134,   175,   145,   166,
-     178,   180,   133,   182,   183,   184,   185,   186,   187,   188,
-     158,   191,   206,   214,   146,   194,   154,   146,   155,   156,
-     157,   158,   174,   159,   205,   221,   160,   161,    30,   144,
-     211,   146,   218,   181,   100,   210,   155,   156,   157,   158,
-     170,   159,   146,   238,   219,   161,   222,   223,   224,   158,
-     225,   159,   226,   227,   228,   229,   230,   231,   232,   233,
-     157,   158,    97,   159,   149,   150,   239,    99,   151,   240,
-     152,   153,   244,   103,   113,   246,   115,   117,   176,   251,
-     234,   154,   164,   155,   156,   157,   158,   195,   159,   196,
-     148,   160,   161,   167,   212,   154,   235,   155,   156,   157,
-     158,   248,   159,   242,   266,   160,   161,   277,   276,   268,
-     243,   154,   269,   155,   156,   157,   158,   270,   159,   249,
-     271,   160,   161,   273,   272,   275,   250,   278,   281,   146,
-     274,   310,   285,   315,   317,   319,   321,   330,   331,   287,
-     289,   343,   314,   332,   354,   333,   287,   293,   334,   335,
-     336,   295,   296,   297,   337,   298,   359,   299,   300,   360,
-     308,     2,     3,   368,   101,   369,   137,   371,   367,     4,
-     318,     0,     0,     0,     5,     6,     7,     0,     8,     0,
-       9,    10,   313,   241,     0,     0,     0,     0,     0,   154,
-       0,   155,   156,   157,   158,     0,   159,   255,     0,   160,
-     161,    11,   149,   150,   256,     0,   151,     0,   152,   153,
-       0,     0,     0,   287,   340,   341,     0,     0,   348,   349,
-       0,   350,     0,   351,   352,     0,   353,   149,   150,     0,
-       0,   151,     0,   152,   153,     0,     0,     0,   370,     0,
-       0,   149,   150,     0,     0,   151,     0,   152,   153,     0,
-       0,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,     0,    27,    28,    29,
-      30,     0,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,     0,    47,
-       0,     0,    48,     0,    49,   149,   150,     0,    50,   151,
-       0,   152,   153,    51,     0,    52,     0,     0,     0,   149,
-     150,     0,     0,   151,     0,   152,   153,   301,   302,   303,
-       0,     8,     0,   304,    10,     0,     0,   154,     0,   155,
-     156,   157,   158,   151,   159,   257,   153,   160,   161,   149,
-     150,     0,   258,   151,     0,   152,   153,     0,     0,     0,
-       0,     0,   154,     0,   155,   156,   157,   158,     0,   159,
-     260,     0,   160,   161,     0,     0,   154,   261,   155,   156,
-     157,   158,     0,   159,   326,     0,   160,   161,   149,   150,
-       0,   327,   151,     0,   152,   153,     0,     0,     0,     0,
-       0,     0,   149,   150,     0,     0,   151,     0,   152,   153,
-       0,     0,   305,   306,   307,     0,   149,   150,     0,     0,
-     151,     0,   152,   153,     0,     0,     0,     0,     0,     0,
-     154,     0,   155,   156,   157,   158,     0,   159,   328,     0,
-     160,   161,     0,     0,   154,   329,   155,   156,   157,   158,
-       0,   159,     0,     0,   160,   161,   149,   150,     0,   245,
-     151,     0,   152,   153,   154,     0,   155,   156,   157,   158,
-       0,   159,     0,     0,   154,   161,   155,   156,   157,   158,
-       0,   159,     0,     0,   160,   161,   149,   150,     0,   247,
-     151,     0,   152,   153,     0,     0,     0,     0,     0,     0,
-     149,   150,     0,     0,   151,     0,   152,   153,     0,     0,
-       0,     0,     0,   154,     0,   155,   156,   157,   158,     0,
-     159,     0,     0,   160,   161,     0,     0,   154,   252,   155,
-     156,   157,   158,     0,   159,     0,     0,   160,   161,     0,
-       0,   154,   263,   155,   156,   157,   158,     0,   159,     0,
-       0,   160,   161,   149,   150,     0,   265,   151,     0,   152,
-     153,     0,     0,     0,     0,     0,     0,   149,   150,     0,
-       0,   151,     0,   152,   153,     0,     0,     0,     0,     0,
-       0,   154,     0,   155,   156,   157,   158,     0,   159,     0,
-       0,   160,   161,   149,   150,     0,   279,   151,     0,   152,
-     153,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   154,     0,   155,   156,   157,   158,     0,   159,     0,
-       0,   160,   161,     0,     0,   154,   309,   155,   156,   157,
-     158,     0,   159,     0,     0,   160,   161,   149,   150,     0,
-     235,   151,     0,   152,   153,     0,     0,     0,     0,     0,
-       0,   149,   150,     0,     0,   151,     0,   152,   153,     0,
-       0,     0,     0,     0,     0,   149,   150,     0,     0,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,   154,     0,
-     155,   156,   157,   158,     0,   159,     0,     0,   160,   161,
-       0,     0,   154,   322,   155,   156,   157,   158,     0,   159,
-       0,     0,   160,   161,   149,   150,     0,   324,   151,     0,
-     152,   153,     0,     0,     0,     0,     0,     0,   154,     0,
-     155,   156,   157,   158,     0,   159,    88,     0,   160,   161,
-     149,   150,     0,   355,   151,     0,   152,   153,     0,     0,
+      59,    86,   290,   345,   152,   148,   122,   154,    65,   294,
+     167,   145,   151,   359,   149,   152,   313,   153,   154,   168,
+     169,   314,    95,   121,   150,   151,   119,   120,   152,   152,
+     153,   154,   154,   346,   123,   149,   149,   359,   149,   145,
+      99,   269,   218,   264,   149,   266,   149,   126,   141,   149,
+     149,   282,    65,   284,   149,   127,   288,   344,   145,   208,
+     209,   374,   164,   136,   102,   217,   140,   149,   145,   105,
+     143,   106,   145,   138,   139,   107,   341,    98,   100,   163,
+     108,   104,   109,   110,   111,   112,   125,   128,   152,   129,
+     130,   154,   114,   116,   118,   173,   152,   131,   124,   154,
+     132,   133,   150,   151,   134,    30,   152,   144,   153,   154,
+     171,   191,   177,    97,   194,   174,   196,   176,    99,   149,
+     179,   181,   103,   183,   184,   185,   186,   187,   188,   189,
+     159,   192,   207,   215,   211,   195,   155,   166,   156,   157,
+     158,   159,   146,   160,   147,   222,   172,   162,   113,   155,
+     212,   156,   157,   158,   159,   159,   160,   160,   115,   161,
+     162,   175,   152,   197,   240,   154,   219,   224,   225,   226,
+     146,   227,   147,   228,   229,   230,   231,   232,   233,   234,
+     235,   150,   151,   275,   167,   152,   117,   153,   154,   146,
+     276,   147,   165,   246,   182,   213,   248,   206,   168,   146,
+     253,   147,   250,   146,   278,   147,   268,   100,   270,   155,
+     271,   156,   157,   158,   159,   280,   160,   220,   272,   223,
+     162,   158,   159,   273,   160,   274,   236,   155,   279,   156,
+     157,   158,   159,   277,   160,    88,   147,   161,   162,   283,
+     241,   312,   237,   242,   317,   319,   321,   323,   332,   345,
+     333,   316,   334,   361,   287,   356,   335,   101,   336,   337,
+     338,   289,   291,   339,   362,   370,   371,   137,   289,   295,
+     243,   373,   369,   297,   298,   299,     0,   300,     0,   301,
+     302,     0,   310,     2,     3,   156,   157,   158,   159,     0,
+     160,     4,   320,     0,   162,     0,     5,     6,     7,     0,
+       8,     0,     9,    10,   315,     0,   155,     0,   156,   157,
+     158,   159,     0,   160,   244,     0,   161,   162,   150,   151,
+       0,   245,   152,    11,   153,   154,     0,     0,     0,     0,
+      30,     0,    31,    32,    33,   289,   342,   343,     0,     0,
+     350,   351,     0,   352,     0,   353,   354,    94,   355,   150,
+     151,     0,     0,   152,    49,   153,   154,     0,     0,     0,
+     372,     0,     0,   150,   151,     0,    52,   152,     0,   153,
+     154,     0,     0,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,     0,    27,
+      28,    29,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+       0,    47,     0,     0,    48,     0,    49,   150,   151,     0,
+      50,   152,     0,   153,   154,    51,     0,     0,    52,     0,
+       0,   150,   151,     0,     0,   152,     0,   153,   154,     0,
+       0,     0,     0,   155,     0,   156,   157,   158,   159,     0,
+     160,   251,     0,   161,   162,   150,   151,     0,   252,   152,
+       0,   153,   154,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   155,     0,   156,   157,   158,   159,
+       0,   160,   257,     0,   161,   162,     0,     0,   155,   258,
+     156,   157,   158,   159,     0,   160,   259,     0,   161,   162,
+     150,   151,     0,   260,   152,     0,   153,   154,     0,     0,
+       0,     0,     0,     0,   150,   151,     0,     0,   152,     0,
+     153,   154,     0,     0,     0,     0,     0,     0,   150,   151,
+       0,     0,   152,     0,   153,   154,     0,     0,     0,     0,
+       0,     0,   155,     0,   156,   157,   158,   159,     0,   160,
+     262,     0,   161,   162,     0,     0,   155,   263,   156,   157,
+     158,   159,     0,   160,   328,     0,   161,   162,   150,   151,
+       0,   329,   152,     0,   153,   154,     0,     0,     0,     0,
+     155,     0,   156,   157,   158,   159,     0,   160,   330,     0,
+     161,   162,   150,   151,     0,   331,   152,     0,   153,   154,
+       0,     0,     0,     0,     0,     0,   150,   151,     0,     0,
+     152,     0,   153,   154,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   155,     0,   156,   157,   158,
+     159,     0,   160,     0,     0,   161,   162,     0,     0,   155,
+     247,   156,   157,   158,   159,     0,   160,     0,     0,   161,
+     162,     0,     0,   155,   249,   156,   157,   158,   159,     0,
+     160,     0,     0,   161,   162,   150,   151,     0,   254,   152,
+       0,   153,   154,     0,     0,     0,     0,     0,     0,   150,
+     151,     0,     0,   152,     0,   153,   154,     0,     0,     0,
+       0,     0,     0,   155,     0,   156,   157,   158,   159,     0,
+     160,     0,     0,   161,   162,   150,   151,     0,   265,   152,
+       0,   153,   154,     0,     0,     0,     0,   155,     0,   156,
+     157,   158,   159,     0,   160,     0,     0,   161,   162,     0,
+       0,   155,   267,   156,   157,   158,   159,     0,   160,     0,
+       0,   161,   162,   150,   151,     0,   281,   152,     0,   153,
+     154,     0,     0,     0,     0,     0,     0,   150,   151,     0,
+       0,   152,     0,   153,   154,     0,     0,     0,     0,     0,
+       0,   150,   151,     0,     0,   152,     0,   153,   154,   303,
+     304,   305,     0,     8,     0,   306,    10,     0,     0,     0,
+     155,     0,   156,   157,   158,   159,     0,   160,     0,     0,
+     161,   162,     0,     0,   155,   311,   156,   157,   158,   159,
+       0,   160,     0,     0,   161,   162,   150,   151,     0,   237,
+     152,     0,   153,   154,     0,     0,     0,     0,     0,     0,
+     155,     0,   156,   157,   158,   159,     0,   160,     0,     0,
+     161,   162,   150,   151,     0,   324,   152,     0,   153,   154,
+       0,     0,     0,     0,     0,     0,   150,   151,     0,     0,
+     152,     0,   153,   154,   307,   308,   309,     0,   155,     0,
+     156,   157,   158,   159,     0,   160,     0,     0,   161,   162,
+       0,     0,   155,   326,   156,   157,   158,   159,     0,   160,
+       0,     0,   161,   162,     0,     0,   155,   357,   156,   157,
+     158,   159,     0,   160,     0,     0,   161,   162,   150,   151,
+       0,   363,   152,     0,   153,   154,     4,     0,     0,     0,
+       0,    87,    88,    89,     0,     8,     0,    90,    10,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    88,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   154,     0,   155,   156,   157,   158,     0,   159,
-       0,     0,   160,   161,     0,     0,   154,   361,   155,   156,
-     157,   158,     0,   159,     0,     0,   160,   161,     0,     0,
-     154,   363,   155,   156,   157,   158,     0,   159,     0,     0,
-     160,   161,     4,    88,     0,   364,     0,    87,    88,    89,
-       0,     8,     0,    90,    10,     0,     0,     0,     0,     0,
-       0,    30,     0,    31,    32,    33,     0,     0,     0,   154,
-       0,   155,   156,   157,   158,     0,   159,     0,    94,   160,
-     161,     0,     0,     0,   365,    49,     0,    30,     0,    31,
-      32,    33,     0,     0,    97,   154,    52,   155,   156,   157,
-     158,     0,   159,     0,    94,   160,   161,     4,     0,     0,
-     366,    49,    87,    88,    89,     0,     8,     0,    90,    10,
-      99,     0,    52,     0,    12,    13,    14,    15,    16,    17,
-      18,    19,    91,    92,    93,     0,     0,     0,    30,     0,
-      31,    32,    33,    30,     0,    31,    32,    33,     0,     0,
-       0,     0,    38,    39,     0,    94,     0,     0,     0,     0,
-      94,     0,    49,     4,     0,    48,     0,    49,    87,    88,
-      89,   103,     8,    52,    90,    10,    51,   189,    52,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    12,
-      13,    14,    15,    16,    17,    18,    19,    91,    92,    93,
-       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
-      31,    32,    33,     0,     0,     0,     0,    38,    39,     0,
-       0,     0,     4,     0,     0,    94,     0,    87,    88,    89,
-      48,     8,    49,    90,    10,     0,     0,     0,     0,     0,
-       0,    51,   192,    52,     0,    12,    13,    14,    15,    16,
-      17,    18,    19,    91,    92,    93,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-       0,     0,     0,    38,    39,     0,     0,     0,     4,     0,
-       0,    94,     0,    87,    88,    89,    48,     8,    49,    90,
-      10,     0,     0,     0,     0,     0,     0,    51,   213,    52,
-       0,     0,     0,     0,    12,    13,    14,    15,    16,    17,
-      18,    19,    91,    92,    93,     0,     0,     0,     0,     0,
-       0,     0,     0,    30,     0,    31,    32,    33,     0,     0,
-       0,     0,    38,    39,     0,     0,     0,     4,     0,     0,
-      94,     0,    87,    88,    89,    48,     8,    49,    90,    10,
-       0,     0,     0,     0,     0,     0,    51,   220,    52,     0,
-      12,    13,    14,    15,    16,    17,    18,    19,    91,    92,
-      93,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,     0,     0,     0,    38,    39,
-       0,     0,     0,     4,     0,     0,    94,     0,     5,   135,
-      89,    48,     8,    49,     9,    10,     0,     0,     0,     0,
-       0,     0,    51,   237,    52,     0,     0,     0,     0,    12,
-      13,    14,    15,    16,    17,    18,    19,    91,    92,    93,
-       0,     0,     0,     0,     0,     0,     0,     0,    30,     0,
-      31,    32,    33,     0,     0,     0,     0,    38,    39,     0,
-       0,     0,     4,     0,     0,    94,     0,    87,    88,    89,
-      48,     8,    49,    90,    10,     0,     0,     0,     0,     0,
-       0,    51,     0,    52,     0,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,   149,   150,     0,     0,
-     151,     0,   152,   153,    30,     0,    31,    32,    33,     0,
-       0,   149,   150,    38,    39,   151,     0,   152,   153,     0,
-       0,    94,     0,   149,   150,     0,    48,   151,    49,   152,
-     153,     0,     0,     0,     0,     0,     0,    51,     0,    52,
-       0,     0,     0,     0,    12,    13,    14,    15,    16,    17,
-      18,    19,    91,    92,    93,   149,   150,     0,     0,   151,
-       0,   152,   153,    30,     0,    31,    32,    33,     0,     0,
-     149,   150,    38,    39,   151,     0,   152,   153,     0,     0,
-      94,     0,   149,   150,     0,    48,   151,    49,   152,   153,
-       0,     0,     0,     0,     0,     0,   177,     0,    52,   149,
-     150,     0,     0,   151,     0,   152,   153,     0,     0,     0,
-       0,   149,   150,     0,     0,   151,     0,   152,   153,     0,
-       0,   154,     0,   155,   156,   157,   158,   283,   159,   284,
-       0,   160,   161,     0,     0,     0,   154,     0,   155,   156,
-     157,   158,     0,   159,   253,     0,   160,   161,   154,     0,
-     155,   156,   157,   158,     0,   159,   254,     0,   160,   161,
-     149,   150,     0,     0,   151,     0,   152,   153,     0,     0,
-       0,     0,   149,   150,     0,     0,   151,     0,   152,   153,
-     154,     0,   155,   156,   157,   158,     0,   159,   259,     0,
-     160,   161,     0,     0,     0,   154,     0,   155,   156,   157,
-     158,   290,   159,     0,     0,   160,   161,   154,     0,   155,
-     156,   157,   158,     0,   159,   291,     0,   160,   161,     0,
-       0,     0,     0,     0,   154,     0,   155,   156,   157,   158,
-     294,   159,     0,     0,   160,   161,   154,     0,   155,   156,
-     157,   158,     0,   159,   316,     0,   160,   161,   149,   150,
-       0,     0,   151,     0,   152,   153,     0,     0,     0,     0,
-     149,   150,     0,     0,   151,     0,   152,   153,     0,     0,
-       0,     0,   149,   150,     0,     0,   151,     0,   152,   153,
-       0,     0,     0,     0,     0,   154,     0,   155,   156,   157,
-     158,     0,   159,   320,     0,   160,   161,   154,     0,   155,
-     156,   157,   158,     0,   159,   323,     0,   160,   161,   149,
-     150,     0,     0,   151,     0,   152,   153,     0,     0,     0,
-       0,   149,   150,     0,     0,   151,     0,   152,   153,     0,
-       0,     0,     0,    -1,   150,     0,     0,   151,     0,   152,
-     153,     0,     0,     0,     0,     0,   150,     0,     0,   151,
-       0,   152,   153,     0,     0,     0,     0,     0,     0,     0,
+       0,   155,     0,   156,   157,   158,   159,     0,   160,     0,
+       0,   161,   162,   150,   151,     0,   365,   152,     0,   153,
+     154,     0,     0,     0,     0,     0,     0,   155,     0,   156,
+     157,   158,   159,     0,   160,    88,     0,   161,   162,     0,
+       0,   155,   366,   156,   157,   158,   159,     0,   160,     0,
+       0,   161,   162,     0,     0,     0,   367,     0,    12,    13,
+      14,    15,    16,    17,    18,    19,    91,    92,    93,     0,
+       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
+      32,    33,     0,     0,     0,     0,    38,    39,     0,     0,
+      88,     0,     0,   155,    94,   156,   157,   158,   159,    48,
+     160,    49,     0,   161,   162,     0,     0,     0,   368,     4,
+      51,   190,     0,    52,    87,    88,    89,     0,     8,     0,
+      90,    10,     0,     0,     0,     0,     0,     0,     0,     0,
+      30,     0,    31,    32,    33,     0,     0,     0,   155,     0,
+     156,   157,   158,   159,   285,   160,   286,    94,   161,   162,
+       0,     0,     0,     0,    49,     0,     0,     0,     0,     0,
+       0,     0,     0,    97,     0,     4,    52,     0,     0,     0,
+      87,    88,    89,     0,     8,     0,    90,    10,     0,     0,
+       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
+       0,    12,    13,    14,    15,    16,    17,    18,    19,    91,
+      92,    93,    94,     0,     0,     0,     0,     0,     0,    49,
+      30,     0,    31,    32,    33,     0,     0,     0,    99,    38,
+      39,    52,     0,     0,     4,     0,     0,    94,     0,    87,
+      88,    89,    48,     8,    49,    90,    10,     0,     0,     0,
+       0,     0,     0,    51,   193,     0,    52,    12,    13,    14,
+      15,    16,    17,    18,    19,    91,    92,    93,     0,     0,
+       0,     0,     0,     0,     0,     0,    30,     0,    31,    32,
+      33,     0,     0,     0,     0,    38,    39,     0,     0,     0,
+       4,     0,     0,    94,     0,    87,    88,    89,    48,     8,
+      49,    90,    10,     0,     0,     0,     0,     0,     0,    51,
+     214,     0,    52,     0,     0,     0,    12,    13,    14,    15,
+      16,    17,    18,    19,    91,    92,    93,     0,     0,     0,
+       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
+       0,     0,     0,     0,    38,    39,     0,     0,     0,     4,
+       0,     0,    94,     0,    87,    88,    89,    48,     8,    49,
+      90,    10,     0,     0,     0,     0,     0,     0,    51,   221,
+       0,    52,    12,    13,    14,    15,    16,    17,    18,    19,
+      91,    92,    93,     0,     0,     0,     0,     0,     0,     0,
+       0,    30,     0,    31,    32,    33,     0,     0,     0,     0,
+      38,    39,     0,     0,     0,     4,     0,     0,    94,     0,
+       5,   135,    89,    48,     8,    49,     9,    10,     0,     0,
+       0,     0,     0,     0,    51,   239,     0,    52,     0,     0,
+       0,    12,    13,    14,    15,    16,    17,    18,    19,    91,
+      92,    93,     0,     0,     0,     0,     0,     0,     0,     0,
+      30,     0,    31,    32,    33,     0,     0,     0,     0,    38,
+      39,     0,     0,     0,     4,     0,     0,    94,     0,    87,
+      88,    89,    48,     8,    49,    90,    10,     0,   150,   151,
+       0,     0,   152,    51,   153,   154,    52,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,   150,   151,
+       0,     0,   152,     0,   153,   154,    30,     0,    31,    32,
+      33,     0,     0,   150,   151,    38,    39,   152,     0,   153,
+     154,     0,     0,    94,     0,   150,   151,     0,    48,   152,
+      49,   153,   154,     0,     0,     0,     0,   150,   151,    51,
+       0,   152,    52,   153,   154,     0,    12,    13,    14,    15,
+      16,    17,    18,    19,    91,    92,    93,   150,   151,     0,
+       0,   152,     0,   153,   154,    30,     0,    31,    32,    33,
+       0,     0,   150,   151,    38,    39,   152,     0,   153,   154,
+       0,     0,    94,     0,   150,   151,     0,    48,   152,    49,
+     153,   154,     0,     0,     0,     0,     0,     0,   178,     0,
+       0,    52,     0,   155,     0,   156,   157,   158,   159,     0,
+     160,   255,     0,   161,   162,   150,   151,     0,     0,   152,
+       0,   153,   154,   155,     0,   156,   157,   158,   159,     0,
+     160,   256,     0,   161,   162,     0,     0,     0,   155,     0,
+     156,   157,   158,   159,     0,   160,   261,     0,   161,   162,
+     155,     0,   156,   157,   158,   159,   292,   160,     0,     0,
+     161,   162,   155,     0,   156,   157,   158,   159,     0,   160,
+     293,     0,   161,   162,   150,   151,     0,     0,   152,     0,
+     153,   154,   155,     0,   156,   157,   158,   159,   296,   160,
+       0,     0,   161,   162,     0,     0,     0,   155,     0,   156,
+     157,   158,   159,     0,   160,   318,     0,   161,   162,   155,
+       0,   156,   157,   158,   159,     0,   160,   322,     0,   161,
+     162,   150,   151,     0,     0,   152,     0,   153,   154,     0,
+       0,     0,     0,     0,     0,    88,     0,     0,     0,     0,
+     155,     0,   156,   157,   158,   159,     0,   160,   325,     0,
+     161,   162,   150,   151,     0,     0,   152,     0,   153,   154,
+       0,     0,     0,     0,   150,   151,     0,     0,   152,     0,
+     153,   154,     0,     0,     0,     0,   150,   151,     0,     0,
+     152,     0,   153,   154,     0,     0,     0,     0,    -1,   151,
+       0,     0,   152,     0,   153,   154,     0,     0,     0,   155,
+       0,   156,   157,   158,   159,     0,   160,   327,     0,   161,
+     162,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   154,     0,   155,   156,   157,   158,     0,
-     159,   325,     0,   160,   161,   154,     0,   155,   156,   157,
-     158,   338,   159,     0,     0,   160,   161,   154,     0,   155,
-     156,   157,   158,   356,   159,    88,     0,   160,   161,   197,
-     198,   199,     0,     8,     0,   200,    10,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    88,   154,     0,   155,   156,   157,   158,
-     362,   159,     0,     0,   160,   161,   154,     0,   155,   156,
-     157,   158,    88,   159,     0,     0,   160,   161,   154,     0,
-     155,   156,   157,   158,     0,   159,     0,     0,   160,   161,
-     154,    88,   155,   156,   157,   158,     0,   159,     0,    88,
-       0,   161,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   201,   202,   203,     0,     0,     0,
-      30,     0,    31,    32,    33,    30,     0,    31,    32,    33,
-       0,     0,     0,     0,     0,     0,     0,    94,     0,     0,
-       0,     0,    94,     0,    49,     0,     0,     0,    30,    49,
-      31,    32,    33,   113,     0,    52,     0,     0,     0,   204,
-      52,     0,     0,     0,     0,    94,     0,    30,     0,    31,
-      32,    33,    49,     0,     0,     0,     0,     0,     0,     0,
-       0,   115,     0,    52,    94,     0,    30,     0,    31,    32,
-      33,    49,     0,     0,    30,     0,    31,    32,    33,     0,
-     117,     0,    52,    94,     0,     0,     0,     0,     0,     0,
-      49,    94,     0,     0,     0,     0,     0,     0,    49,   164,
-       0,    52,     0,     0,     0,     0,     0,     0,     0,    52
+      30,     0,    31,    32,    33,     0,    88,     0,     0,     0,
+       0,    88,     0,     0,     0,     0,   155,    94,   156,   157,
+     158,   159,   340,   160,    49,     0,   161,   162,   198,   199,
+     200,     0,     8,   103,   201,    10,    52,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   155,     0,   156,
+     157,   158,   159,   358,   160,    88,     0,   161,   162,   155,
+       0,   156,   157,   158,   159,   364,   160,     0,     0,   161,
+     162,   155,     0,   156,   157,   158,   159,     0,   160,     0,
+      88,   161,   162,   155,     0,   156,   157,   158,   159,     0,
+     160,     0,     0,   161,   162,     0,     0,     0,     0,     0,
+       0,    30,     0,    31,    32,    33,    30,     0,    31,    32,
+      33,     0,     0,   202,   203,   204,     0,     0,    94,     0,
+       0,     0,     0,    94,    30,    49,    31,    32,    33,     0,
+      49,     0,     0,     0,   113,     0,     0,    52,     0,   115,
+       0,    94,    52,     0,     0,     0,     0,     0,    49,     0,
+      30,     0,    31,    32,    33,     0,     0,     0,   205,     0,
+      52,     0,     0,     0,     0,     0,     0,    94,     0,     0,
+       0,     0,     0,     0,    49,    30,     0,    31,    32,    33,
+       0,     0,     0,   117,     0,     0,    52,     0,     0,     0,
+       0,     0,    94,     0,     0,     0,     0,     0,     0,    49,
+       0,     0,     0,     0,     0,     0,     0,     0,   165,     0,
+       0,    52
 };
 
 static const yytype_int16 yycheck[] =
 {
-       1,   109,   112,    11,     7,   137,    11,    10,     1,   136,
-     344,     3,     4,   142,   241,     7,   143,     9,    10,   142,
-      11,   248,     4,    24,     5,     6,   127,   142,     9,   137,
-     136,    11,   142,     7,   368,   136,    10,   143,   142,    20,
-      21,    22,   136,     7,   127,    26,    10,    29,    49,   143,
-     136,   110,    45,   136,   137,     7,   115,   143,    10,   110,
-     136,   136,    63,    45,   136,   136,    48,   143,   143,   142,
-      52,   143,   143,   134,   142,   136,     3,     4,   142,    61,
-       7,   109,     9,    10,    65,   109,   110,   142,   315,   142,
-       3,     4,   142,    74,     7,    77,     9,    10,   109,   110,
-     142,   143,    46,    47,   142,   142,     3,     4,   142,   109,
-       7,   112,     9,    10,   115,    97,   142,    99,    11,   127,
-     102,   103,   109,   105,   106,   107,   108,   109,   110,   111,
-     133,   113,   125,   134,   142,   117,   128,   142,   130,   131,
-     132,   133,   133,   135,   125,   146,   138,   139,   109,   137,
-     132,   142,   144,   133,   135,   109,   130,   131,   132,   133,
-     136,   135,   142,   164,   145,   139,   148,   149,   150,   133,
-     152,   135,   154,   155,   156,   157,   158,   159,   160,   161,
-     132,   133,   142,   135,     3,     4,   167,   142,     7,   170,
-       9,    10,   174,   142,   142,   177,   142,   142,   110,   181,
-     127,   128,   142,   130,   131,   132,   133,   137,   135,   137,
-     136,   138,   139,   136,   110,   128,   143,   130,   131,   132,
-     133,   136,   135,   136,   143,   138,   139,   209,   110,   143,
-     143,   128,   143,   130,   131,   132,   133,   143,   135,   136,
-     143,   138,   139,   136,   143,   143,   143,   109,   137,   142,
-     143,   110,   234,   136,   133,   136,   133,   143,   143,   241,
-     242,   112,   285,   143,   136,   143,   248,   249,   143,   143,
-     143,   253,   254,   255,   143,   257,   142,   259,   260,   143,
-     273,     0,     1,   136,     6,   143,    45,   368,   354,     8,
-     291,    -1,    -1,    -1,    13,    14,    15,    -1,    17,    -1,
-      19,    20,   284,   171,    -1,    -1,    -1,    -1,    -1,   128,
-      -1,   130,   131,   132,   133,    -1,   135,   136,    -1,   138,
-     139,    40,     3,     4,   143,    -1,     7,    -1,     9,    10,
-      -1,    -1,    -1,   315,   316,   317,    -1,    -1,   320,   321,
-      -1,   323,    -1,   325,   326,    -1,   328,     3,     4,    -1,
-      -1,     7,    -1,     9,    10,    -1,    -1,    -1,   359,    -1,
+       1,   137,   243,   112,     7,   127,   109,    10,     1,   250,
+     127,    11,     4,   346,   136,     7,   110,     9,    10,   136,
+     137,   115,     4,    24,     3,     4,   109,   110,     7,     7,
+       9,    10,    10,   142,   137,   136,   136,   370,   136,    11,
+     142,   143,   143,   143,   136,   143,   136,    29,    49,   136,
+     136,   143,    45,   143,   136,   109,   143,   143,    11,   109,
+     110,   143,    63,    45,   142,   134,    48,   136,    11,   142,
+      52,   142,    11,    46,    47,   142,   317,     5,     6,    61,
+     142,     9,   142,   142,   142,   142,   142,   110,     7,   142,
+     142,    10,    20,    21,    22,    77,     7,   109,    26,    10,
+     142,   109,     3,     4,   142,   109,     7,   137,     9,    10,
+     136,   112,   110,   142,   115,    97,   137,    99,   142,   136,
+     102,   103,   142,   105,   106,   107,   108,   109,   110,   111,
+     133,   113,   125,   134,   109,   117,   128,    65,   130,   131,
+     132,   133,   142,   135,   144,   146,    74,   139,   142,   128,
+     132,   130,   131,   132,   133,   133,   135,   135,   142,   138,
+     139,   133,     7,   137,   165,    10,   145,   149,   150,   151,
+     142,   153,   144,   155,   156,   157,   158,   159,   160,   161,
+     162,     3,     4,   136,   127,     7,   142,     9,    10,   142,
+     143,   144,   142,   175,   133,   110,   178,   125,   136,   142,
+     182,   144,   136,   142,   110,   144,   143,   135,   143,   128,
+     143,   130,   131,   132,   133,   109,   135,   145,   143,   147,
+     139,   132,   133,   143,   135,   143,   127,   128,   210,   130,
+     131,   132,   133,   143,   135,    14,   144,   138,   139,   137,
+     168,   110,   143,   171,   136,   133,   136,   133,   143,   112,
+     143,   287,   143,   142,   236,   136,   143,     6,   143,   143,
+     143,   243,   244,   143,   143,   136,   143,    45,   250,   251,
+     172,   370,   356,   255,   256,   257,    -1,   259,    -1,   261,
+     262,    -1,   275,     0,     1,   130,   131,   132,   133,    -1,
+     135,     8,   293,    -1,   139,    -1,    13,    14,    15,    -1,
+      17,    -1,    19,    20,   286,    -1,   128,    -1,   130,   131,
+     132,   133,    -1,   135,   136,    -1,   138,   139,     3,     4,
+      -1,   143,     7,    40,     9,    10,    -1,    -1,    -1,    -1,
+     109,    -1,   111,   112,   113,   317,   318,   319,    -1,    -1,
+     322,   323,    -1,   325,    -1,   327,   328,   126,   330,     3,
+       4,    -1,    -1,     7,   133,     9,    10,    -1,    -1,    -1,
+     361,    -1,    -1,     3,     4,    -1,   145,     7,    -1,     9,
+      10,    -1,    -1,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,    -1,   106,
+     107,   108,   109,    -1,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+      -1,   128,    -1,    -1,   131,    -1,   133,     3,     4,    -1,
+     137,     7,    -1,     9,    10,   142,    -1,    -1,   145,    -1,
       -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,    -1,   106,   107,   108,
-     109,    -1,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,    -1,   128,
-      -1,    -1,   131,    -1,   133,     3,     4,    -1,   137,     7,
-      -1,     9,    10,   142,    -1,   144,    -1,    -1,    -1,     3,
-       4,    -1,    -1,     7,    -1,     9,    10,    13,    14,    15,
-      -1,    17,    -1,    19,    20,    -1,    -1,   128,    -1,   130,
-     131,   132,   133,     7,   135,   136,    10,   138,   139,     3,
-       4,    -1,   143,     7,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,    -1,
+     135,   136,    -1,   138,   139,     3,     4,    -1,   143,     7,
+      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,
+      -1,   135,   136,    -1,   138,   139,    -1,    -1,   128,   143,
+     130,   131,   132,   133,    -1,   135,   136,    -1,   138,   139,
+       3,     4,    -1,   143,     7,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,
+      -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
       -1,    -1,   128,    -1,   130,   131,   132,   133,    -1,   135,
      136,    -1,   138,   139,    -1,    -1,   128,   143,   130,   131,
      132,   133,    -1,   135,   136,    -1,   138,   139,     3,     4,
       -1,   143,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-      -1,    -1,    98,    99,   100,    -1,     3,     4,    -1,    -1,
+     128,    -1,   130,   131,   132,   133,    -1,   135,   136,    -1,
+     138,   139,     3,     4,    -1,   143,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
        7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-     128,    -1,   130,   131,   132,   133,    -1,   135,   136,    -1,
-     138,   139,    -1,    -1,   128,   143,   130,   131,   132,   133,
-      -1,   135,    -1,    -1,   138,   139,     3,     4,    -1,   143,
-       7,    -1,     9,    10,   128,    -1,   130,   131,   132,   133,
-      -1,   135,    -1,    -1,   128,   139,   130,   131,   132,   133,
-      -1,   135,    -1,    -1,   138,   139,     3,     4,    -1,   143,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   128,    -1,   130,   131,   132,
+     133,    -1,   135,    -1,    -1,   138,   139,    -1,    -1,   128,
+     143,   130,   131,   132,   133,    -1,   135,    -1,    -1,   138,
+     139,    -1,    -1,   128,   143,   130,   131,   132,   133,    -1,
+     135,    -1,    -1,   138,   139,     3,     4,    -1,   143,     7,
+      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
       -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,    -1,
-     135,    -1,    -1,   138,   139,    -1,    -1,   128,   143,   130,
+     135,    -1,    -1,   138,   139,     3,     4,    -1,   143,     7,
+      -1,     9,    10,    -1,    -1,    -1,    -1,   128,    -1,   130,
      131,   132,   133,    -1,   135,    -1,    -1,   138,   139,    -1,
       -1,   128,   143,   130,   131,   132,   133,    -1,   135,    -1,
@@ -1420 +1430 @@
       10,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
       -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    13,
+      14,    15,    -1,    17,    -1,    19,    20,    -1,    -1,    -1,
+     128,    -1,   130,   131,   132,   133,    -1,   135,    -1,    -1,
+     138,   139,    -1,    -1,   128,   143,   130,   131,   132,   133,
+      -1,   135,    -1,    -1,   138,   139,     3,     4,    -1,   143,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+     128,    -1,   130,   131,   132,   133,    -1,   135,    -1,    -1,
+     138,   139,     3,     4,    -1,   143,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
+       7,    -1,     9,    10,    98,    99,   100,    -1,   128,    -1,
+     130,   131,   132,   133,    -1,   135,    -1,    -1,   138,   139,
+      -1,    -1,   128,   143,   130,   131,   132,   133,    -1,   135,
+      -1,    -1,   138,   139,    -1,    -1,   128,   143,   130,   131,
+     132,   133,    -1,   135,    -1,    -1,   138,   139,     3,     4,
+      -1,   143,     7,    -1,     9,    10,     8,    -1,    -1,    -1,
+      -1,    13,    14,    15,    -1,    17,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   128,    -1,   130,   131,   132,   133,    -1,   135,    -1,
       -1,   138,   139,     3,     4,    -1,   143,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   128,    -1,   130,   131,   132,   133,    -1,   135,    -1,
-      -1,   138,   139,    -1,    -1,   128,   143,   130,   131,   132,
-     133,    -1,   135,    -1,    -1,   138,   139,     3,     4,    -1,
-     143,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,   128,    -1,
-     130,   131,   132,   133,    -1,   135,    -1,    -1,   138,   139,
-      -1,    -1,   128,   143,   130,   131,   132,   133,    -1,   135,
-      -1,    -1,   138,   139,     3,     4,    -1,   143,     7,    -1,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,   128,    -1,
-     130,   131,   132,   133,    -1,   135,    14,    -1,   138,   139,
-       3,     4,    -1,   143,     7,    -1,     9,    10,    -1,    -1,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,   128,    -1,   130,
+     131,   132,   133,    -1,   135,    14,    -1,   138,   139,    -1,
+      -1,   128,   143,   130,   131,   132,   133,    -1,   135,    -1,
+      -1,   138,   139,    -1,    -1,    -1,   143,    -1,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
+     112,   113,    -1,    -1,    -1,    -1,   118,   119,    -1,    -1,
+      14,    -1,    -1,   128,   126,   130,   131,   132,   133,   131,
+     135,   133,    -1,   138,   139,    -1,    -1,    -1,   143,     8,
+     142,   143,    -1,   145,    13,    14,    15,    -1,    17,    -1,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     109,    -1,   111,   112,   113,    -1,    -1,    -1,   128,    -1,
+     130,   131,   132,   133,   134,   135,   136,   126,   138,   139,
+      -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   142,    -1,     8,   145,    -1,    -1,    -1,
+      13,    14,    15,    -1,    17,    -1,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   109,    -1,   111,   112,   113,
+      -1,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,   126,    -1,    -1,    -1,    -1,    -1,    -1,   133,
+     109,    -1,   111,   112,   113,    -1,    -1,    -1,   142,   118,
+     119,   145,    -1,    -1,     8,    -1,    -1,   126,    -1,    13,
+      14,    15,   131,    17,   133,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,   142,   143,    -1,   145,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,   112,
+     113,    -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,
+       8,    -1,    -1,   126,    -1,    13,    14,    15,   131,    17,
+     133,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,   142,
+     143,    -1,   145,    -1,    -1,    -1,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   109,    -1,   111,   112,   113,
+      -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,     8,
+      -1,    -1,   126,    -1,    13,    14,    15,   131,    17,   133,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,   142,   143,
+      -1,   145,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   109,    -1,   111,   112,   113,    -1,    -1,    -1,    -1,
+     118,   119,    -1,    -1,    -1,     8,    -1,    -1,   126,    -1,
+      13,    14,    15,   131,    17,   133,    19,    20,    -1,    -1,
+      -1,    -1,    -1,    -1,   142,   143,    -1,   145,    -1,    -1,
+      -1,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     109,    -1,   111,   112,   113,    -1,    -1,    -1,    -1,   118,
+     119,    -1,    -1,    -1,     8,    -1,    -1,   126,    -1,    13,
+      14,    15,   131,    17,   133,    19,    20,    -1,     3,     4,
+      -1,    -1,     7,   142,     9,    10,   145,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,     3,     4,
+      -1,    -1,     7,    -1,     9,    10,   109,    -1,   111,   112,
+     113,    -1,    -1,     3,     4,   118,   119,     7,    -1,     9,
+      10,    -1,    -1,   126,    -1,     3,     4,    -1,   131,     7,
+     133,     9,    10,    -1,    -1,    -1,    -1,     3,     4,   142,
+      -1,     7,   145,     9,    10,    -1,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,   109,    -1,   111,   112,   113,
+      -1,    -1,     3,     4,   118,   119,     7,    -1,     9,    10,
+      -1,    -1,   126,    -1,     3,     4,    -1,   131,     7,   133,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,
+      -1,   145,    -1,   128,    -1,   130,   131,   132,   133,    -1,
+     135,   136,    -1,   138,   139,     3,     4,    -1,    -1,     7,
+      -1,     9,    10,   128,    -1,   130,   131,   132,   133,    -1,
+     135,   136,    -1,   138,   139,    -1,    -1,    -1,   128,    -1,
+     130,   131,   132,   133,    -1,   135,   136,    -1,   138,   139,
+     128,    -1,   130,   131,   132,   133,   134,   135,    -1,    -1,
+     138,   139,   128,    -1,   130,   131,   132,   133,    -1,   135,
+     136,    -1,   138,   139,     3,     4,    -1,    -1,     7,    -1,
+       9,    10,   128,    -1,   130,   131,   132,   133,   134,   135,
+      -1,    -1,   138,   139,    -1,    -1,    -1,   128,    -1,   130,
+     131,   132,   133,    -1,   135,   136,    -1,   138,   139,   128,
+      -1,   130,   131,   132,   133,    -1,   135,   136,    -1,   138,
+     139,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    14,    -1,    -1,    -1,    -1,
+     128,    -1,   130,   131,   132,   133,    -1,   135,   136,    -1,
+     138,   139,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,     3,     4,
+      -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,   128,
+      -1,   130,   131,   132,   133,    -1,   135,   136,    -1,   138,
+     139,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    14,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   128,    -1,   130,   131,   132,   133,    -1,   135,
-      -1,    -1,   138,   139,    -1,    -1,   128,   143,   130,   131,
-     132,   133,    -1,   135,    -1,    -1,   138,   139,    -1,    -1,
-     128,   143,   130,   131,   132,   133,    -1,   135,    -1,    -1,
-     138,   139,     8,    14,    -1,   143,    -1,    13,    14,    15,
-      -1,    17,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,   109,    -1,   111,   112,   113,    -1,    -1,    -1,   128,
-      -1,   130,   131,   132,   133,    -1,   135,    -1,   126,   138,
-     139,    -1,    -1,    -1,   143,   133,    -1,   109,    -1,   111,
-     112,   113,    -1,    -1,   142,   128,   144,   130,   131,   132,
-     133,    -1,   135,    -1,   126,   138,   139,     8,    -1,    -1,
-     143,   133,    13,    14,    15,    -1,    17,    -1,    19,    20,
-     142,    -1,   144,    -1,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,    -1,    -1,    -1,   109,    -1,
-     111,   112,   113,   109,    -1,   111,   112,   113,    -1,    -1,
-      -1,    -1,   118,   119,    -1,   126,    -1,    -1,    -1,    -1,
-     126,    -1,   133,     8,    -1,   131,    -1,   133,    13,    14,
-      15,   142,    17,   144,    19,    20,   142,   143,   144,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,
-     111,   112,   113,    -1,    -1,    -1,    -1,   118,   119,    -1,
-      -1,    -1,     8,    -1,    -1,   126,    -1,    13,    14,    15,
-     131,    17,   133,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,   142,   143,   144,    -1,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   109,    -1,   111,   112,   113,    -1,
-      -1,    -1,    -1,   118,   119,    -1,    -1,    -1,     8,    -1,
-      -1,   126,    -1,    13,    14,    15,   131,    17,   133,    19,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,   142,   143,   144,
-      -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   109,    -1,   111,   112,   113,    -1,    -1,
-      -1,    -1,   118,   119,    -1,    -1,    -1,     8,    -1,    -1,
-     126,    -1,    13,    14,    15,   131,    17,   133,    19,    20,
-      -1,    -1,    -1,    -1,    -1,    -1,   142,   143,   144,    -1,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,
-      -1,   111,   112,   113,    -1,    -1,    -1,    -1,   118,   119,
-      -1,    -1,    -1,     8,    -1,    -1,   126,    -1,    13,    14,
-      15,   131,    17,   133,    19,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,   142,   143,   144,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,
-     111,   112,   113,    -1,    -1,    -1,    -1,   118,   119,    -1,
-      -1,    -1,     8,    -1,    -1,   126,    -1,    13,    14,    15,
-     131,    17,   133,    19,    20,    -1,    -1,    -1,    -1,    -1,
-      -1,   142,    -1,   144,    -1,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,     3,     4,    -1,    -1,
-       7,    -1,     9,    10,   109,    -1,   111,   112,   113,    -1,
-      -1,     3,     4,   118,   119,     7,    -1,     9,    10,    -1,
-      -1,   126,    -1,     3,     4,    -1,   131,     7,   133,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,   144,
-      -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,   109,    -1,   111,   112,   113,    -1,    -1,
-       3,     4,   118,   119,     7,    -1,     9,    10,    -1,    -1,
-     126,    -1,     3,     4,    -1,   131,     7,   133,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,   144,     3,
-       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,   128,    -1,   130,   131,   132,   133,   134,   135,   136,
-      -1,   138,   139,    -1,    -1,    -1,   128,    -1,   130,   131,
-     132,   133,    -1,   135,   136,    -1,   138,   139,   128,    -1,
-     130,   131,   132,   133,    -1,   135,   136,    -1,   138,   139,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-     128,    -1,   130,   131,   132,   133,    -1,   135,   136,    -1,
-     138,   139,    -1,    -1,    -1,   128,    -1,   130,   131,   132,
-     133,   134,   135,    -1,    -1,   138,   139,   128,    -1,   130,
-     131,   132,   133,    -1,   135,   136,    -1,   138,   139,    -1,
-      -1,    -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,
-     134,   135,    -1,    -1,   138,   139,   128,    -1,   130,   131,
-     132,   133,    -1,   135,   136,    -1,   138,   139,     3,     4,
-      -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,   128,    -1,   130,   131,   132,
-     133,    -1,   135,   136,    -1,   138,   139,   128,    -1,   130,
-     131,   132,   133,    -1,   135,   136,    -1,   138,   139,     3,
-       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,    -1,
-     135,   136,    -1,   138,   139,   128,    -1,   130,   131,   132,
-     133,   134,   135,    -1,    -1,   138,   139,   128,    -1,   130,
-     131,   132,   133,   134,   135,    14,    -1,   138,   139,    13,
-      14,    15,    -1,    17,    -1,    19,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    14,   128,    -1,   130,   131,   132,   133,
-     134,   135,    -1,    -1,   138,   139,   128,    -1,   130,   131,
-     132,   133,    14,   135,    -1,    -1,   138,   139,   128,    -1,
-     130,   131,   132,   133,    -1,   135,    -1,    -1,   138,   139,
-     128,    14,   130,   131,   132,   133,    -1,   135,    -1,    14,
-      -1,   139,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    98,    99,   100,    -1,    -1,    -1,
-     109,    -1,   111,   112,   113,   109,    -1,   111,   112,   113,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
-      -1,    -1,   126,    -1,   133,    -1,    -1,    -1,   109,   133,
-     111,   112,   113,   142,    -1,   144,    -1,    -1,    -1,   143,
-     144,    -1,    -1,    -1,    -1,   126,    -1,   109,    -1,   111,
-     112,   113,   133,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   142,    -1,   144,   126,    -1,   109,    -1,   111,   112,
-     113,   133,    -1,    -1,   109,    -1,   111,   112,   113,    -1,
-     142,    -1,   144,   126,    -1,    -1,    -1,    -1,    -1,    -1,
-     133,   126,    -1,    -1,    -1,    -1,    -1,    -1,   133,   142,
-      -1,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   144
+     109,    -1,   111,   112,   113,    -1,    14,    -1,    -1,    -1,
+      -1,    14,    -1,    -1,    -1,    -1,   128,   126,   130,   131,
+     132,   133,   134,   135,   133,    -1,   138,   139,    13,    14,
+      15,    -1,    17,   142,    19,    20,   145,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,    -1,   130,
+     131,   132,   133,   134,   135,    14,    -1,   138,   139,   128,
+      -1,   130,   131,   132,   133,   134,   135,    -1,    -1,   138,
+     139,   128,    -1,   130,   131,   132,   133,    -1,   135,    -1,
+      14,   138,   139,   128,    -1,   130,   131,   132,   133,    -1,
+     135,    -1,    -1,   138,   139,    -1,    -1,    -1,    -1,    -1,
+      -1,   109,    -1,   111,   112,   113,   109,    -1,   111,   112,
+     113,    -1,    -1,    98,    99,   100,    -1,    -1,   126,    -1,
+      -1,    -1,    -1,   126,   109,   133,   111,   112,   113,    -1,
+     133,    -1,    -1,    -1,   142,    -1,    -1,   145,    -1,   142,
+      -1,   126,   145,    -1,    -1,    -1,    -1,    -1,   133,    -1,
+     109,    -1,   111,   112,   113,    -1,    -1,    -1,   143,    -1,
+     145,    -1,    -1,    -1,    -1,    -1,    -1,   126,    -1,    -1,
+      -1,    -1,    -1,    -1,   133,   109,    -1,   111,   112,   113,
+      -1,    -1,    -1,   142,    -1,    -1,   145,    -1,    -1,    -1,
+      -1,    -1,   126,    -1,    -1,    -1,    -1,    -1,    -1,   133,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   142,    -1,
+      -1,   145
 };
 
@@ -1554 +1557 @@
 static const yytype_uint8 yystos[] =
 {
-       0,   146,     0,     1,     8,    13,    14,    15,    17,    19,
+       0,   147,     0,     1,     8,    13,    14,    15,    17,    19,
       20,    40,    90,    91,    92,    93,    94,    95,    96,    97,
       98,    99,   100,   101,   102,   103,   104,   106,   107,   108,
      109,   111,   112,   113,   114,   115,   116,   117,   118,   119,
      120,   121,   122,   123,   124,   125,   126,   128,   131,   133,
-     137,   142,   144,   147,   148,   149,   150,   151,   152,   153,
-     154,   156,   158,   159,   160,   161,   162,   163,   170,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   137,    13,    14,    15,
-      19,    98,    99,   100,   126,   154,   161,   142,   152,   142,
-     152,   160,   142,   142,   152,   142,   142,   142,   142,   142,
-     142,   142,   142,   142,   152,   142,   152,   142,   152,   109,
-     110,   153,   109,   137,   152,   142,   154,   109,   110,   142,
-     142,   109,   142,   109,   142,    14,   154,   162,   163,   163,
-     154,   153,   153,   154,   137,    11,   142,   127,   136,     3,
-       4,     7,     9,    10,   128,   130,   131,   132,   133,   135,
-     138,   139,   154,   153,   142,   152,   127,   136,   137,   169,
-     136,   152,   154,   154,   133,   154,   110,   142,   154,   164,
-     154,   133,   154,   154,   154,   154,   154,   154,   154,   143,
-     153,   154,   143,   153,   154,   137,   137,    13,    14,    15,
-      19,    98,    99,   100,   143,   152,   161,   109,   110,   155,
-     109,   154,   110,   143,   153,   171,   134,   143,   144,   152,
-     143,   153,   154,   154,   154,   154,   154,   154,   154,   154,
-     154,   154,   154,   154,   127,   143,   157,   143,   153,   152,
-     152,   169,   136,   143,   154,   143,   154,   143,   136,   136,
-     143,   154,   143,   136,   136,   136,   143,   136,   143,   136,
+     137,   142,   145,   148,   149,   150,   151,   152,   153,   154,
+     155,   157,   159,   160,   161,   162,   163,   164,   171,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   137,    13,    14,    15,
+      19,    98,    99,   100,   126,   155,   162,   142,   153,   142,
+     153,   161,   142,   142,   153,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   153,   142,   153,   142,   153,   109,
+     110,   154,   109,   137,   153,   142,   155,   109,   110,   142,
+     142,   109,   142,   109,   142,    14,   155,   163,   164,   164,
+     155,   154,   154,   155,   137,    11,   142,   144,   127,   136,
+       3,     4,     7,     9,    10,   128,   130,   131,   132,   133,
+     135,   138,   139,   155,   154,   142,   153,   127,   136,   137,
+     170,   136,   153,   155,   155,   133,   155,   110,   142,   155,
+     165,   155,   133,   155,   155,   155,   155,   155,   155,   155,
+     143,   154,   155,   143,   154,   155,   137,   137,    13,    14,
+      15,    19,    98,    99,   100,   143,   153,   162,   109,   110,
+     156,   109,   155,   110,   143,   154,   172,   134,   143,   145,
+     153,   143,   154,   153,   155,   155,   155,   155,   155,   155,
+     155,   155,   155,   155,   155,   155,   127,   143,   158,   143,
+     154,   153,   153,   170,   136,   143,   155,   143,   155,   143,
+     136,   136,   143,   155,   143,   136,   136,   136,   143,   136,
+     143,   136,   136,   143,   143,   143,   143,   143,   143,   143,
+     143,   143,   143,   143,   143,   136,   143,   143,   110,   155,
+     109,   143,   143,   137,   143,   134,   136,   155,   143,   155,
+     165,   155,   134,   136,   165,   155,   134,   155,   155,   155,
+     155,   155,   155,    13,    14,    15,    19,    98,    99,   100,
+     162,   143,   110,   110,   115,   155,   158,   136,   136,   133,
+     154,   136,   136,   133,   143,   136,   143,   136,   136,   143,
      136,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   136,   143,   143,   110,   154,   109,   143,
-     143,   137,   143,   134,   136,   154,   143,   154,   164,   154,
-     134,   136,   164,   154,   134,   154,   154,   154,   154,   154,
-     154,    13,    14,    15,    19,    98,    99,   100,   161,   143,
-     110,   110,   115,   154,   157,   136,   136,   133,   153,   136,
-     136,   133,   143,   136,   143,   136,   136,   143,   136,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   134,   164,
-     154,   154,   143,   112,   142,   165,   166,   168,   154,   154,
-     154,   154,   154,   154,   136,   143,   134,   166,   167,   142,
-     143,   143,   134,   143,   143,   143,   143,   168,   136,   143,
-     153,   167,   143
+     134,   165,   155,   155,   143,   112,   142,   166,   167,   169,
+     155,   155,   155,   155,   155,   155,   136,   143,   134,   167,
+     168,   142,   143,   143,   134,   143,   143,   143,   143,   169,
+     136,   143,   154,   168,   143
 };
 
@@ -2409 +2412 @@
     {
         case 3:
-#line 360 "grammar.y"
+#line 361 "grammar.y"
     {
             if (timerv)
@@ -2443 +2446 @@
 
   case 5:
-#line 395 "grammar.y"
+#line 396 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
 
   case 6:
-#line 397 "grammar.y"
+#line 398 "grammar.y"
     { (yyvsp[(1) - (2)].lv).CleanUp(); currentVoice->ifsw=0;;}
     break;
 
   case 7:
-#line 399 "grammar.y"
+#line 400 "grammar.y"
     {
             YYACCEPT;
@@ -2460 +2463 @@
 
   case 8:
-#line 403 "grammar.y"
+#line 404 "grammar.y"
     {
             currentVoice->ifsw=0;
@@ -2468 +2471 @@
 
   case 9:
-#line 408 "grammar.y"
+#line 409 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
 
   case 10:
-#line 410 "grammar.y"
+#line 411 "grammar.y"
     {
             #ifdef SIQ
@@ -2525 +2528 @@
 
   case 18:
-#line 468 "grammar.y"
+#line 469 "grammar.y"
     {if (currentVoice!=NULL) currentVoice->ifsw=0;;}
     break;
 
   case 19:
-#line 471 "grammar.y"
+#line 472 "grammar.y"
     { omFree((ADDRESS)(yyvsp[(2) - (2)].name)); ;}
     break;
 
   case 29:
-#line 486 "grammar.y"
+#line 487 "grammar.y"
     {
             if(iiAssign(&(yyvsp[(1) - (2)].lv),&(yyvsp[(2) - (2)].lv))) YYERROR;
@@ -2542 +2545 @@
 
   case 30:
-#line 493 "grammar.y"
+#line 494 "grammar.y"
     {
             if (currRing==NULL) MYYERROR("no ring active");
@@ -2550 +2553 @@
 
   case 31:
-#line 498 "grammar.y"
+#line 499 "grammar.y"
     {
             syMake(&(yyval.lv),(yyvsp[(1) - (1)].name));
@@ -2557 +2560 @@
 
   case 32:
-#line 502 "grammar.y"
+#line 503 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), COLONCOLON, &(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2564 +2567 @@
 
   case 33:
-#line 506 "grammar.y"
+#line 507 "grammar.y"
+    {
+            if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), '.', &(yyvsp[(3) - (3)].lv))) YYERROR;
+          ;}
+    break;
+
+  case 34:
+#line 511 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'(')) YYERROR;
@@ -2570 +2580 @@
     break;
 
-  case 34:
-#line 510 "grammar.y"
+  case 35:
+#line 515 "grammar.y"
     {
             if ((yyvsp[(1) - (4)].lv).rtyp==UNKNOWN)
@@ -2586 +2596 @@
     break;
 
-  case 35:
-#line 523 "grammar.y"
+  case 36:
+#line 528 "grammar.y"
     {
             if (currRingHdl==NULL) MYYERROR("no ring active");
@@ -2617 +2627 @@
     break;
 
-  case 36:
-#line 551 "grammar.y"
+  case 37:
+#line 556 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2644 +2654 @@
     break;
 
-  case 37:
-#line 575 "grammar.y"
+  case 38:
+#line 580 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2653 +2663 @@
     break;
 
-  case 38:
-#line 581 "grammar.y"
+  case 39:
+#line 586 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2662 +2672 @@
     break;
 
-  case 39:
-#line 587 "grammar.y"
+  case 40:
+#line 592 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2669 +2679 @@
     break;
 
-  case 40:
-#line 594 "grammar.y"
+  case 41:
+#line 599 "grammar.y"
     {
             leftv v = &(yyvsp[(1) - (3)].lv);
@@ -2683 +2693 @@
     break;
 
-  case 41:
-#line 605 "grammar.y"
+  case 42:
+#line 610 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(1) - (1)].lv);
@@ -2690 +2700 @@
     break;
 
-  case 42:
-#line 611 "grammar.y"
+  case 43:
+#line 616 "grammar.y"
     {
             /*if ($1.typ == eunknown) YYERROR;*/
@@ -2698 +2708 @@
     break;
 
-  case 43:
-#line 615 "grammar.y"
+  case 44:
+#line 620 "grammar.y"
     { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}
     break;
 
-  case 44:
-#line 616 "grammar.y"
+  case 45:
+#line 621 "grammar.y"
     { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;}
     break;
 
-  case 45:
-#line 618 "grammar.y"
+  case 46:
+#line 623 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR;
@@ -2715 +2725 @@
     break;
 
-  case 46:
-#line 622 "grammar.y"
+  case 47:
+#line 627 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (4)].lv),'[',&(yyvsp[(3) - (4)].lv))) YYERROR;
@@ -2722 +2732 @@
     break;
 
-  case 47:
-#line 626 "grammar.y"
+  case 48:
+#line 631 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2729 +2739 @@
     break;
 
-  case 48:
-#line 630 "grammar.y"
+  case 49:
+#line 635 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2736 +2746 @@
     break;
 
-  case 49:
-#line 634 "grammar.y"
+  case 50:
+#line 639 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2743 +2753 @@
     break;
 
-  case 50:
-#line 638 "grammar.y"
+  case 51:
+#line 643 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2750 +2760 @@
     break;
 
-  case 51:
-#line 642 "grammar.y"
+  case 52:
+#line 647 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2757 +2767 @@
     break;
 
-  case 52:
-#line 646 "grammar.y"
+  case 53:
+#line 651 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2764 +2774 @@
     break;
 
-  case 53:
-#line 650 "grammar.y"
+  case 54:
+#line 655 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2771 +2781 @@
     break;
 
-  case 54:
-#line 654 "grammar.y"
+  case 55:
+#line 659 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2778 +2788 @@
     break;
 
-  case 55:
-#line 658 "grammar.y"
+  case 56:
+#line 663 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2785 +2795 @@
     break;
 
-  case 56:
-#line 662 "grammar.y"
+  case 57:
+#line 667 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2792 +2802 @@
     break;
 
-  case 57:
-#line 666 "grammar.y"
+  case 58:
+#line 671 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2799 +2809 @@
     break;
 
-  case 58:
-#line 670 "grammar.y"
+  case 59:
+#line 675 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2806 +2816 @@
     break;
 
-  case 59:
-#line 674 "grammar.y"
+  case 60:
+#line 679 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2813 +2823 @@
     break;
 
-  case 60:
-#line 678 "grammar.y"
+  case 61:
+#line 683 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2820 +2830 @@
     break;
 
-  case 61:
-#line 682 "grammar.y"
+  case 62:
+#line 687 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2827 +2837 @@
     break;
 
-  case 62:
-#line 686 "grammar.y"
+  case 63:
+#line 691 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2834 +2844 @@
     break;
 
-  case 63:
-#line 690 "grammar.y"
+  case 64:
+#line 695 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2841 +2851 @@
     break;
 
-  case 64:
-#line 694 "grammar.y"
+  case 65:
+#line 699 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2848 +2858 @@
     break;
 
-  case 65:
-#line 698 "grammar.y"
+  case 66:
+#line 703 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2855 +2865 @@
     break;
 
-  case 66:
-#line 702 "grammar.y"
+  case 67:
+#line 707 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2862 +2872 @@
     break;
 
-  case 67:
-#line 706 "grammar.y"
+  case 68:
+#line 711 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),MATRIX_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2869 +2879 @@
     break;
 
-  case 68:
-#line 710 "grammar.y"
+  case 69:
+#line 715 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),MATRIX_CMD)) YYERROR;
@@ -2876 +2886 @@
     break;
 
-  case 69:
-#line 714 "grammar.y"
+  case 70:
+#line 719 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),INTMAT_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2883 +2893 @@
     break;
 
-  case 70:
-#line 718 "grammar.y"
+  case 71:
+#line 723 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),INTMAT_CMD)) YYERROR;
@@ -2890 +2900 @@
     break;
 
-  case 71:
-#line 722 "grammar.y"
+  case 72:
+#line 727 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),RING_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2897 +2907 @@
     break;
 
-  case 72:
-#line 726 "grammar.y"
+  case 73:
+#line 731 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),RING_CMD)) YYERROR;
@@ -2904 +2914 @@
     break;
 
-  case 73:
-#line 730 "grammar.y"
+  case 74:
+#line 735 "grammar.y"
     {
             (yyval.lv)=(yyvsp[(2) - (3)].lv);
@@ -2911 +2921 @@
     break;
 
-  case 74:
-#line 734 "grammar.y"
+  case 75:
+#line 739 "grammar.y"
     {
             #ifdef SIQ
@@ -2931 +2941 @@
     break;
 
-  case 75:
-#line 751 "grammar.y"
+  case 76:
+#line 756 "grammar.y"
     {
             #ifdef SIQ
@@ -2940 +2950 @@
     break;
 
-  case 76:
-#line 757 "grammar.y"
+  case 77:
+#line 762 "grammar.y"
     {
             #ifdef SIQ
@@ -2953 +2963 @@
     break;
 
-  case 77:
-#line 769 "grammar.y"
+  case 78:
+#line 774 "grammar.y"
     {
             #ifdef SIQ
@@ -2962 +2972 @@
     break;
 
-  case 78:
-#line 777 "grammar.y"
+  case 79:
+#line 782 "grammar.y"
     {
             #ifdef SIQ
@@ -2971 +2981 @@
     break;
 
-  case 79:
-#line 786 "grammar.y"
+  case 80:
+#line 791 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),PLUSPLUS)) YYERROR;
@@ -2978 +2988 @@
     break;
 
-  case 80:
-#line 790 "grammar.y"
+  case 81:
+#line 795 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),MINUSMINUS)) YYERROR;
@@ -2985 +2995 @@
     break;
 
-  case 81:
-#line 794 "grammar.y"
+  case 82:
+#line 799 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'+',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2992 +3002 @@
     break;
 
-  case 82:
-#line 798 "grammar.y"
+  case 83:
+#line 803 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'-',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2999 +3009 @@
     break;
 
-  case 83:
-#line 802 "grammar.y"
+  case 84:
+#line 807 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3006 +3016 @@
     break;
 
-  case 84:
-#line 806 "grammar.y"
+  case 85:
+#line 811 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'^',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3013 +3023 @@
     break;
 
-  case 85:
-#line 810 "grammar.y"
+  case 86:
+#line 815 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3020 +3030 @@
     break;
 
-  case 86:
-#line 814 "grammar.y"
+  case 87:
+#line 819 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3027 +3037 @@
     break;
 
-  case 87:
-#line 818 "grammar.y"
+  case 88:
+#line 823 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),NOTEQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3034 +3044 @@
     break;
 
-  case 88:
-#line 822 "grammar.y"
+  case 89:
+#line 827 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),EQUAL_EQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3041 +3051 @@
     break;
 
-  case 89:
-#line 826 "grammar.y"
+  case 90:
+#line 831 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),DOTDOT,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3048 +3058 @@
     break;
 
-  case 90:
-#line 830 "grammar.y"
+  case 91:
+#line 835 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),':',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3055 +3065 @@
     break;
 
-  case 91:
-#line 834 "grammar.y"
+  case 92:
+#line 839 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3065 +3075 @@
     break;
 
-  case 92:
-#line 841 "grammar.y"
+  case 93:
+#line 846 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(2) - (2)].lv),'-')) YYERROR;
@@ -3072 +3082 @@
     break;
 
-  case 93:
-#line 847 "grammar.y"
+  case 94:
+#line 852 "grammar.y"
     { (yyval.lv) = (yyvsp[(1) - (2)].lv); ;}
     break;
 
-  case 94:
-#line 849 "grammar.y"
+  case 95:
+#line 854 "grammar.y"
     {
             if ((yyvsp[(1) - (2)].lv).rtyp==0)
@@ -3095 +3105 @@
     break;
 
-  case 96:
-#line 869 "grammar.y"
+  case 97:
+#line 874 "grammar.y"
     {
             if ((yyvsp[(2) - (3)].lv).Typ()!=STRING_CMD)
@@ -3107 +3117 @@
     break;
 
-  case 99:
-#line 886 "grammar.y"
+  case 100:
+#line 891 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3115 +3125 @@
     break;
 
-  case 100:
-#line 891 "grammar.y"
+  case 101:
+#line 896 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3123 +3133 @@
     break;
 
-  case 101:
-#line 896 "grammar.y"
+  case 102:
+#line 901 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3130 +3140 @@
     break;
 
-  case 102:
-#line 900 "grammar.y"
+  case 103:
+#line 905 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3137 +3147 @@
     break;
 
-  case 103:
-#line 904 "grammar.y"
+  case 104:
+#line 909 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (8)].lv),myynest,(yyvsp[(1) - (8)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3156 +3166 @@
     break;
 
-  case 104:
-#line 920 "grammar.y"
+  case 105:
+#line 925 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&(currRing->idroot), TRUE)) YYERROR;
@@ -3163 +3173 @@
     break;
 
-  case 105:
-#line 924 "grammar.y"
+  case 106:
+#line 929 "grammar.y"
     {
             int r; TESTSETINT((yyvsp[(4) - (8)].lv),r);
@@ -3182 +3192 @@
     break;
 
-  case 106:
-#line 940 "grammar.y"
+  case 107:
+#line 945 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3199 +3209 @@
     break;
 
-  case 107:
-#line 954 "grammar.y"
+  case 108:
+#line 959 "grammar.y"
     {
             int t=(yyvsp[(1) - (3)].lv).Typ();
@@ -3223 +3233 @@
     break;
 
-  case 108:
-#line 975 "grammar.y"
+  case 109:
+#line 980 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3231 +3241 @@
     break;
 
-  case 111:
-#line 988 "grammar.y"
+  case 112:
+#line 993 "grammar.y"
     {
             leftv v = &(yyvsp[(2) - (5)].lv);
@@ -3245 +3255 @@
     break;
 
-  case 112:
-#line 1002 "grammar.y"
+  case 113:
+#line 1007 "grammar.y"
     {
           // let rInit take care of any errors
@@ -3253 +3263 @@
     break;
 
-  case 113:
-#line 1010 "grammar.y"
+  case 114:
+#line 1015 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3265 +3275 @@
     break;
 
-  case 114:
-#line 1019 "grammar.y"
+  case 115:
+#line 1024 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -3310 +3320 @@
     break;
 
-  case 116:
-#line 1065 "grammar.y"
+  case 117:
+#line 1070 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(1) - (3)].lv);
@@ -3319 +3329 @@
     break;
 
-  case 118:
-#line 1075 "grammar.y"
+  case 119:
+#line 1080 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(2) - (3)].lv);
@@ -3326 +3336 @@
     break;
 
-  case 119:
-#line 1081 "grammar.y"
+  case 120:
+#line 1086 "grammar.y"
     {
             expected_parms = TRUE;
@@ -3333 +3343 @@
     break;
 
-  case 120:
-#line 1093 "grammar.y"
+  case 121:
+#line 1098 "grammar.y"
     { if ((yyvsp[(1) - (2)].i) != '<') YYERROR;
             if((feFilePending=feFopen((yyvsp[(2) - (2)].name),"r",NULL,TRUE))==NULL) YYERROR; ;}
     break;
 
-  case 121:
-#line 1096 "grammar.y"
-    { newFile((yyvsp[(2) - (4)].name),feFilePending); ;}
-    break;
-
   case 122:
 #line 1101 "grammar.y"
+    { newFile((yyvsp[(2) - (4)].name),feFilePending); ;}
+    break;
+
+  case 123:
+#line 1106 "grammar.y"
     {
             feHelp((yyvsp[(2) - (3)].name));
@@ -3352 +3362 @@
     break;
 
-  case 123:
-#line 1106 "grammar.y"
+  case 124:
+#line 1111 "grammar.y"
     {
             feHelp(NULL);
@@ -3359 +3369 @@
     break;
 
-  case 124:
-#line 1113 "grammar.y"
+  case 125:
+#line 1118 "grammar.y"
     {
             singular_example((yyvsp[(2) - (3)].name));
@@ -3367 +3377 @@
     break;
 
-  case 125:
-#line 1121 "grammar.y"
+  case 126:
+#line 1126 "grammar.y"
     {
           if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl)
@@ -3379 +3389 @@
     break;
 
-  case 126:
-#line 1133 "grammar.y"
+  case 127:
+#line 1138 "grammar.y"
     {
           leftv v=&(yyvsp[(2) - (2)].lv);
@@ -3398 +3408 @@
     break;
 
-  case 127:
-#line 1149 "grammar.y"
+  case 128:
+#line 1154 "grammar.y"
     {
           leftv v=&(yyvsp[(3) - (3)].lv);
@@ -3417 +3427 @@
     break;
 
-  case 128:
-#line 1168 "grammar.y"
+  case 129:
+#line 1173 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3424 +3434 @@
     break;
 
-  case 129:
-#line 1172 "grammar.y"
+  case 130:
+#line 1177 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3431 +3441 @@
     break;
 
-  case 130:
-#line 1176 "grammar.y"
+  case 131:
+#line 1181 "grammar.y"
     {
             if ((yyvsp[(3) - (4)].i)==QRING_CMD) (yyvsp[(3) - (4)].i)=RING_CMD;
@@ -3439 +3449 @@
     break;
 
-  case 131:
-#line 1181 "grammar.y"
+  case 132:
+#line 1186 "grammar.y"
     {
             list_cmd((yyvsp[(3) - (4)].i),NULL,"// ",TRUE);
@@ -3446 +3456 @@
     break;
 
-  case 132:
-#line 1185 "grammar.y"
+  case 133:
+#line 1190 "grammar.y"
     {
             list_cmd(RING_CMD,NULL,"// ",TRUE);
@@ -3453 +3463 @@
     break;
 
-  case 133:
-#line 1189 "grammar.y"
+  case 134:
+#line 1194 "grammar.y"
     {
             list_cmd(MATRIX_CMD,NULL,"// ",TRUE);
@@ -3460 +3470 @@
     break;
 
-  case 134:
-#line 1193 "grammar.y"
+  case 135:
+#line 1198 "grammar.y"
     {
             list_cmd(INTMAT_CMD,NULL,"// ",TRUE);
@@ -3467 +3477 @@
     break;
 
-  case 135:
-#line 1197 "grammar.y"
+  case 136:
+#line 1202 "grammar.y"
     {
             list_cmd(PROC_CMD,NULL,"// ",TRUE);
@@ -3474 +3484 @@
     break;
 
-  case 136:
-#line 1201 "grammar.y"
+  case 137:
+#line 1206 "grammar.y"
     {
             list_cmd(0,(yyvsp[(3) - (4)].lv).Fullname(),"// ",TRUE);
@@ -3482 +3492 @@
     break;
 
-  case 137:
-#line 1206 "grammar.y"
+  case 138:
+#line 1211 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3491 +3501 @@
     break;
 
-  case 138:
-#line 1212 "grammar.y"
+  case 139:
+#line 1217 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3500 +3510 @@
     break;
 
-  case 139:
-#line 1218 "grammar.y"
+  case 140:
+#line 1223 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3509 +3519 @@
     break;
 
-  case 140:
-#line 1224 "grammar.y"
+  case 141:
+#line 1229 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3518 +3528 @@
     break;
 
-  case 141:
-#line 1230 "grammar.y"
+  case 142:
+#line 1235 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3527 +3537 @@
     break;
 
-  case 142:
-#line 1236 "grammar.y"
+  case 143:
+#line 1241 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3536 +3546 @@
     break;
 
-  case 143:
-#line 1242 "grammar.y"
+  case 144:
+#line 1247 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3545 +3555 @@
     break;
 
-  case 144:
-#line 1248 "grammar.y"
+  case 145:
+#line 1253 "grammar.y"
     {
             if((yyvsp[(3) - (6)].lv).Typ() == PACKAGE_CMD)
@@ -3554 +3564 @@
     break;
 
-  case 145:
-#line 1260 "grammar.y"
+  case 146:
+#line 1265 "grammar.y"
     {
             list_cmd(-1,NULL,"// ",TRUE);
@@ -3561 +3571 @@
     break;
 
-  case 146:
-#line 1266 "grammar.y"
+  case 147:
+#line 1271 "grammar.y"
     { yyInRingConstruction = TRUE; ;}
     break;
 
-  case 147:
-#line 1275 "grammar.y"
+  case 148:
+#line 1280 "grammar.y"
     {
             const char *ring_name = (yyvsp[(2) - (8)].lv).name;
@@ -3603 +3613 @@
     break;
 
-  case 148:
-#line 1309 "grammar.y"
+  case 149:
+#line 1314 "grammar.y"
     {
             const char *ring_name = (yyvsp[(2) - (2)].lv).name;
@@ -3613 +3623 @@
     break;
 
-  case 149:
-#line 1319 "grammar.y"
+  case 150:
+#line 1324 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)!=LIB_CMD)||(iiLibCmd((yyvsp[(2) - (2)].name),TRUE,TRUE,TRUE)))
@@ -3627 +3637 @@
     break;
 
-  case 152:
-#line 1335 "grammar.y"
+  case 153:
+#line 1340 "grammar.y"
     {
             if (((yyvsp[(1) - (2)].i)==KEEPRING_CMD) && (myynest==0))
@@ -3699 +3709 @@
     break;
 
-  case 153:
-#line 1407 "grammar.y"
+  case 154:
+#line 1412 "grammar.y"
     {
             if ((yyvsp[(2) - (2)].lv).rtyp!=IDHDL) MYYERROR("identifier expected");
@@ -3708 +3718 @@
     break;
 
-  case 154:
-#line 1413 "grammar.y"
+  case 155:
+#line 1418 "grammar.y"
     {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -3734 +3744 @@
     break;
 
-  case 155:
-#line 1442 "grammar.y"
+  case 156:
+#line 1447 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -3750 +3760 @@
     break;
 
-  case 156:
-#line 1455 "grammar.y"
+  case 157:
+#line 1460 "grammar.y"
     {
             if (currentVoice->ifsw==1)
@@ -3770 +3780 @@
     break;
 
-  case 157:
-#line 1472 "grammar.y"
+  case 158:
+#line 1477 "grammar.y"
     {
             int i; TESTSETINT((yyvsp[(3) - (5)].lv),i);
@@ -3782 +3792 @@
     break;
 
-  case 158:
-#line 1481 "grammar.y"
+  case 159:
+#line 1486 "grammar.y"
     {
             if (exitBuffer(BT_break)) YYERROR;
@@ -3790 +3800 @@
     break;
 
-  case 159:
-#line 1486 "grammar.y"
+  case 160:
+#line 1491 "grammar.y"
     {
             if (contBuffer(BT_break)) YYERROR;
@@ -3798 +3808 @@
     break;
 
-  case 160:
-#line 1494 "grammar.y"
+  case 161:
+#line 1499 "grammar.y"
     {
             /* -> if(!$2) break; $3; continue;*/
@@ -3810 +3820 @@
     break;
 
-  case 161:
-#line 1506 "grammar.y"
+  case 162:
+#line 1511 "grammar.y"
     {
             /* $2 */
@@ -3829 +3839 @@
     break;
 
-  case 162:
-#line 1525 "grammar.y"
+  case 163:
+#line 1530 "grammar.y"
     {
             procinfov pi;
@@ -3843 +3853 @@
     break;
 
-  case 163:
-#line 1536 "grammar.y"
+  case 164:
+#line 1541 "grammar.y"
     {
             idhdl h = enterid((yyvsp[(1) - (3)].name),myynest,PROC_CMD,&IDROOT,TRUE);
@@ -3866 +3876 @@
     break;
 
-  case 164:
-#line 1556 "grammar.y"
+  case 165:
+#line 1561 "grammar.y"
     {
             omFree((ADDRESS)(yyvsp[(3) - (4)].name));
@@ -3890 +3900 @@
     break;
 
-  case 165:
-#line 1580 "grammar.y"
+  case 166:
+#line 1585 "grammar.y"
     {
             // decl. of type proc p(int i)
@@ -3899 +3909 @@
     break;
 
-  case 166:
-#line 1586 "grammar.y"
+  case 167:
+#line 1591 "grammar.y"
     {
             // decl. of type proc p(i)
@@ -3911 +3921 @@
     break;
 
-  case 167:
-#line 1598 "grammar.y"
+  case 168:
+#line 1603 "grammar.y"
     {
             if(iiRETURNEXPR==NULL) YYERROR;
@@ -3921 +3931 @@
     break;
 
-  case 168:
-#line 1605 "grammar.y"
+  case 169:
+#line 1610 "grammar.y"
     {
             if ((yyvsp[(1) - (3)].i)==RETURN)
@@ -3936 +3946 @@
 
 /* Line 1267 of yacc.c.  */
-#line 3936 "grammar.cc"
+#line 3946 "grammar.cc"
       default: break;
     }

Singular/grammar.y

@@ -353 +353 @@
 %left PLUSPLUS MINUSMINUS
 %left COLONCOLON
+%left '.'
 
 %%
@@ -502 +503 @@
           {
             if(iiExprArith2(&$$, &$1, COLONCOLON, &$3)) YYERROR;
+          }
+        | elemexpr '.' elemexpr
+          {
+            if(iiExprArith2(&$$, &$1, '.', &$3)) YYERROR;
           }
         | elemexpr '('  ')'

Singular/ipassign.cc

@@ -770 +770 @@
   {
     blackbox *bb=getBlackboxStuff(lt);
+#ifdef BLACKBOX_DEVEL
     Print("bb-assign: bb=%lx\n",bb);
+#endif
     return (bb==NULL) || bb->blackbox_Assign(l,r);
   }

Singular/ipid.cc

@@ -193 +193 @@
            if (t>MAX_TOK)
            {
+#ifdef BLACKBOX_DEVEL
              Print("bb-type %d\n",t);
+#endif
              blackbox *bb=getBlackboxStuff(t);
              if (bb!=NULL)

Singular/iplib.cc

@@ -32 +32 @@
 #define SI_MAX_NEST 1000
 #endif
+
+#if defined(ix86Mac_darwin) || defined(ppcMac_darwin)
+#  define MODULE_SUFFIX bundle
+#elif defined(ix86_Win)
+#  define MODULE_SUFFIX dll
+#else
+#  define MODULE_SUFFIX so
+#endif
+
+#define MODULE_SUFFIX_STRING EXPANDED_STRINGIFY(MODULE_SUFFIX)
+
 
 #ifdef HAVE_DYNAMIC_LOADING
@@ -1056 +1067 @@
 #endif /*STATIC */
 }
+
+// loads a dynamic module from the binary path and returns a named function
+// returns NULL, if something fails
+void* binary_module_function(const char* newlib, const char* funcname)
+{
+  void* result = NULL;
+
+#ifdef HAVE_STATIC
+  WerrorS("static version can not load function from dynamic modules");
+#else
+  const char* bin_dir = feGetResource('b');
+  if (!bin_dir)  { return NULL; }
+  
+  char path_name[MAXPATHLEN]; 
+  sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, newlib, MODULE_SUFFIX_STRING);
+
+  void* openlib = dynl_open(path_name);
+  if(!openlib)
+  {
+    Werror("dynl_open of %s failed:%s", path_name, dynl_error());
+    return NULL;
+  }
+  result = dynl_sym(openlib, funcname);
+  if (!result) Werror("%s: %s\n", funcname, dynl_error());
+#endif
+
+  return result;
+}
+
 #endif /* HAVE_DYNAMIC_LOADING */
 

Singular/mod2.h.in

@@ -160 +160 @@
 /* CPU type: x86_64: */
 #undef SI_CPU_X86_64
+/* whether development version of python is available */
+#undef HAVE_PYTHON
 
 /*******************************************************************
@@ -611 +613 @@
 #endif
 
+#define STRINGIFY(name) #name
+#define EXPANDED_STRINGIFY(name) STRINGIFY(name)
+
 #endif /* MOD2_H  */

Singular/silink.cc

@@ -614 +614 @@
   if (type_id == QRING_CMD)
     return DumpQring(fd, h, type_str);
+
+  // C-proc not to be dumped
+  if ((type_id == PROC_CMD) && (IDPROC(h)->language == LANG_C))
+    return FALSE;
 
   // put type and name

Singular/tesths.cc

@@ -33 +33 @@
 #include <Singular/ssiLink.h>
 #include <Singular/bigintm.h>
+#include <Singular/pyobject_setup.h>
+
 
 #ifdef HAVE_FACTORY
@@ -131 +133 @@
     //for official version: not active
     //bigintm_setup();
+    pyobject_setup();
   }
 #endif

Tst/regress.cmd

@@ -116 +116 @@
 }
 # sed scripts which are applied to res files before they are diff'ed
-$sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id:/d' -e '/error occurred in/d' -e '/tst_status/d' -e'/init >>/d' -e 's/\\[[0-9]*:[0-9]*\\]//g'";
+$sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id[:\$]/d' -e '/error occurred in/d' -e '/tst_status/d' -e'/init >>/d' -e 's/\\[[0-9]*:[0-9]*\\]//g'";
 # default value (in %) above which differences are reported on -r
 $report_val = 5;