Changeset b85a6c in git


Ignore:
Timestamp:
Apr 25, 1997, 8:35:11 PM (27 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
592f6b13721f1df818bbd5a7e150c08ade6bae05
Parents:
7fa4ba1d7ea81d3e4ff89f1c02f4559bbcbcfc1e
Message:
Fri Apr 25 16:59:31 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* fixed sys/times.h and sys/time.h confusion


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

Legend:

Unmodified
Added
Removed

  • Singular/ChangeLog

    r7fa4ba rb85a6c  
    11Fri Apr 25 16:59:31 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
     2
     3        * fixed sys/times.h and sys/time.h confusion
    24
    35        * Various changes to reflect new configure (versions defined in

  • Singular/Makefile.in

    r7fa4ba rb85a6c  
    141141        /bin/rm gentable
    142142
    143 version.h: ${SOURCES} ${HEADERS} Makefile.in configure.in
     143version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in configure.in
    144144        echo "#define VERSION_ID " `date '+%y%m%d%H'` >version.h
    145145
    146 mod2.h: configure mod2.h.in
     146mod2.h: configure mod2.h.in Makefile.in
    147147        ./configure ${CONFIGURE_INPUT}
    148 
    149 Makefile: configure Makefile.in
    150         ./configure ${CONFIGURE_INPUT}
     148        touch -r mod2.h configure configure.in
    151149
    152150configure: configure.in
    … …  
    189187distclean: clean
    190188        -rm -f depend *.inc ${DIST_NAME}
    191         -rm Singular* Makefile TAGS* config.status config.cache config.log
     189        -rm mod2.h Makefile TAGS* config.status config.cache config.log
    192190
    193191maintainer-clean: distlean

  • Singular/cntrlc.cc

    r7fa4ba rb85a6c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: cntrlc.cc,v 1.8 1997-04-25 15:03:54 obachman Exp $ */
     4/* $Id: cntrlc.cc,v 1.9 1997-04-25 18:35:06 obachman Exp $ */
    55/*
    66* ABSTRACT - interupt handling
    … …  
    2828#include <sys/types.h>
    2929
    30 #if TIME_WITH_SYS_TIME
     30#ifdef TIME_WITH_SYS_TIME
    3131# include <time.h>
    32 # include <sys/times.h>
    33 #else
    34 # if HAVE_SYS_TIME_H
    35 #   include <sys/times.h>
     32# ifdef HAVE_SYS_TIME_H
     33#   include <sys/time.h>
     34# endif
     35#else
     36# ifdef HAVE_SYS_TIME_H
     37#   include <sys/time.h>
    3638# else
    3739#   include <time.h>
    3840# endif
     41#endif
     42#ifdef HAVE_SYS_TIMES_H
     43#include <sys/times.h>
    3944#endif
    4045

  • Singular/configure

    r7fa4ba rb85a6c  
    788788  CXX=gcc
    789789fi 
    790 if test ${prefix} != "/usr/local" || test ${libdir} != "${prefix}/lib"; then
    791   LDFLAGS="-L${libdir} ${LDFLAGS}"
    792 fi
    793 
    794 if test ${prefix} != "/usr/local" || test ${includedir} != "${prefix}/include"; then
    795   CPPFLAGS="-I${includedir} ${CPPFLAGS}"
    796 fi
     790
     791LDFLAGS="-L${libdir} ${LDFLAGS}"
     792CPPFLAGS="-I${includedir} ${CPPFLAGS}"
    797793
    798794# Extract the first word of "flex", so it can be a program name with args.
    … …  
    838834LIBS="-l$ac_lib  $LIBS"
    839835cat > conftest.$ac_ext <<EOF
    840 #line 841 "configure"
     836#line 837 "configure"
    841837#include "confdefs.h"
    842838/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    848844; return 0; }
    849845EOF
    850 if { (eval echo configure:851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     846if { (eval echo configure:847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    851847  rm -rf conftest*
    852848  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11071103LIBS="-lbsd  $LIBS"
    11081104cat > conftest.$ac_ext <<EOF
    1109 #line 1110 "configure"
     1105#line 1106 "configure"
    11101106#include "confdefs.h"
    11111107/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11171113; return 0; }
    11181114EOF
    1119 if { (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1115if { (eval echo configure:1116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11201116  rm -rf conftest*
    11211117  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11461142LIBS="-lncurses  $LIBS"
    11471143cat > conftest.$ac_ext <<EOF
    1148 #line 1149 "configure"
     1144#line 1145 "configure"
    11491145#include "confdefs.h"
    11501146/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11561152; return 0; }
    11571153EOF
    1158 if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1154if { (eval echo configure:1155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11591155  rm -rf conftest*
    11601156  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    11871183LIBS="-lcurses  $LIBS"
    11881184cat > conftest.$ac_ext <<EOF
    1189 #line 1190 "configure"
     1185#line 1186 "configure"
    11901186#include "confdefs.h"
    11911187/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    11971193; return 0; }
    11981194EOF
    1199 if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1195if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12001196  rm -rf conftest*
    12011197  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12281224LIBS="-ltermcap  $LIBS"
    12291225cat > conftest.$ac_ext <<EOF
    1230 #line 1231 "configure"
     1226#line 1227 "configure"
    12311227#include "confdefs.h"
    12321228/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12381234; return 0; }
    12391235EOF
    1240 if { (eval echo configure:1241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1236if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12411237  rm -rf conftest*
    12421238  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    12741270LIBS="-lreadline  $LIBS"
    12751271cat > conftest.$ac_ext <<EOF
    1276 #line 1277 "configure"
     1272#line 1273 "configure"
    12771273#include "confdefs.h"
    12781274/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    12841280; return 0; }
    12851281EOF
    1286 if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1282if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    12871283  rm -rf conftest*
    12881284  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13241320  # not just through cpp.
    13251321  cat > conftest.$ac_ext <<EOF
    1326 #line 1327 "configure"
     1322#line 1323 "configure"
    13271323#include "confdefs.h"
    13281324#include <assert.h>
    … …  
    13301326EOF
    13311327ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1332 { (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1328{ (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13331329ac_err=`grep -v '^ *+' conftest.out`
    13341330if test -z "$ac_err"; then
    … …  
    13391335  CPP="${CC-cc} -E -traditional-cpp"
    13401336  cat > conftest.$ac_ext <<EOF
    1341 #line 1342 "configure"
     1337#line 1338 "configure"
    13421338#include "confdefs.h"
    13431339#include <assert.h>
    … …  
    13451341EOF
    13461342ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1347 { (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1343{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13481344ac_err=`grep -v '^ *+' conftest.out`
    13491345if test -z "$ac_err"; then
    … …  
    13731369else
    13741370  cat > conftest.$ac_ext <<EOF
    1375 #line 1376 "configure"
     1371#line 1372 "configure"
    13761372#include "confdefs.h"
    13771373#include <$ac_hdr>
    13781374EOF
    13791375ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1380 { (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1376{ (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13811377ac_err=`grep -v '^ *+' conftest.out`
    13821378if test -z "$ac_err"; then
    … …  
    14321428LIBS="-ldbm  $LIBS"
    14331429cat > conftest.$ac_ext <<EOF
    1434 #line 1435 "configure"
     1430#line 1431 "configure"
    14351431#include "confdefs.h"
    14361432/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    14421438; return 0; }
    14431439EOF
    1444 if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1440if { (eval echo configure:1441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    14451441  rm -rf conftest*
    14461442  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    14691465LIBS="-lgbm  $LIBS"
    14701466cat > conftest.$ac_ext <<EOF
    1471 #line 1472 "configure"
     1467#line 1468 "configure"
    14721468#include "confdefs.h"
    14731469/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    14791475; return 0; }
    14801476EOF
    1481 if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1477if { (eval echo configure:1478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    14821478  rm -rf conftest*
    14831479  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15141510LIBS="-ldld  $LIBS"
    15151511cat > conftest.$ac_ext <<EOF
    1516 #line 1517 "configure"
     1512#line 1513 "configure"
    15171513#include "confdefs.h"
    15181514/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    15241520; return 0; }
    15251521EOF
    1526 if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1522if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    15271523  rm -rf conftest*
    15281524  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15561552LIBS="-lgmp  $LIBS"
    15571553cat > conftest.$ac_ext <<EOF
    1558 #line 1559 "configure"
     1554#line 1555 "configure"
    15591555#include "confdefs.h"
    15601556/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    15661562; return 0; }
    15671563EOF
    1568 if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1564if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    15691565  rm -rf conftest*
    15701566  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    15981594else
    15991595  cat > conftest.$ac_ext <<EOF
    1600 #line 1601 "configure"
     1596#line 1597 "configure"
    16011597#include "confdefs.h"
    16021598#include <$ac_hdr>
    16031599EOF
    16041600ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1605 { (eval echo configure:1606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1601{ (eval echo configure:1602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    16061602ac_err=`grep -v '^ *+' conftest.out`
    16071603if test -z "$ac_err"; then
    … …  
    16611657LIBS="-lMPT -lMP $LIBS"
    16621658cat > conftest.$ac_ext <<EOF
    1663 #line 1664 "configure"
     1659#line 1660 "configure"
    16641660#include "confdefs.h"
    16651661/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    16711667; return 0; }
    16721668EOF
    1673 if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1669if { (eval echo configure:1670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    16741670  rm -rf conftest*
    16751671  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    17041700else
    17051701  cat > conftest.$ac_ext <<EOF
    1706 #line 1707 "configure"
     1702#line 1703 "configure"
    17071703#include "confdefs.h"
    17081704#include <$ac_hdr>
    17091705EOF
    17101706ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1711 { (eval echo configure:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1707{ (eval echo configure:1708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    17121708ac_err=`grep -v '^ *+' conftest.out`
    17131709if test -z "$ac_err"; then
    … …  
    17661762LIBS="-lsingcf  $LIBS"
    17671763cat > conftest.$ac_ext <<EOF
    1768 #line 1769 "configure"
     1764#line 1765 "configure"
    17691765#include "confdefs.h"
    17701766/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    17761772; return 0; }
    17771773EOF
    1778 if { (eval echo configure:1779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1774if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    17791775  rm -rf conftest*
    17801776  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    18091805else
    18101806  cat > conftest.$ac_ext <<EOF
    1811 #line 1812 "configure"
     1807#line 1808 "configure"
    18121808#include "confdefs.h"
    18131809#include <$ac_hdr>
    18141810EOF
    18151811ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1816 { (eval echo configure:1817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1812{ (eval echo configure:1813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    18171813ac_err=`grep -v '^ *+' conftest.out`
    18181814if test -z "$ac_err"; then
    … …  
    18731869LIBS="-lsinglibfac  $LIBS"
    18741870cat > conftest.$ac_ext <<EOF
    1875 #line 1876 "configure"
     1871#line 1872 "configure"
    18761872#include "confdefs.h"
    18771873/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    18831879; return 0; }
    18841880EOF
    1885 if { (eval echo configure:1886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1881if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    18861882  rm -rf conftest*
    18871883  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    19161912else
    19171913  cat > conftest.$ac_ext <<EOF
    1918 #line 1919 "configure"
     1914#line 1915 "configure"
    19191915#include "confdefs.h"
    19201916#include <$ac_hdr>
    19211917EOF
    19221918ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1923 { (eval echo configure:1924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1919{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19241920ac_err=`grep -v '^ *+' conftest.out`
    19251921if test -z "$ac_err"; then
    … …  
    19771973else
    19781974cat > conftest.$ac_ext <<EOF
    1979 #line 1980 "configure"
     1975#line 1976 "configure"
    19801976#include "confdefs.h"
    19811977main(){return(0);}
    19821978EOF
    1983 { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     1979{ (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    19841980if test -s conftest && (./conftest; exit) 2>/dev/null; then
    19851981  ac_cv_c_cross=no
    … …  
    19991995else
    20001996  cat > conftest.$ac_ext <<EOF
    2001 #line 2002 "configure"
     1997#line 1998 "configure"
    20021998#include "confdefs.h"
    20031999#include <stdlib.h>
    … …  
    20072003EOF
    20082004ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2009 { (eval echo configure:2010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2005{ (eval echo configure:2006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    20102006ac_err=`grep -v '^ *+' conftest.out`
    20112007if test -z "$ac_err"; then
    … …  
    20222018  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    20232019cat > conftest.$ac_ext <<EOF
    2024 #line 2025 "configure"
     2020#line 2021 "configure"
    20252021#include "confdefs.h"
    20262022#include <string.h>
    … …  
    20402036  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    20412037cat > conftest.$ac_ext <<EOF
    2042 #line 2043 "configure"
     2038#line 2039 "configure"
    20432039#include "confdefs.h"
    20442040#include <stdlib.h>
    … …  
    20612057else
    20622058cat > conftest.$ac_ext <<EOF
    2063 #line 2064 "configure"
     2059#line 2060 "configure"
    20642060#include "confdefs.h"
    20652061#include <ctype.h>
    … …  
    20722068
    20732069EOF
    2074 { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2070{ (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    20752071if test -s conftest && (./conftest; exit) 2>/dev/null; then
    20762072  :
    … …  
    21002096else
    21012097  cat > conftest.$ac_ext <<EOF
    2102 #line 2103 "configure"
     2098#line 2099 "configure"
    21032099#include "confdefs.h"
    21042100#include <$ac_hdr>
    21052101EOF
    21062102ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2107 { (eval echo configure:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2103{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21082104ac_err=`grep -v '^ *+' conftest.out`
    21092105if test -z "$ac_err"; then
    … …  
    21312127
    21322128
    2133 for ac_hdr in sys/file.h sys/ioctl.h sys/time.h
     2129for ac_hdr in sys/file.h sys/ioctl.h sys/time.h sys/times.h
    21342130do
    21352131ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
    … …  
    21392135else
    21402136  cat > conftest.$ac_ext <<EOF
    2141 #line 2142 "configure"
     2137#line 2138 "configure"
    21422138#include "confdefs.h"
    21432139#include <$ac_hdr>
    21442140EOF
    21452141ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2146 { (eval echo configure:2147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2142{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21472143ac_err=`grep -v '^ *+' conftest.out`
    21482144if test -z "$ac_err"; then
    … …  
    21742170else
    21752171  cat > conftest.$ac_ext <<EOF
    2176 #line 2177 "configure"
     2172#line 2173 "configure"
    21772173#include "confdefs.h"
    21782174
    … …  
    22242220; return 0; }
    22252221EOF
    2226 if { (eval echo configure:2227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2222if { (eval echo configure:2223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    22272223  rm -rf conftest*
    22282224  ac_cv_c_const=yes
    … …  
    22502246for ac_kw in inline __inline__ __inline; do
    22512247  cat > conftest.$ac_ext <<EOF
    2252 #line 2253 "configure"
     2248#line 2249 "configure"
    22532249#include "confdefs.h"
    22542250
    … …  
    22582254; return 0; }
    22592255EOF
    2260 if { (eval echo configure:2261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2256if { (eval echo configure:2257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    22612257  rm -rf conftest*
    22622258  ac_cv_c_inline=$ac_kw; break
    … …  
    22862282else
    22872283  cat > conftest.$ac_ext <<EOF
    2288 #line 2289 "configure"
     2284#line 2285 "configure"
    22892285#include "confdefs.h"
    22902286#include <sys/types.h>
    … …  
    23172313else
    23182314  cat > conftest.$ac_ext <<EOF
    2319 #line 2320 "configure"
     2315#line 2316 "configure"
    23202316#include "confdefs.h"
    23212317#include <sys/types.h>
    … …  
    23272323; return 0; }
    23282324EOF
    2329 if { (eval echo configure:2330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2325if { (eval echo configure:2326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    23302326  rm -rf conftest*
    23312327  ac_cv_header_time=yes
    … …  
    23512347else
    23522348  cat > conftest.$ac_ext <<EOF
    2353 #line 2354 "configure"
     2349#line 2350 "configure"
    23542350#include "confdefs.h"
    23552351#include <sys/types.h>
    … …  
    23602356; return 0; }
    23612357EOF
    2362 if { (eval echo configure:2363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2358if { (eval echo configure:2359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    23632359  rm -rf conftest*
    23642360  ac_cv_struct_tm=time.h
    … …  
    23872383else
    23882384  cat > conftest.$ac_ext <<EOF
    2389 #line 2390 "configure"
     2385#line 2386 "configure"
    23902386#include "confdefs.h"
    23912387#include <alloca.h>
    … …  
    23952391; return 0; }
    23962392EOF
    2397 if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2393if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    23982394  rm -rf conftest*
    23992395  ac_cv_header_alloca_h=yes
    … …  
    24192415else
    24202416  cat > conftest.$ac_ext <<EOF
    2421 #line 2422 "configure"
     2417#line 2418 "configure"
    24222418#include "confdefs.h"
    24232419
    … …  
    24432439; return 0; }
    24442440EOF
    2445 if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2441if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    24462442  rm -rf conftest*
    24472443  ac_cv_func_alloca=yes
    … …  
    24782474else
    24792475  cat > conftest.$ac_ext <<EOF
    2480 #line 2481 "configure"
     2476#line 2477 "configure"
    24812477#include "confdefs.h"
    24822478#if defined(CRAY) && ! defined(CRAY2)
    … …  
    25072503else
    25082504  cat > conftest.$ac_ext <<EOF
    2509 #line 2510 "configure"
     2505#line 2506 "configure"
    25102506#include "confdefs.h"
    25112507/* System header to define __stub macros and hopefully few prototypes,
    … …  
    25292525; return 0; }
    25302526EOF
    2531 if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2527if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    25322528  rm -rf conftest*
    25332529  eval "ac_cv_func_$ac_func=yes"
    … …  
    25612557else
    25622558cat > conftest.$ac_ext <<EOF
    2563 #line 2564 "configure"
     2559#line 2560 "configure"
    25642560#include "confdefs.h"
    25652561find_stack_direction ()
    … …  
    25802576}
    25812577EOF
    2582 { (eval echo configure:2583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2578{ (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    25832579if test -s conftest && (./conftest; exit) 2>/dev/null; then
    25842580  ac_cv_c_stack_direction=1
    … …  
    26042600    ac_pattern="Autoconf.*'x'"
    26052601  cat > conftest.$ac_ext <<EOF
    2606 #line 2607 "configure"
     2602#line 2603 "configure"
    26072603#include "confdefs.h"
    26082604#include <sgtty.h>
    … …  
    26222618  if test $ac_cv_prog_gcc_traditional = no; then
    26232619    cat > conftest.$ac_ext <<EOF
    2624 #line 2625 "configure"
     2620#line 2621 "configure"
    26252621#include "confdefs.h"
    26262622#include <termio.h>
    … …  
    26502646else
    26512647  cat > conftest.$ac_ext <<EOF
    2652 #line 2653 "configure"
     2648#line 2649 "configure"
    26532649#include "confdefs.h"
    26542650/* System header to define __stub macros and hopefully few prototypes,
    … …  
    26722668; return 0; }
    26732669EOF
    2674 if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2670if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    26752671  rm -rf conftest*
    26762672  eval "ac_cv_func_$ac_func=yes"
    … …  
    27022698else
    27032699cat > conftest.$ac_ext <<EOF
    2704 #line 2705 "configure"
     2700#line 2701 "configure"
    27052701#include "confdefs.h"
    27062702
    … …  
    27712767
    27722768EOF
    2773 { (eval echo configure:2774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2769{ (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    27742770if test -s conftest && (./conftest; exit) 2>/dev/null; then
    27752771  ac_cv_func_mmap=yes
    … …  
    27942790else
    27952791  cat > conftest.$ac_ext <<EOF
    2796 #line 2797 "configure"
     2792#line 2793 "configure"
    27972793#include "confdefs.h"
    27982794#include <sys/types.h>
    … …  
    28122808; return 0; }
    28132809EOF
    2814 if { (eval echo configure:2815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2810if { (eval echo configure:2811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    28152811  rm -rf conftest*
    28162812  ac_cv_type_signal=void
    … …  
    28342830else
    28352831  cat > conftest.$ac_ext <<EOF
    2836 #line 2837 "configure"
     2832#line 2833 "configure"
    28372833#include "confdefs.h"
    28382834/* System header to define __stub macros and hopefully few prototypes,
    … …  
    28562852; return 0; }
    28572853EOF
    2858 if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2854if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    28592855  rm -rf conftest*
    28602856  eval "ac_cv_func_vprintf=yes"
    … …  
    28822878else
    28832879  cat > conftest.$ac_ext <<EOF
    2884 #line 2885 "configure"
     2880#line 2881 "configure"
    28852881#include "confdefs.h"
    28862882/* System header to define __stub macros and hopefully few prototypes,
    … …  
    29042900; return 0; }
    29052901EOF
    2906 if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     2902if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    29072903  rm -rf conftest*
    29082904  eval "ac_cv_func__doprnt=yes"
    … …  
    29332929else
    29342930  cat > conftest.$ac_ext <<EOF
    2935 #line 2936 "configure"
     2931#line 2932 "configure"
    29362932#include "confdefs.h"
    29372933/* System header to define __stub macros and hopefully few prototypes,
    … …  
    29552951; return 0; }
    29562952EOF
    2957 if { (eval echo configure:2958: \"$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
    29582954  rm -rf conftest*
    29592955  eval "ac_cv_func_$ac_func=yes"
    … …  
    29872983else
    29882984cat > conftest.$ac_ext <<EOF
    2989 #line 2990 "configure"
     2985#line 2986 "configure"
    29902986#include "confdefs.h"
    29912987 int main() { if (-2 >> 1 == -1) exit(0); else exit(1); }
    29922988EOF
    2993 { (eval echo configure:2994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     2989{ (eval echo configure:2990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    29942990if test -s conftest && (./conftest; exit) 2>/dev/null; then
    29952991  ac_cv_shift=yes
    … …  
    30173013else
    30183014cat > conftest.$ac_ext <<EOF
    3019 #line 3020 "configure"
     3015#line 3016 "configure"
    30203016#include "confdefs.h"
    30213017 int main() {if (sizeof(int) == 4)  exit(0); else exit(1); }
    30223018EOF
    3023 { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3019{ (eval echo configure:3020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30243020if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30253021  ac_cv_sizeof_int_equals_four=yes
    … …  
    30473043else
    30483044cat > conftest.$ac_ext <<EOF
    3049 #line 3050 "configure"
     3045#line 3046 "configure"
    30503046#include "confdefs.h"
    30513047 int main() {if (sizeof(long) == sizeof(void*))  exit(0); else exit(1); }
    30523048EOF
    3053 { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3049{ (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30543050if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30553051  ac_cv_sizeof_long_equals_voidp=yes
    … …  
    30763072else
    30773073cat > conftest.$ac_ext <<EOF
    3078 #line 3079 "configure"
     3074#line 3075 "configure"
    30793075#include "confdefs.h"
    30803076#include <stdio.h>
    30813077 main() { char str21; if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
    30823078EOF
    3083 { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3079{ (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    30843080if test -s conftest && (./conftest; exit) 2>/dev/null; then
    30853081  ac_cv_returns_n_of_chars=yes
    … …  
    31093105else
    31103106cat > conftest.$ac_ext <<EOF
    3111 #line 3112 "configure"
     3107#line 3108 "configure"
    31123108#include "confdefs.h"
    31133109#include <stdio.h>
    … …  
    31203116}
    31213117EOF
    3122 { (eval echo configure:3123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
     3118{ (eval echo configure:3119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
    31233119if test -s conftest && (./conftest; exit) 2>/dev/null; then
    31243120  ac_cv_sizeof_voidp=`cat conftestval`

  • Singular/configure.in

    r7fa4ba rb85a6c  
    271271  AC_MSG_ERROR(Can not compile without limits.h unistd.h))
    272272
    273 AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/time.h)
     273AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/time.h sys/times.h)
    274274
    275275dnl

  • Singular/extra.cc

    r7fa4ba rb85a6c  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.8 1997-04-25 15:03:55 obachman Exp $ */
     4/* $Id: extra.cc,v 1.9 1997-04-25 18:35:09 obachman Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
    … …  
    1111#include <string.h>
    1212#include <ctype.h>
     13#include "mod2.h"
    1314
    1415#ifndef macintosh
    15 #if TIME_WITH_SYS_TIME
     16#ifdef TIME_WITH_SYS_TIME
    1617# include <time.h>
    17 # include <sys/times.h>
     18# ifdef HAVE_SYS_TIME_H
     19#   include <sys/time.h>
     20# endif
    1821#else
    19 # if HAVE_SYS_TIME_H
    20 #   include <sys/times.h>
     22# ifdef HAVE_SYS_TIME_H
     23#   include <sys/time.h>
    2124# else
    2225#   include <time.h>
    2326# endif
    2427#endif
     28#ifdef HAVE_SYS_TIMES_H
     29#include <sys/times.h>
     30#endif
    2531
    2632#include <unistd.h>
    2733#endif
    2834
    29 #include "mod2.h"
    3035#include "tok.h"
    3136#include "ipid.h"

  • Singular/mod2.h.in

    r7fa4ba rb85a6c  
    3838/* Define if you have sys/time.h */
    3939#undef HAVE_SYS_TIME_H
     40/* Define if you have sys/times.h */
     41#undef HAVE_SYS_TIMES_H
    4042/* Define if time.h and sys/time.h can be included at the same time */
    4143#undef TIME_WITH_SYS_TIME

  • Singular/timer.cc

    r7fa4ba rb85a6c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: timer.cc,v 1.7 1997-04-25 15:04:08 obachman Exp $ */
     4/* $Id: timer.cc,v 1.8 1997-04-25 18:35:11 obachman Exp $ */
    55
    66/*
    … …  
    4343#ifdef TIME_WITH_SYS_TIME
    4444# include <time.h>
    45 # include <sys/times.h>
     45# ifdef HAVE_SYS_TIME_H
     46#   include <sys/time.h>
     47# endif
    4648#else
    47 # if HAVE_SYS_TIME_H
    48 #   include <sys/times.h>
     49# ifdef HAVE_SYS_TIME_H
     50#   include <sys/time.h>
    4951# else
    5052#   include <time.h>
    5153# endif
    5254#endif
     55#ifdef HAVE_SYS_TIMES_H
     56#include <sys/times.h>
     57#endif
     58
    5359
    5460// need to be adjusted on your machine: the number of ticks per second: HZ
Note: See TracChangeset for help on using the changeset viewer.