Changeset 76b37c in git


Ignore:
Timestamp:
Feb 10, 2011, 7:15:30 PM (13 years ago)
Author:
Alexander Dreyer <alexander.dreyer@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
08d65ab4c41b40dad43dd4b171c5c2d577ad1661
Parents:
c728c0debfe1bf7bd3fba17cdaaa1b6a644cc251
git-author:
Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2011-02-10 18:15:30+00:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-02-10 18:15:30+00:00
Message:
Merge commit 'origin/master' into pyobject

From: Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@13837 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.in

    rc728c0 r76b37c  
    1 ################################################################
     1#################################################################
    22###
    33### Makefile for Singular
    … …  
    2121HAVE_PYTHON             = @HAVE_PYTHON_VALUE@
    2222PYTHON_CPPFLAGS         = @PYTHON_CPPFLAGS@
    23 PYTHON_LDFLAGS          = @PYTHON_LDFLAGS@
    24 PYTHON_SITE_PKG         = @PYTHON_SITE_PKG@
    25 PYTHON_EXTRA_LIBS       = @PYTHON_EXTRA_LIBS@
    26 PYTHON_EXTRA_LDFLAGS    = @PYTHON_EXTRA_LDFLAGS@
    27 
    28 # Note: compiler(!) flags for linking to python
    29 # todo: need flags for statically linking dependencies to shared modules
    30 PYTHON_LINKFLAGS        = ${PYTHON_LDFLAGS} ${PYTHON_EXTRA_LIBS} ${PYTHON_EXTRA_LDFLAGS}
     23PYTHON_MODULE_LIBS      = @PYTHON_LDFLAGS@ @PYTHON_EXTRA_LIBS@
     24PYTHON_MODULE_LDFLAGS   = @PYTHON_MODULE_FLAGS@ @PYTHON_EXTRA_LDFLAGS@
     25
     26MODULE_SUFFIX = so
     27
     28ifdef LD_STATIC
     29PYTHON_LIBS = @PYTHON_STATIC_LIBS@
     30else
     31PYTHON_LIBS = @PYTHON_EMBED_LIBS@
     32ifeq (${HAVE_PYTHON},1)
     33PYOBJECT_MODULE = pyobject.${MODULE_SUFFIX}
     34endif
     35
     36endif
    3137
    3238##
    … …  
    7177CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I.. -I@prefix@
    7278ifneq ($(SINGUNAME),ix86-Win)
    73 CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@ ${PYTHON_CPPFLAGS}
     79CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@ @PYTHON_CPPFLAGS@
    7480else
    7581## Dirs after @CPPFLAGS@ are for PySingular
    76 CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@
     82CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@ @PYTHON_CPPFLAGS@
    7783## -I/usr/include/python2.4 -I/usr/local/include -I../modules/python
    7884endif
    … …  
    8086LDFLAGS2        = @LDFLAGS@
    8187ifneq ($(SINGUNAME),ix86-Win)
    82 LDFLAGS         = -L@prefix@/kernel -L../kernel -lkernel @LDFLAGS@
    83 LDFLAGSG        = -L@prefix@/kernel -L../kernel -lkernel_g @LDFLAGS@
    84 LDFLAGSP        = -L@prefix@/kernel -L../kernel -lkernel_p @LDFLAGS@
     88LDFLAGS         = -L@prefix@/kernel -L../kernel -lkernel @LDFLAGS@ 
     89LDFLAGSG        = -L@prefix@/kernel -L../kernel -lkernel_g @LDFLAGS@ 
     90LDFLAGSP        = -L@prefix@/kernel -L../kernel -lkernel_p @LDFLAGS@ 
    8591else
    8692## -L/usr/local/lib -L@prefix@/modules/python --> PySingular
    87 LDFLAGS         = -L@prefix@/kernel -L/bin -lkernel @LDFLAGS@ -L/usr/local/lib -L../modules/python
    88 LDFLAGSG        = -L@prefix@/kernel -L/bin -lkernel_g @LDFLAGS@
    89 LDFLAGSP        = -L@prefix@/kernel -L/bin -lkernel_p @LDFLAGS@
     93LDFLAGS         = -L@prefix@/kernel -L/bin -lkernel @LDFLAGS@ -L/usr/local/lib -L../modules/python 
     94LDFLAGSG        = -L@prefix@/kernel -L/bin -lkernel_g @LDFLAGS@ 
     95LDFLAGSP        = -L@prefix@/kernel -L/bin -lkernel_p @LDFLAGS@ 
    9096endif
    9197LD_DYN_FLAGS    = @LD_DYN_FLAGS@
    … …  
    102108
    103109LD_LIBC         = -lc
    104 STATIC_LDFLAGS  = ${PYTHON_LINKFLAGS} @STATIC_LDFLAGS@
     110STATIC_LDFLAGS  = @STATIC_LDFLAGS@
    105111# under cygwin, do not explicitly link against -lm, for it is the cygwin
    106112# lib -- if you really want to do this, use -lm as the _last_ thing on the
    … …  
    129135
    130136SO_SUFFIX = so
    131 MODULE_SUFFIX = so
    132137
    133138#LIBSINGULAR_FLAGS = -export-dynamic
    … …  
    171176LDFLAGS  := ${STATIC_LDFLAGS} ${LDFLAGS}
    172177SING_EXEC = Singular-static
    173 LIBS := ${MP_LIBS} ${LIBS}
    174 LIBSG := ${MP_LIBS} ${LIBSG}
     178LIBS := ${MP_LIBS} ${LIBS} ${PYTHON_LIBS}
     179LIBSG := ${MP_LIBS} ${LIBSG} ${PYTHON_LIBS}
    175180DL_KERNEL =
    176181GLIBC_DYN_FIX=
    … …  
    178183LDFLAGS  := ${LD_DYN_FLAGS} ${LDFLAGS}
    179184SING_EXEC = Singular
     185LIBS := ${LIBS} ${PYTHON_LIBS}
     186LIBSG := ${LIBSG} ${PYTHON_LIBS}
    180187DL_KERNEL       = @DL_KERNEL@
    181188GLIBC_DYN_FIX= @GLIBC_DYN_FIX@
    182189endif
    183190
    184 
    185 ifeq (${HAVE_PYTHON},1)
    186 PYOBJECT_MODULE = pyobject.${MODULE_SUFFIX}
    187 else
    188 PYOBJECT_MODULE =
    189 endif
    190191
    191192# CXXFLAGS =  -g -Wall -Wno-unused
    … …  
    370371          -o Singular${S_EXT} \
    371372          tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
    372           ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
     373          ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o 
    373374
    374375libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
    … …  
    486487pyobject.${MODULE_SUFFIX}: pyobject.dl_o
    487488        @echo "build dynamic module pyobject..."
    488         $(CXX) ${SLDFLAGS} ${PYTHON_LINKFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
     489        $(CXX) $^ ${PYTHON_MODULE_LDFLAGS} ${SLDFLAGS} ${PYTHON_MODULE_LIBS} ${LD_LIBC} -o $@
    489490
    490491src: scanner.cc grammar.h grammar.cc libparse.cc

  • Singular/configure

    rc728c0 r76b37c  
    2222                        do use dynamic/static/no readline for fancy display"
    2323ac_help="$ac_help
    24   --with-python=[PYTHON,no]     uses PYTHON as python executable, default is python"
     24  --with-python[=PYTHON[,embed|module[,static|dynamic]]]
     25                        uses PYTHON as python executable, default is python;
     26                        optionally set plug-in and linkage type"
    2527ac_help="$ac_help
    2628  --without-Boost         do not use Boost "
    … …  
    569571
    570572
     573
     574
     575
    571576echo $ac_n "checking CPU for singular""... $ac_c" 1>&6
    572 echo "configure:573: checking CPU for singular" >&5
     577echo "configure:578: checking CPU for singular" >&5
    573578ac_cv_singcpuname=`uname -m`
    574579echo "$ac_t""$ac_cv_singcpuname" 1>&6
    575580
    576581echo $ac_n "checking uname for singular""... $ac_c" 1>&6
    577 echo "configure:578: checking uname for singular" >&5
     582echo "configure:583: checking uname for singular" >&5
    578583if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
    579584  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    767772set dummy gcc; ac_word=$2
    768773echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    769 echo "configure:770: checking for $ac_word" >&5
     774echo "configure:775: checking for $ac_word" >&5
    770775if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    771776  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    797802set dummy cc; ac_word=$2
    798803echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    799 echo "configure:800: checking for $ac_word" >&5
     804echo "configure:805: checking for $ac_word" >&5
    800805if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    801806  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    848853set dummy cl; ac_word=$2
    849854echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    850 echo "configure:851: checking for $ac_word" >&5
     855echo "configure:856: checking for $ac_word" >&5
    851856if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    852857  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    880885
    881886echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    882 echo "configure:883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     887echo "configure:888: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    883888
    884889ac_ext=c
    … …  
    891896cat > conftest.$ac_ext << EOF
    892897
    893 #line 894 "configure"
     898#line 899 "configure"
    894899#include "confdefs.h"
    895900
    896901main(){return(0);}
    897902EOF
    898 if { (eval echo configure:899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     903if { (eval echo configure:904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    899904  ac_cv_prog_cc_works=yes
    900905  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    922927fi
    923928echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    924 echo "configure:925: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     929echo "configure:930: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    925930echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    926931cross_compiling=$ac_cv_prog_cc_cross
    927932
    928933echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    929 echo "configure:930: checking whether we are using GNU C" >&5
     934echo "configure:935: checking whether we are using GNU C" >&5
    930935if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    931936  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    936941#endif
    937942EOF
    938 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
     943if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    939944  ac_cv_prog_gcc=yes
    940945else
    … …  
    955960CFLAGS=
    956961echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    957 echo "configure:958: checking whether ${CC-cc} accepts -g" >&5
     962echo "configure:963: checking whether ${CC-cc} accepts -g" >&5
    958963if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    959964  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    987992
    988993echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    989 echo "configure:990: checking how to run the C preprocessor" >&5
     994echo "configure:995: checking how to run the C preprocessor" >&5
    990995# On Suns, sometimes $CPP names a directory.
    991996if test -n "$CPP" && test -d "$CPP"; then
    … …  
    10021007  # not just through cpp.
    10031008  cat > conftest.$ac_ext <<EOF
    1004 #line 1005 "configure"
     1009#line 1010 "configure"
    10051010#include "confdefs.h"
    10061011#include <assert.h>
    … …  
    10081013EOF
    10091014ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1010 { (eval echo configure:1011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1015{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    10111016ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    10121017if test -z "$ac_err"; then
    … …  
    10191024  CPP="${CC-cc} -E -traditional-cpp"
    10201025  cat > conftest.$ac_ext <<EOF
    1021 #line 1022 "configure"
     1026#line 1027 "configure"
    10221027#include "confdefs.h"
    10231028#include <assert.h>
    … …  
    10251030EOF
    10261031ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1027 { (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1032{ (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    10281033ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    10291034if test -z "$ac_err"; then
    … …  
    10361041  CPP="${CC-cc} -nologo -E"
    10371042  cat > conftest.$ac_ext <<EOF
    1038 #line 1039 "configure"
     1043#line 1044 "configure"
    10391044#include "confdefs.h"
    10401045#include <assert.h>
    … …  
    10421047EOF
    10431048ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1044 { (eval echo configure:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1049{ (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    10451050ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    10461051if test -z "$ac_err"; then
    … …  
    10711076set dummy $ac_prog; ac_word=$2
    10721077echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1073 echo "configure:1074: checking for $ac_word" >&5
     1078echo "configure:1079: checking for $ac_word" >&5
    10741079if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    10751080  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11031108
    11041109echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    1105 echo "configure:1106: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
     1110echo "configure:1111: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    11061111
    11071112ac_ext=C
    … …  
    11141119cat > conftest.$ac_ext << EOF
    11151120
    1116 #line 1117 "configure"
     1121#line 1122 "configure"
    11171122#include "confdefs.h"
    11181123
    11191124int main(){return(0);}
    11201125EOF
    1121 if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1126if { (eval echo configure:1127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    11221127  ac_cv_prog_cxx_works=yes
    11231128  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    11451150fi
    11461151echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    1147 echo "configure:1148: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
     1152echo "configure:1153: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    11481153echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    11491154cross_compiling=$ac_cv_prog_cxx_cross
    11501155
    11511156echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    1152 echo "configure:1153: checking whether we are using GNU C++" >&5
     1157echo "configure:1158: checking whether we are using GNU C++" >&5
    11531158if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    11541159  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11591164#endif
    11601165EOF
    1161 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
     1166if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    11621167  ac_cv_prog_gxx=yes
    11631168else
    … …  
    11781183CXXFLAGS=
    11791184echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    1180 echo "configure:1181: checking whether ${CXX-g++} accepts -g" >&5
     1185echo "configure:1186: checking whether ${CXX-g++} accepts -g" >&5
    11811186if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    11821187  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    12401245# ./install, which can be erroneously created by make from ./install.sh.
    12411246echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    1242 echo "configure:1243: checking for a BSD compatible install" >&5
     1247echo "configure:1248: checking for a BSD compatible install" >&5
    12431248if test -z "$INSTALL"; then
    12441249if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    … …  
    12931298
    12941299echo $ac_n "checking for AIX""... $ac_c" 1>&6
    1295 echo "configure:1296: checking for AIX" >&5
     1300echo "configure:1301: checking for AIX" >&5
    12961301cat > conftest.$ac_ext <<EOF
    1297 #line 1298 "configure"
     1302#line 1303 "configure"
    12981303#include "confdefs.h"
    12991304#ifdef _AIX
    … …  
    13211326#                       other:       CC=cc   CXX=c++
    13221327echo $ac_n "checking gcc version""... $ac_c" 1>&6
    1323 echo "configure:1324: checking gcc version" >&5
     1328echo "configure:1329: checking gcc version" >&5
    13241329if eval "test \"`echo '$''{'ac_cv_c_cpp'+set}'`\" = set"; then
    13251330  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    13531358  # check whether gcc accepts --no-rtti
    13541359  echo $ac_n "checking whether gcc accepts --no-rtti""... $ac_c" 1>&6
    1355 echo "configure:1356: checking whether gcc accepts --no-rtti" >&5
     1360echo "configure:1361: checking whether gcc accepts --no-rtti" >&5
    13561361  CXXFLAGS="${CXXFLAGS} --no-rtti"
    13571362  if eval "test \"`echo '$''{'ac_cv_cxx_have_rtti'+set}'`\" = set"; then
    … …  
    13591364else
    13601365  cat > conftest.$ac_ext <<EOF
    1361 #line 1362 "configure"
     1366#line 1367 "configure"
    13621367#include "confdefs.h"
    13631368
    … …  
    13661371; return 0; }
    13671372EOF
    1368 if { (eval echo configure:1369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1373if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    13691374  rm -rf conftest*
    13701375  ac_cv_cxx_have_rtti=yes
    … …  
    13891394# check whether gcc accepts --no-exceptions
    13901395  echo $ac_n "checking whether gcc accepts --no-exceptions""... $ac_c" 1>&6
    1391 echo "configure:1392: checking whether gcc accepts --no-exceptions" >&5
     1396echo "configure:1397: checking whether gcc accepts --no-exceptions" >&5
    13921397  CXXFLAGS="${CXXFLAGS} --no-exceptions"
    13931398  if eval "test \"`echo '$''{'ac_cv_cxx_have_exceptions'+set}'`\" = set"; then
    … …  
    13951400else
    13961401  cat > conftest.$ac_ext <<EOF
    1397 #line 1398 "configure"
     1402#line 1403 "configure"
    13981403#include "confdefs.h"
    13991404
    … …  
    14021407; return 0; }
    14031408EOF
    1404 if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1409if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    14051410  rm -rf conftest*
    14061411  ac_cv_cxx_have_exceptions=yes
    … …  
    14401445then
    14411446  echo $ac_n "checking whether compiler accepts -pipe""... $ac_c" 1>&6
    1442 echo "configure:1443: checking whether compiler accepts -pipe" >&5
     1447echo "configure:1448: checking whether compiler accepts -pipe" >&5
    14431448  temp_cflags="${CFLAGS}"
    14441449  CFLAGS="${CFLAGS} -pipe"
    … …  
    14471452else
    14481453  cat > conftest.$ac_ext <<EOF
    1449 #line 1450 "configure"
     1454#line 1455 "configure"
    14501455#include "confdefs.h"
    14511456
    … …  
    14541459; return 0; }
    14551460EOF
    1456 if { (eval echo configure:1457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1461if { (eval echo configure:1462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    14571462  rm -rf conftest*
    14581463  ac_cv_cxx_have_pipe=yes
    … …  
    14811486# Customize CFLAGS
    14821487echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
    1483 echo "configure:1484: checking whether _AIX is defined" >&5
     1488echo "configure:1489: checking whether _AIX is defined" >&5
    14841489if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
    14851490  echo $ac_n "(cached) $ac_c" 1>&6
    14861491else
    14871492  cat > conftest.$ac_ext <<EOF
    1488 #line 1489 "configure"
     1493#line 1494 "configure"
    14891494#include "confdefs.h"
    14901495#ifdef _AIX
    … …  
    15451550
    15461551echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    1547 echo "configure:1548: checking whether ${MAKE-make} sets \${MAKE}" >&5
     1552echo "configure:1553: checking whether ${MAKE-make} sets \${MAKE}" >&5
    15481553set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    15491554if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    … …  
    16281633if test "${with_lex+set}" != set; then
    16291634  echo $ac_n "checking for flex""... $ac_c" 1>&6
    1630 echo "configure:1631: checking for flex" >&5
     1635echo "configure:1636: checking for flex" >&5
    16311636    cmd="egrep [2-9]\.[5-9]"
    16321637    if eval "test \"`echo '$''{'ac_cv_prog_flex'+set}'`\" = set"; then
    … …  
    16601665set dummy $ac_prog; ac_word=$2
    16611666echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1662 echo "configure:1663: checking for $ac_word" >&5
     1667echo "configure:1668: checking for $ac_word" >&5
    16631668if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
    16641669  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    17001705set dummy $ac_prog; ac_word=$2
    17011706echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1702 echo "configure:1703: checking for $ac_word" >&5
     1707echo "configure:1708: checking for $ac_word" >&5
    17031708if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
    17041709  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    17351740# ln -s
    17361741echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    1737 echo "configure:1738: checking whether ln -s works" >&5
     1742echo "configure:1743: checking whether ln -s works" >&5
    17381743if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    17391744  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    17611766set dummy $ac_prog; ac_word=$2
    17621767echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1763 echo "configure:1764: checking for $ac_word" >&5
     1768echo "configure:1769: checking for $ac_word" >&5
    17641769if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    17651770  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    17921797
    17931798# python
    1794 if test "${with_python+set}" != set; then
    1795   PYTHON_EXE="no"
    1796 else
    1797   if test "${with_python}" = yes; then
    1798     PYTHON_EXE="python"
    1799   else
    1800     PYTHON_EXE="${with_python}"
    1801   fi
    1802 fi
     1799python_exe_name="no"
     1800PYTHON_PLUGIN="module"
     1801PYTHON_LINKAGE="static"
     1802
     1803if test "${with_python+set}" == set; then
     1804  case "${with_python}" in
     1805    yes|static*|dynamic*|shared*|module*|embed*)
     1806      python_exe_name="python"
     1807    ;;
     1808    *)
     1809    python_exe_name="${with_python%%,*}"
     1810    ;;
     1811  esac
     1812
     1813  case ",${with_python}," in
     1814    *,dynamic,*|*,shared,*)
     1815      PYTHON_LINKAGE="dynamic"
     1816    ;;
     1817    *,static,*)
     1818      PYTHON_LINKAGE="static"
     1819    ;;
     1820  esac
     1821
     1822  case ",${with_python}," in
     1823    *,embed,*|*,embedded,*)
     1824      PYTHON_PLUGIN="embed"
     1825    ;;
     1826    *,static,*)
     1827      PYTHON_PLUGIN="module"
     1828    ;;
     1829  esac
     1830fi
     1831
     1832PYTHON_EXE=`basename "${python_exe_name}"`
     1833PYTHON_PATH=`dirname "${python_exe_name}"`
    18031834
    18041835if test "${PYTHON_EXE}" = no; then
    … …  
    18081839set dummy $PYTHON_EXE; ac_word=$2
    18091840echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1810 echo "configure:1811: checking for $ac_word" >&5
     1841echo "configure:1842: checking for $ac_word" >&5
    18111842if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    18121843  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    18211852  *)
    18221853  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
    1823   ac_dummy="$PATH"
     1854  ac_dummy=""$PYTHON_PATH:$PATH""
    18241855  for ac_dir in $ac_dummy; do
    18251856    test -z "$ac_dir" && ac_dir=.
    … …  
    18541885        #
    18551886        echo $ac_n "checking for a version of Python >= '2.1.0'""... $ac_c" 1>&6
    1856 echo "configure:1857: checking for a version of Python >= '2.1.0'" >&5
     1887echo "configure:1888: checking for a version of Python >= '2.1.0'" >&5
    18571888        ac_supports_python_ver=`$PYTHON -c "import sys, string; \
    18581889                        ver = string.split(sys.version)[0]; \
    … …  
    18821913        if test -n ">= '2.4'"; then
    18831914                echo $ac_n "checking for a version of Python >= '2.4'""... $ac_c" 1>&6
    1884 echo "configure:1885: checking for a version of Python >= '2.4'" >&5
     1915echo "configure:1916: checking for a version of Python >= '2.4'" >&5
    18851916                ac_supports_python_ver=`$PYTHON -c "import sys, string; \
    18861917                        ver = string.split(sys.version)[0]; print ver >= '2.4'"`
    … …  
    19021933        #
    19031934        echo $ac_n "checking for the distutils Python package""... $ac_c" 1>&6
    1904 echo "configure:1905: checking for the distutils Python package" >&5
     1935echo "configure:1936: checking for the distutils Python package" >&5
    19051936        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
    19061937        if test -z "$ac_distutils_result"; then
    … …  
    19181949        #
    19191950        echo $ac_n "checking for Python include path""... $ac_c" 1>&6
    1920 echo "configure:1921: checking for Python include path" >&5
     1951echo "configure:1952: checking for Python include path" >&5
    19211952        if test -z "$PYTHON_CPPFLAGS"; then
    19221953                python_path=`$PYTHON -c "import distutils.sysconfig; \
    … …  
    19341965        #
    19351966        echo $ac_n "checking for Python library path""... $ac_c" 1>&6
    1936 echo "configure:1937: checking for Python library path" >&5
     1967echo "configure:1968: checking for Python library path" >&5
    19371968        if test -z "$PYTHON_LDFLAGS"; then
    19381969                # (makes two attempts to ensure we've got a version number
    … …  
    19641995        #
    19651996        echo $ac_n "checking for Python site-packages path""... $ac_c" 1>&6
    1966 echo "configure:1967: checking for Python site-packages path" >&5
     1997echo "configure:1998: checking for Python site-packages path" >&5
    19671998        if test -z "$PYTHON_SITE_PKG"; then
    19681999                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
    … …  
    19762007        #
    19772008        echo $ac_n "checking python extra libraries""... $ac_c" 1>&6
    1978 echo "configure:1979: checking python extra libraries" >&5
     2009echo "configure:2010: checking python extra libraries" >&5
    19792010        if test -z "$PYTHON_EXTRA_LIBS"; then
    19802011           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
    … …  
    19892020        #
    19902021        echo $ac_n "checking python extra linking flags""... $ac_c" 1>&6
    1991 echo "configure:1992: checking python extra linking flags" >&5
     2022echo "configure:2023: checking python extra linking flags" >&5
    19922023        if test -z "$PYTHON_EXTRA_LDFLAGS"; then
    19932024                PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
    … …  
    20022033        #
    20032034        echo $ac_n "checking consistency of all components of python development environment""... $ac_c" 1>&6
    2004 echo "configure:2005: checking consistency of all components of python development environment" >&5
     2035echo "configure:2036: checking consistency of all components of python development environment" >&5
    20052036#       AC_LANG_PUSH([C])
    20062037        # save current global flags
    … …  
    20102041        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
    20112042        cat > conftest.$ac_ext <<EOF
    2012 #line 2013 "configure"
     2043#line 2044 "configure"
    20132044#include "confdefs.h"
    20142045
    … …  
    20212052; return 0; }
    20222053EOF
    2023 if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2054if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    20242055  rm -rf conftest*
    20252056  pythonexists=yes
    … …  
    20532084
    20542085          HAVE_PYTHON_VALUE=1
    2055                
     2086         
    20562087        fi
     2088
    20572089#       AC_LANG_POP
    20582090        # turn back to default flags
    … …  
    20642096        #
    20652097
     2098   
     2099        ac_save_LIBS_for_python="${LIBS}"
     2100        ac_save_CPPFLAGS_for_python="${CPPFLAGS}"
     2101
     2102        echo $ac_n "checking ${try_python_shared_static_flags} for linking \
     2103python statically""... $ac_c" 1>&6
     2104echo "configure:2105: checking ${try_python_shared_static_flags} for linking \
     2105python statically" >&5
     2106        all_cppflags="${ac_save_CPPFLAGS} ${PYTHON_CPPFLAGS}"
     2107
     2108        CPPFLAGS="-static ${all_cppflags}"
     2109        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS -lc -lm $PYTHON_EXTRA_LDFLAGS"
     2110
     2111        cat > conftest.$ac_ext <<EOF
     2112#line 2113 "configure"
     2113#include "confdefs.h"
     2114
     2115              #include <Python.h>
     2116       
     2117int main() {
     2118
     2119              Py_Initialize();
     2120       
     2121; return 0; }
     2122EOF
     2123if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2124  rm -rf conftest*
     2125  pythonstaticexists=yes
     2126else
     2127  echo "configure: failed program was:" >&5
     2128  cat conftest.$ac_ext >&5
     2129  rm -rf conftest*
     2130  pythonstaticexists=no
     2131fi
     2132rm -f conftest*
     2133
     2134        echo "$ac_t""$pythonstaticexists" 1>&6
     2135
     2136        if test "$pythonstaticexists" == yes ; then
     2137          cat >> confdefs.h <<\EOF
     2138#define HAVE_STATIC_PYTHON 1
     2139EOF
     2140
     2141          PYTHON_STATIC_LIBS="$PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
     2142         
     2143   
     2144          try_flags="-Xlinker -static -nodefaultlibs"
     2145          CPPFLAGS="-shared -fPIC ${try_flags} ${all_cppflags}"
     2146          echo $ac_n "checking $try_flags for linking python module statically""... $ac_c" 1>&6
     2147echo "configure:2148: checking $try_flags for linking python module statically" >&5
     2148          cat > conftest.$ac_ext <<EOF
     2149#line 2150 "configure"
     2150#include "confdefs.h"
     2151
     2152                #include <Python.h>
     2153         
     2154int main() {
     2155
     2156                Py_Initialize();
     2157         
     2158; return 0; }
     2159EOF
     2160if { (eval echo configure:2161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2161  rm -rf conftest*
     2162  pythonsharedstaticexists=yes
     2163else
     2164  echo "configure: failed program was:" >&5
     2165  cat conftest.$ac_ext >&5
     2166  rm -rf conftest*
     2167  pythonsharedstaticexists=no
     2168fi
     2169rm -f conftest*
     2170          echo "$ac_t""$pythonsharedstaticexists" 1>&6
     2171 
     2172          if test "$pythonsharedstaticexists" = yes; then
     2173            PYTHON_MODULE_FLAGS="${try_flags}"
     2174          fi
     2175        fi
     2176
     2177       
     2178        CPPFLAGS="$ac_save_CPPFLAGS_for_python"
     2179        LIBS="$ac_save_LIBS_for_python"
     2180
     2181
     2182    if test "${PYTHON_PLUGIN}" = embed; then
     2183      cat >> confdefs.h <<\EOF
     2184#define EMBED_PYTHON 1
     2185EOF
     2186
     2187      EMBED_PYTHON_VALUE=1
     2188
     2189      PYTHON_EMBED_LIBS="$PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
     2190     
     2191    fi
     2192
    20662193  fi
    20672194fi
     2195
     2196
    20682197
    20692198# lib checks
    … …  
    20722201if test "$ac_cv_singuname" != ix86-Win; then
    20732202echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
    2074 echo "configure:2075: checking for atof in -lm" >&5
     2203echo "configure:2204: checking for atof in -lm" >&5
    20752204ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
    20762205if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    20802209LIBS="-lm  $LIBS"
    20812210cat > conftest.$ac_ext <<EOF
    2082 #line 2083 "configure"
     2211#line 2212 "configure"
    20832212#include "confdefs.h"
    20842213/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    20912220; return 0; }
    20922221EOF
    2093 if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2222if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    20942223  rm -rf conftest*
    20952224  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    21202249fi
    21212250echo $ac_n "checking for  in -lnsl""... $ac_c" 1>&6
    2122 echo "configure:2123: checking for  in -lnsl" >&5
     2251echo "configure:2252: checking for  in -lnsl" >&5
    21232252ac_lib_var=`echo nsl'_' | sed 'y%./+-%__p_%'`
    21242253if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    21282257LIBS="-lnsl  $LIBS"
    21292258cat > conftest.$ac_ext <<EOF
    2130 #line 2131 "configure"
     2259#line 2260 "configure"
    21312260#include "confdefs.h"
    21322261/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    21392268; return 0; }
    21402269EOF
    2141 if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2270if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    21422271  rm -rf conftest*
    21432272  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    21672296
    21682297echo $ac_n "checking for  in -lsocket""... $ac_c" 1>&6
    2169 echo "configure:2170: checking for  in -lsocket" >&5
     2298echo "configure:2299: checking for  in -lsocket" >&5
    21702299ac_lib_var=`echo socket'_' | sed 'y%./+-%__p_%'`
    21712300if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    21752304LIBS="-lsocket  $LIBS"
    21762305cat > conftest.$ac_ext <<EOF
    2177 #line 2178 "configure"
     2306#line 2307 "configure"
    21782307#include "confdefs.h"
    21792308/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    21862315; return 0; }
    21872316EOF
    2188 if { (eval echo configure:2189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2317if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    21892318  rm -rf conftest*
    21902319  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    22172346
    22182347echo $ac_n "checking for setenv in -lbsd""... $ac_c" 1>&6
    2219 echo "configure:2220: checking for setenv in -lbsd" >&5
     2348echo "configure:2349: checking for setenv in -lbsd" >&5
    22202349ac_lib_var=`echo bsd'_'setenv | sed 'y%./+-%__p_%'`
    22212350if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    22252354LIBS="-lbsd  $LIBS"
    22262355cat > conftest.$ac_ext <<EOF
    2227 #line 2228 "configure"
     2356#line 2357 "configure"
    22282357#include "confdefs.h"
    22292358/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    22362365; return 0; }
    22372366EOF
    2238 if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2367if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    22392368  rm -rf conftest*
    22402369  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    22642393
    22652394echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
    2266 echo "configure:2267: checking for listen in -lsocket" >&5
     2395echo "configure:2396: checking for listen in -lsocket" >&5
    22672396ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
    22682397if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    22722401LIBS="-lsocket  $LIBS"
    22732402cat > conftest.$ac_ext <<EOF
    2274 #line 2275 "configure"
     2403#line 2404 "configure"
    22752404#include "confdefs.h"
    22762405/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    22832412; return 0; }
    22842413EOF
    2285 if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2414if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    22862415  rm -rf conftest*
    22872416  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    23112440
    23122441echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
    2313 echo "configure:2314: checking for gethostbyname in -lnsl" >&5
     2442echo "configure:2443: checking for gethostbyname in -lnsl" >&5
    23142443ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
    23152444if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    23192448LIBS="-lnsl  $LIBS"
    23202449cat > conftest.$ac_ext <<EOF
    2321 #line 2322 "configure"
     2450#line 2451 "configure"
    23222451#include "confdefs.h"
    23232452/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    23302459; return 0; }
    23312460EOF
    2332 if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2461if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    23332462  rm -rf conftest*
    23342463  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    23622491        HPUX*)
    23632492          echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
    2364 echo "configure:2365: checking for shl_load in -ldld" >&5
     2493echo "configure:2494: checking for shl_load in -ldld" >&5
    23652494ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
    23662495if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    23702499LIBS="-ldld  $LIBS"
    23712500cat > conftest.$ac_ext <<EOF
    2372 #line 2373 "configure"
     2501#line 2502 "configure"
    23732502#include "confdefs.h"
    23742503/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    23812510; return 0; }
    23822511EOF
    2383 if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2512if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    23842513  rm -rf conftest*
    23852514  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    24202549        *Linux*)
    24212550          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
    2422 echo "configure:2423: checking for dlopen in -ldl" >&5
     2551echo "configure:2552: checking for dlopen in -ldl" >&5
    24232552ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
    24242553if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    24282557LIBS="-ldl  $LIBS"
    24292558cat > conftest.$ac_ext <<EOF
    2430 #line 2431 "configure"
     2559#line 2560 "configure"
    24312560#include "confdefs.h"
    24322561/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    24392568; return 0; }
    24402569EOF
    2441 if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2570if { (eval echo configure:2571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    24422571  rm -rf conftest*
    24432572  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    24872616        SunOS-5)
    24882617          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
    2489 echo "configure:2490: checking for dlopen in -ldl" >&5
     2618echo "configure:2619: checking for dlopen in -ldl" >&5
    24902619ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
    24912620if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    24952624LIBS="-ldl  $LIBS"
    24962625cat > conftest.$ac_ext <<EOF
    2497 #line 2498 "configure"
     2626#line 2627 "configure"
    24982627#include "confdefs.h"
    24992628/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    25062635; return 0; }
    25072636EOF
    2508 if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2637if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    25092638  rm -rf conftest*
    25102639  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    25462675        ppcMac-darwin)
    25472676          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
    2548 echo "configure:2549: checking for dlopen in -ldl" >&5
     2677echo "configure:2678: checking for dlopen in -ldl" >&5
    25492678ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
    25502679if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    25542683LIBS="-ldl  $LIBS"
    25552684cat > conftest.$ac_ext <<EOF
    2556 #line 2557 "configure"
     2685#line 2686 "configure"
    25572686#include "confdefs.h"
    25582687/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    25652694; return 0; }
    25662695EOF
    2567 if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2696if { (eval echo configure:2697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    25682697  rm -rf conftest*
    25692698  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    26042733        ix86Mac-darwin)
    26052734          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
    2606 echo "configure:2607: checking for dlopen in -ldl" >&5
     2735echo "configure:2736: checking for dlopen in -ldl" >&5
    26072736ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
    26082737if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    26122741LIBS="-ldl  $LIBS"
    26132742cat > conftest.$ac_ext <<EOF
    2614 #line 2615 "configure"
     2743#line 2744 "configure"
    26152744#include "confdefs.h"
    26162745/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    26232752; return 0; }
    26242753EOF
    2625 if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2754if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26262755  rm -rf conftest*
    26272756  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    26622791        ix86-freebsd)
    26632792          echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
    2664 echo "configure:2665: checking for dlopen in -lc" >&5
     2793echo "configure:2794: checking for dlopen in -lc" >&5
    26652794ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
    26662795if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    26702799LIBS="-lc  $LIBS"
    26712800cat > conftest.$ac_ext <<EOF
    2672 #line 2673 "configure"
     2801#line 2802 "configure"
    26732802#include "confdefs.h"
    26742803/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    26812810; return 0; }
    26822811EOF
    2683 if { (eval echo configure:2684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2812if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26842813  rm -rf conftest*
    26852814  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    27282857# heder file checks
    27292858echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    2730 echo "configure:2731: checking for ANSI C header files" >&5
     2859echo "configure:2860: checking for ANSI C header files" >&5
    27312860if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    27322861  echo $ac_n "(cached) $ac_c" 1>&6
    27332862else
    27342863  cat > conftest.$ac_ext <<EOF
    2735 #line 2736 "configure"
     2864#line 2865 "configure"
    27362865#include "confdefs.h"
    27372866#include <stdlib.h>
    … …  
    27412870EOF
    27422871ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2743 { (eval echo configure:2744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2872{ (eval echo configure:2873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    27442873ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    27452874if test -z "$ac_err"; then
    … …  
    27582887  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    27592888cat > conftest.$ac_ext <<EOF
    2760 #line 2761 "configure"
     2889#line 2890 "configure"
    27612890#include "confdefs.h"
    27622891#include <string.h>
    … …  
    27762905  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    27772906cat > conftest.$ac_ext <<EOF
    2778 #line 2779 "configure"
     2907#line 2908 "configure"
    27792908#include "confdefs.h"
    27802909#include <stdlib.h>
    … …  
    27972926else
    27982927  cat > conftest.$ac_ext <<EOF
    2799 #line 2800 "configure"
     2928#line 2929 "configure"
    28002929#include "confdefs.h"
    28012930#include <ctype.h>
    … …  
    28082937
    28092938EOF
    2810 if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2939if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    28112940then
    28122941  :
    … …  
    28352964ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    28362965echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2837 echo "configure:2838: checking for $ac_hdr" >&5
     2966echo "configure:2967: checking for $ac_hdr" >&5
    28382967if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    28392968  echo $ac_n "(cached) $ac_c" 1>&6
    28402969else
    28412970  cat > conftest.$ac_ext <<EOF
    2842 #line 2843 "configure"
     2971#line 2972 "configure"
    28432972#include "confdefs.h"
    28442973#include <$ac_hdr>
    28452974EOF
    28462975ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2847 { (eval echo configure:2848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2976{ (eval echo configure:2977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    28482977ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    28492978if test -z "$ac_err"; then
    … …  
    28793008ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    28803009echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2881 echo "configure:2882: checking for $ac_hdr" >&5
     3010echo "configure:3011: checking for $ac_hdr" >&5
    28823011if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    28833012  echo $ac_n "(cached) $ac_c" 1>&6
    28843013else
    28853014  cat > conftest.$ac_ext <<EOF
    2886 #line 2887 "configure"
     3015#line 3016 "configure"
    28873016#include "confdefs.h"
    28883017#include <$ac_hdr>
    28893018EOF
    28903019ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2891 { (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     3020{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    28923021ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    28933022if test -z "$ac_err"; then
    … …  
    29183047# typedefs, structures
    29193048echo $ac_n "checking for working const""... $ac_c" 1>&6
    2920 echo "configure:2921: checking for working const" >&5
     3049echo "configure:3050: checking for working const" >&5
    29213050if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    29223051  echo $ac_n "(cached) $ac_c" 1>&6
    29233052else
    29243053  cat > conftest.$ac_ext <<EOF
    2925 #line 2926 "configure"
     3054#line 3055 "configure"
    29263055#include "confdefs.h"
    29273056
    … …  
    29723101; return 0; }
    29733102EOF
    2974 if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3103if { (eval echo configure:3104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    29753104  rm -rf conftest*
    29763105  ac_cv_c_const=yes
    … …  
    29933122
    29943123echo $ac_n "checking for inline""... $ac_c" 1>&6
    2995 echo "configure:2996: checking for inline" >&5
     3124echo "configure:3125: checking for inline" >&5
    29963125if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    29973126  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    30003129for ac_kw in inline __inline__ __inline; do
    30013130  cat > conftest.$ac_ext <<EOF
    3002 #line 3003 "configure"
     3131#line 3132 "configure"
    30033132#include "confdefs.h"
    30043133
    … …  
    30073136; return 0; }
    30083137EOF
    3009 if { (eval echo configure:3010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3138if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30103139  rm -rf conftest*
    30113140  ac_cv_c_inline=$ac_kw; break
    … …  
    30333162
    30343163echo $ac_n "checking for size_t""... $ac_c" 1>&6
    3035 echo "configure:3036: checking for size_t" >&5
     3164echo "configure:3165: checking for size_t" >&5
    30363165if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    30373166  echo $ac_n "(cached) $ac_c" 1>&6
    30383167else
    30393168  cat > conftest.$ac_ext <<EOF
    3040 #line 3041 "configure"
     3169#line 3170 "configure"
    30413170#include "confdefs.h"
    30423171#include <sys/types.h>
    … …  
    30663195
    30673196echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
    3068 echo "configure:3069: checking whether struct tm is in sys/time.h or time.h" >&5
     3197echo "configure:3198: checking whether struct tm is in sys/time.h or time.h" >&5
    30693198if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    30703199  echo $ac_n "(cached) $ac_c" 1>&6
    30713200else
    30723201  cat > conftest.$ac_ext <<EOF
    3073 #line 3074 "configure"
     3202#line 3203 "configure"
    30743203#include "confdefs.h"
    30753204#include <sys/types.h>
    … …  
    30793208; return 0; }
    30803209EOF
    3081 if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3210if { (eval echo configure:3211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30823211  rm -rf conftest*
    30833212  ac_cv_struct_tm=time.h
    … …  
    31003229
    31013230echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
    3102 echo "configure:3103: checking whether time.h and sys/time.h may both be included" >&5
     3231echo "configure:3232: checking whether time.h and sys/time.h may both be included" >&5
    31033232if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    31043233  echo $ac_n "(cached) $ac_c" 1>&6
    31053234else
    31063235  cat > conftest.$ac_ext <<EOF
    3107 #line 3108 "configure"
     3236#line 3237 "configure"
    31083237#include "confdefs.h"
    31093238#include <sys/types.h>
    … …  
    31143243; return 0; }
    31153244EOF
    3116 if { (eval echo configure:3117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3245if { (eval echo configure:3246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    31173246  rm -rf conftest*
    31183247  ac_cv_header_time=yes
    … …  
    31393268# for constant arguments.  Useless!
    31403269echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
    3141 echo "configure:3142: checking for working alloca.h" >&5
     3270echo "configure:3271: checking for working alloca.h" >&5
    31423271if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    31433272  echo $ac_n "(cached) $ac_c" 1>&6
    31443273else
    31453274  cat > conftest.$ac_ext <<EOF
    3146 #line 3147 "configure"
     3275#line 3276 "configure"
    31473276#include "confdefs.h"
    31483277#include <alloca.h>
    … …  
    31513280; return 0; }
    31523281EOF
    3153 if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3282if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    31543283  rm -rf conftest*
    31553284  ac_cv_header_alloca_h=yes
    … …  
    31723301
    31733302echo $ac_n "checking for alloca""... $ac_c" 1>&6
    3174 echo "configure:3175: checking for alloca" >&5
     3303echo "configure:3304: checking for alloca" >&5
    31753304if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    31763305  echo $ac_n "(cached) $ac_c" 1>&6
    31773306else
    31783307  cat > conftest.$ac_ext <<EOF
    3179 #line 3180 "configure"
     3308#line 3309 "configure"
    31803309#include "confdefs.h"
    31813310
    … …  
    32053334; return 0; }
    32063335EOF
    3207 if { (eval echo configure:3208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3336if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    32083337  rm -rf conftest*
    32093338  ac_cv_func_alloca_works=yes
    … …  
    32373366
    32383367echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
    3239 echo "configure:3240: checking whether alloca needs Cray hooks" >&5
     3368echo "configure:3369: checking whether alloca needs Cray hooks" >&5
    32403369if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    32413370  echo $ac_n "(cached) $ac_c" 1>&6
    32423371else
    32433372  cat > conftest.$ac_ext <<EOF
    3244 #line 3245 "configure"
     3373#line 3374 "configure"
    32453374#include "confdefs.h"
    32463375#if defined(CRAY) && ! defined(CRAY2)
    … …  
    32673396for ac_func in _getb67 GETB67 getb67; do
    32683397  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3269 echo "configure:3270: checking for $ac_func" >&5
     3398echo "configure:3399: checking for $ac_func" >&5
    32703399if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    32713400  echo $ac_n "(cached) $ac_c" 1>&6
    32723401else
    32733402  cat > conftest.$ac_ext <<EOF
    3274 #line 3275 "configure"
     3403#line 3404 "configure"
    32753404#include "confdefs.h"
    32763405/* System header to define __stub macros and hopefully few prototypes,
    … …  
    32953424; return 0; }
    32963425EOF
    3297 if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3426if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    32983427  rm -rf conftest*
    32993428  eval "ac_cv_func_$ac_func=yes"
    … …  
    33223451
    33233452echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
    3324 echo "configure:3325: checking stack direction for C alloca" >&5
     3453echo "configure:3454: checking stack direction for C alloca" >&5
    33253454if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    33263455  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    33303459else
    33313460  cat > conftest.$ac_ext <<EOF
    3332 #line 3333 "configure"
     3461#line 3462 "configure"
    33333462#include "confdefs.h"
    33343463find_stack_direction ()
    … …  
    33493478}
    33503479EOF
    3351 if { (eval echo configure:3352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     3480if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    33523481then
    33533482  ac_cv_c_stack_direction=1
    … …  
    33723501if test $ac_cv_prog_gcc = yes; then
    33733502    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    3374 echo "configure:3375: checking whether ${CC-cc} needs -traditional" >&5
     3503echo "configure:3504: checking whether ${CC-cc} needs -traditional" >&5
    33753504if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    33763505  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    33783507    ac_pattern="Autoconf.*'x'"
    33793508  cat > conftest.$ac_ext <<EOF
    3380 #line 3381 "configure"
     3509#line 3510 "configure"
    33813510#include "confdefs.h"
    33823511#include <sgtty.h>
    … …  
    33963525  if test $ac_cv_prog_gcc_traditional = no; then
    33973526    cat > conftest.$ac_ext <<EOF
    3398 #line 3399 "configure"
     3527#line 3528 "configure"
    33993528#include "confdefs.h"
    34003529#include <termio.h>
    … …  
    34213550ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    34223551echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    3423 echo "configure:3424: checking for $ac_hdr" >&5
     3552echo "configure:3553: checking for $ac_hdr" >&5
    34243553if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    34253554  echo $ac_n "(cached) $ac_c" 1>&6
    34263555else
    34273556  cat > conftest.$ac_ext <<EOF
    3428 #line 3429 "configure"
     3557#line 3558 "configure"
    34293558#include "confdefs.h"
    34303559#include <$ac_hdr>
    34313560EOF
    34323561ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    3433 { (eval echo configure:3434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     3562{ (eval echo configure:3563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    34343563ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    34353564if test -z "$ac_err"; then
    … …  
    34603589do
    34613590echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3462 echo "configure:3463: checking for $ac_func" >&5
     3591echo "configure:3592: checking for $ac_func" >&5
    34633592if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    34643593  echo $ac_n "(cached) $ac_c" 1>&6
    34653594else
    34663595  cat > conftest.$ac_ext <<EOF
    3467 #line 3468 "configure"
     3596#line 3597 "configure"
    34683597#include "confdefs.h"
    34693598/* System header to define __stub macros and hopefully few prototypes,
    … …  
    34883617; return 0; }
    34893618EOF
    3490 if { (eval echo configure:3491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3619if { (eval echo configure:3620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    34913620  rm -rf conftest*
    34923621  eval "ac_cv_func_$ac_func=yes"
    … …  
    35133642
    35143643echo $ac_n "checking for working mmap""... $ac_c" 1>&6
    3515 echo "configure:3516: checking for working mmap" >&5
     3644echo "configure:3645: checking for working mmap" >&5
    35163645if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
    35173646  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    35213650else
    35223651  cat > conftest.$ac_ext <<EOF
    3523 #line 3524 "configure"
     3652#line 3653 "configure"
    35243653#include "confdefs.h"
    35253654
    … …  
    36613790
    36623791EOF
    3663 if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     3792if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    36643793then
    36653794  ac_cv_func_mmap_fixed_mapped=yes
    … …  
    36843813
    36853814echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
    3686 echo "configure:3687: checking return type of signal handlers" >&5
     3815echo "configure:3816: checking return type of signal handlers" >&5
    36873816if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    36883817  echo $ac_n "(cached) $ac_c" 1>&6
    36893818else
    36903819  cat > conftest.$ac_ext <<EOF
    3691 #line 3692 "configure"
     3820#line 3821 "configure"
    36923821#include "confdefs.h"
    36933822#include <sys/types.h>
    … …  
    37063835; return 0; }
    37073836EOF
    3708 if { (eval echo configure:3709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3837if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    37093838  rm -rf conftest*
    37103839  ac_cv_type_signal=void
    … …  
    37253854
    37263855echo $ac_n "checking for vprintf""... $ac_c" 1>&6
    3727 echo "configure:3728: checking for vprintf" >&5
     3856echo "configure:3857: checking for vprintf" >&5
    37283857if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    37293858  echo $ac_n "(cached) $ac_c" 1>&6
    37303859else
    37313860  cat > conftest.$ac_ext <<EOF
    3732 #line 3733 "configure"
     3861#line 3862 "configure"
    37333862#include "confdefs.h"
    37343863/* System header to define __stub macros and hopefully few prototypes,
    … …  
    37533882; return 0; }
    37543883EOF
    3755 if { (eval echo configure:3756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3884if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    37563885  rm -rf conftest*
    37573886  eval "ac_cv_func_vprintf=yes"
    … …  
    37773906if test "$ac_cv_func_vprintf" != yes; then
    37783907echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
    3779 echo "configure:3780: checking for _doprnt" >&5
     3908echo "configure:3909: checking for _doprnt" >&5
    37803909if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    37813910  echo $ac_n "(cached) $ac_c" 1>&6
    37823911else
    37833912  cat > conftest.$ac_ext <<EOF
    3784 #line 3785 "configure"
     3913#line 3914 "configure"
    37853914#include "confdefs.h"
    37863915/* System header to define __stub macros and hopefully few prototypes,
    … …  
    38053934; return 0; }
    38063935EOF
    3807 if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3936if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    38083937  rm -rf conftest*
    38093938  eval "ac_cv_func__doprnt=yes"
    … …  
    38313960
    38323961echo $ac_n "checking for library containing setenv""... $ac_c" 1>&6
    3833 echo "configure:3834: checking for library containing setenv" >&5
     3962echo "configure:3963: checking for library containing setenv" >&5
    38343963if eval "test \"`echo '$''{'ac_cv_search_setenv'+set}'`\" = set"; then
    38353964  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    38383967ac_cv_search_setenv="no"
    38393968cat > conftest.$ac_ext <<EOF
    3840 #line 3841 "configure"
     3969#line 3970 "configure"
    38413970#include "confdefs.h"
    38423971/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    38493978; return 0; }
    38503979EOF
    3851 if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3980if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    38523981  rm -rf conftest*
    38533982  ac_cv_search_setenv="none required"
    … …  
    38603989LIBS="-l$i  $ac_func_search_save_LIBS"
    38613990cat > conftest.$ac_ext <<EOF
    3862 #line 3863 "configure"
     3991#line 3992 "configure"
    38633992#include "confdefs.h"
    38643993/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    38714000; return 0; }
    38724001EOF
    3873 if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4002if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    38744003  rm -rf conftest*
    38754004  ac_cv_search_setenv="-l$i"
    … …  
    38954024do
    38964025echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3897 echo "configure:3898: checking for $ac_func" >&5
     4026echo "configure:4027: checking for $ac_func" >&5
    38984027if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    38994028  echo $ac_n "(cached) $ac_c" 1>&6
    39004029else
    39014030  cat > conftest.$ac_ext <<EOF
    3902 #line 3903 "configure"
     4031#line 4032 "configure"
    39034032#include "confdefs.h"
    39044033/* System header to define __stub macros and hopefully few prototypes,
    … …  
    39234052; return 0; }
    39244053EOF
    3925 if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4054if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    39264055  rm -rf conftest*
    39274056  eval "ac_cv_func_$ac_func=yes"
    … …  
    39734102# check for a peculiar constructor initialization
    39744103echo $ac_n "checking whether explicit C++ constructor calls are allowed""... $ac_c" 1>&6
    3975 echo "configure:3976: checking whether explicit C++ constructor calls are allowed" >&5
     4104echo "configure:4105: checking whether explicit C++ constructor calls are allowed" >&5
    39764105
    39774106ac_ext=C
    … …  
    39864115else
    39874116  cat > conftest.$ac_ext <<EOF
    3988 #line 3989 "configure"
     4117#line 4118 "configure"
    39894118#include "confdefs.h"
    39904119
    … …  
    40044133; return 0; }
    40054134EOF
    4006 if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     4135if { (eval echo configure:4136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    40074136  rm -rf conftest*
    40084137  ac_cv_explicit_const=yes
    … …  
    40334162# sprintf returns number of printed chars
    40344163echo $ac_n "checking whether vsprintf returns number of printed chars""... $ac_c" 1>&6
    4035 echo "configure:4036: checking whether vsprintf returns number of printed chars" >&5
     4164echo "configure:4165: checking whether vsprintf returns number of printed chars" >&5
    40364165if eval "test \"`echo '$''{'ac_cv_returns_n_of_chars'+set}'`\" = set"; then
    40374166  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    40414170else
    40424171  cat > conftest.$ac_ext <<EOF
    4043 #line 4044 "configure"
     4172#line 4173 "configure"
    40444173#include "confdefs.h"
    40454174#include <stdio.h>
    40464175 main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
    40474176EOF
    4048 if { (eval echo configure:4049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4177if { (eval echo configure:4178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    40494178then
    40504179  ac_cv_returns_n_of_chars=yes
    … …  
    40724201# determine ALIGN_8
    40734202echo $ac_n "checking size of char""... $ac_c" 1>&6
    4074 echo "configure:4075: checking size of char" >&5
     4203echo "configure:4204: checking size of char" >&5
    40754204if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
    40764205  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    40804209else
    40814210  cat > conftest.$ac_ext <<EOF
    4082 #line 4083 "configure"
     4211#line 4212 "configure"
    40834212#include "confdefs.h"
    40844213#include <stdio.h>
    … …  
    40914220}
    40924221EOF
    4093 if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4222if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    40944223then
    40954224  ac_cv_sizeof_char=`cat conftestval`
    … …  
    41114240
    41124241echo $ac_n "checking size of short""... $ac_c" 1>&6
    4113 echo "configure:4114: checking size of short" >&5
     4242echo "configure:4243: checking size of short" >&5
    41144243if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    41154244  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    41194248else
    41204249  cat > conftest.$ac_ext <<EOF
    4121 #line 4122 "configure"
     4250#line 4251 "configure"
    41224251#include "confdefs.h"
    41234252#include <stdio.h>
    … …  
    41304259}
    41314260EOF
    4132 if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4261if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    41334262then
    41344263  ac_cv_sizeof_short=`cat conftestval`
    … …  
    41504279
    41514280echo $ac_n "checking size of int""... $ac_c" 1>&6
    4152 echo "configure:4153: checking size of int" >&5
     4281echo "configure:4282: checking size of int" >&5
    41534282if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    41544283  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    41584287else
    41594288  cat > conftest.$ac_ext <<EOF
    4160 #line 4161 "configure"
     4289#line 4290 "configure"
    41614290#include "confdefs.h"
    41624291#include <stdio.h>
    … …  
    41694298}
    41704299EOF
    4171 if { (eval echo configure:4172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4300if { (eval echo configure:4301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    41724301then
    41734302  ac_cv_sizeof_int=`cat conftestval`
    … …  
    41894318
    41904319echo $ac_n "checking size of long""... $ac_c" 1>&6
    4191 echo "configure:4192: checking size of long" >&5
     4320echo "configure:4321: checking size of long" >&5
    41924321if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    41934322  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    41974326else
    41984327  cat > conftest.$ac_ext <<EOF
    4199 #line 4200 "configure"
     4328#line 4329 "configure"
    42004329#include "confdefs.h"
    42014330#include <stdio.h>
    … …  
    42084337}
    42094338EOF
    4210 if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4339if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    42114340then
    42124341  ac_cv_sizeof_long=`cat conftestval`
    … …  
    42284357
    42294358echo $ac_n "checking size of void*""... $ac_c" 1>&6
    4230 echo "configure:4231: checking size of void*" >&5
     4359echo "configure:4360: checking size of void*" >&5
    42314360if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
    42324361  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    42364365else
    42374366  cat > conftest.$ac_ext <<EOF
    4238 #line 4239 "configure"
     4367#line 4368 "configure"
    42394368#include "confdefs.h"
    42404369#include <stdio.h>
    … …  
    42474376}
    42484377EOF
    4249 if { (eval echo configure:4250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4378if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    42504379then
    42514380  ac_cv_sizeof_voidp=`cat conftestval`
    … …  
    42674396
    42684397echo $ac_n "checking size of double""... $ac_c" 1>&6
    4269 echo "configure:4270: checking size of double" >&5
     4398echo "configure:4399: checking size of double" >&5
    42704399if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
    42714400  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    42754404else
    42764405  cat > conftest.$ac_ext <<EOF
    4277 #line 4278 "configure"
     4406#line 4407 "configure"
    42784407#include "confdefs.h"
    42794408#include <stdio.h>
    … …  
    42864415}
    42874416EOF
    4288 if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4417if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    42894418then
    42904419  ac_cv_sizeof_double=`cat conftestval`
    … …  
    43064435
    43074436echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
    4308 echo "configure:4309: checking whether byte ordering is bigendian" >&5
     4437echo "configure:4438: checking whether byte ordering is bigendian" >&5
    43094438if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    43104439  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    43134442# See if sys/param.h defines the BYTE_ORDER macro.
    43144443cat > conftest.$ac_ext <<EOF
    4315 #line 4316 "configure"
     4444#line 4445 "configure"
    43164445#include "confdefs.h"
    43174446#include <sys/types.h>
    … …  
    43244453; return 0; }
    43254454EOF
    4326 if { (eval echo configure:4327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     4455if { (eval echo configure:4456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    43274456  rm -rf conftest*
    43284457  # It does; now see whether it defined to BIG_ENDIAN or not.
    43294458cat > conftest.$ac_ext <<EOF
    4330 #line 4331 "configure"
     4459#line 4460 "configure"
    43314460#include "confdefs.h"
    43324461#include <sys/types.h>
    … …  
    43394468; return 0; }
    43404469EOF
    4341 if { (eval echo configure:4342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     4470if { (eval echo configure:4471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    43424471  rm -rf conftest*
    43434472  ac_cv_c_bigendian=yes
    … …  
    43594488else
    43604489  cat > conftest.$ac_ext <<EOF
    4361 #line 4362 "configure"
     4490#line 4491 "configure"
    43624491#include "confdefs.h"
    43634492main () {
    … …  
    43724501}
    43734502EOF
    4374 if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     4503if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    43754504then
    43764505  ac_cv_c_bigendian=no
    … …  
    45264655
    45274656echo $ac_n "checking whether to use dynamic linking""... $ac_c" 1>&6
    4528 echo "configure:4529: checking whether to use dynamic linking" >&5
     4657echo "configure:4658: checking whether to use dynamic linking" >&5
    45294658if test "$with_dl" != no && test "$ac_lib_dl" = yes; then
    45304659  cat >> confdefs.h <<\EOF
    … …  
    45394668
    45404669echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
    4541 echo "configure:4542: checking for tgetent in -lncurses" >&5
     4670echo "configure:4671: checking for tgetent in -lncurses" >&5
    45424671ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
    45434672if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    45474676LIBS="-lncurses  $LIBS"
    45484677cat > conftest.$ac_ext <<EOF
    4549 #line 4550 "configure"
     4678#line 4679 "configure"
    45504679#include "confdefs.h"
    45514680/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    45584687; return 0; }
    45594688EOF
    4560 if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4689if { (eval echo configure:4690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    45614690  rm -rf conftest*
    45624691  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    45854714\
    45864715 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
    4587 echo "configure:4588: checking for tgetent in -lcurses" >&5
     4716echo "configure:4717: checking for tgetent in -lcurses" >&5
    45884717ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
    45894718if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    45934722LIBS="-lcurses  $LIBS"
    45944723cat > conftest.$ac_ext <<EOF
    4595 #line 4596 "configure"
     4724#line 4725 "configure"
    45964725#include "confdefs.h"
    45974726/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    46044733; return 0; }
    46054734EOF
    4606 if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4735if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    46074736  rm -rf conftest*
    46084737  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    46314760\
    46324761  echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
    4633 echo "configure:4634: checking for tgetent in -ltermcap" >&5
     4762echo "configure:4763: checking for tgetent in -ltermcap" >&5
    46344763ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
    46354764if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    46394768LIBS="-ltermcap  $LIBS"
    46404769cat > conftest.$ac_ext <<EOF
    4641 #line 4642 "configure"
     4770#line 4771 "configure"
    46424771#include "confdefs.h"
    46434772/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    46504779; return 0; }
    46514780EOF
    4652 if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4781if { (eval echo configure:4782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    46534782  rm -rf conftest*
    46544783  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    46994828
    47004829   echo $ac_n "checking for rl_abort in -lreadline""... $ac_c" 1>&6
    4701 echo "configure:4702: checking for rl_abort in -lreadline" >&5
     4830echo "configure:4831: checking for rl_abort in -lreadline" >&5
    47024831ac_lib_var=`echo readline'_'rl_abort | sed 'y%./+-%__p_%'`
    47034832if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    47074836LIBS="-lreadline  $LIBS"
    47084837cat > conftest.$ac_ext <<EOF
    4709 #line 4710 "configure"
     4838#line 4839 "configure"
    47104839#include "confdefs.h"
    47114840/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    47214850; return 0; }
    47224851EOF
    4723 if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4852if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    47244853  rm -rf conftest*
    47254854  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    47494878
    47504879   echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
    4751 echo "configure:4752: checking how to run the C++ preprocessor" >&5
     4880echo "configure:4881: checking how to run the C++ preprocessor" >&5
    47524881if test -z "$CXXCPP"; then
    47534882if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    … …  
    47624891  CXXCPP="${CXX-g++} -E"
    47634892  cat > conftest.$ac_ext <<EOF
    4764 #line 4765 "configure"
     4893#line 4894 "configure"
    47654894#include "confdefs.h"
    47664895#include <stdlib.h>
    47674896EOF
    47684897ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    4769 { (eval echo configure:4770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     4898{ (eval echo configure:4899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    47704899ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    47714900if test -z "$ac_err"; then
    … …  
    47954924ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    47964925echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    4797 echo "configure:4798: checking for $ac_hdr" >&5
     4926echo "configure:4927: checking for $ac_hdr" >&5
    47984927if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    47994928  echo $ac_n "(cached) $ac_c" 1>&6
    48004929else
    48014930  cat > conftest.$ac_ext <<EOF
    4802 #line 4803 "configure"
     4931#line 4932 "configure"
    48034932#include "confdefs.h"
    48044933#include <$ac_hdr>
    48054934EOF
    48064935ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    4807 { (eval echo configure:4808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     4936{ (eval echo configure:4937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    48084937ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    48094938if test -z "$ac_err"; then
    … …  
    48344963      test "$ac_cv_header_readline_readline_h" = yes; then
    48354964     echo $ac_n "checking whether readline.h is ok""... $ac_c" 1>&6
    4836 echo "configure:4837: checking whether readline.h is ok" >&5
     4965echo "configure:4966: checking whether readline.h is ok" >&5
    48374966     if eval "test \"`echo '$''{'ac_cv_header_readline_readline_h_ok'+set}'`\" = set"; then
    48384967  echo $ac_n "(cached) $ac_c" 1>&6
    48394968else
    48404969  cat > conftest.$ac_ext <<EOF
    4841 #line 4842 "configure"
     4970#line 4971 "configure"
    48424971#include "confdefs.h"
    48434972#include<unistd.h>
    … …  
    48524981; return 0; }
    48534982EOF
    4854 if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4983if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    48554984  rm -rf conftest*
    48564985  ac_cv_header_readline_readline_h_ok="yes"
    … …  
    48684997#not ok -- try once more with explicitly declaring everything
    48694998      echo $ac_n "checking whether or not we nevertheless can use readline""... $ac_c" 1>&6
    4870 echo "configure:4871: checking whether or not we nevertheless can use readline" >&5
     4999echo "configure:5000: checking whether or not we nevertheless can use readline" >&5
    48715000      if eval "test \"`echo '$''{'ac_cv_have_readline'+set}'`\" = set"; then
    48725001  echo $ac_n "(cached) $ac_c" 1>&6
    48735002else
    48745003  cat > conftest.$ac_ext <<EOF
    4875 #line 4876 "configure"
     5004#line 5005 "configure"
    48765005#include "confdefs.h"
    48775006#include <stdio.h>
    … …  
    49075036; return 0; }
    49085037EOF
    4909 if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5038if { (eval echo configure:5039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    49105039  rm -rf conftest*
    49115040  ac_cv_have_readline="yes"
    … …  
    49465075
    49475076echo $ac_n "checking which readline to use""... $ac_c" 1>&6
    4948 echo "configure:4949: checking which readline to use" >&5
     5077echo "configure:5078: checking which readline to use" >&5
    49495078if test "$ac_cv_with_readline" = dynamic; then
    49505079  echo "$ac_t""dynamic" 1>&6
    … …  
    49665095# gmp, MP, MPT, factory, libfac
    49675096echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
    4968 echo "configure:4969: checking for main in -lgmp" >&5
     5097echo "configure:5098: checking for main in -lgmp" >&5
    49695098ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
    49705099if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    49745103LIBS="-lgmp  $LIBS"
    49755104cat > conftest.$ac_ext <<EOF
    4976 #line 4977 "configure"
     5105#line 5106 "configure"
    49775106#include "confdefs.h"
    49785107
    … …  
    49815110; return 0; }
    49825111EOF
    4983 if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5112if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    49845113  rm -rf conftest*
    49855114  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    50105139SAVE_LIBS=$LIBS
    50115140echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
    5012 echo "configure:5013: checking for IMP_PutGmpInt in -lMP" >&5
     5141echo "configure:5142: checking for IMP_PutGmpInt in -lMP" >&5
    50135142ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
    50145143if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    50185147LIBS="-lMP $MP_LIBS $LIBS"
    50195148cat > conftest.$ac_ext <<EOF
    5020 #line 5021 "configure"
     5149#line 5150 "configure"
    50215150#include "confdefs.h"
    50225151/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    50295158; return 0; }
    50305159EOF
    5031 if { (eval echo configure:5032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5160if { (eval echo configure:5161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    50325161  rm -rf conftest*
    50335162  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    50575186
    50585187echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
    5059 echo "configure:5060: checking for MPT_GetTree in -lMPT" >&5
     5188echo "configure:5189: checking for MPT_GetTree in -lMPT" >&5
    50605189ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
    50615190if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    50655194LIBS="-lMPT $MP_LIBS $LIBS"
    50665195cat > conftest.$ac_ext <<EOF
    5067 #line 5068 "configure"
     5196#line 5197 "configure"
    50685197#include "confdefs.h"
    50695198/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    50765205; return 0; }
    50775206EOF
    5078 if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5207if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    50795208  rm -rf conftest*
    50805209  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    51055234LIBS=$SAVE_LIBS
    51065235echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
    5107 echo "configure:5108: checking for atof in -lsingcf" >&5
     5236echo "configure:5237: checking for atof in -lsingcf" >&5
    51085237ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
    51095238if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    51135242LIBS="-lsingcf  $LIBS"
    51145243cat > conftest.$ac_ext <<EOF
    5115 #line 5116 "configure"
     5244#line 5245 "configure"
    51165245#include "confdefs.h"
    51175246/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    51245253; return 0; }
    51255254EOF
    5126 if { (eval echo configure:5127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5255if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    51275256  rm -rf conftest*
    51285257  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    51525281
    51535282echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
    5154 echo "configure:5155: checking for atof in -lsingfac" >&5
     5283echo "configure:5284: checking for atof in -lsingfac" >&5
    51555284ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
    51565285if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    51605289LIBS="-lsingfac  $LIBS"
    51615290cat > conftest.$ac_ext <<EOF
    5162 #line 5163 "configure"
     5291#line 5292 "configure"
    51635292#include "confdefs.h"
    51645293/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    51715300; return 0; }
    51725301EOF
    5173 if { (eval echo configure:5174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5302if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    51745303  rm -rf conftest*
    51755304  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    51995328
    52005329echo $ac_n "checking for omTestAddr in -lomalloc""... $ac_c" 1>&6
    5201 echo "configure:5202: checking for omTestAddr in -lomalloc" >&5
     5330echo "configure:5331: checking for omTestAddr in -lomalloc" >&5
    52025331ac_lib_var=`echo omalloc'_'omTestAddr | sed 'y%./+-%__p_%'`
    52035332if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    52075336LIBS="-lomalloc  $LIBS"
    52085337cat > conftest.$ac_ext <<EOF
    5209 #line 5210 "configure"
     5338#line 5339 "configure"
    52105339#include "confdefs.h"
    52115340/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    52185347; return 0; }
    52195348EOF
    5220 if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5349if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    52215350  rm -rf conftest*
    52225351  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    52465375
    52475376echo $ac_n "checking for main in -lomalloc_ndebug""... $ac_c" 1>&6
    5248 echo "configure:5249: checking for main in -lomalloc_ndebug" >&5
     5377echo "configure:5378: checking for main in -lomalloc_ndebug" >&5
    52495378ac_lib_var=`echo omalloc_ndebug'_'main | sed 'y%./+-%__p_%'`
    52505379if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    52545383LIBS="-lomalloc_ndebug  $LIBS"
    52555384cat > conftest.$ac_ext <<EOF
    5256 #line 5257 "configure"
     5385#line 5386 "configure"
    52575386#include "confdefs.h"
    52585387
    … …  
    52615390; return 0; }
    52625391EOF
    5263 if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5392if { (eval echo configure:5393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    52645393  rm -rf conftest*
    52655394  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    52895418
    52905419echo $ac_n "checking for main in -lntl""... $ac_c" 1>&6
    5291 echo "configure:5292: checking for main in -lntl" >&5
     5420echo "configure:5421: checking for main in -lntl" >&5
    52925421ac_lib_var=`echo ntl'_'main | sed 'y%./+-%__p_%'`
    52935422if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    52975426LIBS="-lntl  $LIBS"
    52985427cat > conftest.$ac_ext <<EOF
    5299 #line 5300 "configure"
     5428#line 5429 "configure"
    53005429#include "confdefs.h"
    53015430
    … …  
    53045433; return 0; }
    53055434EOF
    5306 if { (eval echo configure:5307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5435if { (eval echo configure:5436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    53075436  rm -rf conftest*
    53085437  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    53375466ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    53385467echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    5339 echo "configure:5340: checking for $ac_hdr" >&5
     5468echo "configure:5469: checking for $ac_hdr" >&5
    53405469if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    53415470  echo $ac_n "(cached) $ac_c" 1>&6
    53425471else
    53435472  cat > conftest.$ac_ext <<EOF
    5344 #line 5345 "configure"
     5473#line 5474 "configure"
    53455474#include "confdefs.h"
    53465475#include <$ac_hdr>
    53475476EOF
    53485477ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    5349 { (eval echo configure:5350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     5478{ (eval echo configure:5479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    53505479ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    53515480if test -z "$ac_err"; then
    … …  
    53755504
    53765505echo $ac_n "checking whether to use Boost""... $ac_c" 1>&6
    5377 echo "configure:5378: checking whether to use Boost" >&5
     5506echo "configure:5507: checking whether to use Boost" >&5
    53785507if test "$with_Boost" != no; then
    53795508  echo "$ac_t""yes" 1>&6
    … …  
    53905519ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    53915520echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    5392 echo "configure:5393: checking for $ac_hdr" >&5
     5521echo "configure:5522: checking for $ac_hdr" >&5
    53935522if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    53945523  echo $ac_n "(cached) $ac_c" 1>&6
    53955524else
    53965525  cat > conftest.$ac_ext <<EOF
    5397 #line 5398 "configure"
     5526#line 5527 "configure"
    53985527#include "confdefs.h"
    53995528#include <$ac_hdr>
    54005529EOF
    54015530ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    5402 { (eval echo configure:5403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     5531{ (eval echo configure:5532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    54035532ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    54045533if test -z "$ac_err"; then
    … …  
    54365565  echo "$ac_t""no" 1>&6
    54375566  echo $ac_n "checking whether to use std::vector""... $ac_c" 1>&6
    5438 echo "configure:5439: checking whether to use std::vector" >&5
     5567echo "configure:5568: checking whether to use std::vector" >&5
    54395568  if test "$with_stdvec" != yes; then
    54405569    echo "$ac_t""no" 1>&6
    … …  
    54855614SAVE_LIBS=$LIBS
    54865615echo $ac_n "checking for __stack_chk_fail_local in -lc_nonshared""... $ac_c" 1>&6
    5487 echo "configure:5488: checking for __stack_chk_fail_local in -lc_nonshared" >&5
     5616echo "configure:5617: checking for __stack_chk_fail_local in -lc_nonshared" >&5
    54885617ac_lib_var=`echo c_nonshared'_'__stack_chk_fail_local | sed 'y%./+-%__p_%'`
    54895618if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    54935622LIBS="-lc_nonshared  $LIBS"
    54945623cat > conftest.$ac_ext <<EOF
    5495 #line 5496 "configure"
     5624#line 5625 "configure"
    54965625#include "confdefs.h"
    54975626/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    55045633; return 0; }
    55055634EOF
    5506 if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     5635if { (eval echo configure:5636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    55075636  rm -rf conftest*
    55085637  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    55285657
    55295658
     5659
    55305660# evaluate results
    55315661if test "$ac_cv_omalloc_ok" != yes && test "$enable_omalloc" != yes; then
    … …  
    55345664
    55355665echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
    5536 echo "configure:5537: checking which apint package to use" >&5
     5666echo "configure:5667: checking which apint package to use" >&5
    55375667if test "${with_apint}" != gmp; then
    55385668  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    … …  
    55565686
    55575687echo $ac_n "checking gfanlib""... $ac_c" 1>&6
    5558 echo "configure:5559: checking gfanlib" >&5
     5688echo "configure:5689: checking gfanlib" >&5
    55595689if test "$enable_gfanlib" = yes; then
    55605690  echo "$ac_t""yes" 1>&6
    … …  
    55655695
    55665696echo $ac_n "checking whether to use libsvd""... $ac_c" 1>&6
    5567 echo "configure:5568: checking whether to use libsvd" >&5
     5697echo "configure:5698: checking whether to use libsvd" >&5
    55685698if test "$with_svd" = yes; then
    55695699  echo "$ac_t""yes" 1>&6
    … …  
    55805710#
    55815711echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
    5582 echo "configure:5583: checking whether to have MP" >&5
     5712echo "configure:5713: checking whether to have MP" >&5
    55835713if test "${with_MP}" != yes && test "${with_MP}" != no; then
    55845714  if (test "${will_have_gmp}" = yes) && \
    … …  
    56155745
    56165746echo $ac_n "checking whether to have NTL""... $ac_c" 1>&6
    5617 echo "configure:5618: checking whether to have NTL" >&5
     5747echo "configure:5748: checking whether to have NTL" >&5
    56185748if test "${with_NTL}" = yes ; then
    56195749  echo "$ac_t""yes" 1>&6
    … …  
    56245754
    56255755echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
    5626 echo "configure:5627: checking whether to have factory" >&5
     5756echo "configure:5757: checking whether to have factory" >&5
    56275757if test "${with_factory}" != yes && test "${with_factory}" != no; then
    56285758  if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
    … …  
    56555785
    56565786echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
    5657 echo "configure:5658: checking whether to have libfac" >&5
     5787echo "configure:5788: checking whether to have libfac" >&5
    56585788if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
    56595789  if (test "${will_have_factory}" = yes) && \
    … …  
    56905820
    56915821echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
    5692 echo "configure:5693: checking whether to have dbm links" >&5
     5822echo "configure:5823: checking whether to have dbm links" >&5
    56935823if test "$with_dbm" != no; then
    56945824  cat >> confdefs.h <<\EOF
    … …  
    57025832
    57035833echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
    5704 echo "configure:5705: checking whether to have dynamic modules" >&5
     5834echo "configure:5835: checking whether to have dynamic modules" >&5
    57055835if test "$with_dynamic_modules" = no || test "$ac_have_dl" != yes; then
    57065836  echo "$ac_t""no" 1>&6
    … …  
    57145844
    57155845echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
    5716 echo "configure:5717: checking whether to have dynamic kernel" >&5
     5846echo "configure:5847: checking whether to have dynamic kernel" >&5
    57175847if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
    57185848  DL_KERNEL=1
    … …  
    57245854
    57255855echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
    5726 echo "configure:5727: checking whether to have Plural" >&5
     5856echo "configure:5857: checking whether to have Plural" >&5
    57275857if test "$with_Plural" != no && test "$enable_Plural" != no; then
    57285858  cat >> confdefs.h <<\EOF
    … …  
    57385868
    57395869echo $ac_n "checking whether to have ratGB""... $ac_c" 1>&6
    5740 echo "configure:5741: checking whether to have ratGB" >&5
     5870echo "configure:5871: checking whether to have ratGB" >&5
    57415871if test "$with_ratGB" != yes && test "$enable_ratGB" != yes; then
    57425872  echo "$ac_t""no" 1>&6
    … …  
    59256055s%@PYTHON_EXTRA_LDFLAGS@%$PYTHON_EXTRA_LDFLAGS%g
    59266056s%@HAVE_PYTHON_VALUE@%$HAVE_PYTHON_VALUE%g
     6057s%@PYTHON_STATIC_LIBS@%$PYTHON_STATIC_LIBS%g
     6058s%@PYTHON_MODULE_FLAGS@%$PYTHON_MODULE_FLAGS%g
     6059s%@PYTHON_EMBED_LIBS@%$PYTHON_EMBED_LIBS%g
     6060s%@EMBED_PYTHON_VALUE@%$EMBED_PYTHON_VALUE%g
    59276061s%@LD_DYN_FLAGS@%$LD_DYN_FLAGS%g
    59286062s%@SFLAGS@%$SFLAGS%g

  • Singular/configure.in

    rc728c0 r76b37c  
    188188          AC_DEFINE(HAVE_PYTHON)
    189189          HAVE_PYTHON_VALUE=1
    190           AC_SUBST(HAVE_PYTHON_VALUE)     
     190          AC_SUBST(HAVE_PYTHON_VALUE)
    191191        fi
     192
    192193#       AC_LANG_POP
    193194        # turn back to default flags
    … …  
    198199        # all done!
    199200        #
     201])
     202
     203
     204dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
     205dnl check whethe python-based module can be build statically
     206dnl
     207AC_DEFUN([AC_PYTHON_TEST_STATIC],[
     208        ac_save_LIBS_for_python="${LIBS}"
     209        ac_save_CPPFLAGS_for_python="${CPPFLAGS}"
     210
     211        AC_MSG_CHECKING([${try_python_shared_static_flags} for linking \
     212python statically])
     213        all_cppflags="${ac_save_CPPFLAGS} ${PYTHON_CPPFLAGS}"
     214
     215        CPPFLAGS="-static ${all_cppflags}"
     216        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS -lc -lm $PYTHON_EXTRA_LDFLAGS"
     217
     218        AC_TRY_LINK([
     219              #include <Python.h>
     220        ],[
     221              Py_Initialize();
     222        ],[pythonstaticexists=yes],[pythonstaticexists=no])
     223
     224        AC_MSG_RESULT([$pythonstaticexists])
     225
     226        if test "$pythonstaticexists" == yes ; then
     227          AC_DEFINE(HAVE_STATIC_PYTHON)
     228          PYTHON_STATIC_LIBS="$PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
     229          AC_SUBST(PYTHON_STATIC_LIBS)
     230   
     231          try_flags="-Xlinker -static -nodefaultlibs"
     232          CPPFLAGS="-shared -fPIC ${try_flags} ${all_cppflags}"
     233          AC_MSG_CHECKING([$try_flags for linking python module statically])
     234          AC_TRY_LINK([
     235                #include <Python.h>
     236          ],[
     237                Py_Initialize();
     238          ],[pythonsharedstaticexists=yes],[pythonsharedstaticexists=no])
     239          AC_MSG_RESULT([$pythonsharedstaticexists])
     240 
     241          if test "$pythonsharedstaticexists" = yes; then
     242            PYTHON_MODULE_FLAGS="${try_flags}"
     243          fi
     244        fi
     245
     246        AC_SUBST(PYTHON_MODULE_FLAGS)
     247        CPPFLAGS="$ac_save_CPPFLAGS_for_python"
     248        LIBS="$ac_save_LIBS_for_python"
    200249])
    201250
    … …  
    579628
    580629# python
    581 if test "${with_python+set}" != set; then
    582 dnl Default value here!
    583   PYTHON_EXE="no"
    584 else
    585   if test "${with_python}" = yes; then
    586     PYTHON_EXE="python"
    587   else
    588     PYTHON_EXE="${with_python}"
    589   fi
    590 fi
     630dnl Default values here!
     631python_exe_name="no"
     632PYTHON_PLUGIN="module"
     633PYTHON_LINKAGE="static"
     634
     635if test "${with_python+set}" == set; then
     636  case "${with_python}" in
     637    yes|static*|dynamic*|shared*|module*|embed*)
     638      python_exe_name="python"
     639    ;;
     640    *)
     641    python_exe_name="${with_python%%,*}"
     642    ;;
     643  esac
     644
     645  case ",${with_python}," in
     646    *,dynamic,*|*,shared,*)
     647      PYTHON_LINKAGE="dynamic"
     648    ;;
     649    *,static,*)
     650      PYTHON_LINKAGE="static"
     651    ;;
     652  esac
     653
     654  case ",${with_python}," in
     655    *,embed,*|*,embedded,*)
     656      PYTHON_PLUGIN="embed"
     657    ;;
     658    *,static,*)
     659      PYTHON_PLUGIN="module"
     660    ;;
     661  esac
     662fi
     663
     664PYTHON_EXE=`basename "${python_exe_name}"`
     665PYTHON_PATH=`dirname "${python_exe_name}"`
    591666
    592667if test "${PYTHON_EXE}" = no; then
    593668  AC_MSG_WARN(building without python support)
    594669else
    595   AC_PATH_PROG([PYTHON],[$PYTHON_EXE])
     670  AC_PATH_PROG([PYTHON],[$PYTHON_EXE],, "$PYTHON_PATH:$PATH")
    596671  if test -z "$PYTHON"; then
    597672    AC_MSG_WARN([Cannot find $PYTHON_EXE in your system path - skipping python support])
    598673  else
    599674    AC_PYTHON_DEVEL_SINGULAR(>= '2.4', "${PYTHON}")
    600   fi
    601 fi
     675    AC_PYTHON_TEST_STATIC()
     676
     677    if test "${PYTHON_PLUGIN}" = embed; then
     678      AC_DEFINE(EMBED_PYTHON)
     679      EMBED_PYTHON_VALUE=1
     680
     681      PYTHON_EMBED_LIBS="$PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS"
     682      AC_SUBST(PYTHON_EMBED_LIBS)
     683    fi
     684
     685  fi
     686fi
     687AC_SUBST(EMBED_PYTHON_VALUE)
     688
    602689
    603690dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    … …  
    845932AC_ARG_WITH(
    846933  python,
    847   [  --with-python=[PYTHON,no]     uses PYTHON as python executable, default is python])
     934  [  --with-python[=PYTHON[,embed|module[,static|dynamic]]]
     935                        uses PYTHON as python executable, default is python;
     936                        optionally set plug-in and linkage type])
    848937AC_ARG_WITH(
    849938  Boost,
    … …  
    10781167AC_SUBST(GLIBC_DYN_FIX)
    10791168
     1169
    10801170# evaluate results
    10811171dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll

  • Singular/mod2.h.in

    rc728c0 r76b37c  
    162162/* whether development version of python is available */
    163163#undef HAVE_PYTHON
     164/* whether static development version of python is available */
     165#undef HAVE_STATIC_PYTHON
     166/* whether python should be embedded */
     167#undef EMBED_PYTHON
    164168
    165169/*******************************************************************

  • Singular/pyobject_setup.cc

    rc728c0 r76b37c  
    1717#include "static.h"
    1818
    19 /* whether development version of python is linked statically or dynamically */
    20 #ifdef HAVE_STATIC
    21   #define HAVE_STATIC_PYTHON 1
     19/* whether pyobject module is linked statically or dynamically */
     20#ifdef HAVE_PYTHON
     21
     22  #if defined(HAVE_STATIC)
     23    #ifdef HAVE_STATIC_PYTHON
     24      #define HAVE_STATIC_PYOBJECT
     25    #endif
     26  #else
     27    #ifdef EMBED_PYTHON
     28      #define HAVE_STATIC_PYOBJECT
     29    #else
     30      #define HAVE_DYNAMIC_PYOBJECT
     31    #endif
     32  #endif
    2233#endif
    2334
    24 #ifdef HAVE_PYTHON  // Case: python available (prefered variant)
    25 
    26 
    27 # ifdef HAVE_STATIC_PYTHON // Case: link pyobject interface statically
     35# ifdef HAVE_STATIC_PYOBJECT // Case: link pyobject interface statically
    2836#include "pyobject.cc"
    2937void pyobject_setup() { pyobject_init(); }
    3038
    3139
    32 # else                    // Case: pyobject is dynamic module (prefered variant)
     40# elif defined(HAVE_DYNAMIC_PYOBJECT) // Case: pyobject is dynamic module (prefered variant)
    3341
    3442// forward declaration for Singular/iplib.cc
    … …  
    3846  void* fktn = binary_module_function("pyobject", "mod_init");
    3947  if (fktn) (* reinterpret_cast<void (*)()>(fktn) )();
    40   else Werror("python related functions are not avialable");
     48  else Werror("python related functions are not available");
    4149}
    42 
    43 # endif
    4450
    4551#else                // Case: no python
Note: See TracChangeset for help on using the changeset viewer.