Changeset 460c1e1 in git


Ignore:
Timestamp:
Jul 19, 1999, 2:06:33 PM (24 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
b00a82cbecb96fbd56a19be975fa94c5c6ee3016
Parents:
a204eaabfd4864b4c4e333658414701e14bee58f
Message:
* increased version 1o 1-3-4
* parsing of help strings by doc2tex
* much better texi2html
* new directory layout for install in source tree


git-svn-id: file:///usr/local/Singular/svn/trunk@3292 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
23 added
12 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    ra204ea r460c1e1  
    5050          fi;); \
    5151        done
     52
     53install-doc:
     54        cd doc; make install
    5255
    5356##############################################################
  • Singular/Makefile.in

    ra204ea r460c1e1  
    2525# includes are taken from here
    2626includedir      = @includedir@
     27slibdir         = ${prefix}/LIB
     28
    2729
    2830##
     
    251253## install targets
    252254##
    253 install: all installbin
     255install: all installbin installslib
    254256
    255257installbin: Singular libparse
     
    264266        fi
    265267
     268installslib: LIB
     269        test -L ${slibdir} || (rm -rf ${slibdir}; ln -s  `pwd`/LIB ${slibdir})
    266270
    267271
  • Singular/libparse.l

    ra204ea r460c1e1  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 /* $Id: libparse.l,v 1.32 1999-07-01 12:49:48 obachman Exp $ */
     5/* $Id: libparse.l,v 1.33 1999-07-19 12:06:08 obachman Exp $ */
    66#include <stdio.h>
    77#include <string.h>
     
    254254#ifdef STANDALONE_PARSER
    255255               if (texinfo_out)
    256                  printf("$version = \"%s\";\n", libnamebuf);
     256               {
     257                 char *c = libnamebuf;
     258                 printf("$version = \"");
     259                 while (*c != '\0')
     260                 {
     261                    if (*c  == '$' || *c  == '@' || *c == '\\') putchar('\\');
     262                    putchar(*c);
     263                    c++;
     264                 }
     265                 printf("\";\n");
     266               }
    257267               else
    258268                 printf("Version:%s;\n", libnamebuf);
  • Singular/utils.cc

    ra204ea r460c1e1  
    154154  {
    155155    c = fgetc(fd);
    156     if (c == '@' || c == '$') putchar('\\');
     156    if (c == '@' || c == '$' || c == '\\') putchar('\\');
    157157    if (c != '\r') putchar(c);
    158158  }
  • configure

    ra204ea r460c1e1  
    589589   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" modules/tools/Makefile"
    590590fi
     591if test -d "emacs"; then
     592   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" emacs/Makefile"
     593fi
    591594
    592595echo $ac_n "checking uname for singular""... $ac_c" 1>&6
    593 echo "configure:594: checking uname for singular" >&5
     596echo "configure:597: checking uname for singular" >&5
    594597if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
    595598  echo $ac_n "(cached) $ac_c" 1>&6
     
    618621SINGULAR_MAJOR_VERSION=1
    619622SINGULAR_MINOR_VERSION=3
    620 SINGULAR_SUB_VERSION=3
     623SINGULAR_SUB_VERSION=4
    621624SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    622625SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
     
    636639set dummy gcc; ac_word=$2
    637640echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    638 echo "configure:639: checking for $ac_word" >&5
     641echo "configure:642: checking for $ac_word" >&5
    639642if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    640643  echo $ac_n "(cached) $ac_c" 1>&6
     
    666669set dummy cc; ac_word=$2
    667670echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    668 echo "configure:669: checking for $ac_word" >&5
     671echo "configure:672: checking for $ac_word" >&5
    669672if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    670673  echo $ac_n "(cached) $ac_c" 1>&6
     
    717720set dummy cl; ac_word=$2
    718721echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    719 echo "configure:720: checking for $ac_word" >&5
     722echo "configure:723: checking for $ac_word" >&5
    720723if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    721724  echo $ac_n "(cached) $ac_c" 1>&6
     
    749752
    750753echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    751 echo "configure:752: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     754echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    752755
    753756ac_ext=c
     
    760763cat > conftest.$ac_ext << EOF
    761764
    762 #line 763 "configure"
     765#line 766 "configure"
    763766#include "confdefs.h"
    764767
    765768main(){return(0);}
    766769EOF
    767 if { (eval echo configure:768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     770if { (eval echo configure:771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    768771  ac_cv_prog_cc_works=yes
    769772  # If we can't run a trivial program, we are probably using a cross compiler.
     
    791794fi
    792795echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    793 echo "configure:794: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     796echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    794797echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    795798cross_compiling=$ac_cv_prog_cc_cross
    796799
    797800echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    798 echo "configure:799: checking whether we are using GNU C" >&5
     801echo "configure:802: checking whether we are using GNU C" >&5
    799802if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    800803  echo $ac_n "(cached) $ac_c" 1>&6
     
    805808#endif
    806809EOF
    807 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     810if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    808811  ac_cv_prog_gcc=yes
    809812else
     
    824827CFLAGS=
    825828echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    826 echo "configure:827: checking whether ${CC-cc} accepts -g" >&5
     829echo "configure:830: checking whether ${CC-cc} accepts -g" >&5
    827830if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    828831  echo $ac_n "(cached) $ac_c" 1>&6
     
    856859
    857860echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    858 echo "configure:859: checking how to run the C preprocessor" >&5
     861echo "configure:862: checking how to run the C preprocessor" >&5
    859862# On Suns, sometimes $CPP names a directory.
    860863if test -n "$CPP" && test -d "$CPP"; then
     
    871874  # not just through cpp.
    872875  cat > conftest.$ac_ext <<EOF
    873 #line 874 "configure"
     876#line 877 "configure"
    874877#include "confdefs.h"
    875878#include <assert.h>
     
    877880EOF
    878881ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    879 { (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     882{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    880883ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    881884if test -z "$ac_err"; then
     
    888891  CPP="${CC-cc} -E -traditional-cpp"
    889892  cat > conftest.$ac_ext <<EOF
    890 #line 891 "configure"
     893#line 894 "configure"
    891894#include "confdefs.h"
    892895#include <assert.h>
     
    894897EOF
    895898ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    896 { (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     899{ (eval echo configure:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    897900ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    898901if test -z "$ac_err"; then
     
    905908  CPP="${CC-cc} -nologo -E"
    906909  cat > conftest.$ac_ext <<EOF
    907 #line 908 "configure"
     910#line 911 "configure"
    908911#include "confdefs.h"
    909912#include <assert.h>
     
    911914EOF
    912915ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    913 { (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     916{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    914917ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    915918if test -z "$ac_err"; then
     
    936939
    937940echo $ac_n "checking for AIX""... $ac_c" 1>&6
    938 echo "configure:939: checking for AIX" >&5
     941echo "configure:942: checking for AIX" >&5
    939942cat > conftest.$ac_ext <<EOF
    940 #line 941 "configure"
     943#line 944 "configure"
    941944#include "confdefs.h"
    942945#ifdef _AIX
     
    965968set dummy $ac_prog; ac_word=$2
    966969echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    967 echo "configure:968: checking for $ac_word" >&5
     970echo "configure:971: checking for $ac_word" >&5
    968971if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    969972  echo $ac_n "(cached) $ac_c" 1>&6
     
    9971000set dummy latex2html; ac_word=$2
    9981001echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    999 echo "configure:1000: checking for $ac_word" >&5
     1002echo "configure:1003: checking for $ac_word" >&5
    10001003if eval "test \"`echo '$''{'ac_cv_prog_LATEX2HTML'+set}'`\" = set"; then
    10011004  echo $ac_n "(cached) $ac_c" 1>&6
     
    10241027
    10251028echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    1026 echo "configure:1027: checking whether ln -s works" >&5
     1029echo "configure:1030: checking whether ln -s works" >&5
    10271030if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    10281031  echo $ac_n "(cached) $ac_c" 1>&6
     
    10561059set dummy texi2html; ac_word=$2
    10571060echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1058 echo "configure:1059: checking for $ac_word" >&5
     1061echo "configure:1062: checking for $ac_word" >&5
    10591062if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
    10601063  echo $ac_n "(cached) $ac_c" 1>&6
     
    11041107# expand bindir
    11051108if test "x$bindir" = 'x${exec_prefix}/bin'; then
    1106   bindir="${exec_prefix}/bin"
     1109  bindir="${exec_prefix}/"
    11071110  ac_configure_args="$ac_configure_args --bindir=${bindir}"
    11081111fi
     
    11101113# expand libdir
    11111114if test "x$libdir" = 'x${exec_prefix}/lib'; then
    1112   libdir="${exec_prefix}/lib/${SINGULAR_VERSION}"
     1115  libdir="${exec_prefix}/lib/"
    11131116  ac_configure_args="$ac_configure_args --libdir=${libdir}"
    11141117fi
     
    11161119# expand includedir
    11171120if test "x$includedir" = 'x${prefix}/include'; then
    1118   includedir="${exec_prefix}/include/${SINGULAR_VERSION}"
     1121  includedir="${exec_prefix}/include/"
    11191122  ac_configure_args="$ac_configure_args --includedir=${includedir}"
    11201123fi
     
    11321135# check for AIX
    11331136echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
    1134 echo "configure:1135: checking whether _AIX is defined" >&5
     1137echo "configure:1138: checking whether _AIX is defined" >&5
    11351138if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
    11361139  echo $ac_n "(cached) $ac_c" 1>&6
    11371140else
    11381141  cat > conftest.$ac_ext <<EOF
    1139 #line 1140 "configure"
     1142#line 1143 "configure"
    11401143#include "confdefs.h"
    11411144#ifdef _AIX
     
    11631166
    11641167echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
    1165 echo "configure:1166: checking for atof in -lm" >&5
     1168echo "configure:1169: checking for atof in -lm" >&5
    11661169ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
    11671170if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    11711174LIBS="-lm  $LIBS"
    11721175cat > conftest.$ac_ext <<EOF
    1173 #line 1174 "configure"
     1176#line 1177 "configure"
    11741177#include "confdefs.h"
    11751178/* Override any gcc2 internal prototype to avoid an error.  */
     
    11821185; return 0; }
    11831186EOF
    1184 if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1187if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    11851188  rm -rf conftest*
    11861189  eval "ac_cv_lib_$ac_lib_var=yes"
     
    12101213
    12111214echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
    1212 echo "configure:1213: checking for socket in -lbsd" >&5
     1215echo "configure:1216: checking for socket in -lbsd" >&5
    12131216ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
    12141217if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    12181221LIBS="-lbsd  $LIBS"
    12191222cat > conftest.$ac_ext <<EOF
    1220 #line 1221 "configure"
     1223#line 1224 "configure"
    12211224#include "confdefs.h"
    12221225/* Override any gcc2 internal prototype to avoid an error.  */
     
    12291232; return 0; }
    12301233EOF
    1231 if { (eval echo configure:1232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1234if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    12321235  rm -rf conftest*
    12331236  eval "ac_cv_lib_$ac_lib_var=yes"
     
    12571260
    12581261echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
    1259 echo "configure:1260: checking for listen in -lsocket" >&5
     1262echo "configure:1263: checking for listen in -lsocket" >&5
    12601263ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
    12611264if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    12651268LIBS="-lsocket  $LIBS"
    12661269cat > conftest.$ac_ext <<EOF
    1267 #line 1268 "configure"
     1270#line 1271 "configure"
    12681271#include "confdefs.h"
    12691272/* Override any gcc2 internal prototype to avoid an error.  */
     
    12761279; return 0; }
    12771280EOF
    1278 if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1281if { (eval echo configure:1282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    12791282  rm -rf conftest*
    12801283  eval "ac_cv_lib_$ac_lib_var=yes"
     
    13041307
    13051308echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
    1306 echo "configure:1307: checking for gethostbyname in -lnsl" >&5
     1309echo "configure:1310: checking for gethostbyname in -lnsl" >&5
    13071310ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
    13081311if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    13121315LIBS="-lnsl  $LIBS"
    13131316cat > conftest.$ac_ext <<EOF
    1314 #line 1315 "configure"
     1317#line 1318 "configure"
    13151318#include "confdefs.h"
    13161319/* Override any gcc2 internal prototype to avoid an error.  */
     
    13231326; return 0; }
    13241327EOF
    1325 if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1328if { (eval echo configure:1329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13261329  rm -rf conftest*
    13271330  eval "ac_cv_lib_$ac_lib_var=yes"
     
    13511354
    13521355echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
    1353 echo "configure:1354: checking for mpq_init in -lgmp" >&5
     1356echo "configure:1357: checking for mpq_init in -lgmp" >&5
    13541357ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
    13551358if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    13591362LIBS="-lgmp  $LIBS"
    13601363cat > conftest.$ac_ext <<EOF
    1361 #line 1362 "configure"
     1364#line 1365 "configure"
    13621365#include "confdefs.h"
    13631366/* Override any gcc2 internal prototype to avoid an error.  */
     
    13701373; return 0; }
    13711374EOF
    1372 if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1375if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13731376  rm -rf conftest*
    13741377  eval "ac_cv_lib_$ac_lib_var=yes"
     
    13981401
    13991402echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
    1400 echo "configure:1401: checking for mpz_init in -lsmallgmp" >&5
     1403echo "configure:1404: checking for mpz_init in -lsmallgmp" >&5
    14011404ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
    14021405if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    14061409LIBS="-lsmallgmp  $LIBS"
    14071410cat > conftest.$ac_ext <<EOF
    1408 #line 1409 "configure"
     1411#line 1412 "configure"
    14091412#include "confdefs.h"
    14101413/* Override any gcc2 internal prototype to avoid an error.  */
     
    14171420; return 0; }
    14181421EOF
    1419 if { (eval echo configure:1420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1422if { (eval echo configure:1423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    14201423  rm -rf conftest*
    14211424  eval "ac_cv_lib_$ac_lib_var=yes"
     
    14451448
    14461449echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
    1447 echo "configure:1448: checking for IMP_PutGmpInt in -lMP" >&5
     1450echo "configure:1451: checking for IMP_PutGmpInt in -lMP" >&5
    14481451ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
    14491452if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    14531456LIBS="-lMP  $LIBS"
    14541457cat > conftest.$ac_ext <<EOF
    1455 #line 1456 "configure"
     1458#line 1459 "configure"
    14561459#include "confdefs.h"
    14571460/* Override any gcc2 internal prototype to avoid an error.  */
     
    14641467; return 0; }
    14651468EOF
    1466 if { (eval echo configure:1467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1469if { (eval echo configure:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    14671470  rm -rf conftest*
    14681471  eval "ac_cv_lib_$ac_lib_var=yes"
     
    14921495
    14931496echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
    1494 echo "configure:1495: checking for MPT_GetTree in -lMPT" >&5
     1497echo "configure:1498: checking for MPT_GetTree in -lMPT" >&5
    14951498ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
    14961499if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15001503LIBS="-lMPT  $LIBS"
    15011504cat > conftest.$ac_ext <<EOF
    1502 #line 1503 "configure"
     1505#line 1506 "configure"
    15031506#include "confdefs.h"
    15041507/* Override any gcc2 internal prototype to avoid an error.  */
     
    15111514; return 0; }
    15121515EOF
    1513 if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1516if { (eval echo configure:1517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15141517  rm -rf conftest*
    15151518  eval "ac_cv_lib_$ac_lib_var=yes"
     
    15391542
    15401543echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
    1541 echo "configure:1542: checking for atof in -lsingcf" >&5
     1544echo "configure:1545: checking for atof in -lsingcf" >&5
    15421545ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
    15431546if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15471550LIBS="-lsingcf  $LIBS"
    15481551cat > conftest.$ac_ext <<EOF
    1549 #line 1550 "configure"
     1552#line 1553 "configure"
    15501553#include "confdefs.h"
    15511554/* Override any gcc2 internal prototype to avoid an error.  */
     
    15581561; return 0; }
    15591562EOF
    1560 if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1563if { (eval echo configure:1564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    15611564  rm -rf conftest*
    15621565  eval "ac_cv_lib_$ac_lib_var=yes"
     
    15861589
    15871590echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
    1588 echo "configure:1589: checking for atof in -lsingfac" >&5
     1591echo "configure:1592: checking for atof in -lsingfac" >&5
    15891592ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
    15901593if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    15941597LIBS="-lsingfac  $LIBS"
    15951598cat > conftest.$ac_ext <<EOF
    1596 #line 1597 "configure"
     1599#line 1600 "configure"
    15971600#include "confdefs.h"
    15981601/* Override any gcc2 internal prototype to avoid an error.  */
     
    16051608; return 0; }
    16061609EOF
    1607 if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1610if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    16081611  rm -rf conftest*
    16091612  eval "ac_cv_lib_$ac_lib_var=yes"
     
    16371640ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    16381641echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1639 echo "configure:1640: checking for $ac_hdr" >&5
     1642echo "configure:1643: checking for $ac_hdr" >&5
    16401643if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    16411644  echo $ac_n "(cached) $ac_c" 1>&6
    16421645else
    16431646  cat > conftest.$ac_ext <<EOF
    1644 #line 1645 "configure"
     1647#line 1648 "configure"
    16451648#include "confdefs.h"
    16461649#include <$ac_hdr>
    16471650EOF
    16481651ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1649 { (eval echo configure:1650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1652{ (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    16501653ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    16511654if test -z "$ac_err"; then
     
    17891792
    17901793echo $ac_n "checking which tmp dir to use""... $ac_c" 1>&6
    1791 echo "configure:1792: checking which tmp dir to use" >&5
     1794echo "configure:1795: checking which tmp dir to use" >&5
    17921795if test "${with_tmpdir+set}" = set && test -d ${with_tmpdir}; then
    17931796  if (echo "${with_tmpdir}" | egrep "\." >/dev/null 2>&1)
     
    18061809if test "${with_perl5+set}" != set; then
    18071810  echo $ac_n "checking for perl5""... $ac_c" 1>&6
    1808 echo "configure:1809: checking for perl5" >&5
     1811echo "configure:1812: checking for perl5" >&5
    18091812    if eval "test \"`echo '$''{'ac_cv_prog_perl5'+set}'`\" = set"; then
    18101813  echo $ac_n "(cached) $ac_c" 1>&6
     
    18431846set dummy $ac_prog; ac_word=$2
    18441847echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1845 echo "configure:1846: checking for $ac_word" >&5
     1848echo "configure:1849: checking for $ac_word" >&5
    18461849if eval "test \"`echo '$''{'ac_cv_prog_PERL5'+set}'`\" = set"; then
    18471850  echo $ac_n "(cached) $ac_c" 1>&6
     
    18791882
    18801883echo $ac_n "checking whether to configure and build texinfo""... $ac_c" 1>&6
    1881 echo "configure:1882: checking whether to configure and build texinfo" >&5
     1884echo "configure:1885: checking whether to configure and build texinfo" >&5
    18821885if test "$enable_texinfo" != no && test -d Texinfo; then
    18831886  echo "$ac_t""yes" 1>&6
     
    19011904
    19021905echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
    1903 echo "configure:1904: checking whether to configure and build gmp lib" >&5
     1906echo "configure:1907: checking whether to configure and build gmp lib" >&5
    19041907if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
    19051908  if test "$ac_gmp_ok" != yes && test -d gmp; then
     
    19271930
    19281931echo $ac_n "checking whether to configure and build smallgmp lib""... $ac_c" 1>&6
    1929 echo "configure:1930: checking whether to configure and build smallgmp lib" >&5
     1932echo "configure:1933: checking whether to configure and build smallgmp lib" >&5
    19301933if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
    19311934  if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
     
    19661969
    19671970echo $ac_n "checking whether to configure and build MP lib""... $ac_c" 1>&6
    1968 echo "configure:1969: checking whether to configure and build MP lib" >&5
     1971echo "configure:1972: checking whether to configure and build MP lib" >&5
    19691972if test "$enable_MP" != yes && test "$enable_MP" != no; then
    19701973  if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
     
    19951998 
    19961999echo $ac_n "checking whether to configure and build factory lib""... $ac_c" 1>&6
    1997 echo "configure:1998: checking whether to configure and build factory lib" >&5
     2000echo "configure:2001: checking whether to configure and build factory lib" >&5
    19982001if test "$enable_factory" != yes && test "$enable_factory" != no; then
    19992002  if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
     
    20202023
    20212024echo $ac_n "checking whether to configure and build libfac lib""... $ac_c" 1>&6
    2022 echo "configure:2023: checking whether to configure and build libfac lib" >&5
     2025echo "configure:2026: checking whether to configure and build libfac lib" >&5
    20232026if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
    20242027  if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
     
    20502053
    20512054echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
    2052 echo "configure:2053: checking whether to configure and build sgroup lib" >&5
     2055echo "configure:2056: checking whether to configure and build sgroup lib" >&5
    20532056if test "$enable_sgroup" != yes && test "$enable_sgroup" != no; then
    20542057  if test "$with_sgroup" != no && test "$ac_sgroup_ok" != yes && \
     
    20802083
    20812084echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
    2082 echo "configure:2083: checking whether to configure and build Singular" >&5
     2085echo "configure:2086: checking whether to configure and build Singular" >&5
    20832086if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
    20842087  if test "$with_Singular" != no && test -d Singular; then
     
    21052108
    21062109echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
    2107 echo "configure:2108: checking which apint package to use" >&5
     2110echo "configure:2111: checking which apint package to use" >&5
    21082111if test "$with_apint" = gmp; then
    21092112  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     
    21292132
    21302133echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
    2131 echo "configure:2132: checking whether to use with MP" >&5
     2134echo "configure:2135: checking whether to use with MP" >&5
    21322135if test "$with_MP" = yes; then
    21332136  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
     
    21482151
    21492152echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
    2150 echo "configure:2151: checking whether to use with factory" >&5
     2153echo "configure:2154: checking whether to use with factory" >&5
    21512154if test "$with_factory" = yes; then
    21522155  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
     
    21672170 
    21682171echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
    2169 echo "configure:2170: checking whether to use with libfac" >&5
     2172echo "configure:2173: checking whether to use with libfac" >&5
    21702173if test "$with_libfac" = yes; then
    21712174  if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
     
    21862189
    21872190echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
    2188 echo "configure:2189: checking whether to use with Singular" >&5
     2191echo "configure:2192: checking whether to use with Singular" >&5
    21892192if test "$with_Singular" != no && test "$with_Singular" != yes; then
    21902193  if test "$enable_Singular" = yes; then
     
    22352238  SUBDIRS="$SUBDIRS mpr"
    22362239fi
     2240if test -d emacs; then
     2241  SUBDIRS="$SUBDIRS emacs"
     2242fi
    22372243 
    22382244
    22392245echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    2240 echo "configure:2241: checking whether ${MAKE-make} sets \${MAKE}" >&5
     2246echo "configure:2247: checking whether ${MAKE-make} sets \${MAKE}" >&5
    22412247set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    22422248if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
  • configure.in

    ra204ea r460c1e1  
    1616   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" modules/tools/Makefile"
    1717fi
     18if test -d "emacs"; then
     19   OUTPUT_MAKEFILES=$OUTPUT_MAKEFILES" emacs/Makefile"
     20fi
    1821
    1922dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
     
    4649SINGULAR_MAJOR_VERSION=1
    4750SINGULAR_MINOR_VERSION=3
    48 SINGULAR_SUB_VERSION=3
     51SINGULAR_SUB_VERSION=4
    4952SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    5053SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
     
    107110# expand bindir
    108111if test "x$bindir" = 'x${exec_prefix}/bin'; then
    109   bindir="${exec_prefix}/bin"
     112  bindir="${exec_prefix}/"
    110113  ac_configure_args="$ac_configure_args --bindir=${bindir}"
    111114fi
     
    113116# expand libdir
    114117if test "x$libdir" = 'x${exec_prefix}/lib'; then
    115   libdir="${exec_prefix}/lib/${SINGULAR_VERSION}"
     118  libdir="${exec_prefix}/lib/"
    116119  ac_configure_args="$ac_configure_args --libdir=${libdir}"
    117120fi
     
    119122# expand includedir
    120123if test "x$includedir" = 'x${prefix}/include'; then
    121   includedir="${exec_prefix}/include/${SINGULAR_VERSION}"
     124  includedir="${exec_prefix}/include/"
    122125  ac_configure_args="$ac_configure_args --includedir=${includedir}"
    123126fi
     
    653656  SUBDIRS="$SUBDIRS mpr"
    654657fi
     658if test -d emacs; then
     659  SUBDIRS="$SUBDIRS emacs"
     660fi
    655661 
    656662
  • doc/Makefile.in

    ra204ea r460c1e1  
    1515infodir         = ${prefix}/info
    1616bindir          = @bindir@
     17htmldir         = ${prefix}/html
    1718
    1819##
     
    3334TEXI2HTML       = @TEXI2HTML@
    3435DVIPS           = dvips
    35 IMAGES          = contents_motif.gif index_motif.gif \
    36                 next_motif.gif next_motif_gr.gif \
    37                 previous_motif.gif previous_motif_gr.gif \
    38                 singular-small.jpg singular.jpg \
    39                 invisible.xbm bg_left.gif bg_right.gif bg.jpg spacer3.gif
     36IMAGES_UU       := $(wildcard images/*.uu)
    4037
    4138# d2t stuff
     
    6158                tutor.tex examples.tex start.tex copyright.tex
    6259
    63 IMAGES_UU := $(IMAGES:%=images/%.uu)
     60IMAGES     := $(IMAGES_UU:images/%.uu=%)
    6461IMAGES_SRC := $(IMAGES:%=images/%)
    6562IMAGES_HTML := $(IMAGES:%=html/%)
     
    154151
    155152# targets concerned with maintenance
    156 install: singular.hlp
     153install: singular.hlp html/index.htm
    157154        ${MKINSTALLDIRS} ${infodir}
    158155        ${INSTALL_DATA} singular.hlp ${infodir}
     156        test -L ${htmldir} || (rm -rf ${htmldir}; ln -s `pwd`/html ${htmldir})
    159157
    160158uninstall:
  • doc/doc2tex.pl

    ra204ea r460c1e1  
    11#!/usr/local/bin/perl
    2 # $Id: doc2tex.pl,v 1.8 1999-07-17 14:49:10 obachman Exp $
     2# $Id: doc2tex.pl,v 1.9 1999-07-19 12:06:13 obachman Exp $
    33###################################################################
    44#  Computer Algebra System SINGULAR
     
    319319{
    320320  s/^\@c\s*include\s+([^\s]+)\s/$1/;
     321  s/\s*$//;
    321322  unless (&Open(*INC, "<$_"))
    322323  {
     
    407408sub HandleLib
    408409{
    409   local($lib, $lib_name, $ltex_file, $l_ex, $l_fun);
     410  local($lib, $lib_name, $ltex_file, $l_ex, $l_fun, $no_node, $section);
    410411  my ($func);
    411412
     
    426427  $l_fun = 1 if (($lib_fun || (/lib_fun/)) && !/no_fun/);
    427428  $l_ex = 1 if (($lib_ex || /lib_ex/) && !/no_ex/ && $l_fun);
    428 
     429  if (/(\w+)section/)
     430  {
     431    $section = $1. 'section';
     432  }
     433  else
     434  {
     435    $section = "subsection";
     436  }
    429437  $ltex_file = "$doc_subdir/$lib"."_lib";
    430438  unless ($l_ex)
     
    555563        print LDOC " ".$procs[$i-1] if ($i > 0);
    556564        print LDOC ", " . $lib ."_lib\n";
    557         print LDOC "\@subsection " . $procs[$i] . "\n";
     565        print LDOC "\@$section " . $procs[$i] . "\n";
    558566        print LDOC "\@cindex ". $procs[$i] . "\n";
    559567
    560568        print LDOC "\@c ---content $procs[$i]---\n";
    561569        print LDOC "Procedure from library \@code{$lib.lib} (\@pxref{${lib}_lib}).\n\n";
    562         print LDOC "\@table \@asis\n";
    563         $table_is_open = 1;
    564         # print help
    565         $ref = OutInfo(\*LDOC, $help{$procs[$i]});
    566         print LDOC "\@end table\n";
    567         $table_is_open = 0;
     570        if ($help{$procs[$i]} =~ /^\@/)
     571        {
     572          print LDOC $help{$procs[$i]};
     573          $ref = '';
     574        }
     575        else
     576        {
     577          print LDOC "\@table \@asis\n";
     578          $table_is_open = 1;
     579          # print help
     580          $ref = OutInfo(\*LDOC, $help{$procs[$i]});
     581          print LDOC "\@end table\n";
     582        }
    568583        # print example
    569584        if ($example = &CleanUpExample($lib, $example{$procs[$i]}))
     
    600615  my ($FH, $info, $l_fun) = @_;
    601616  print $FH "\@c ---content LibInfo---\n";
     617    if ($info =~ /^\@/)
     618  {
     619    print $FH $info;
     620    return;
     621  }
    602622  print $FH "\@table \@asis\n";
    603623  $table_is_open = 1;
     
    614634{
    615635  my ($FH, $info, $l_fun) = @_;
     636  if ($info =~ /^\@/)
     637  {
     638    print $FH $info;
     639    return;
     640  }
    616641  $info =~ s/^\s*//;
    617642  $info =~ s/\s*$//;
     
    654679    {
    655680      $line = $1;
     681      # break line if
    656682      $text .= '@*'
    657         if ($line =~ /\w/ && $pline =~ /\w/ &&
    658             ((length($pline) < 60) || $line =~ /^\s*\w*\(.*?\)/));
     683        if ($line =~ /\w/ && $pline =~ /\w/ # line and prev line are not empty
     684            && $line !~ /^\s*\@\*/  # line does not start with @*
     685            && $pline !~ /\@\*\s*/  # prev line does not end with @*
     686            &&
     687            ((length($pline) < 60  && # prev line is shorter than 60 chars
     688              $pline !~ /\@code{.*?}/ # and does not contain @code, @math
     689              && $pline !~ /\@math{.*?}/)
     690             ||
     691             $line =~ /^\s*\w*\(.*?\)/ # $line starts with \w*(..)
     692             ||
     693             $pline =~ /^\s*\w*\(.*?\)[\s;:]*$/)); # prev line is only \w(..)
    659694      $line =~ s/\s*$//;
    660695      $text .= "$line\n";
     
    667702  s/\s*$//g;
    668703  s/ +/ /g;  # replace double whitespaces by one
     704  s/(\w+\(.*?\))/\@code{$1}/g;
    669705  s/\@\*\s*/\@\*/g;
    670706  s/(\@[^\*])/\@$1/g; # escape @ signs, except @*
    671   s/{/\@{/g;
     707  s/{/\@{/g; # escape {}
    672708  s/}/\@}/g;
     709  # unprotect @@math@{@}, @code@{@}
     710  s/\@\@math\@{(.*?)\@}/\@math{$1}/g;
     711  s/\@\@code\@{(.*?)\@}/\@code{$1}/g;
    673712}
    674713
     
    753792    # just print the text
    754793    FormatInfoText(length($item) + 1);
    755     # if functions are in text, then make it in code
    756     s/(\w+\(.*?\))/\@code{$1}/g
    757       if ($item =~ /usage/i || $item =~ /Return/i);
    758 
    759794    print $FH "$_\n";
    760795  }
     
    787822  $refs =~ s/^\s*//;
    788823  $refs =~ s/\s*$//;
    789   my @refs = split (/[\s,]+/, $refs);
     824  $refs =~ s/\n/,/g;
     825  my @refs = split (/[,;\.]+/, $refs);
    790826  my $ref;
    791827
     
    795831  for $ref (@refs)
    796832  {
    797     print $FH ", \@ref{$ref}";
     833    $ref =~ s/^\s*//;
     834    $ref =~ s/\s*$//;
     835    print $FH ", \@ref{$ref}"  if ($ref =~ /\w/);
    798836  }
    799837  print $FH "\n\@c ref\n";
  • doc/t2h_singular.init

    ra204ea r460c1e1  
    3838$T2H_IDX_SUMMARY = 'cp';
    3939
     40$T2H_STANDARD = 1;
     41
    4042# inside <BODY ..>
    4143$T2H_BODYTEXT = 'LANG="EN"  BACKGROUND="bg.jpg"';
     
    6163  my $fh = shift;
    6264  print $fh <<EOT;
    63 <P></P>
    6465<FONT SIZE="-1">
    6566User manual for <A HREF="http://www.mathematik.uni-kl.de/~zca/Singular/"><I>Singular</I></A> version $value{VERSION}, $value{VERSION_DATE},
     
    7172EOT
    7273}
     74 
     75$T2H_ICONS = 1;
     76
     77%T2H_ACTIVE_ICONS =
     78  (
     79   'Top',      'blue_top.gif',
     80   'Contents', 'blue_dir.gif',
     81   'Overview', '',
     82   'Index',    'blue_readme.gif',
     83   'Back',     'xy_previous.gif',
     84   'FastBack', 'xy_previoussection.gif',
     85   'Prev',     'xy_previoussection.gif',
     86   'Up',       'xy_up.gif',
     87   'Next',     'xy_nextsection.gif',
     88   'Forward',  'xy_next.gif',
     89   'FastForward', 'xy_nextsection.gif',
     90   'About' ,    'blue_help.gif',
     91   ' ',        ''
     92  );
     93
     94%T2H_PASSIVE_ICONS =
     95  (
     96   'Top',      'blue_top.gif',
     97   'Contents', 'blue_dir.gif',
     98   'Overview', '',
     99   'Index',    'blue_readme.gif',
     100   'Back',     'xy_previous_gr.gif',
     101   'FastBack', 'xy_previoussection_gr.gif',
     102   'Prev',     'xy_previoussection_gr.gif',
     103   'Up',       'xy_up_gr.gif',
     104   'Next',     'xy_nextsection_gr.gif',
     105   'Forward',  'xy_next_gr.gif',
     106   'FastForward', 'xy_nextsection_gr.gif',
     107   'About' ,    'blue_help.gif',
     108  );
     109
     110sub t2h_pre_about
     111{
     112  return <<EOT;
     113This document is the user manual for <A HREF="http://www.mathematik.uni-kl.de/~zca/Singular/"><I>Singular</I></A> version $value{VERSION}, $value{VERSION_DATE}.
     114<BR>   
     115
     116For questions and comments about Singular, send email to <A href="mailto:singular\@mathematik.uni-kl.de">singular\@mathematik.uni-kl.de</a>.
     117 
     118<P></P> 
     119This document was generated by <A HREF="$T2H_HOMEPAGE"><I>$THISPROG</I></A>
     120and <ahref="http://www-dsed.llnl.gov/files/programs/unix/latex2html/manual/">LaTeX2<TT>HTML</TT></a>
     121and is best  viewed with 16 or 18 point screen font.
     122<P></P> 
     123EOT
     124}
     125
     126$T2H_PRE_ABOUT = \&t2h_pre_about;
    73127
    741281;      # This must be the last line
Note: See TracChangeset for help on using the changeset viewer.