Changeset 9bc556 in git


Ignore:
Timestamp:
Jun 4, 1998, 3:59:33 PM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
091de603300f5d7fb426cc3765a6c47e3f18b934
Parents:
b9624d64c55d185b8c90a49c706ec0dcd63989d0
Message:
* improvments/bug fixes of configure, etc


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

Legend:

Unmodified
Added
Removed

  • Makefile.in

    rb9624d6 r9bc556  
    1818
    1919
     20##############################################################
    2021# default target
    2122${SINGULAR}:
    2223        ${MAKE} install
    2324
     25# general targets
    2426# simply descend for these targets
    2527all install uninstall: Makefile
    … …  
    3335
    3436# clean up in all subdirectories known to us
    35 clean distclean mostlyclean maintainer-clean:
     37clean distclean mostlyclean maintainer-clean: uninstall
    3638        for SUBDIR in ${SUBDIRS}; \
    3739        do \
    … …  
    4345        rm -rf *~ a.out core *.o *.log; \
    4446        if test "$@" = distclean || test "$@" = maintainer-clean; then \
    45           rm -rf Makefile config.cache config.log config.status TAGS* *.gz *.tar; \
    46         fi; \
     47          rm -rf Makefile config.cache config.log config.status TAGS* *.gz *.tar;\
     48        fi 
    4749        if test "$@" = maintainer-clean; then \
    4850          echo "This command is intended for maintainer use, only"; \
    … …  
    5052        fi
    5153
     54##############################################################
    5255# some extra targets for the specific packages
     56${SINGULAR} :
     57        ${MAKE} install
     58
    5359Singular factory libfac MP gmp:
    5460        cd $@; ${MAKE} all
    5561
     62##############################################################
    5663# documentation
    57 info dvi ps doc doc/singular.hlp: ${SINGULAR}
     64info dvi ps doc/singular.hlp: ${SINGULAR}
    5865        cd doc; ${MAKE} $@
    5966
    60 info/singular.hlp:
     67doc info/singular.hlp: ${SINGULAR}             
    6168        cd doc; ${MAKE} install
    6269
    63 # remaking Makefile
    64 Makefile: Makefile.in config.status
     70##############################################################
     71# Tst targets
     72Tst-All: Tst-Old Tst-Short Tst-Long
     73
     74Tst: Tst-Old Tst-Short
     75
     76Tst-Old: ${SINGULAR} Tst/Old/universal.lst Tst/regress.cmd
     77        Tst/regress.cmd -s ${SINGULAR} Tst/Old/universal.lst
     78
     79Tst-Short: ${SINGULAR} Tst/Short Tst/regress.cmd
     80        Tst/regress.cmd -s ${SINGULAR} Tst/Short/*.tst
     81
     82Tst-Long:  ${SINGULAR} Tst/Short Tst/regress.cmd
     83        Tst/regess.cmd -s ${SINGULAR} Tst/Long/*.tst
     84
     85
     86##############################################################
     87#stuff for configure
     88Makefile : Makefile.in config.status
    6589        ./config.status
    6690

  • configure

    rb9624d6 r9bc556  
    5252\
    5353  --with-apint=PACKAGE    use PACKAGE for arbitary integer arithmetic
    54                           where PACKAGE can be gmp or smallgmp"
     54                          where PACKAGE can be gmp or smallgmp
     55All additional --enable and --with options are passed to subsequent calls
     56to configure of the packages to be built. See also configure --help in
     57these packages (resp. subdirs). "
    5558
    5659# Initialize some variables set by options.
    … …  
    581584
    582585
    583 # construct name of installed Singular executable
    584 SINGULAR=${bindir}/Singular-${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}
    585 export SINGULAR
    586 
    587 
    588586
    589587# Extract the first word of "gcc", so it can be a program name with args.
    590588set dummy gcc; ac_word=$2
    591589echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    592 echo "configure:593: checking for $ac_word" >&5
     590echo "configure:591: checking for $ac_word" >&5
    593591if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    594592  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    619617set dummy cc; ac_word=$2
    620618echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    621 echo "configure:622: checking for $ac_word" >&5
     619echo "configure:620: checking for $ac_word" >&5
    622620if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    623621  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    667665
    668666echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    669 echo "configure:670: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     667echo "configure:668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    670668
    671669ac_ext=c
    … …  
    677675
    678676cat > conftest.$ac_ext <<EOF
    679 #line 680 "configure"
     677#line 678 "configure"
    680678#include "confdefs.h"
    681679main(){return(0);}
    682680EOF
    683 if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     681if { (eval echo configure:682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    684682  ac_cv_prog_cc_works=yes
    685683  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    701699fi
    702700echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    703 echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     701echo "configure:702: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    704702echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    705703cross_compiling=$ac_cv_prog_cc_cross
    706704
    707705echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    708 echo "configure:709: checking whether we are using GNU C" >&5
     706echo "configure:707: checking whether we are using GNU C" >&5
    709707if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    710708  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    715713#endif
    716714EOF
    717 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     715if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    718716  ac_cv_prog_gcc=yes
    719717else
    … …  
    730728  CFLAGS=
    731729  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    732 echo "configure:733: checking whether ${CC-cc} accepts -g" >&5
     730echo "configure:731: checking whether ${CC-cc} accepts -g" >&5
    733731if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    734732  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    758756
    759757echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    760 echo "configure:761: checking how to run the C preprocessor" >&5
     758echo "configure:759: checking how to run the C preprocessor" >&5
    761759# On Suns, sometimes $CPP names a directory.
    762760if test -n "$CPP" && test -d "$CPP"; then
    … …  
    773771  # not just through cpp.
    774772  cat > conftest.$ac_ext <<EOF
    775 #line 776 "configure"
     773#line 774 "configure"
    776774#include "confdefs.h"
    777775#include <assert.h>
    … …  
    779777EOF
    780778ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    781 { (eval echo configure:782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     779{ (eval echo configure:780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    782780ac_err=`grep -v '^ *+' conftest.out`
    783781if test -z "$ac_err"; then
    … …  
    790788  CPP="${CC-cc} -E -traditional-cpp"
    791789  cat > conftest.$ac_ext <<EOF
    792 #line 793 "configure"
     790#line 791 "configure"
    793791#include "confdefs.h"
    794792#include <assert.h>
    … …  
    796794EOF
    797795ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    798 { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     796{ (eval echo configure:797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    799797ac_err=`grep -v '^ *+' conftest.out`
    800798if test -z "$ac_err"; then
    … …  
    819817
    820818echo $ac_n "checking for AIX""... $ac_c" 1>&6
    821 echo "configure:822: checking for AIX" >&5
     819echo "configure:820: checking for AIX" >&5
    822820cat > conftest.$ac_ext <<EOF
    823 #line 824 "configure"
     821#line 822 "configure"
    824822#include "confdefs.h"
    825823#ifdef _AIX
    … …  
    882880fi
    883881
     882# construct name of installed Singular executable
     883SINGULAR=${bindir}/Singular-${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}
     884export SINGULAR
     885
    884886
    885887
    … …  
    890892# check for AIX
    891893echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
    892 echo "configure:893: checking whether _AIX is defined" >&5
     894echo "configure:895: checking whether _AIX is defined" >&5
    893895if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
    894896  echo $ac_n "(cached) $ac_c" 1>&6
    895897else
    896898  cat > conftest.$ac_ext <<EOF
    897 #line 898 "configure"
     899#line 900 "configure"
    898900#include "confdefs.h"
    899901#ifdef _AIX
    … …  
    921923
    922924echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
    923 echo "configure:924: checking for atof in -lm" >&5
     925echo "configure:926: checking for atof in -lm" >&5
    924926ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
    925927if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    929931LIBS="-lm  $LIBS"
    930932cat > conftest.$ac_ext <<EOF
    931 #line 932 "configure"
     933#line 934 "configure"
    932934#include "confdefs.h"
    933935/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    940942; return 0; }
    941943EOF
    942 if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     944if { (eval echo configure:945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    943945  rm -rf conftest*
    944946  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    968970
    969971echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
    970 echo "configure:971: checking for socket in -lbsd" >&5
     972echo "configure:973: checking for socket in -lbsd" >&5
    971973ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
    972974if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    976978LIBS="-lbsd  $LIBS"
    977979cat > conftest.$ac_ext <<EOF
    978 #line 979 "configure"
     980#line 981 "configure"
    979981#include "confdefs.h"
    980982/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    987989; return 0; }
    988990EOF
    989 if { (eval echo configure:990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     991if { (eval echo configure:992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    990992  rm -rf conftest*
    991993  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    10151017
    10161018echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
    1017 echo "configure:1018: checking for listen in -lsocket" >&5
     1019echo "configure:1020: checking for listen in -lsocket" >&5
    10181020ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
    10191021if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    10231025LIBS="-lsocket  $LIBS"
    10241026cat > conftest.$ac_ext <<EOF
    1025 #line 1026 "configure"
     1027#line 1028 "configure"
    10261028#include "confdefs.h"
    10271029/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    10341036; return 0; }
    10351037EOF
    1036 if { (eval echo configure:1037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1038if { (eval echo configure:1039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    10371039  rm -rf conftest*
    10381040  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    10621064
    10631065echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
    1064 echo "configure:1065: checking for gethostbyname in -lnsl" >&5
     1066echo "configure:1067: checking for gethostbyname in -lnsl" >&5
    10651067ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
    10661068if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    10701072LIBS="-lnsl  $LIBS"
    10711073cat > conftest.$ac_ext <<EOF
    1072 #line 1073 "configure"
     1074#line 1075 "configure"
    10731075#include "confdefs.h"
    10741076/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    10811083; return 0; }
    10821084EOF
    1083 if { (eval echo configure:1084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1085if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    10841086  rm -rf conftest*
    10851087  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11091111
    11101112echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
    1111 echo "configure:1112: checking for mpq_init in -lgmp" >&5
     1113echo "configure:1114: checking for mpq_init in -lgmp" >&5
    11121114ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
    11131115if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    11171119LIBS="-lgmp  $LIBS"
    11181120cat > conftest.$ac_ext <<EOF
    1119 #line 1120 "configure"
     1121#line 1122 "configure"
    11201122#include "confdefs.h"
    11211123/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11281130; return 0; }
    11291131EOF
    1130 if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1132if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    11311133  rm -rf conftest*
    11321134  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11561158
    11571159echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
    1158 echo "configure:1159: checking for mpz_init in -lsmallgmp" >&5
     1160echo "configure:1161: checking for mpz_init in -lsmallgmp" >&5
    11591161ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
    11601162if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    11641166LIBS="-lsmallgmp  $LIBS"
    11651167cat > conftest.$ac_ext <<EOF
    1166 #line 1167 "configure"
     1168#line 1169 "configure"
    11671169#include "confdefs.h"
    11681170/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11751177; return 0; }
    11761178EOF
    1177 if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1179if { (eval echo configure:1180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    11781180  rm -rf conftest*
    11791181  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12031205
    12041206echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
    1205 echo "configure:1206: checking for IMP_PutGmpInt in -lMP" >&5
     1207echo "configure:1208: checking for IMP_PutGmpInt in -lMP" >&5
    12061208ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
    12071209if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    12111213LIBS="-lMP  $LIBS"
    12121214cat > conftest.$ac_ext <<EOF
    1213 #line 1214 "configure"
     1215#line 1216 "configure"
    12141216#include "confdefs.h"
    12151217/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12221224; return 0; }
    12231225EOF
    1224 if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1226if { (eval echo configure:1227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    12251227  rm -rf conftest*
    12261228  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12501252
    12511253echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
    1252 echo "configure:1253: checking for MPT_GetTree in -lMPT" >&5
     1254echo "configure:1255: checking for MPT_GetTree in -lMPT" >&5
    12531255ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
    12541256if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    12581260LIBS="-lMPT  $LIBS"
    12591261cat > conftest.$ac_ext <<EOF
    1260 #line 1261 "configure"
     1262#line 1263 "configure"
    12611263#include "confdefs.h"
    12621264/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12691271; return 0; }
    12701272EOF
    1271 if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1273if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    12721274  rm -rf conftest*
    12731275  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12971299
    12981300echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
    1299 echo "configure:1300: checking for atof in -lsingcf" >&5
     1301echo "configure:1302: checking for atof in -lsingcf" >&5
    13001302ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
    13011303if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    13051307LIBS="-lsingcf  $LIBS"
    13061308cat > conftest.$ac_ext <<EOF
    1307 #line 1308 "configure"
     1309#line 1310 "configure"
    13081310#include "confdefs.h"
    13091311/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    13161318; return 0; }
    13171319EOF
    1318 if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1320if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    13191321  rm -rf conftest*
    13201322  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13441346
    13451347echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
    1346 echo "configure:1347: checking for atof in -lsingfac" >&5
     1348echo "configure:1349: checking for atof in -lsingfac" >&5
    13471349ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
    13481350if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    13521354LIBS="-lsingfac  $LIBS"
    13531355cat > conftest.$ac_ext <<EOF
    1354 #line 1355 "configure"
     1356#line 1357 "configure"
    13551357#include "confdefs.h"
    13561358/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    13631365; return 0; }
    13641366EOF
    1365 if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
     1367if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    13661368  rm -rf conftest*
    13671369  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13951397ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    13961398echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1397 echo "configure:1398: checking for $ac_hdr" >&5
     1399echo "configure:1400: checking for $ac_hdr" >&5
    13981400if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    13991401  echo $ac_n "(cached) $ac_c" 1>&6
    14001402else
    14011403  cat > conftest.$ac_ext <<EOF
    1402 #line 1403 "configure"
     1404#line 1405 "configure"
    14031405#include "confdefs.h"
    14041406#include <$ac_hdr>
    14051407EOF
    14061408ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1407 { (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1409{ (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    14081410ac_err=`grep -v '^ *+' conftest.out`
    14091411if test -z "$ac_err"; then
    … …  
    15301532
    15311533echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
    1532 echo "configure:1533: checking whether to configure and build gmp lib" >&5
     1534echo "configure:1535: checking whether to configure and build gmp lib" >&5
    15331535if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
    15341536  if test "$ac_gmp_ok" != yes && test -d gmp; then
    … …  
    15561558
    15571559echo $ac_n "checking whether to configure and build smallgmp lib""... $ac_c" 1>&6
    1558 echo "configure:1559: checking whether to configure and build smallgmp lib" >&5
     1560echo "configure:1561: checking whether to configure and build smallgmp lib" >&5
    15591561if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
    15601562  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
    … …  
    15951597
    15961598echo $ac_n "checking whether to configure and build MP lib""... $ac_c" 1>&6
    1597 echo "configure:1598: checking whether to configure and build MP lib" >&5
     1599echo "configure:1600: checking whether to configure and build MP lib" >&5
    15981600if test "$enable_MP" != yes && test "$enable_MP" != no; then
    15991601  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
    … …  
    16221624  echo "$ac_t""no" 1>&6
    16231625fi
    1624 
    16251626 
    16261627echo $ac_n "checking whether to configure and build factory lib""... $ac_c" 1>&6
    1627 echo "configure:1628: checking whether to configure and build factory lib" >&5
     1628echo "configure:1629: checking whether to configure and build factory lib" >&5
    16281629if test "$enable_factory" != yes && test "$enable_factory" != no; then
    16291630  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
    … …  
    16501651
    16511652echo $ac_n "checking whether to configure and build libfac lib""... $ac_c" 1>&6
    1652 echo "configure:1653: checking whether to configure and build libfac lib" >&5
     1653echo "configure:1654: checking whether to configure and build libfac lib" >&5
    16531654if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
    16541655  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
    … …  
    16801681
    16811682echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
    1682 echo "configure:1683: checking whether to configure and build sgroup lib" >&5
     1683echo "configure:1684: checking whether to configure and build sgroup lib" >&5
    16831684if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
    16841685  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
    … …  
    17091710fi
    17101711
    1711 
    17121712echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
    17131713echo "configure:1714: checking whether to configure and build Singular" >&5
    … …  
    17351735
    17361736
    1737 echo $ac_n "checking wich apint package to use""... $ac_c" 1>&6
    1738 echo "configure:1739: checking wich apint package to use" >&5
     1737echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
     1738echo "configure:1739: checking which apint package to use" >&5
    17391739if test "$with_apint" = gmp; then
    17401740  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    … …  
    17541754    echo "$ac_t""gmp" 1>&6
    17551755    ac_configure_args="$ac_configure_args --with-apint=gmp"
    1756 else
     1756else 
    17571757   echo "$ac_t""smallgmp" 1>&6
    17581758   ac_configure_args="$ac_configure_args --with-apint=smallgmp"
    … …  
    18161816fi
    18171817
    1818 
    18191818echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
    1820 echo "configure:1821: checking whether to use with Singular" >&5
     1819echo "configure:1820: checking whether to use with Singular" >&5
    18211820if test "$with_Singular" != no && test "$with_Singular" != yes; then
    18221821  if test "$enable_Singular" = yes; then
    … …  
    18331832  echo "$ac_t""no" 1>&6
    18341833fi
     1834
    18351835
    18361836SUBDIRS=""
    … …  
    20542054s%@SINGULAR_MINOR_VERSION@%$SINGULAR_MINOR_VERSION%g
    20552055s%@SINGULAR_SUB_VERSION@%$SINGULAR_SUB_VERSION%g
    2056 s%@SINGULAR@%$SINGULAR%g
    20572056s%@CC@%$CC%g
    20582057s%@CPP@%$CPP%g
     2058s%@SINGULAR@%$SINGULAR%g
    20592059s%@SET_MAKE@%$SET_MAKE%g
    20602060s%@SUBDIRS@%$SUBDIRS%g

  • configure.in

    rb9624d6 r9bc556  
    2626AC_SUBST(SINGULAR_SUB_VERSION)
    2727
    28 # construct name of installed Singular executable
    29 SINGULAR=${bindir}/Singular-${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}
    30 export SINGULAR
    31 AC_SUBST(SINGULAR)
    32 
    3328
    3429dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    … …  
    8176fi
    8277
     78# construct name of installed Singular executable
     79SINGULAR=${bindir}/Singular-${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}
     80export SINGULAR
     81AC_SUBST(SINGULAR)
    8382
    8483dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    … …  
    182181AC_ARG_WITH(gmp, \
    183182 [ --with-apint=PACKAGE    use PACKAGE for arbitary integer arithmetic
    184                           where PACKAGE can be gmp or smallgmp])
     183                          where PACKAGE can be gmp or smallgmp
     184All additional --enable and --with options are passed to subsequent calls
     185to configure of the packages to be built. See also configure --help in
     186these packages (resp. subdirs). ])
    185187
    186188dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    … …  
    405407    AC_MSG_RESULT(gmp)
    406408    ac_configure_args="$ac_configure_args --with-apint=gmp"
    407 else
     409else
     410dnl now we are sure that we have the smallgmp --otherwise enable
     411dnl checks had thrown an error
    408412   AC_MSG_RESULT(smallgmp)
    409413   ac_configure_args="$ac_configure_args --with-apint=smallgmp"

  • doc/Makefile.in

    rb9624d6 r9bc556  
    9595        /bin/rm -f *.dvi singular.hlp configure ${SINGULAR_OBJS}
    9696
    97 singular.tex :  singular.doc  doc2tex ${SINGULAR}
    98         ./doc2tex ${SINGULAR} singular
    99         echo expect one error
    100         -grep "error occurred" singular.tex
    101 
    10297%.tex: %.doc doc2tex ${SINGULAR}
    10398        ./doc2tex ${SINGULAR} $*
    10499        -grep "error occurred" $@
    105 
    106100
    107101doc2tex: doc2tex.c
    … …  
    109103
    110104${SINGULAR}:
    111         cd ${prefix}; ${MAKE} ${SINGULAR}
     105        cd ..; ${MAKE} ${SINGULAR}
    112106
    113107Makefile: Makefile.in
    114         cd ${prefix}; ${MAKE} Makefile
     108        cd ..; ${MAKE} Makefile
    115109
    116110#examples.tex: examples.doc
Note: See TracChangeset for help on using the changeset viewer.