Changeset 05fc79 in git


Ignore:
Timestamp:
May 6, 1997, 10:31:05 AM (27 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
9e5e191dde2d31704b667e7cc56dd7fa4431506e
Parents:
62bcaaad67d045162aa38c0840c82852cc7935d6
Message:
Tue May  6 08:29:57 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* added factorycheck target in Makefile.in

	* Makefile.in (configure): took out rules which automatically
	  reruns autoconf. Print out warning, instead

	* misc.cc, configure.in, mod2.h.in:
	    added SINGULAR_INFODIR to search for info files

	* configure.in: Added AC_SUBST(WITH_LIBFAC, WITH_MP,WITH_FACTORY)


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

Legend:

Unmodified
Added
Removed

  • Singular/ChangeLog

    r62bcaaa r05fc79  
     1Tue May  6 08:29:57 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     2
     3        * added factorycheck target in Makefile.in
     4
     5        * Makefile.in (configure): took out rules which automatically
     6          reruns autoconf. Print out warning, instead
     7
     8        * misc.cc, configure.in, mod2.h.in:
     9            added SINGULAR_INFODIR to search for info files
     10
     11        * configure.in: Added AC_SUBST(WITH_LIBFAC, WITH_MP, WITH_FACTORY)
     12
    113Mon May  5 10:31:15 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
    214

  • Singular/Makefile.in

    r62bcaaa r05fc79  
    5858# where the tests files are
    5959testdir         = tests
     60
     61##
     62## the configuration
     63##
     64WITH_MP         = @WITH_MP@
     65WITH_FACTORY    = @WITH_FACTORY@
     66WITH_LIBFAC     = @WITH_LIBFAC@
    6067
    6168##
    … …  
    183190
    184191configure: configure.in
    185         autoconf
     192        echo "You need to rerun autoconf. I am proceeding, for now."
     193        touch configure
     194#       autoconf
    186195
    187196##
    … …  
    246255check:  Singular ${testdir}/check ${testdir}/out.should
    247256        cd ${testdir}; SINGULARPATH=./../LIB/ ./check ./../Singular
    248         if test -n "@HAVE_MPSR@"; then echo; ${MAKE} mpcheck; fi
     257        if test "$WITH_MP" = yes; then echo; ${MAKE} mpcheck; fi
     258        if test "$WITH_FACTORY" = yes && test "$WITH_LIBFAC" = yes; then \
     259          ${MAKE} factorycheck;\
     260        fi     
     261                   
    249262
    250263mpcheck: Singular ${testdir}/mpcheck ${testdir}/mpcheck.data
    251264        cd ${testdir}; ./mpcheck `pwd`/.. mpcheck.data
    252265
     266factorycheck: Singular ${testdir}/comparecheck ${testdir}/fac_test.in \
     267                ${testdir}/fac_test.out
     268        SINGULARPATH=`pwd`/LIB; export SINGULARPATH; \
     269        PATH=`pwd`:${PATH}; export PATH;\
     270        cd ${testdir}; ./comparecheck fac_test.in fac_test.out
     271       
    253272##
    254273## miscellanous targets

  • Singular/configure

    r62bcaaa r05fc79  
    566566fi
    567567
     568if test "x$infodir" = 'x${prefix}/info'; then
     569  if test "x${prefix}" = xNONE; then
     570    singularinfodir=${ac_default_prefix}/info;
     571  else
     572    singularinfodir=${prefix}/info;
     573  fi
     574else
     575  singularinfodir=$infodir;
     576fi
    568577cat >> confdefs.h <<EOF
    569578#define SINGULAR_DATADIR "${singulardatadir}"
     579EOF
     580
     581cat >> confdefs.h <<EOF
     582#define SINGULAR_INFODIR "${singularinfodir}"
    570583EOF
    571584
    … …  
    667680#endif
    668681EOF
    669 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     682if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    670683  ac_cv_prog_gcc=yes
    671684else
    … …  
    719732  # not just through cpp.
    720733  cat > conftest.$ac_ext <<EOF
    721 #line 722 "configure"
     734#line 735 "configure"
    722735#include "confdefs.h"
    723736#include <assert.h>
    … …  
    725738EOF
    726739ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    727 { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     740{ (eval echo configure:741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    728741ac_err=`grep -v '^ *+' conftest.out`
    729742if test -z "$ac_err"; then
    … …  
    734747  CPP="${CC-cc} -E -traditional-cpp"
    735748  cat > conftest.$ac_ext <<EOF
    736 #line 737 "configure"
     749#line 750 "configure"
    737750#include "confdefs.h"
    738751#include <assert.h>
    … …  
    740753EOF
    741754ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    742 { (eval echo configure:743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     755{ (eval echo configure:756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    743756ac_err=`grep -v '^ *+' conftest.out`
    744757if test -z "$ac_err"; then
    … …  
    803816#endif
    804817EOF
    805 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     818if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    806819  ac_cv_prog_gxx=yes
    807820else
    … …  
    11031116LIBS="-lm  $LIBS"
    11041117cat > conftest.$ac_ext <<EOF
    1105 #line 1106 "configure"
     1118#line 1119 "configure"
    11061119#include "confdefs.h"
    11071120/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11131126; return 0; }
    11141127EOF
    1115 if { (eval echo configure:1116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1128if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11161129  rm -rf conftest*
    11171130  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11451158LIBS="-lbsd  $LIBS"
    11461159cat > conftest.$ac_ext <<EOF
    1147 #line 1148 "configure"
     1160#line 1161 "configure"
    11481161#include "confdefs.h"
    11491162/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11551168; return 0; }
    11561169EOF
    1157 if { (eval echo configure:1158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1170if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11581171  rm -rf conftest*
    11591172  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11891202LIBS="-lncurses  $LIBS"
    11901203cat > conftest.$ac_ext <<EOF
    1191 #line 1192 "configure"
     1204#line 1205 "configure"
    11921205#include "confdefs.h"
    11931206/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11991212; return 0; }
    12001213EOF
    1201 if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1214if { (eval echo configure:1215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12021215  rm -rf conftest*
    12031216  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12301243LIBS="-lcurses  $LIBS"
    12311244cat > conftest.$ac_ext <<EOF
    1232 #line 1233 "configure"
     1245#line 1246 "configure"
    12331246#include "confdefs.h"
    12341247/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12401253; return 0; }
    12411254EOF
    1242 if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1255if { (eval echo configure:1256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12431256  rm -rf conftest*
    12441257  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12711284LIBS="-ltermcap  $LIBS"
    12721285cat > conftest.$ac_ext <<EOF
    1273 #line 1274 "configure"
     1286#line 1287 "configure"
    12741287#include "confdefs.h"
    12751288/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12811294; return 0; }
    12821295EOF
    1283 if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1296if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12841297  rm -rf conftest*
    12851298  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13171330LIBS="-lreadline  $LIBS"
    13181331cat > conftest.$ac_ext <<EOF
    1319 #line 1320 "configure"
     1332#line 1333 "configure"
    13201333#include "confdefs.h"
    13211334/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    13271340; return 0; }
    13281341EOF
    1329 if { (eval echo configure:1330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1342if { (eval echo configure:1343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    13301343  rm -rf conftest*
    13311344  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13601373else
    13611374  cat > conftest.$ac_ext <<EOF
    1362 #line 1363 "configure"
     1375#line 1376 "configure"
    13631376#include "confdefs.h"
    13641377#include <$ac_hdr>
    13651378EOF
    13661379ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1367 { (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1380{ (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13681381ac_err=`grep -v '^ *+' conftest.out`
    13691382if test -z "$ac_err"; then
    … …  
    14191432LIBS="-ldbm  $LIBS"
    14201433cat > conftest.$ac_ext <<EOF
    1421 #line 1422 "configure"
     1434#line 1435 "configure"
    14221435#include "confdefs.h"
    14231436/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    14291442; return 0; }
    14301443EOF
    1431 if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1444if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    14321445  rm -rf conftest*
    14331446  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    14561469LIBS="-lgdbm  $LIBS"
    14571470cat > conftest.$ac_ext <<EOF
    1458 #line 1459 "configure"
     1471#line 1472 "configure"
    14591472#include "confdefs.h"
    14601473/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    14661479; return 0; }
    14671480EOF
    1468 if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1481if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    14691482  rm -rf conftest*
    14701483  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15011514LIBS="-ldld  $LIBS"
    15021515cat > conftest.$ac_ext <<EOF
    1503 #line 1504 "configure"
     1516#line 1517 "configure"
    15041517#include "confdefs.h"
    15051518/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    15111524; return 0; }
    15121525EOF
    1513 if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1526if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    15141527  rm -rf conftest*
    15151528  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15431556LIBS="-lgmp  $LIBS"
    15441557cat > conftest.$ac_ext <<EOF
    1545 #line 1546 "configure"
     1558#line 1559 "configure"
    15461559#include "confdefs.h"
    15471560/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    15531566; return 0; }
    15541567EOF
    1555 if { (eval echo configure:1556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1568if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    15561569  rm -rf conftest*
    15571570  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15831596else
    15841597  cat > conftest.$ac_ext <<EOF
    1585 #line 1586 "configure"
     1598#line 1599 "configure"
    15861599#include "confdefs.h"
    15871600#include <gmp.h>
    15881601EOF
    15891602ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1590 { (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1603{ (eval echo configure:1604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15911604ac_err=`grep -v '^ *+' conftest.out`
    15921605if test -z "$ac_err"; then
    … …  
    16281641fi
    16291642
     1643WITH_MP=no
    16301644if test "$with_MP" != no; then
    16311645  if test "$ac_gmp_ok" != yes; then
    … …  
    16411655LIBS="-lMP  $LIBS"
    16421656cat > conftest.$ac_ext <<EOF
    1643 #line 1644 "configure"
     1657#line 1658 "configure"
    16441658#include "confdefs.h"
    16451659/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    16511665; return 0; }
    16521666EOF
    1653 if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1667if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    16541668  rm -rf conftest*
    16551669  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    16831697LIBS="-lMPT  $LIBS"
    16841698cat > conftest.$ac_ext <<EOF
    1685 #line 1686 "configure"
     1699#line 1700 "configure"
    16861700#include "confdefs.h"
    16871701/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    16931707; return 0; }
    16941708EOF
    1695 if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1709if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    16961710  rm -rf conftest*
    16971711  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    17261740else
    17271741  cat > conftest.$ac_ext <<EOF
    1728 #line 1729 "configure"
     1742#line 1743 "configure"
    17291743#include "confdefs.h"
    17301744#include <$ac_hdr>
    17311745EOF
    17321746ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1733 { (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1747{ (eval echo configure:1748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    17341748ac_err=`grep -v '^ *+' conftest.out`
    17351749if test -z "$ac_err"; then
    … …  
    17641778
    17651779      NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
    1766       HAVE_MPSR=HAVE_MP
     1780      WITH_MP=yes
    17671781    elif test "$enable_MP" = yes; then
    17681782      cat >> confdefs.h <<\EOF
    … …  
    17711785
    17721786      NEED_LIBS="-lMPT -lMP ${NEED_LIBS}"
    1773       HAVE_MPSR=HAVE_MP
     1787      WITH_MP=yes
    17741788      echo "configure: warning: install MP before making Singular or configure --without-MP" 1>&2
    17751789    else
    … …  
    17801794
    17811795
     1796WITH_FACTORY=no
    17821797if test "$with_factory" != no; then
    17831798  if test "$ac_gmp_ok" != yes; then
    … …  
    17931808LIBS="-lsingcf  $LIBS"
    17941809cat > conftest.$ac_ext <<EOF
    1795 #line 1796 "configure"
     1810#line 1811 "configure"
    17961811#include "confdefs.h"
    17971812/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    18031818; return 0; }
    18041819EOF
    1805 if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1820if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    18061821  rm -rf conftest*
    18071822  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    18361851else
    18371852  cat > conftest.$ac_ext <<EOF
    1838 #line 1839 "configure"
     1853#line 1854 "configure"
    18391854#include "confdefs.h"
    18401855#include <$ac_hdr>
    18411856EOF
    18421857ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1843 { (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1858{ (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    18441859ac_err=`grep -v '^ *+' conftest.out`
    18451860if test -z "$ac_err"; then
    … …  
    18721887
    18731888      NEED_LIBS="-lsingcf ${NEED_LIBS}"
    1874       ac_factory_ok=yes
     1889      WITH_FACTORY=yes
    18751890    elif test "$enable_factory" = yes; then
    18761891      NEED_LIBS="-lsingcf ${NEED_LIBS}"
    … …  
    18791894EOF
    18801895
    1881       ac_factory_ok=yes
     1896      WITH_FACTORY=yes
    18821897      echo "configure: warning: install factory before making Singular or configure --without-factory" 1>&2
    18831898    else
    … …  
    18871902fi
    18881903
     1904
     1905WITH_LIBFAC=no
    18891906if test "$with_libfac" != no; then
    18901907  if test "$ac_factory_ok" != yes; then
    … …  
    19001917LIBS="-lsingfac  $LIBS"
    19011918cat > conftest.$ac_ext <<EOF
    1902 #line 1903 "configure"
     1919#line 1920 "configure"
    19031920#include "confdefs.h"
    19041921/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    19101927; return 0; }
    19111928EOF
    1912 if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1929if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    19131930  rm -rf conftest*
    19141931  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    19431960else
    19441961  cat > conftest.$ac_ext <<EOF
    1945 #line 1946 "configure"
     1962#line 1963 "configure"
    19461963#include "confdefs.h"
    19471964#include <$ac_hdr>
    19481965EOF
    19491966ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1950 { (eval echo configure:1951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1967{ (eval echo configure:1968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19511968ac_err=`grep -v '^ *+' conftest.out`
    19521969if test -z "$ac_err"; then
    … …  
    19791996EOF
    19801997
     1998      WITH_LIBFAC=yes
    19811999    elif test "$enable_libfac" = yes; then
    19822000      NEED_LIBS="-lsingfac ${NEED_LIBS}"
    … …  
    19852003EOF
    19862004
     2005      WITH_LIBFAC=yes
    19872006      echo "configure: warning: install libfac before making Singular or configure --without-libfac" 1>&2
    19882007    else
    … …  
    19952014
    19962015
     2016
    19972017# If we cannot run a trivial program, we must be cross compiling.
    19982018echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
    … …  
    20042024else
    20052025cat > conftest.$ac_ext <<EOF
    2006 #line 2007 "configure"
     2026#line 2027 "configure"
    20072027#include "confdefs.h"
    20082028main(){return(0);}
    20092029EOF
    2010 { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2030{ (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    20112031if test -s conftest && (./conftest; exit) 2>/dev/null; then
    20122032  ac_cv_c_cross=no
    … …  
    20262046else
    20272047  cat > conftest.$ac_ext <<EOF
    2028 #line 2029 "configure"
     2048#line 2049 "configure"
    20292049#include "confdefs.h"
    20302050#include <stdlib.h>
    … …  
    20342054EOF
    20352055ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2036 { (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2056{ (eval echo configure:2057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    20372057ac_err=`grep -v '^ *+' conftest.out`
    20382058if test -z "$ac_err"; then
    … …  
    20492069  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    20502070cat > conftest.$ac_ext <<EOF
    2051 #line 2052 "configure"
     2071#line 2072 "configure"
    20522072#include "confdefs.h"
    20532073#include <string.h>
    … …  
    20672087  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    20682088cat > conftest.$ac_ext <<EOF
    2069 #line 2070 "configure"
     2089#line 2090 "configure"
    20702090#include "confdefs.h"
    20712091#include <stdlib.h>
    … …  
    20882108else
    20892109cat > conftest.$ac_ext <<EOF
    2090 #line 2091 "configure"
     2110#line 2111 "configure"
    20912111#include "confdefs.h"
    20922112#include <ctype.h>
    … …  
    20992119
    21002120EOF
    2101 { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2121{ (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    21022122if test -s conftest && (./conftest; exit) 2>/dev/null; then
    21032123  :
    … …  
    21272147else
    21282148  cat > conftest.$ac_ext <<EOF
    2129 #line 2130 "configure"
     2149#line 2150 "configure"
    21302150#include "confdefs.h"
    21312151#include <$ac_hdr>
    21322152EOF
    21332153ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2134 { (eval echo configure:2135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2154{ (eval echo configure:2155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21352155ac_err=`grep -v '^ *+' conftest.out`
    21362156if test -z "$ac_err"; then
    … …  
    21662186else
    21672187  cat > conftest.$ac_ext <<EOF
    2168 #line 2169 "configure"
     2188#line 2189 "configure"
    21692189#include "confdefs.h"
    21702190#include <$ac_hdr>
    21712191EOF
    21722192ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2173 { (eval echo configure:2174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2193{ (eval echo configure:2194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21742194ac_err=`grep -v '^ *+' conftest.out`
    21752195if test -z "$ac_err"; then
    … …  
    22012221else
    22022222  cat > conftest.$ac_ext <<EOF
    2203 #line 2204 "configure"
     2223#line 2224 "configure"
    22042224#include "confdefs.h"
    22052225
    … …  
    22512271; return 0; }
    22522272EOF
    2253 if { (eval echo configure:2254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2273if { (eval echo configure:2274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    22542274  rm -rf conftest*
    22552275  ac_cv_c_const=yes
    … …  
    22772297for ac_kw in inline __inline__ __inline; do
    22782298  cat > conftest.$ac_ext <<EOF
    2279 #line 2280 "configure"
     2299#line 2300 "configure"
    22802300#include "confdefs.h"
    22812301
    … …  
    22852305; return 0; }
    22862306EOF
    2287 if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2307if { (eval echo configure:2308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    22882308  rm -rf conftest*
    22892309  ac_cv_c_inline=$ac_kw; break
    … …  
    23132333else
    23142334  cat > conftest.$ac_ext <<EOF
    2315 #line 2316 "configure"
     2335#line 2336 "configure"
    23162336#include "confdefs.h"
    23172337#include <sys/types.h>
    … …  
    23442364else
    23452365  cat > conftest.$ac_ext <<EOF
    2346 #line 2347 "configure"
     2366#line 2367 "configure"
    23472367#include "confdefs.h"
    23482368#include <sys/types.h>
    … …  
    23542374; return 0; }
    23552375EOF
    2356 if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2376if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    23572377  rm -rf conftest*
    23582378  ac_cv_header_time=yes
    … …  
    23782398else
    23792399  cat > conftest.$ac_ext <<EOF
    2380 #line 2381 "configure"
     2400#line 2401 "configure"
    23812401#include "confdefs.h"
    23822402#include <sys/types.h>
    … …  
    23872407; return 0; }
    23882408EOF
    2389 if { (eval echo configure:2390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2409if { (eval echo configure:2410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    23902410  rm -rf conftest*
    23912411  ac_cv_struct_tm=time.h
    … …  
    24142434else
    24152435  cat > conftest.$ac_ext <<EOF
    2416 #line 2417 "configure"
     2436#line 2437 "configure"
    24172437#include "confdefs.h"
    24182438#include <alloca.h>
    … …  
    24222442; return 0; }
    24232443EOF
    2424 if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2444if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    24252445  rm -rf conftest*
    24262446  ac_cv_header_alloca_h=yes
    … …  
    24462466else
    24472467  cat > conftest.$ac_ext <<EOF
    2448 #line 2449 "configure"
     2468#line 2469 "configure"
    24492469#include "confdefs.h"
    24502470
    … …  
    24702490; return 0; }
    24712491EOF
    2472 if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2492if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    24732493  rm -rf conftest*
    24742494  ac_cv_func_alloca=yes
    … …  
    25052525else
    25062526  cat > conftest.$ac_ext <<EOF
    2507 #line 2508 "configure"
     2527#line 2528 "configure"
    25082528#include "confdefs.h"
    25092529#if defined(CRAY) && ! defined(CRAY2)
    … …  
    25342554else
    25352555  cat > conftest.$ac_ext <<EOF
    2536 #line 2537 "configure"
     2556#line 2557 "configure"
    25372557#include "confdefs.h"
    25382558/* System header to define __stub macros and hopefully few prototypes,
    … …  
    25562576; return 0; }
    25572577EOF
    2558 if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2578if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    25592579  rm -rf conftest*
    25602580  eval "ac_cv_func_$ac_func=yes"
    … …  
    25882608else
    25892609cat > conftest.$ac_ext <<EOF
    2590 #line 2591 "configure"
     2610#line 2611 "configure"
    25912611#include "confdefs.h"
    25922612find_stack_direction ()
    … …  
    26072627}
    26082628EOF
    2609 { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2629{ (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    26102630if test -s conftest && (./conftest; exit) 2>/dev/null; then
    26112631  ac_cv_c_stack_direction=1
    … …  
    26312651    ac_pattern="Autoconf.*'x'"
    26322652  cat > conftest.$ac_ext <<EOF
    2633 #line 2634 "configure"
     2653#line 2654 "configure"
    26342654#include "confdefs.h"
    26352655#include <sgtty.h>
    … …  
    26492669  if test $ac_cv_prog_gcc_traditional = no; then
    26502670    cat > conftest.$ac_ext <<EOF
    2651 #line 2652 "configure"
     2671#line 2672 "configure"
    26522672#include "confdefs.h"
    26532673#include <termio.h>
    … …  
    26772697else
    26782698  cat > conftest.$ac_ext <<EOF
    2679 #line 2680 "configure"
     2699#line 2700 "configure"
    26802700#include "confdefs.h"
    26812701/* System header to define __stub macros and hopefully few prototypes,
    … …  
    26992719; return 0; }
    27002720EOF
    2701 if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2721if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    27022722  rm -rf conftest*
    27032723  eval "ac_cv_func_$ac_func=yes"
    … …  
    27292749else
    27302750cat > conftest.$ac_ext <<EOF
    2731 #line 2732 "configure"
     2751#line 2752 "configure"
    27322752#include "confdefs.h"
    27332753
    … …  
    27982818
    27992819EOF
    2800 { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2820{ (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    28012821if test -s conftest && (./conftest; exit) 2>/dev/null; then
    28022822  ac_cv_func_mmap=yes
    … …  
    28212841else
    28222842  cat > conftest.$ac_ext <<EOF
    2823 #line 2824 "configure"
     2843#line 2844 "configure"
    28242844#include "confdefs.h"
    28252845#include <sys/types.h>
    … …  
    28392859; return 0; }
    28402860EOF
    2841 if { (eval echo configure:2842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2861if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    28422862  rm -rf conftest*
    28432863  ac_cv_type_signal=void
    … …  
    28612881else
    28622882  cat > conftest.$ac_ext <<EOF
    2863 #line 2864 "configure"
     2883#line 2884 "configure"
    28642884#include "confdefs.h"
    28652885/* System header to define __stub macros and hopefully few prototypes,
    … …  
    28832903; return 0; }
    28842904EOF
    2885 if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2905if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    28862906  rm -rf conftest*
    28872907  eval "ac_cv_func_vprintf=yes"
    … …  
    29092929else
    29102930  cat > conftest.$ac_ext <<EOF
    2911 #line 2912 "configure"
     2931#line 2932 "configure"
    29122932#include "confdefs.h"
    29132933/* System header to define __stub macros and hopefully few prototypes,
    … …  
    29312951; return 0; }
    29322952EOF
    2933 if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2953if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    29342954  rm -rf conftest*
    29352955  eval "ac_cv_func__doprnt=yes"
    … …  
    29602980else
    29612981  cat > conftest.$ac_ext <<EOF
    2962 #line 2963 "configure"
     2982#line 2983 "configure"
    29632983#include "confdefs.h"
    29642984/* System header to define __stub macros and hopefully few prototypes,
    … …  
    29823002; return 0; }
    29833003EOF
    2984 if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     3004if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    29853005  rm -rf conftest*
    29863006  eval "ac_cv_func_$ac_func=yes"
    … …  
    30143034else
    30153035cat > conftest.$ac_ext <<EOF
    3016 #line 3017 "configure"
     3036#line 3037 "configure"
    30173037#include "confdefs.h"
    30183038 int main() { if (-2 >> 1 == -1) exit(0); else exit(1); }
    30193039EOF
    3020 { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3040{ (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30213041if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30223042  ac_cv_shift=yes
    … …  
    30443064else
    30453065cat > conftest.$ac_ext <<EOF
    3046 #line 3047 "configure"
     3066#line 3067 "configure"
    30473067#include "confdefs.h"
    30483068 int main() {if (sizeof(int) == 4)  exit(0); else exit(1); }
    30493069EOF
    3050 { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3070{ (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30513071if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30523072  ac_cv_sizeof_int_equals_four=yes
    … …  
    30743094else
    30753095cat > conftest.$ac_ext <<EOF
    3076 #line 3077 "configure"
     3096#line 3097 "configure"
    30773097#include "confdefs.h"
    30783098 int main() {if (sizeof(long) == sizeof(void*))  exit(0); else exit(1); }
    30793099EOF
    3080 { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3100{ (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30813101if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30823102  ac_cv_sizeof_long_equals_voidp=yes
    … …  
    31033123else
    31043124cat > conftest.$ac_ext <<EOF
    3105 #line 3106 "configure"
     3125#line 3126 "configure"
    31063126#include "confdefs.h"
    31073127#include <stdio.h>
    31083128 main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
    31093129EOF
    3110 { (eval echo configure:3111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3130{ (eval echo configure:3131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    31113131if test -s conftest && (./conftest; exit) 2>/dev/null; then
    31123132  ac_cv_returns_n_of_chars=yes
    … …  
    31363156else
    31373157cat > conftest.$ac_ext <<EOF
    3138 #line 3139 "configure"
     3158#line 3159 "configure"
    31393159#include "confdefs.h"
    31403160#include <stdio.h>
    … …  
    31473167}
    31483168EOF
    3149 { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3169{ (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    31503170if test -s conftest && (./conftest; exit) 2>/dev/null; then
    31513171  ac_cv_sizeof_voidp=`cat conftestval`
    … …  
    33053325s%@INSTALL_DATA@%$INSTALL_DATA%g
    33063326s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
    3307 s%@HAVE_MPSR@%$HAVE_MPSR%g
     3327s%@WITH_MP@%$WITH_MP%g
     3328s%@WITH_FACTORY@%$WITH_FACTORY%g
     3329s%@WITH_LIBFAC@%$WITH_LIBFAC%g
    33083330s%@NEED_LIBS@%$NEED_LIBS%g
    33093331s%@ALLOCA@%$ALLOCA%g

  • Singular/misc.cc

    r62bcaaa r05fc79  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: misc.cc,v 1.9 1997-05-02 15:10:20 Singular Exp $ */
     4/* $Id: misc.cc,v 1.10 1997-05-06 08:31:05 obachman Exp $ */
    55/*
    66* ABSTRACT:
    … …  
    173173#define HELP_NOT_OPEN  1
    174174#define HELP_NOT_FOUND 2
     175#ifndef macintosh
     176#define Index_File     SINGULAR_INFODIR "singular.hlp"
     177#define Help_File      SINGULAR_INFODIR "singular.hlp"
     178#else
    175179#define Index_File     "singular.hlp"
    176180#define Help_File      "singular.hlp"
     181#endif
    177182#define BUF_LEN        128
    178183#define IDX_LEN        64
    … …  
    371376      singular_manual(str);
    372377#else
    373       char tmp[100];
    374       sprintf(tmp,"info singular Index \"%s\"",str);
     378      char tmp[150];
     379      sprintf(tmp,"%s/singular.hlp", SINGULAR_INFODIR);
     380      if (!access(tmp, R_OK))
     381        sprintf(tmp, "info -f %s/singular.hlp Index \"%s\"",
     382                SINGULAR_INFODIR, str);
     383      else
     384        sprintf(tmp,"info singular Index \"%s\"",str);
    375385      system(tmp);
    376386#ifndef MSDOS

  • Singular/mod2.h.in

    r62bcaaa r05fc79  
    7676/* Define the data directory where Singular searches for libs and gftables */
    7777#define SINGULAR_DATADIR "/usr/local/share/Singular"
     78/* Define the info directory where Singular searches for help files */
     79#define SINGULAR_INFODIR "/usr/local/info"
    7880
    7981/*******************************************************************
Note: See TracChangeset for help on using the changeset viewer.