Changeset 91329a in git


Ignore:
Timestamp:
Apr 11, 2006, 2:58:20 PM (18 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '873fc1222e995d7cb33f79d8f1792ce418c8c72c')
Children:
0df49c2e400b9863057d102ed862846695394c7a
Parents:
809adb522f705e1a61117c4bfcf789f6d67b80f0
Message:
*hannes: removed smallgmp


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

Legend:

Unmodified
Added
Removed

  • Singular/configure

    r809adb5 r91329a  
    43004300NEED_LIBS=$LIBS
    43014301
    4302 # gmp, smallgmp, MP, MPT, factory, libfac
     4302# gmp, MP, MPT, factory, libfac
    43034303echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
    43044304echo "configure:4305: checking for main in -lgmp" >&5
    … …  
    43444344fi
    43454345
    4346 if test "ac_cv_lib_gmp_main" = yes && test "$with-apint" = smallgmp; then
    4347   LIBS=${NEED_LIBS}
    4348 fi
    4349 echo $ac_n "checking for main in -lsmallgmp""... $ac_c" 1>&6
    4350 echo "configure:4351: checking for main in -lsmallgmp" >&5
    4351 ac_lib_var=`echo smallgmp'_'main | sed 'y%./+-%__p_%'`
    4352 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    4353   echo $ac_n "(cached) $ac_c" 1>&6
    4354 else
    4355   ac_save_LIBS="$LIBS"
    4356 LIBS="-lsmallgmp  $LIBS"
    4357 cat > conftest.$ac_ext <<EOF
    4358 #line 4359 "configure"
    4359 #include "confdefs.h"
    4360 
    4361 int main() {
    4362 main()
    4363 ; return 0; }
    4364 EOF
    4365 if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    4366   rm -rf conftest*
    4367   eval "ac_cv_lib_$ac_lib_var=yes"
    4368 else
    4369   echo "configure: failed program was:" >&5
    4370   cat conftest.$ac_ext >&5
    4371   rm -rf conftest*
    4372   eval "ac_cv_lib_$ac_lib_var=no"
    4373 fi
    4374 rm -f conftest*
    4375 LIBS="$ac_save_LIBS"
    4376 
    4377 fi
    4378 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    4379   echo "$ac_t""yes" 1>&6
    4380     ac_tr_lib=HAVE_LIB`echo smallgmp | sed -e 's/[^a-zA-Z0-9_]/_/g' \
    4381     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
    4382   cat >> confdefs.h <<EOF
    4383 #define $ac_tr_lib 1
    4384 EOF
    4385 
    4386   LIBS="-lsmallgmp $LIBS"
    4387 
    4388 else
    4389   echo "$ac_t""no" 1>&6
    4390 fi
    4391 
    43924346SAVE_LIBS=$LIBS
    43934347echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
    4394 echo "configure:4395: checking for IMP_PutGmpInt in -lMP" >&5
     4348echo "configure:4349: checking for IMP_PutGmpInt in -lMP" >&5
    43954349ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
    43964350if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    44004354LIBS="-lMP $MP_LIBS $LIBS"
    44014355cat > conftest.$ac_ext <<EOF
    4402 #line 4403 "configure"
     4356#line 4357 "configure"
    44034357#include "confdefs.h"
    44044358/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    44114365; return 0; }
    44124366EOF
    4413 if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4367if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    44144368  rm -rf conftest*
    44154369  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    44394393
    44404394echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
    4441 echo "configure:4442: checking for MPT_GetTree in -lMPT" >&5
     4395echo "configure:4396: checking for MPT_GetTree in -lMPT" >&5
    44424396ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
    44434397if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    44474401LIBS="-lMPT $MP_LIBS $LIBS"
    44484402cat > conftest.$ac_ext <<EOF
    4449 #line 4450 "configure"
     4403#line 4404 "configure"
    44504404#include "confdefs.h"
    44514405/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    44584412; return 0; }
    44594413EOF
    4460 if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4414if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    44614415  rm -rf conftest*
    44624416  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    44874441LIBS=$SAVE_LIBS
    44884442echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
    4489 echo "configure:4490: checking for atof in -lsingcf" >&5
     4443echo "configure:4444: checking for atof in -lsingcf" >&5
    44904444ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
    44914445if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    44954449LIBS="-lsingcf  $LIBS"
    44964450cat > conftest.$ac_ext <<EOF
    4497 #line 4498 "configure"
     4451#line 4452 "configure"
    44984452#include "confdefs.h"
    44994453/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    45064460; return 0; }
    45074461EOF
    4508 if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4462if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    45094463  rm -rf conftest*
    45104464  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    45344488
    45354489echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
    4536 echo "configure:4537: checking for atof in -lsingfac" >&5
     4490echo "configure:4491: checking for atof in -lsingfac" >&5
    45374491ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
    45384492if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    45424496LIBS="-lsingfac  $LIBS"
    45434497cat > conftest.$ac_ext <<EOF
    4544 #line 4545 "configure"
     4498#line 4499 "configure"
    45454499#include "confdefs.h"
    45464500/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    45534507; return 0; }
    45544508EOF
    4555 if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4509if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    45564510  rm -rf conftest*
    45574511  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    45814535
    45824536echo $ac_n "checking for omTestAddr in -lomalloc""... $ac_c" 1>&6
    4583 echo "configure:4584: checking for omTestAddr in -lomalloc" >&5
     4537echo "configure:4538: checking for omTestAddr in -lomalloc" >&5
    45844538ac_lib_var=`echo omalloc'_'omTestAddr | sed 'y%./+-%__p_%'`
    45854539if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    45894543LIBS="-lomalloc  $LIBS"
    45904544cat > conftest.$ac_ext <<EOF
    4591 #line 4592 "configure"
     4545#line 4546 "configure"
    45924546#include "confdefs.h"
    45934547/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    46004554; return 0; }
    46014555EOF
    4602 if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4556if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    46034557  rm -rf conftest*
    46044558  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    46284582
    46294583echo $ac_n "checking for main in -lomalloc_ndebug""... $ac_c" 1>&6
    4630 echo "configure:4631: checking for main in -lomalloc_ndebug" >&5
     4584echo "configure:4585: checking for main in -lomalloc_ndebug" >&5
    46314585ac_lib_var=`echo omalloc_ndebug'_'main | sed 'y%./+-%__p_%'`
    46324586if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    46364590LIBS="-lomalloc_ndebug  $LIBS"
    46374591cat > conftest.$ac_ext <<EOF
    4638 #line 4639 "configure"
     4592#line 4593 "configure"
    46394593#include "confdefs.h"
    46404594
    … …  
    46434597; return 0; }
    46444598EOF
    4645 if { (eval echo configure:4646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4599if { (eval echo configure:4600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    46464600  rm -rf conftest*
    46474601  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    46714625
    46724626echo $ac_n "checking for main in -lntl""... $ac_c" 1>&6
    4673 echo "configure:4674: checking for main in -lntl" >&5
     4627echo "configure:4628: checking for main in -lntl" >&5
    46744628ac_lib_var=`echo ntl'_'main | sed 'y%./+-%__p_%'`
    46754629if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    46794633LIBS="-lntl  $LIBS"
    46804634cat > conftest.$ac_ext <<EOF
    4681 #line 4682 "configure"
     4635#line 4636 "configure"
    46824636#include "confdefs.h"
    46834637
    … …  
    46864640; return 0; }
    46874641EOF
    4688 if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     4642if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    46894643  rm -rf conftest*
    46904644  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    47144668
    47154669
    4716 for ac_hdr in gmp.h smallgmp.h MP.h  MPT.h factory.h factor.h omalloc.h \
     4670for ac_hdr in gmp.h MP.h  MPT.h factory.h factor.h omalloc.h \
    47174671 omalloc.c
    47184672do
    47194673ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    47204674echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    4721 echo "configure:4722: checking for $ac_hdr" >&5
     4675echo "configure:4676: checking for $ac_hdr" >&5
    47224676if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    47234677  echo $ac_n "(cached) $ac_c" 1>&6
    47244678else
    47254679  cat > conftest.$ac_ext <<EOF
    4726 #line 4727 "configure"
     4680#line 4681 "configure"
    47274681#include "confdefs.h"
    47284682#include <$ac_hdr>
    47294683EOF
    47304684ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    4731 { (eval echo configure:4732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     4685{ (eval echo configure:4686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    47324686ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    47334687if test -z "$ac_err"; then
    … …  
    47614715fi
    47624716
    4763 if test "$ac_cv_lib_smallgmp_main" = yes && \
    4764  test "$ac_cv_header_smallgmp_h" = yes && \
    4765  test "$ac_cv_header_gmp_h" = yes; then
    4766     ac_smallgmp_ok=yes
    4767 fi
    4768 
    47694717if test "$ac_cv_lib_MP_IMP_PutGmpInt" = yes && \
    47704718 test "$ac_cv_lib_MPT_MPT_GetTree" && \
    … …  
    48014749
    48024750echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
    4803 echo "configure:4804: checking which apint package to use" >&5
    4804 if test "${with_apint}" != gmp && test "${with_apint}" != smallgmp; then
     4751echo "configure:4752: checking which apint package to use" >&5
     4752if test "${with_apint}" != gmp; then
    48054753  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    48064754    echo "$ac_t""gmp" 1>&6
    48074755    will_have_gmp=yes
    48084756    NEED_LIBS="-lgmp ${NEED_LIBS}"
    4809   elif test "ac_gmp_smallgmp_ok" = yes || test "$enable_smallgmp" = "yes"; then
    4810     echo "$ac_t""smallgmp" 1>&6
    4811     cat >> confdefs.h <<\EOF
    4812 #define HAVE_SMALLGMP 1
    4813 EOF
    4814 
    4815     NEED_LIBS="-lsmallgmp ${NEED_LIBS}"
    48164757  else
    48174758    echo "$ac_t""none" 1>&6
    4818     { echo "configure: error: can not build without gmp or smallgmp" 1>&2; exit 1; }
     4759    { echo "configure: error: can not build without gmp" 1>&2; exit 1; }
    48194760  fi
    4820 elif test "${with_apint}" = gmp; then
     4761else
    48214762  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    48224763    echo "$ac_t""gmp" 1>&6
    … …  
    48274768    { echo "configure: error: can not build with gmp" 1>&2; exit 1; }
    48284769  fi
    4829 else
    4830   if test "ac_gmp_smallgmp_ok" = yes || test "$enable_smallgmp" = "yes"; then
    4831     echo "$ac_t""smallgmp" 1>&6
    4832     cat >> confdefs.h <<\EOF
    4833 #define HAVE_SMALLGMP 1
    4834 EOF
    4835 
    4836     NEED_LIBS="-lsmallgmp ${NEED_LIBS}"
    4837   else
    4838     echo "$ac_t""none" 1>&6
    4839     { echo "configure: error: can not build with smallgmp" 1>&2; exit 1; }
    4840   fi
    48414770fi
    48424771
    48434772#
    48444773echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
    4845 echo "configure:4846: checking whether to have MP" >&5
     4774echo "configure:4775: checking whether to have MP" >&5
    48464775if test "${with_MP}" != yes && test "${with_MP}" != no; then
    48474776  if (test "${will_have_gmp}" = yes) && \
    … …  
    48784807
    48794808echo $ac_n "checking whether to have NTL""... $ac_c" 1>&6
    4880 echo "configure:4881: checking whether to have NTL" >&5
     4809echo "configure:4810: checking whether to have NTL" >&5
    48814810if test "${with_NTL}" = yes ; then
    48824811  echo "$ac_t""yes" 1>&6
    … …  
    48874816
    48884817echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
    4889 echo "configure:4890: checking whether to have factory" >&5
     4818echo "configure:4819: checking whether to have factory" >&5
    48904819if test "${with_factory}" != yes && test "${with_factory}" != no; then
    48914820  if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
    … …  
    49184847
    49194848echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
    4920 echo "configure:4921: checking whether to have libfac" >&5
     4849echo "configure:4850: checking whether to have libfac" >&5
    49214850if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
    49224851  if (test "${will_have_factory}" = yes) && \
    … …  
    49524881
    49534882echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
    4954 echo "configure:4955: checking whether to have dbm links" >&5
     4883echo "configure:4884: checking whether to have dbm links" >&5
    49554884if test "$with_dbm" != no; then
    49564885  cat >> confdefs.h <<\EOF
    … …  
    49644893
    49654894echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
    4966 echo "configure:4967: checking whether to have namespaces" >&5
     4895echo "configure:4896: checking whether to have namespaces" >&5
    49674896if test "$with_namespaces" != no; then
    49684897  echo "$ac_t""yes" 1>&6
    … …  
    49764905
    49774906echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
    4978 echo "configure:4979: checking whether to have dynamic modules" >&5
     4907echo "configure:4908: checking whether to have dynamic modules" >&5
    49794908if test "$with_dynamic_modules" = no || test "$ac_have_dl" != yes; then
    49804909  echo "$ac_t""no" 1>&6
    … …  
    49884917
    49894918echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
    4990 echo "configure:4991: checking whether to have dynamic kernel" >&5
     4919echo "configure:4920: checking whether to have dynamic kernel" >&5
    49914920if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
    49924921  DL_KERNEL=1
    … …  
    49984927
    49994928echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
    5000 echo "configure:5001: checking whether to have Plural" >&5
     4929echo "configure:4930: checking whether to have Plural" >&5
    50014930if test "$with_Plural" != yes && test "$enable_Plural" != yes; then
    50024931  echo "$ac_t""no" 1>&6

  • Singular/configure.in

    r809adb5 r91329a  
    669669NEED_LIBS=$LIBS
    670670
    671 # gmp, smallgmp, MP, MPT, factory, libfac
     671# gmp, MP, MPT, factory, libfac
    672672AC_CHECK_LIB(gmp, main)
    673 if test "ac_cv_lib_gmp_main" = yes && test "$with-apint" = smallgmp; then
    674   LIBS=${NEED_LIBS}
    675 fi
    676 AC_CHECK_LIB(smallgmp, main)
    677673SAVE_LIBS=$LIBS
    678674AC_CHECK_LIB(MP, IMP_PutGmpInt,,,$MP_LIBS)
    … …  
    685681AC_CHECK_LIB(ntl,main)
    686682
    687 AC_CHECK_HEADERS(gmp.h smallgmp.h MP.h  MPT.h factory.h factor.h omalloc.h \
     683AC_CHECK_HEADERS(gmp.h MP.h  MPT.h factory.h factor.h omalloc.h \
    688684 omalloc.c)
    689685
    … …  
    691687 test "$ac_cv_header_gmp_h" = yes; then
    692688    ac_gmp_ok=yes
    693 fi
    694 
    695 if test "$ac_cv_lib_smallgmp_main" = yes && \
    696  test "$ac_cv_header_smallgmp_h" = yes && \
    697  test "$ac_cv_header_gmp_h" = yes; then
    698     ac_smallgmp_ok=yes
    699689fi
    700690
    … …  
    736726
    737727AC_MSG_CHECKING(which apint package to use)
    738 if test "${with_apint}" != gmp && test "${with_apint}" != smallgmp; then
     728if test "${with_apint}" != gmp; then
    739729  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    740730    AC_MSG_RESULT(gmp)
    741731    will_have_gmp=yes
    742732    NEED_LIBS="-lgmp ${NEED_LIBS}"
    743   elif test "ac_gmp_smallgmp_ok" = yes || test "$enable_smallgmp" = "yes"; then
    744     AC_MSG_RESULT(smallgmp)
    745     AC_DEFINE(HAVE_SMALLGMP)
    746     NEED_LIBS="-lsmallgmp ${NEED_LIBS}"
    747733  else
    748734    AC_MSG_RESULT(none)
    749     AC_MSG_ERROR(can not build without gmp or smallgmp)
    750   fi
    751 elif test "${with_apint}" = gmp; then
     735    AC_MSG_ERROR(can not build without gmp)
     736  fi
     737else
    752738  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    753739    AC_MSG_RESULT(gmp)
    … …  
    757743    AC_MSG_RESULT(none)
    758744    AC_MSG_ERROR(can not build with gmp)
    759   fi
    760 else
    761   if test "ac_gmp_smallgmp_ok" = yes || test "$enable_smallgmp" = "yes"; then
    762     AC_MSG_RESULT(smallgmp)
    763     AC_DEFINE(HAVE_SMALLGMP)
    764     NEED_LIBS="-lsmallgmp ${NEED_LIBS}"
    765   else
    766     AC_MSG_RESULT(none)
    767     AC_MSG_ERROR(can not build with smallgmp)
    768745  fi
    769746fi
Note: See TracChangeset for help on using the changeset viewer.