Release calc version 2.11.5t4.3

Release calc version 2.11.5t4.2
Release calc version 2.11.5t4.1
2025-08-22 01:23:28 +03:00 · 2017-05-21 15:38:41 -07:00 · 2017-05-21 15:38:41 -07:00 · 2017-05-21 15:38:40 -07:00
37 changed files with 963 additions and 350 deletions
--- a/29
+++ b/29
@@ -29,13 +29,20 @@ The calc web site is located at:
 =-=

 If you have tried all of the above and things still are not right,
-then it may be time to send in a bug report.  You can send bug reports to:
+then it may be time to send in a bug report.  You can send bug
+and bug fixes reports to:

    calc-bugs at asthe dot com

    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
    [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]

+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 When you send your report, please include the following information:

    * a description of the problem
@@ -54,18 +61,8 @@ When you send your report, please include the following information:

 Stack traces from core dumps are useful to send as well.

-=-=
-
-Send any comments, compiler warning messages, suggestions and most
-importantly, fixes (in the form of a context diff patch) to:
-
-    calc-bugs at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
-
-You should use the above calc-bugs address for bug reports, if you are
-not currently a member of the calc-tester mailing list.
+Fell free to use the above address to send in big fixes (in the form
+of a context diff patch).

 =-=

@@ -75,8 +72,6 @@ Known bugs:
    us know!  See the above for details on how to report and were to
    EMail your bug reports and hopefully patches to fix them.

-=-=
-
 Problems with known work-a-rounds:

    * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
@@ -246,8 +241,8 @@ Problems with known work-a-rounds:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.10 $
-## @(#) $Id: BUGS,v 29.10 2001/04/08 11:32:52 chongo Exp $
+## @(#) $Revision: 29.12 $
+## @(#) $Id: BUGS,v 29.12 2001/06/01 11:32:01 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13
--- a/45
+++ b/45
@@ -1,4 +1,43 @@
-The following are the changes from calc version 2.11.5t3 to date:
+The following are the changes from calc version 2.11.5t4.1 to date:
+
+    Updated dependency rules in Makefiles.
+
+    Calc include files use #include "foo.h" to include other calc
+    header files if -DSRC.  Otherwise they use <calc/foo.h>.
+    The -DSRC symbol is defined by default in calc's Makefile
+    and so it uses the header files from within the calc src tree.
+    If an external non-calc program includes an installed calc
+    header file (from under /usr/include), and it does NOT define
+    SRC, then it will obtain the calc header files from the
+    correct system location (such as /usr/include/calc/foo.h).
+
+    Added calc builtin function: version() which returns the calc
+    version string.
+
+    Added subject requirements for the calc-tester-request and
+    calc-bugs-mail EMail aliases.  See:
+
+    	http://www.isthe.com/chongo/tech/comp/calc/email.html
+
+    for details.
+
+    Corrected a bug that incorrectly set the default calc path
+    back in version 2.11.5t4.  The default CALCPATH is now:
+
+	.:./cal:~/.cal:/usr/share/calc:/usr/share/calc/custom
+
+    and the default CALCRC is now:
+
+	/usr/share/calc/startup:~/.calcrc:./.calcinit
+
+    This fixes the missing bindings error and it places the calc
+    resource files into the default path.
+
+    If you are using the GNU readline then the Makefile recommends that
+    you link with the ncurses library.
+
+
+The following are the changes from calc version 2.11.5t3 to 2.11.5t4:

    The Makefile will now send both stdout and sterr to /dev/null
    when compiling hsrc intermeriates.
@@ -5281,8 +5320,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.32 $
-## @(#) $Id: CHANGES,v 29.32 2001/05/28 21:59:59 chongo Exp $
+## @(#) $Revision: 29.35 $
+## @(#) $Id: CHANGES,v 29.35 2001/06/01 21:44:44 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
--- a/27
+++ b/27
@@ -12,8 +12,8 @@ This file is Copyrighted
 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.

-    # @(#) $Revision: 29.5 $
-    # @(#) $Id: COPYING,v 29.5 2000/12/18 10:22:55 chongo Exp $
+    # @(#) $Revision: 29.6 $
+    # @(#) $Id: COPYING,v 29.6 2001/06/01 11:26:53 chongo Exp $
    # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $

 =-=
@@ -55,13 +55,18 @@ Calc is covered by the GNU Lesser General Public License

    The contact addresses for calc is as follows:

-	Web:	http://www.isthe.com/chongo/tech/comp/calc/index.html
-	EMail:	calc-contrib at asthe dot com
+	Web:	http://www.isthe.com/chongo/tech/comp/calc/email.html

-    To join the calc-tester mailing list.  Send a request to:
+    To join the low volume calc mailing list.  Send a EMail message to:

 	calc-tester-request at asthe dot com

+    Your subject must contain the words:
+
+	calc mailing list subscription
+
+    You may have additional words in your subject line.
+
    Your message body (not the subject) should consist of:

 	 subscribe calc-tester address
@@ -71,13 +76,23 @@ Calc is covered by the GNU Lesser General Public License
    where ``address'' is your EMail address and ``your_full_name'' is
    your full name.

-    Calc bug reports, however should be sent to:
+    Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+    Calc bug reports and calc bug fixes should be sent to:

 	calc-bugs at asthe dot com

    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]

+    Your subject must contain the words:
+
+	   calc bug report
+
+    You may have additional words in your subject line.
+
 =-=

 Calc's relationship to the GNU Lesser General Public License
--- a/245
+++ b/245
@@ -20,8 +20,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.28 $$
-# @(#) $Id: Makefile.ship,v 29.28 2001/05/28 22:44:50 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.31 $$
+# @(#) $Id: Makefile.ship,v 29.31 2001/06/01 21:44:44 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -607,12 +607,12 @@ CATMODE= 0444
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be search for calc resource file routines.
 #
-CALCPATH= .:./cal:~/cal:${LIBDIR}:${CUSTOMLIBDIR}
+CALCPATH= .:./cal:~/.cal:${CSHAREDIR}:${CUSTOMLIBDIR}

 # If the $CALCRC environment variable is not defined, then the following
 # path will be search for calc resource files.
 #
-CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit
+CALCRC= ${CSHAREDIR}/startup:~/.calcrc:./.calcinit

 # Determine of the GNU-readline facility will be used instead of the
 # built-in calc binding method.
@@ -625,6 +625,7 @@ CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit
 #	READLINE_LIB		The flags needed to link in the readline
 #				and history link libraries
 #	READLINE_INCLUDE	Where the readline include files reside
+#				(leave blank if they are /usr/include/readline)
 #
 # NOTE: The GNU-readline code is not shipped with calc.	 You must have
 #	the appropriate headers and link libs installed on your system in
@@ -635,10 +636,10 @@ CALCRC= ${LIBDIR}/startup:~/.calcrc:./.calcinit
 USE_READLINE=
 #USE_READLINE= -DUSE_READLINE
 #
-READLINE_LIB=
-#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory
-#READLINE_LIB= -lreadline -lhistory
-#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory
+#READLINE_LIB=
+READLINE_LIB= -lreadline -lhistory -lncurses
+#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
+#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
 #
 READLINE_INCLUDE=
 #READLINE_INCLUDE= -I/usr/gnu/include
@@ -812,8 +813,8 @@ CCWARN= -Wall -Wno-implicit -Wno-comment
 CCOPT= ${DEBUG} ${NO_SHARED}
 CCMISC=
 #
-CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-ICFLAGS= ${CCWARN} ${CCMISC}
+CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 ILDFLAGS=
@@ -832,8 +833,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -853,8 +854,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -880,8 +881,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -rdata_shared
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -902,8 +903,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= +e
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -919,8 +920,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -qlanglvl=ansi
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -941,8 +942,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC= -DFORCE_STDC
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC}
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC}
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -961,8 +962,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -980,8 +981,8 @@ CC= ${PURIFY} ${LCC}
 #CCOPT= ${DEBUG} ${NO_SHARED}
 #CCMISC=
 #
-#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
-#ICFLAGS= ${CCWARN} ${CCMISC} -Wno-unused
+#CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC}
+#ICFLAGS= -DSRC ${CCWARN} ${CCMISC} -Wno-unused
 #
 #LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 #ILDFLAGS=
@@ -2814,7 +2815,7 @@ depend: hsrc
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/makedep.out
 	${Q}cd skel; \
-	    ${MAKEDEPEND} -w 1 -m -f makedep.out ${C_SRC} ${BUILD_C_SRC}
+	    ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} ${BUILD_C_SRC}
 	-${Q}for i in ${C_SRC} ${BUILD_C_SRC}; do \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	done >> skel/makedep.out
@@ -3524,8 +3525,8 @@ addop.o: addop.c
 addop.o: alloc.h
 addop.o: block.h
 addop.o: byteswap.h
-addop.o: calcerr.h
 addop.o: calc.h
+addop.o: calcerr.h
 addop.o: cmath.h
 addop.o: config.h
 addop.o: endian_calc.h
@@ -3543,8 +3544,8 @@ addop.o: md5.h
 addop.o: nametype.h
 addop.o: opcodes.h
 addop.o: qmath.h
-addop.o: shs1.h
 addop.o: shs.h
+addop.o: shs1.h
 addop.o: string.h
 addop.o: symbol.h
 addop.o: token.h
@@ -3572,8 +3573,8 @@ assocfunc.o: longbits.h
 assocfunc.o: md5.h
 assocfunc.o: nametype.h
 assocfunc.o: qmath.h
-assocfunc.o: shs1.h
 assocfunc.o: shs.h
+assocfunc.o: shs1.h
 assocfunc.o: string.h
 assocfunc.o: value.h
 assocfunc.o: win32dll.h
@@ -3583,8 +3584,8 @@ blkcpy.o: blkcpy.c
 blkcpy.o: blkcpy.h
 blkcpy.o: block.h
 blkcpy.o: byteswap.h
-blkcpy.o: calcerr.h
 blkcpy.o: calc.h
+blkcpy.o: calcerr.h
 blkcpy.o: cmath.h
 blkcpy.o: config.h
 blkcpy.o: endian_calc.h
@@ -3601,8 +3602,8 @@ blkcpy.o: longbits.h
 blkcpy.o: md5.h
 blkcpy.o: nametype.h
 blkcpy.o: qmath.h
-blkcpy.o: shs1.h
 blkcpy.o: shs.h
+blkcpy.o: shs1.h
 blkcpy.o: string.h
 blkcpy.o: value.h
 blkcpy.o: win32dll.h
@@ -3625,8 +3626,8 @@ block.o: longbits.h
 block.o: md5.h
 block.o: nametype.h
 block.o: qmath.h
-block.o: shs1.h
 block.o: shs.h
+block.o: shs1.h
 block.o: string.h
 block.o: value.h
 block.o: win32dll.h
@@ -3645,16 +3646,13 @@ byteswap.o: longbits.h
 byteswap.o: qmath.h
 byteswap.o: win32dll.h
 byteswap.o: zmath.h
-calcerr.o: calcerr.c
-calcerr.o: calcerr.h
-calcerr.o: have_const.h
 calc.o: alloc.h
 calc.o: args.h
 calc.o: block.h
 calc.o: byteswap.h
 calc.o: calc.c
-calc.o: calcerr.h
 calc.o: calc.h
+calc.o: calcerr.h
 calc.o: cmath.h
 calc.o: conf.h
 calc.o: config.h
@@ -3679,19 +3677,22 @@ calc.o: md5.h
 calc.o: nametype.h
 calc.o: opcodes.h
 calc.o: qmath.h
-calc.o: shs1.h
 calc.o: shs.h
+calc.o: shs1.h
 calc.o: string.h
 calc.o: symbol.h
 calc.o: token.h
 calc.o: value.h
 calc.o: win32dll.h
 calc.o: zmath.h
+calcerr.o: calcerr.c
+calcerr.o: calcerr.h
+calcerr.o: have_const.h
 codegen.o: alloc.h
 codegen.o: block.h
 codegen.o: byteswap.h
-codegen.o: calcerr.h
 codegen.o: calc.h
+codegen.o: calcerr.h
 codegen.o: cmath.h
 codegen.o: codegen.c
 codegen.o: conf.h
@@ -3712,8 +3713,8 @@ codegen.o: md5.h
 codegen.o: nametype.h
 codegen.o: opcodes.h
 codegen.o: qmath.h
-codegen.o: shs1.h
 codegen.o: shs.h
+codegen.o: shs1.h
 codegen.o: string.h
 codegen.o: symbol.h
 codegen.o: token.h
@@ -3753,8 +3754,8 @@ commath.o: zmath.h
 config.o: alloc.h
 config.o: block.h
 config.o: byteswap.h
-config.o: calcerr.h
 config.o: calc.h
+config.o: calcerr.h
 config.o: cmath.h
 config.o: config.c
 config.o: config.h
@@ -3771,8 +3772,8 @@ config.o: longbits.h
 config.o: md5.h
 config.o: nametype.h
 config.o: qmath.h
-config.o: shs1.h
 config.o: shs.h
+config.o: shs1.h
 config.o: string.h
 config.o: token.h
 config.o: value.h
@@ -3782,8 +3783,8 @@ config.o: zrand.h
 const.o: alloc.h
 const.o: block.h
 const.o: byteswap.h
-const.o: calcerr.h
 const.o: calc.h
+const.o: calcerr.h
 const.o: cmath.h
 const.o: config.h
 const.o: const.c
@@ -3799,8 +3800,8 @@ const.o: longbits.h
 const.o: md5.h
 const.o: nametype.h
 const.o: qmath.h
-const.o: shs1.h
 const.o: shs.h
+const.o: shs1.h
 const.o: string.h
 const.o: value.h
 const.o: win32dll.h
@@ -3808,8 +3809,8 @@ const.o: zmath.h
 custom.o: alloc.h
 custom.o: block.h
 custom.o: byteswap.h
-custom.o: calcerr.h
 custom.o: calc.h
+custom.o: calcerr.h
 custom.o: cmath.h
 custom.o: config.h
 custom.o: custom.c
@@ -3826,8 +3827,8 @@ custom.o: longbits.h
 custom.o: md5.h
 custom.o: nametype.h
 custom.o: qmath.h
-custom.o: shs1.h
 custom.o: shs.h
+custom.o: shs1.h
 custom.o: string.h
 custom.o: value.h
 custom.o: win32dll.h
@@ -3837,8 +3838,8 @@ endian.o: have_unistd.h
 file.o: alloc.h
 file.o: block.h
 file.o: byteswap.h
-file.o: calcerr.h
 file.o: calc.h
+file.o: calcerr.h
 file.o: cmath.h
 file.o: config.h
 file.o: endian_calc.h
@@ -3859,8 +3860,8 @@ file.o: longbits.h
 file.o: md5.h
 file.o: nametype.h
 file.o: qmath.h
-file.o: shs1.h
 file.o: shs.h
+file.o: shs1.h
 file.o: string.h
 file.o: value.h
 file.o: win32dll.h
@@ -3874,8 +3875,8 @@ fposval.o: have_posscl.h
 func.o: alloc.h
 func.o: block.h
 func.o: byteswap.h
-func.o: calcerr.h
 func.o: calc.h
+func.o: calcerr.h
 func.o: cmath.h
 func.o: config.h
 func.o: custom.h
@@ -3901,8 +3902,8 @@ func.o: nametype.h
 func.o: opcodes.h
 func.o: prime.h
 func.o: qmath.h
-func.o: shs1.h
 func.o: shs.h
+func.o: shs1.h
 func.o: string.h
 func.o: symbol.h
 func.o: token.h
@@ -3914,8 +3915,8 @@ func.o: zrandom.h
 hash.o: alloc.h
 hash.o: block.h
 hash.o: byteswap.h
-hash.o: calcerr.h
 hash.o: calc.h
+hash.o: calcerr.h
 hash.o: cmath.h
 hash.o: config.h
 hash.o: endian_calc.h
@@ -3931,8 +3932,8 @@ hash.o: longbits.h
 hash.o: md5.h
 hash.o: nametype.h
 hash.o: qmath.h
-hash.o: shs1.h
 hash.o: shs.h
+hash.o: shs1.h
 hash.o: string.h
 hash.o: value.h
 hash.o: win32dll.h
@@ -3967,8 +3968,8 @@ have_varvs.o: have_varvs.c
 help.o: alloc.h
 help.o: block.h
 help.o: byteswap.h
-help.o: calcerr.h
 help.o: calc.h
+help.o: calcerr.h
 help.o: cmath.h
 help.o: conf.h
 help.o: config.h
@@ -3986,8 +3987,8 @@ help.o: longbits.h
 help.o: md5.h
 help.o: nametype.h
 help.o: qmath.h
-help.o: shs1.h
 help.o: shs.h
+help.o: shs1.h
 help.o: string.h
 help.o: value.h
 help.o: win32dll.h
@@ -3995,8 +3996,8 @@ help.o: zmath.h
 hist.o: alloc.h
 hist.o: block.h
 hist.o: byteswap.h
-hist.o: calcerr.h
 hist.o: calc.h
+hist.o: calcerr.h
 hist.o: cmath.h
 hist.o: config.h
 hist.o: endian_calc.h
@@ -4015,8 +4016,8 @@ hist.o: longbits.h
 hist.o: md5.h
 hist.o: nametype.h
 hist.o: qmath.h
-hist.o: shs1.h
 hist.o: shs.h
+hist.o: shs1.h
 hist.o: string.h
 hist.o: value.h
 hist.o: win32dll.h
@@ -4024,8 +4025,8 @@ hist.o: zmath.h
 input.o: alloc.h
 input.o: block.h
 input.o: byteswap.h
-input.o: calcerr.h
 input.o: calc.h
+input.o: calcerr.h
 input.o: cmath.h
 input.o: conf.h
 input.o: config.h
@@ -4044,8 +4045,8 @@ input.o: longbits.h
 input.o: md5.h
 input.o: nametype.h
 input.o: qmath.h
-input.o: shs1.h
 input.o: shs.h
+input.o: shs1.h
 input.o: string.h
 input.o: value.h
 input.o: win32dll.h
@@ -4056,8 +4057,8 @@ jump.o: jump.h
 label.o: alloc.h
 label.o: block.h
 label.o: byteswap.h
-label.o: calcerr.h
 label.o: calc.h
+label.o: calcerr.h
 label.o: cmath.h
 label.o: config.h
 label.o: endian_calc.h
@@ -4076,8 +4077,8 @@ label.o: md5.h
 label.o: nametype.h
 label.o: opcodes.h
 label.o: qmath.h
-label.o: shs1.h
 label.o: shs.h
+label.o: shs1.h
 label.o: string.h
 label.o: token.h
 label.o: value.h
@@ -4086,8 +4087,8 @@ label.o: zmath.h
 lib_calc.o: alloc.h
 lib_calc.o: block.h
 lib_calc.o: byteswap.h
-lib_calc.o: calcerr.h
 lib_calc.o: calc.h
+lib_calc.o: calcerr.h
 lib_calc.o: cmath.h
 lib_calc.o: conf.h
 lib_calc.o: config.h
@@ -4108,8 +4109,8 @@ lib_calc.o: longbits.h
 lib_calc.o: md5.h
 lib_calc.o: nametype.h
 lib_calc.o: qmath.h
-lib_calc.o: shs1.h
 lib_calc.o: shs.h
+lib_calc.o: shs1.h
 lib_calc.o: string.h
 lib_calc.o: symbol.h
 lib_calc.o: terminal.h
@@ -4150,8 +4151,8 @@ listfunc.o: longbits.h
 listfunc.o: md5.h
 listfunc.o: nametype.h
 listfunc.o: qmath.h
-listfunc.o: shs1.h
 listfunc.o: shs.h
+listfunc.o: shs1.h
 listfunc.o: string.h
 listfunc.o: value.h
 listfunc.o: win32dll.h
@@ -4183,8 +4184,8 @@ matfunc.o: matfunc.c
 matfunc.o: md5.h
 matfunc.o: nametype.h
 matfunc.o: qmath.h
-matfunc.o: shs1.h
 matfunc.o: shs.h
+matfunc.o: shs1.h
 matfunc.o: string.h
 matfunc.o: value.h
 matfunc.o: win32dll.h
@@ -4194,8 +4195,8 @@ math_error.o: alloc.h
 math_error.o: args.h
 math_error.o: block.h
 math_error.o: byteswap.h
-math_error.o: calcerr.h
 math_error.o: calc.h
+math_error.o: calcerr.h
 math_error.o: cmath.h
 math_error.o: config.h
 math_error.o: endian_calc.h
@@ -4212,8 +4213,8 @@ math_error.o: math_error.h
 math_error.o: md5.h
 math_error.o: nametype.h
 math_error.o: qmath.h
-math_error.o: shs1.h
 math_error.o: shs.h
+math_error.o: shs1.h
 math_error.o: string.h
 math_error.o: value.h
 math_error.o: win32dll.h
@@ -4237,8 +4238,8 @@ md5.o: md5.c
 md5.o: md5.h
 md5.o: nametype.h
 md5.o: qmath.h
-md5.o: shs1.h
 md5.o: shs.h
+md5.o: shs1.h
 md5.o: string.h
 md5.o: value.h
 md5.o: win32dll.h
@@ -4246,8 +4247,8 @@ md5.o: zmath.h
 obj.o: alloc.h
 obj.o: block.h
 obj.o: byteswap.h
-obj.o: calcerr.h
 obj.o: calc.h
+obj.o: calcerr.h
 obj.o: cmath.h
 obj.o: config.h
 obj.o: endian_calc.h
@@ -4266,8 +4267,8 @@ obj.o: nametype.h
 obj.o: obj.c
 obj.o: opcodes.h
 obj.o: qmath.h
-obj.o: shs1.h
 obj.o: shs.h
+obj.o: shs1.h
 obj.o: string.h
 obj.o: symbol.h
 obj.o: value.h
@@ -4276,8 +4277,8 @@ obj.o: zmath.h
 opcodes.o: alloc.h
 opcodes.o: block.h
 opcodes.o: byteswap.h
-opcodes.o: calcerr.h
 opcodes.o: calc.h
+opcodes.o: calcerr.h
 opcodes.o: cmath.h
 opcodes.o: config.h
 opcodes.o: custom.h
@@ -4301,8 +4302,8 @@ opcodes.o: nametype.h
 opcodes.o: opcodes.c
 opcodes.o: opcodes.h
 opcodes.o: qmath.h
-opcodes.o: shs1.h
 opcodes.o: shs.h
+opcodes.o: shs1.h
 opcodes.o: string.h
 opcodes.o: symbol.h
 opcodes.o: value.h
@@ -4343,8 +4344,8 @@ poly.o: md5.h
 poly.o: nametype.h
 poly.o: poly.c
 poly.o: qmath.h
-poly.o: shs1.h
 poly.o: shs.h
+poly.o: shs1.h
 poly.o: string.h
 poly.o: value.h
 poly.o: win32dll.h
@@ -4460,8 +4461,8 @@ quickhash.o: md5.h
 quickhash.o: nametype.h
 quickhash.o: qmath.h
 quickhash.o: quickhash.c
-quickhash.o: shs1.h
 quickhash.o: shs.h
+quickhash.o: shs1.h
 quickhash.o: string.h
 quickhash.o: value.h
 quickhash.o: win32dll.h
@@ -4491,31 +4492,6 @@ seed.o: qmath.h
 seed.o: seed.c
 seed.o: win32dll.h
 seed.o: zmath.h
-shs1.o: align32.h
-shs1.o: alloc.h
-shs1.o: block.h
-shs1.o: byteswap.h
-shs1.o: calcerr.h
-shs1.o: cmath.h
-shs1.o: config.h
-shs1.o: endian_calc.h
-shs1.o: hash.h
-shs1.o: have_malloc.h
-shs1.o: have_memmv.h
-shs1.o: have_newstr.h
-shs1.o: have_stdlib.h
-shs1.o: have_string.h
-shs1.o: longbits.h
-shs1.o: md5.h
-shs1.o: nametype.h
-shs1.o: qmath.h
-shs1.o: shs1.c
-shs1.o: shs1.h
-shs1.o: shs.h
-shs1.o: string.h
-shs1.o: value.h
-shs1.o: win32dll.h
-shs1.o: zmath.h
 shs.o: align32.h
 shs.o: alloc.h
 shs.o: block.h
@@ -4534,13 +4510,38 @@ shs.o: longbits.h
 shs.o: md5.h
 shs.o: nametype.h
 shs.o: qmath.h
-shs.o: shs1.h
 shs.o: shs.c
 shs.o: shs.h
+shs.o: shs1.h
 shs.o: string.h
 shs.o: value.h
 shs.o: win32dll.h
 shs.o: zmath.h
+shs1.o: align32.h
+shs1.o: alloc.h
+shs1.o: block.h
+shs1.o: byteswap.h
+shs1.o: calcerr.h
+shs1.o: cmath.h
+shs1.o: config.h
+shs1.o: endian_calc.h
+shs1.o: hash.h
+shs1.o: have_malloc.h
+shs1.o: have_memmv.h
+shs1.o: have_newstr.h
+shs1.o: have_stdlib.h
+shs1.o: have_string.h
+shs1.o: longbits.h
+shs1.o: md5.h
+shs1.o: nametype.h
+shs1.o: qmath.h
+shs1.o: shs.h
+shs1.o: shs1.c
+shs1.o: shs1.h
+shs1.o: string.h
+shs1.o: value.h
+shs1.o: win32dll.h
+shs1.o: zmath.h
 size.o: alloc.h
 size.o: block.h
 size.o: byteswap.h
@@ -4559,8 +4560,8 @@ size.o: longbits.h
 size.o: md5.h
 size.o: nametype.h
 size.o: qmath.h
-size.o: shs1.h
 size.o: shs.h
+size.o: shs1.h
 size.o: size.c
 size.o: string.h
 size.o: value.h
@@ -4571,8 +4572,8 @@ size.o: zrandom.h
 string.o: alloc.h
 string.o: block.h
 string.o: byteswap.h
-string.o: calcerr.h
 string.o: calc.h
+string.o: calcerr.h
 string.o: cmath.h
 string.o: config.h
 string.o: endian_calc.h
@@ -4587,8 +4588,8 @@ string.o: longbits.h
 string.o: md5.h
 string.o: nametype.h
 string.o: qmath.h
-string.o: shs1.h
 string.o: shs.h
+string.o: shs1.h
 string.o: string.c
 string.o: string.h
 string.o: value.h
@@ -4597,8 +4598,8 @@ string.o: zmath.h
 symbol.o: alloc.h
 symbol.o: block.h
 symbol.o: byteswap.h
-symbol.o: calcerr.h
 symbol.o: calc.h
+symbol.o: calcerr.h
 symbol.o: cmath.h
 symbol.o: config.h
 symbol.o: endian_calc.h
@@ -4616,8 +4617,8 @@ symbol.o: md5.h
 symbol.o: nametype.h
 symbol.o: opcodes.h
 symbol.o: qmath.h
-symbol.o: shs1.h
 symbol.o: shs.h
+symbol.o: shs1.h
 symbol.o: string.h
 symbol.o: symbol.c
 symbol.o: symbol.h
@@ -4629,8 +4630,8 @@ token.o: alloc.h
 token.o: args.h
 token.o: block.h
 token.o: byteswap.h
-token.o: calcerr.h
 token.o: calc.h
+token.o: calcerr.h
 token.o: cmath.h
 token.o: config.h
 token.o: endian_calc.h
@@ -4646,8 +4647,8 @@ token.o: math_error.h
 token.o: md5.h
 token.o: nametype.h
 token.o: qmath.h
-token.o: shs1.h
 token.o: shs.h
+token.o: shs1.h
 token.o: string.h
 token.o: token.c
 token.o: token.h
@@ -4657,8 +4658,8 @@ token.o: zmath.h
 value.o: alloc.h
 value.o: block.h
 value.o: byteswap.h
-value.o: calcerr.h
 value.o: calc.h
+value.o: calcerr.h
 value.o: cmath.h
 value.o: config.h
 value.o: endian_calc.h
@@ -4678,8 +4679,8 @@ value.o: md5.h
 value.o: nametype.h
 value.o: opcodes.h
 value.o: qmath.h
-value.o: shs1.h
 value.o: shs.h
+value.o: shs1.h
 value.o: string.h
 value.o: symbol.h
 value.o: value.c
@@ -4691,8 +4692,8 @@ value.o: zrandom.h
 version.o: alloc.h
 version.o: block.h
 version.o: byteswap.h
-version.o: calcerr.h
 version.o: calc.h
+version.o: calcerr.h
 version.o: cmath.h
 version.o: config.h
 version.o: endian_calc.h
@@ -4707,8 +4708,8 @@ version.o: longbits.h
 version.o: md5.h
 version.o: nametype.h
 version.o: qmath.h
-version.o: shs1.h
 version.o: shs.h
+version.o: shs1.h
 version.o: string.h
 version.o: value.h
 version.o: version.c
@@ -4804,8 +4805,8 @@ zprime.o: md5.h
 zprime.o: nametype.h
 zprime.o: prime.h
 zprime.o: qmath.h
-zprime.o: shs1.h
 zprime.o: shs.h
+zprime.o: shs1.h
 zprime.o: string.h
 zprime.o: value.h
 zprime.o: win32dll.h
@@ -4828,6 +4829,16 @@ zrand.o: have_stdlib.h
 zrand.o: have_string.h
 zrand.o: longbits.h
 zrand.o: md5.h
+zrand.o: nametype.h
+zrand.o: qmath.h
+zrand.o: shs.h
+zrand.o: shs1.h
+zrand.o: string.h
+zrand.o: value.h
+zrand.o: win32dll.h
+zrand.o: zmath.h
+zrand.o: zrand.c
+zrand.o: zrand.h
 zrandom.o: alloc.h
 zrandom.o: block.h
 zrandom.o: byteswap.h
@@ -4846,21 +4857,11 @@ zrandom.o: longbits.h
 zrandom.o: md5.h
 zrandom.o: nametype.h
 zrandom.o: qmath.h
-zrandom.o: shs1.h
 zrandom.o: shs.h
+zrandom.o: shs1.h
 zrandom.o: string.h
 zrandom.o: value.h
 zrandom.o: win32dll.h
 zrandom.o: zmath.h
 zrandom.o: zrandom.c
 zrandom.o: zrandom.h
-zrand.o: nametype.h
-zrand.o: qmath.h
-zrand.o: shs1.h
-zrand.o: shs.h
-zrand.o: string.h
-zrand.o: value.h
-zrand.o: win32dll.h
-zrand.o: zmath.h
-zrand.o: zrand.c
-zrand.o: zrand.h
--- a/24
+++ b/24
@@ -73,13 +73,19 @@ for a wish/todo list.  Code contributions are welcome.

 =-=

-To join the calc-tester mailing list.  Send a request to:
+To join the calc-tester mailing list.  Send an EMail message to:

    calc-tester-request at asthe dot com

    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]

+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
 Your message body (not the subject) should consist of:

     subscribe calc-tester address
@@ -89,7 +95,11 @@ Your message body (not the subject) should consist of:
 where ``address'' is your EMail address and ``your_full_name'' is
 your full name.

-Calc bug reports, however should be sent to:
+Feel free to follow the name line with additional EMail text as desired.
+
+=-=
+
+Send Calc bug and bug fixes to:

    calc-bugs at asthe dot com

@@ -98,6 +108,12 @@ Calc bug reports, however should be sent to:

 but see the BUGS file first.

+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 The calc web site is located at:

 	http://www.isthe.com/chongo/tech/comp/calc/
@@ -118,8 +134,8 @@ The calc web site is located at:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: README,v 29.2 2000/06/07 14:02:13 chongo Exp $
+## @(#) $Revision: 29.3 $
+## @(#) $Id: README,v 29.3 2001/06/01 11:26:53 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/README,v $
 ##
 ## Under source code control:	1995/10/25 05:27:59
--- a/alloc.h
+++ b/alloc.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: alloc.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: alloc.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
 *
 * Under source code control:	1990/02/15 01:48:29
@@ -32,10 +32,17 @@
 #define __ALLOC_H__


-#include "have_malloc.h"
-#include "have_newstr.h"
-#include "have_string.h"
-#include "have_memmv.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "have_malloc.h"
+# include "have_newstr.h"
+# include "have_string.h"
+# include "have_memmv.h"
+#else
+# include <calc/have_malloc.h>
+# include <calc/have_newstr.h>
+# include <calc/have_string.h>
+# include <calc/have_memmv.h>
+#endif

 #ifdef HAVE_MALLOC_H
 # include <malloc.h>
--- a/byteswap.h
+++ b/byteswap.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: byteswap.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: byteswap.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
 *
 * Under source code control:	1995/10/11 04:44:01
@@ -33,7 +33,11 @@
 #define __BYTESWAP_H__


-#include "longbits.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "longbits.h"
+#else
+# include <calc/longbits.h>
+#endif


 /*
--- a/calc.h
+++ b/calc.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: calc.h,v 29.6 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: calc.h,v 29.7 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
 *
 * Under source code control:	1990/02/15 01:48:31
@@ -32,9 +32,15 @@
 #define __CALC_H__

 #include <setjmp.h>
-#include "win32dll.h"
-#include "value.h"
-#include "have_const.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+# include "value.h"
+# include "have_const.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/value.h>
+# include <calc/have_const.h>
+#endif


 /*
--- a/calc.man
+++ b/calc.man
@@ -15,8 +15,8 @@
 .\" received a copy with calc; if not, write to Free Software Foundation, Inc.
 .\" 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 .\"
-.\" @(#) $Revision: 29.6 $
-.\" @(#) $Id: calc.man,v 29.6 2001/04/10 21:48:46 chongo Exp $
+.\" @(#) $Revision: 29.7 $
+.\" @(#) $Id: calc.man,v 29.7 2001/06/01 11:26:53 chongo Exp $
 .\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -994,25 +994,58 @@ Copyright (C) 1999  Landon Curt Noll
 and is covered under version 2.1 GNU Lesser General
 Public License.
 .sp
-.SH "BUG REPORTS / BUG FIXES / ENHANCEMENTS"
+.SH "CALC MAILING LIST / CALC UPDATES / ENHANCEMENTS"
 \&
 .br
 .sp
-Send comments, suggestions, bug fixes, enhancements
+To contribute comments, suggestions, enhancements
 and interesting
 .B calc
-resource files,
-.B calc
-shell scripts that you would like you see included
-in future distributions to:
+resource files, and
+shell scripts please join the low volume calc mailing list.
+.sp
+To join the low volume calc mailing list, send EMail to:
 .sp
 .in +0.5i
 .nf
-calc-contrib at asthe dot com
+calc-tester-request at asthe dot com
 .fi
 .in -0.5i
 .sp
-Bug reports are sent to:
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc mailing list subscription
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
+Your message body must contain:
+.sp
+.in +0.5i
+.nf
+subscribe calc-tester address
+end
+name your_full_name
+.fi
+.in -0.5i
+.sp
+where
+.B address
+s your EMail address and
+.B your_full_name
+is your full name.
+Feel free to follow the
+.B name
+line with additional EMail text as desired.
+.sp
+.SH "BUG REPORTS / BUG FIXES"
+\&
+.br
+.sp
+Send bug reports and bug fixes to:
 .sp
 .in +0.5i
 .nf
@@ -1023,6 +1056,16 @@ calc-bugs at asthe dot com
 .fi
 .in -0.5i
 .sp
+Your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc bug report
+.fi
+.in -0.5i
+.sp
+You may have additional words in your subject line.
+.sp
 See the
 .I BUGS
 source file or use the
@@ -1037,7 +1080,7 @@ help bugs
 .sp
 for more information about bug reporting.
 .sp
-.SH "CALC WEB SITE / MAILING LIST"
+.SH "CALC WEB SITE"
 \&
 .br
 Landon Noll maintains the the
@@ -1048,30 +1091,4 @@ web site is located at:
 http://www.isthe.com/chongo/tech/comp/calc/
 .in -0.5i
 .sp
-One may join the
-.B calc
-testing group by sending a request to:
-.sp
-.in +0.5i
-.nf
-calc-tester-request at asthe dot com
-
-[[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-[[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-.fi
-.in -0.5i
-.sp
-Your message body (not the subject) should consist of:
-.sp
-.in +0.5i
-.nf
-subscribe calc-tester address
-end
-name your_full_name
-.fi
-.in -0.5i
-.sp
-where "address" is your EMail address and "your_full_name"
-is your full name.
-.sp
 Share and Enjoy! :\-)
--- a/cmath.h
+++ b/cmath.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: cmath.h,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: cmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
 *
 * Under source code control:	1993/07/30 19:42:45
@@ -32,7 +32,11 @@
 #define __CMATH_H__


-#include "qmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "qmath.h"
+#else
+# include <calc/qmath.h>
+#endif


 /*
--- a/config.h
+++ b/config.h
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.9 $
- * @(#) $Id: config.h,v 29.9 2001/04/14 22:47:21 chongo Exp $
+ * @(#) $Revision: 29.10 $
+ * @(#) $Id: config.h,v 29.10 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/config.h,v $
 *
 * Under source code control:	1995/11/01 22:20:17
@@ -35,9 +35,15 @@
 #define __CONFIG_H__


-#include "win32dll.h"
-#include "nametype.h"
-#include "qmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+# include "nametype.h"
+# include "qmath.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/nametype.h>
+# include <calc/qmath.h>
+#endif


 /*
--- a/cscript/4dsphere.calc
+++ b/cscript/4dsphere.calc
@@ -0,0 +1,320 @@
+#!/usr/local/bin/calc -q -s -f
+/*
+ * 4dsphere - determine if 6 points lie on the surface of a sphere in R^4
+ *
+ * usage:
+ *      4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
+ *
+ *      x0 y0 z0 w0	point 0 in R^4
+ *      x1 y1 z1 w1	point 1 in R^4
+ *	...		...
+ *      x5 y5 z5 w5	point 5 in R^4
+ *
+ * Copyright (C) 2001  Landon Curt Noll
+ *
+ * Calc is open software; you can redistribute it and/or modify it under
+ * the terms of the version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
+ *
+ * Calc is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+ * Public License for more details.
+ *
+ * A copy of version 2.1 of the GNU Lesser General Public License is
+ * distributed with calc under the filename COPYING-LGPL.  You should have
+ * received a copy with calc; if not, write to Free Software Foundation, Inc.
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * @(#) $Revision: 1.2 $
+ * @(#) $Id: 4dsphere.calc,v 1.2 2001/05/29 00:48:46 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/4dsphere.calc,v $
+ *
+ * Under source code control:   2001/05/03 19:02:03
+ * File existed as early as:    2001
+ *
+ * chongo <was here> /\oo/\     http://www.isthe.com/chongo/
+ * Share and enjoy!  :-)        http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+/*
+ * parse args
+ */
+argc = argv();
+if (argc != 25) {
+    fprintf(files(2), "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+	argv(0));
+    exit;
+}
+x0 = eval(argv(1));
+y0 = eval(argv(2));
+z0 = eval(argv(3));
+w0 = eval(argv(4));
+x1 = eval(argv(5));
+y1 = eval(argv(6));
+z1 = eval(argv(7));
+w1 = eval(argv(8));
+x2 = eval(argv(9));
+y2 = eval(argv(10));
+z2 = eval(argv(11));
+w2 = eval(argv(12));
+x3 = eval(argv(13));
+y3 = eval(argv(14));
+z3 = eval(argv(15));
+w3 = eval(argv(16));
+x4 = eval(argv(17));
+y4 = eval(argv(18));
+z4 = eval(argv(19));
+w4 = eval(argv(20));
+x5 = eval(argv(21));
+y5 = eval(argv(22));
+z5 = eval(argv(23));
+w5 = eval(argv(24));
+
+/*
+ * verbose output setup
+ */
+print "(":x0:",":y0:",":z0:",":w0:") ":;
+print "(":x1:",":y1:",":z1:",":w1:") ":;
+print "(":x2:",":y2:",":z2:",":w2:") ":;
+print "(":x3:",":y3:",":z3:",":w3:") ":;
+print "(":x4:",":y4:",":z4:",":w4:") ":;
+print "(":x5:",":y5:",":z5:",":w5:") ":;
+
+/*
+ *
+ * Given the 5 points:
+ *
+ * 	(x0,y1,z1,w1)
+ * 	(x1,y1,z1,w1)
+ * 	(x2,y2,z2,w2)
+ * 	(x3,y3,z3,w3)
+ * 	(x4,y4,z4,w4)
+ * 	(x5,y5,z5,w5)
+ *
+ * we can determine if they lie in the surface of 4D sphere in R^4 if the
+ * following matrix is 0:
+ *
+ * 	| x0^2+y0^2+z0^2+w0^2	x0	y0	z0	w0	1 |
+ * 	| x1^2+y1^2+z1^2+w1^2	x1	y1	z1	w1	1 |
+ * 	| x2^2+y2^2+z2^2+w2^2	x2	y2	z2	w2	1 |	= 0
+ * 	| x3^2+y3^2+z3^2+w3^2	x3	y3	z3	w3	1 |
+ * 	| x4^2+y4^2+z4^2+w4^2	x4	y4	z4	w4	1 |
+ * 	| x5^2+y5^2+z5^2+w5^2	x5	y5	z5	w5	1 |
+ */
+if ((w0*(-x1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) +y1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -z3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5)
+    -x5*z4- (x4-x5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(x2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4-
+    (x4-x5)*z3) +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+
+    (x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3)) -x0*(-w1*(-y2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +y5*(z4^2+y4^2+x4^2+w4^2) + (y4-y5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4)) -y1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z1^2+y1^2+x1^2+w1^2)*(w2*(y4*z5+y3*(z4-z5) -y5*z4-
+    (y4-y5)*z3) -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3-
+    (-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)*z2) +
+    (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3)) +y0*(-w1*(-x2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    +x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z2^2+y2^2+x2^2+w2^2)*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3) -
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -x1*(w2*(-z4*(z5^2+y5^2+x5^2+w5^2)
+    -z3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +
+    (z4^2+y4^2+x4^2+w4^2)*z5+ (z3^2+y3^2+x3^2+w3^2)*(z4-z5))
+    -w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +z3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (z2^2+y2^2+x2^2+w2^2)*(-w4*z5-w3*(z4-z5)
+    +w5*z4+ (w4-w5)*z3) - (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5))
+    -w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) +
+    (z1^2+y1^2+x1^2+w1^2)*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3))
+    -w1*(-x2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    +y2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4)) -z2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3))
+    +x1*(-w2*(-y3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(y4*z5-y5*z4))
+    -y2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3))
+    -y1*(-w2*(-x3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    +z3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    + (z3^2+y3^2+x3^2+w3^2)*(x4*z5-x5*z4))
+    -x2*(w3*((z4^2+y4^2+x4^2+w4^2)*z5-z4*(z5^2+y5^2+x5^2+w5^2))
+    -z3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (z3^2+y3^2+x3^2+w3^2)*(w5*z4-w4*z5)) +z2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2))
+    + (z2^2+y2^2+x2^2+w2^2)*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5)
+    - (w5*x4-w4*x5)*z3)) -z0*(-w1*(-x2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +x5*(z4^2+y4^2+x4^2+w4^2) + (x4-x5)*(z3^2+y3^2+x3^2+w3^2))
+    -y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) -
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2) + (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -x1*(w2*(-y4*(z5^2+y5^2+x5^2+w5^2)
+    -y3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +y5*(z4^2+y4^2+x4^2+w4^2)
+    + (y4-y5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2)
+    +w5*(z4^2+y4^2+x4^2+w4^2) + (w4-w5)*(z3^2+y3^2+x3^2+w3^2))
+    +y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) -
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2) + (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*(z2^2+y2^2+x2^2+w2^2)) -w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) +y3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) + (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2))
+    -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    -y3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2)) +y1*(w2*(-x4*(z5^2+y5^2+x5^2+w5^2)
+    -x3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +x5*(z4^2+y4^2+x4^2+w4^2)
+    + (x4-x5)*(z3^2+y3^2+x3^2+w3^2)) -w3*(x5*(z4^2+y4^2+x4^2+w4^2)
+    -x4*(z5^2+y5^2+x5^2+w5^2)) -x2*(-w4*(z5^2+y5^2+x5^2+w5^2)
+    -w3*(-z5^2+z4^2-y5^2+y4^2-x5^2+x4^2-w5^2+w4^2) +w5*(z4^2+y4^2+x4^2+w4^2)
+    + (w4-w5)*(z3^2+y3^2+x3^2+w3^2)) +x3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) - (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)
+    + (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*(z2^2+y2^2+x2^2+w2^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5)
+    - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2) + (w2*(x4*y5+x3*(y4-y5)
+    -x5*y4- (x4-x5)*y3) -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5)
+    +w5*y4+ (w4-w5)*y3) -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3-
+    (-w4*x5-w3*(x4-x5) +w5*x4+ (w4-w5)*x3)*y2)*(z1^2+y1^2+x1^2+w1^2))
+    +z1*(-w2*(-x3*(y5*(z4^2+y4^2+x4^2+w4^2) -y4*(z5^2+y5^2+x5^2+w5^2))
+    +y3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2)) +
+    (x4*y5-x5*y4)*(z3^2+y3^2+x3^2+w3^2)) -x2*(w3*(y5*(z4^2+y4^2+x4^2+w4^2)
+    -y4*(z5^2+y5^2+x5^2+w5^2)) -y3*(w5*(z4^2+y4^2+x4^2+w4^2)
+    -w4*(z5^2+y5^2+x5^2+w5^2)) + (w5*y4-w4*y5)*(z3^2+y3^2+x3^2+w3^2))
+    +y2*(w3*(x5*(z4^2+y4^2+x4^2+w4^2) -x4*(z5^2+y5^2+x5^2+w5^2))
+    -x3*(w5*(z4^2+y4^2+x4^2+w4^2) -w4*(z5^2+y5^2+x5^2+w5^2)) +
+    (w5*x4-w4*x5)*(z3^2+y3^2+x3^2+w3^2)) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*(z2^2+y2^2+x2^2+w2^2)) +
+    (z0^2+y0^2+x0^2+w0^2)*(-w1*(x2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -x3*(y4*z5-y5*z4) -y2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    +y3*(x4*z5-x5*z4) - (x4*y5-x5*y4)*z3+ (x4*y5+x3*(y4-y5) -x5*y4-
+    (x4-x5)*y3)*z2) +x1*(w2*(y4*z5+y3*(z4-z5) -y5*z4- (y4-y5)*z3)
+    -w3*(y4*z5-y5*z4) +y2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -y3*(w5*z4-w4*z5) + (w5*y4-w4*y5)*z3- (-w4*y5-w3*(y4-y5) +w5*y4+
+    (w4-w5)*y3)*z2) -w2*(x3*(y4*z5-y5*z4) -y3*(x4*z5-x5*z4) +
+    (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4) +y3*(w5*z4-w4*z5) -
+    (w5*y4-w4*y5)*z3) -y1*(w2*(x4*z5+x3*(z4-z5) -x5*z4- (x4-x5)*z3)
+    -w3*(x4*z5-x5*z4) +x2*(-w4*z5-w3*(z4-z5) +w5*z4+ (w4-w5)*z3)
+    -x3*(w5*z4-w4*z5) + (w5*x4-w4*x5)*z3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*z2) -y2*(w3*(x4*z5-x5*z4) +x3*(w5*z4-w4*z5) -
+    (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4) +x3*(w5*y4-w4*y5) -
+    (w5*x4-w4*x5)*y3)*z2+ (w2*(x4*y5+x3*(y4-y5) -x5*y4- (x4-x5)*y3)
+    -w3*(x4*y5-x5*y4) +x2*(-w4*y5-w3*(y4-y5) +w5*y4+ (w4-w5)*y3)
+    -x3*(w5*y4-w4*y5) + (w5*x4-w4*x5)*y3- (-w4*x5-w3*(x4-x5) +w5*x4+
+    (w4-w5)*x3)*y2)*z1) - (z1^2+y1^2+x1^2+w1^2)*(-w2*(x3*(y4*z5-y5*z4)
+    -y3*(x4*z5-x5*z4) + (x4*y5-x5*y4)*z3) +x2*(w3*(y4*z5-y5*z4)
+    +y3*(w5*z4-w4*z5) - (w5*y4-w4*y5)*z3) -y2*(w3*(x4*z5-x5*z4)
+    +x3*(w5*z4-w4*z5) - (w5*x4-w4*x5)*z3) + (w3*(x4*y5-x5*y4)
+    +x3*(w5*y4-w4*y5) - (w5*x4-w4*x5)*y3)*z2)) == 0) {
+    print "are in the surface of a 4D sphere";
+} else {
+    print "are NOT on a 4D sphere surface";
+}
--- a/cscript/Makefile
+++ b/cscript/Makefile
@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.13 $
-# @(#) $Id: Makefile,v 29.13 2001/05/13 14:43:56 chongo Exp chongo $
+# @(#) $Revision: 29.14 $
+# @(#) $Id: Makefile,v 29.14 2001/05/28 23:08:22 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -77,10 +77,11 @@ CMP= cmp
 #
 #		make detaillist
 #
-SCRIPT= mersenne piforever plus simple square fproduct powerterm
+SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm simple \
+	square

-SCRIPT_SRC= mersenne.calc piforever.calc plus.calc simple.calc square.calc \
-	fproduct.calc powerterm.calc
+SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc piforever.calc \
+	plus.calc powerterm.calc simple.calc square.calc

 # These files are found (but not built) in the distribution
 #
@@ -266,6 +267,14 @@ install: all

 # DO NOT DELETE THIS LINE -- make depend depends on it.

+4dsphere: 4dsphere.calc
+	rm -f $@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	${CHMOD} +x $@
+fproduct: fproduct.calc
+	rm -f $@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	${CHMOD} +x $@
 mersenne: mersenne.calc
 	rm -f $@
 	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
@@ -278,6 +287,10 @@ plus: plus.calc
 	rm -f $@
 	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@
+powerterm: powerterm.calc
+	rm -f $@
+	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
+	${CHMOD} +x $@
 simple: simple.calc
 	rm -f $@
 	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
@@ -286,11 +299,3 @@ square: square.calc
 	rm -f $@
 	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
 	${CHMOD} +x $@
-fproduct: fproduct.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
-powerterm: powerterm.calc
-	rm -f $@
-	${SED} -e "1s:^#!/usr/local/src/cmd/calc/calc:#!${BINDIR}/calc:" $?>$@
-	${CHMOD} +x $@
--- a/cscript/README
+++ b/cscript/README
@@ -19,6 +19,18 @@ For more info, see:

 =-=

+4dsphere
+
+    determine if 6 points lie on the surface of a sphere in R^4
+
+     usage: 4dsphere x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5
+
+        x0 y0 z0 w0     point 0 in R^4
+        x1 y1 z1 w1     point 1 in R^4
+        ...             ...
+        x5 y5 z5 w5     point 5 in R^4
+
+
 fproduct filename term ...

    Write the big Endian product of terms to a file.  Use - for stdout.
@@ -65,8 +77,8 @@ simple
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.6 $
-## @(#) $Id: README,v 29.6 2001/04/25 07:26:12 chongo Exp $
+## @(#) $Revision: 29.7 $
+## @(#) $Id: README,v 29.7 2001/05/28 23:08:22 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/README,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.11 $
-# @(#) $Id: Makefile,v 29.11 2001/05/28 22:23:56 chongo Exp $
+# @(#) $Revision: 29.13 $
+# @(#) $Id: Makefile,v 29.13 2001/05/28 23:54:53 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -434,7 +434,7 @@ depend:
 	${Q}echo forming custom dependency list
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/custom/makedep.out
-	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -m -f makedep.out ${C_SRC}
+	${Q}cd skel/custom; ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC}
 	-${Q}for i in ${C_SRC}; do \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	done >> skel/custom/makedep.out
@@ -632,9 +632,8 @@ install: all
 c_argv.o: ../alloc.h
 c_argv.o: ../block.h
 c_argv.o: ../byteswap.h
-c_argv.o: ../calcerr.h
 c_argv.o: ../calc.h
-c_argv.o: c_argv.c
+c_argv.o: ../calcerr.h
 c_argv.o: ../cmath.h
 c_argv.o: ../config.h
 c_argv.o: ../custom.h
@@ -650,17 +649,17 @@ c_argv.o: ../longbits.h
 c_argv.o: ../md5.h
 c_argv.o: ../nametype.h
 c_argv.o: ../qmath.h
-c_argv.o: ../shs1.h
 c_argv.o: ../shs.h
+c_argv.o: ../shs1.h
 c_argv.o: ../string.h
 c_argv.o: ../value.h
 c_argv.o: ../win32dll.h
 c_argv.o: ../zmath.h
+c_argv.o: c_argv.c
 c_devnull.o: ../alloc.h
 c_devnull.o: ../block.h
 c_devnull.o: ../byteswap.h
 c_devnull.o: ../calcerr.h
-c_devnull.o: c_devnull.c
 c_devnull.o: ../cmath.h
 c_devnull.o: ../config.h
 c_devnull.o: ../custom.h
@@ -676,17 +675,17 @@ c_devnull.o: ../longbits.h
 c_devnull.o: ../md5.h
 c_devnull.o: ../nametype.h
 c_devnull.o: ../qmath.h
-c_devnull.o: ../shs1.h
 c_devnull.o: ../shs.h
+c_devnull.o: ../shs1.h
 c_devnull.o: ../string.h
 c_devnull.o: ../value.h
 c_devnull.o: ../win32dll.h
 c_devnull.o: ../zmath.h
+c_devnull.o: c_devnull.c
 c_help.o: ../alloc.h
 c_help.o: ../block.h
 c_help.o: ../byteswap.h
 c_help.o: ../calcerr.h
-c_help.o: c_help.c
 c_help.o: ../cmath.h
 c_help.o: ../config.h
 c_help.o: ../custom.h
@@ -702,19 +701,19 @@ c_help.o: ../longbits.h
 c_help.o: ../md5.h
 c_help.o: ../nametype.h
 c_help.o: ../qmath.h
-c_help.o: ../shs1.h
 c_help.o: ../shs.h
+c_help.o: ../shs1.h
 c_help.o: ../string.h
 c_help.o: ../value.h
 c_help.o: ../win32dll.h
 c_help.o: ../zmath.h
+c_help.o: c_help.c
 c_pzasusb8.o: ../alloc.h
 c_pzasusb8.o: ../block.h
 c_pzasusb8.o: ../byteswap.h
 c_pzasusb8.o: ../calcerr.h
 c_pzasusb8.o: ../cmath.h
 c_pzasusb8.o: ../config.h
-c_pzasusb8.o: c_pzasusb8.c
 c_pzasusb8.o: ../custom.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
@@ -728,21 +727,21 @@ c_pzasusb8.o: ../longbits.h
 c_pzasusb8.o: ../md5.h
 c_pzasusb8.o: ../nametype.h
 c_pzasusb8.o: ../qmath.h
-c_pzasusb8.o: ../shs1.h
 c_pzasusb8.o: ../shs.h
+c_pzasusb8.o: ../shs1.h
 c_pzasusb8.o: ../string.h
 c_pzasusb8.o: ../value.h
 c_pzasusb8.o: ../win32dll.h
 c_pzasusb8.o: ../zmath.h
+c_pzasusb8.o: c_pzasusb8.c
 c_sysinfo.o: ../alloc.h
 c_sysinfo.o: ../block.h
 c_sysinfo.o: ../byteswap.h
-c_sysinfo.o: ../calcerr.h
 c_sysinfo.o: ../calc.h
+c_sysinfo.o: ../calcerr.h
 c_sysinfo.o: ../cmath.h
 c_sysinfo.o: ../conf.h
 c_sysinfo.o: ../config.h
-c_sysinfo.o: c_sysinfo.c
 c_sysinfo.o: ../custom.h
 c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
@@ -760,14 +759,15 @@ c_sysinfo.o: ../md5.h
 c_sysinfo.o: ../nametype.h
 c_sysinfo.o: ../prime.h
 c_sysinfo.o: ../qmath.h
-c_sysinfo.o: ../shs1.h
 c_sysinfo.o: ../shs.h
+c_sysinfo.o: ../shs1.h
 c_sysinfo.o: ../string.h
 c_sysinfo.o: ../value.h
 c_sysinfo.o: ../win32dll.h
 c_sysinfo.o: ../zmath.h
 c_sysinfo.o: ../zrand.h
 c_sysinfo.o: ../zrandom.h
+c_sysinfo.o: c_sysinfo.c
 custtbl.o: ../alloc.h
 custtbl.o: ../block.h
 custtbl.o: ../byteswap.h
@@ -775,7 +775,6 @@ custtbl.o: ../calcerr.h
 custtbl.o: ../cmath.h
 custtbl.o: ../config.h
 custtbl.o: ../custom.h
-custtbl.o: custtbl.c
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
 custtbl.o: ../have_const.h
@@ -788,9 +787,10 @@ custtbl.o: ../longbits.h
 custtbl.o: ../md5.h
 custtbl.o: ../nametype.h
 custtbl.o: ../qmath.h
-custtbl.o: ../shs1.h
 custtbl.o: ../shs.h
+custtbl.o: ../shs1.h
 custtbl.o: ../string.h
 custtbl.o: ../value.h
 custtbl.o: ../win32dll.h
 custtbl.o: ../zmath.h
+custtbl.o: custtbl.c
--- a/file.h
+++ b/file.h
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: file.h,v 29.3 2001/04/10 22:06:46 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: file.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.h,v $
 *
 * Under source code control:	1996/05/24 05:55:58
@@ -35,7 +35,11 @@
 #define __FILE_H__


-#include "have_fpos.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "have_fpos.h"
+#else
+# include <calc/have_fpos.h>
+#endif


 /*
--- a/func.c
+++ b/func.c
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.9 $
- * @(#) $Id: func.c,v 29.9 2001/04/10 22:06:46 chongo Exp $
+ * @(#) $Revision: 29.10 $
+ * @(#) $Id: func.c,v 29.10 2001/05/29 00:41:22 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.c,v $
 *
 * Under source code control:	1990/02/15 01:48:15
@@ -7303,6 +7303,7 @@ f_free(int count, VALUE **vals)
 	return result;
 }

+
 static VALUE
 f_freeglobals(void)
 {
@@ -7316,6 +7317,7 @@ f_freeglobals(void)
 	return result;
 }

+
 static VALUE
 f_freeredc(void)
 {
@@ -7723,6 +7725,20 @@ f_argv(int count, VALUE **vals)
 }


+static VALUE
+f_version(void)
+{
+	VALUE result;
+
+	/* return the calc verstion string */
+	result.v_type = V_STR;
+	result.v_subtype = V_NOSUBTYPE;
+	result.v_str = makestring(strdup(version()));
+
+	return result;
+}
+
+
 #endif /* !FUNCLIST */


@@ -8325,6 +8341,8 @@ static CONST struct builtin builtins[] = {
 	 "truncate a to b number of decimal places"},
 	{"ungetc", 2, 2, 0, OP_NOP, 0, f_ungetc,
 	 "unget char read from file"},
+	{"version", 0, 0, 0, OP_NOP, 0, f_version,
+	 "calc version string"},
 	{"xor", 1, IN, 0, OP_NOP, 0, f_xor,
 	 "logical xor"},

--- a/func.h
+++ b/func.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: func.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: func.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
 *
 * Under source code control:	1990/02/15 01:48:33
@@ -32,8 +32,13 @@
 #define __FUNC_H__


-#include "calc.h"
-#include "label.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "calc.h"
+# include "label.h"
+#else
+# include <calc/calc.h>
+# include <calc/label.h>
+#endif


 /*
--- a/hash.h
+++ b/hash.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: hash.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: hash.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/hash.h,v $
 *
 * Under source code control:	1995/11/14 23:57:45
@@ -33,10 +33,17 @@
 #define __HASH_H__


-#include "shs.h"
-#include "shs1.h"
-#include "md5.h"
-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "shs.h"
+# include "shs1.h"
+# include "md5.h"
+# include "zmath.h"
+#else
+# include <calc/shs.h>
+# include <calc/shs1.h>
+# include <calc/md5.h>
+# include <calc/zmath.h>
+#endif


 /* MAX_CHUNKSIZE is the largest chunksize of any hash */
--- a/help/Makefile
+++ b/help/Makefile
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.12 $
-# @(#) $Id: Makefile,v 29.12 2001/05/28 22:36:28 chongo Exp $
+# @(#) $Revision: 29.13 $
+# @(#) $Id: Makefile,v 29.13 2001/05/29 00:41:11 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -166,7 +166,7 @@ DETAIL_HELP= abs access acos acosh acot acoth acsc acsch address agd append \
 	runtime saveval scale scan scanf search sec sech seed segment select \
 	sgn sha sha1 sin sinh size sizeof sleep sort sqrt srand srandom \
 	ssq str strcat strerror strlen strpos strprintf strscan strscanf \
-	substr sum swap system tail tan tanh test time trunc xor
+	substr sum swap system tail tan tanh test time trunc version xor

 # This list is of files that are clones of DETAIL_HELP files.  They are
 # built from DETAIL_HELP files.
--- a/help/contrib
+++ b/help/contrib
@@ -35,24 +35,41 @@ If your change is large, you should send entire files (either
 as a diff -c /dev/null your-file patch, or as a uuencoded and
 gziped (or compressed) tar file).

-You should send submissions to:
+To contribute code, scripts, resource files and/or to help please
+join the low volume calc mailing list by sending EMail to:

    calc-contrib at asthe dot com

    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]

+Your subject must contain the words:
+
+    calc mailing list subscription
+
+You may have additional words in your subject line.
+
+Feel free to follow the name line with additional EMail text as desired.
+
 Thanks for considering submitting code to calc.	 Calc is a collective
 work by a number of people.  It would not be what it is today without
 your efforts and submissions!

-Calc bug reports, however, should be sent to:
+=-=
+
+Calc bug reports and calc bug fixes should be sent to:

    calc-bugs at asthe dot com

    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]

+Your subject must contain the words:
+
+       calc bug report
+
+You may have additional words in your subject line.
+
 See the BUGS file or try the help command:

    help bugs
@@ -61,26 +78,10 @@ for details on bug reporting.

 =-=

-One may join the calc testing group by sending a request to:
-
-	calc-tester-request at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
-
-    Your message body (not the subject) should consist of:
-
-	subscribe calc-tester address
-	end
-	name your_full_name
-
-    where "address" is your EMail address and "your_full_name"
-    is your full name.
-
 Landon Curt Noll
 http://www.isthe.com/chongo/

-chongo <was here> /\../\
+chongo (share and enjoy) /\../\

 ## Copyright (C) 1999  Landon Curt Noll
 ##
@@ -98,8 +99,8 @@ chongo <was here> /\../\
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.2 $
-## @(#) $Id: contrib,v 29.2 2000/06/07 14:02:33 chongo Exp $
+## @(#) $Revision: 29.4 $
+## @(#) $Id: contrib,v 29.4 2001/06/01 11:37:14 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/contrib,v $
 ##
 ## Under source code control:	1997/03/09 16:33:22
--- a/help/version
+++ b/help/version
@@ -0,0 +1,60 @@
+NAME
+    version - return the calc version string
+
+SYNOPSIS
+    version()
+
+TYPES
+    return	string
+
+DESCRIPTION
+    Returns the calc version string.
+
+    Calc version strings can be of the form:
+
+    	x.y.ztw.v
+    	x.y.ztw
+    	x.y.z
+    	x.y
+
+    where x, y, z, w, v are integers (without leading 0's) and,
+    t is the the liternal character 't'.
+
+EXAMPLE
+    > version()
+    	    "2.11.5t4.1"
+
+LIMITS
+    none
+
+LINK LIBRARY
+    none
+
+SEE ALSO
+    n/a
+
+## Copyright (C) 2001  Landon Curt Noll
+##
+## Calc is open software; you can redistribute it and/or modify it under
+## the terms of the version 2.1 of the GNU Lesser General Public License
+## as published by the Free Software Foundation.
+##
+## Calc is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+## or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
+## Public License for more details.
+##
+## A copy of version 2.1 of the GNU Lesser General Public License is
+## distributed with calc under the filename COPYING-LGPL.  You should have
+## received a copy with calc; if not, write to Free Software Foundation, Inc.
+## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+##
+## @(#) $Revision: 29.2 $
+## @(#) $Id: version,v 29.2 2001/05/29 00:43:54 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/version,v $
+##
+## Under source code control:	2001/05/28 17:38:01
+## File existed as early as:	2001
+##
+## chongo <was here> /\oo/\	http://www.isthe.com/chongo/
+## Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
--- a/jump.h
+++ b/jump.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: jump.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: jump.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/jump.h,v $
 *
 * Under source code control:	1994/06/29 04:03:55
@@ -65,7 +65,13 @@
 #if !defined(__JUMP_H__)
 #define __JUMP_H__

-#include "have_const.h"
+
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "have_const.h"
+#else
+# include <calc/have_const.h>
+#endif
+

 /*
 * trivial prime CONSTants
--- a/label.h
+++ b/label.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: label.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: label.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/label.h,v $
 *
 * Under source code control:	1990/02/15 01:48:33
@@ -32,7 +32,11 @@
 #define __LABEL_H__


-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif


 #define NULL_LABEL	((LABEL *) 0)
--- a/math_error.h
+++ b/math_error.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: math_error.h,v 29.3 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: math_error.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/math_error.h,v $
 *
 * Under source code control:	1997/03/23 18:37:10
@@ -33,7 +33,11 @@
 #define __MATH_ERROR_H__


-#include "win32dll.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+#else
+# include <calc/win32dll.h>
+#endif


 /*
--- a/opcodes.h
+++ b/opcodes.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.4 $
- * @(#) $Id: opcodes.h,v 29.4 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.5 $
+ * @(#) $Id: opcodes.h,v 29.5 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/opcodes.h,v $
 *
 * Under source code control:	1990/02/15 01:48:35
@@ -32,7 +32,11 @@
 #define __OPCODES_H__


-#include "win32dll.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+#else
+# include <calc/win32dll.h>
+#endif


 /*
--- a/prime.h
+++ b/prime.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: prime.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: prime.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/prime.h,v $
 *
 * Under source code control:	1994/06/04 03:26:15
@@ -33,8 +33,13 @@
 #define __PRIME_H__


-#include "qmath.h"
-#include "have_const.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "qmath.h"
+# include "have_const.h"
+#else
+# include <calc/math.h>
+# include <calc/have_const.h>
+#endif


 #define MAX_MAP_PRIME ((FULL)65521)	   /* (2^16-15) larest prime in prmap */
--- a/qmath.h
+++ b/qmath.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: qmath.h,v 29.3 2000/07/17 15:35:49 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: qmath.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/qmath.h,v $
 *
 * Under source code control:	1993/07/30 19:42:47
@@ -32,7 +32,12 @@
 #define __QMATH_H__


-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif
+

 #define INITCONSTCOUNT 9    /* number of initnumbs[] pre-defined constants */

--- a/sample/Makefile
+++ b/sample/Makefile
@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.9 $
-# @(#) $Id: Makefile,v 29.9 2001/05/28 22:27:15 chongo Exp $
+# @(#) $Revision: 29.11 $
+# @(#) $Id: Makefile,v 29.11 2001/05/28 23:54:53 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -411,7 +411,7 @@ depend:
 	${Q}echo forming sample dependency list
 	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/sample/makedep.out
-	${Q}cd skel/sample; ${MAKEDEPEND} -w 1 -m -f makedep.out -I.. ${C_SRC}
+	${Q}cd skel/sample; ${MAKEDEPEND} -w 1 -f makedep.out -I.. ${C_SRC}
 	-${Q}for i in ${C_SRC}; do \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	done >> skel/sample/makedep.out
@@ -479,8 +479,8 @@ install: all
 many_random.o: ../alloc.h
 many_random.o: ../block.h
 many_random.o: ../byteswap.h
-many_random.o: ../calcerr.h
 many_random.o: ../calc.h
+many_random.o: ../calcerr.h
 many_random.o: ../cmath.h
 many_random.o: ../config.h
 many_random.o: ../endian_calc.h
@@ -493,22 +493,22 @@ many_random.o: ../have_stdlib.h
 many_random.o: ../have_string.h
 many_random.o: ../lib_util.h
 many_random.o: ../longbits.h
-many_random.o: many_random.c
 many_random.o: ../md5.h
 many_random.o: ../nametype.h
 many_random.o: ../qmath.h
-many_random.o: ../shs1.h
 many_random.o: ../shs.h
+many_random.o: ../shs1.h
 many_random.o: ../string.h
 many_random.o: ../value.h
 many_random.o: ../win32dll.h
 many_random.o: ../zmath.h
 many_random.o: ../zrandom.h
+many_random.o: many_random.c
 test_random.o: ../alloc.h
 test_random.o: ../block.h
 test_random.o: ../byteswap.h
-test_random.o: ../calcerr.h
 test_random.o: ../calc.h
+test_random.o: ../calcerr.h
 test_random.o: ../cmath.h
 test_random.o: ../config.h
 test_random.o: ../endian_calc.h
@@ -524,11 +524,11 @@ test_random.o: ../longbits.h
 test_random.o: ../md5.h
 test_random.o: ../nametype.h
 test_random.o: ../qmath.h
-test_random.o: ../shs1.h
 test_random.o: ../shs.h
+test_random.o: ../shs1.h
 test_random.o: ../string.h
-test_random.o: test_random.c
 test_random.o: ../value.h
 test_random.o: ../win32dll.h
 test_random.o: ../zmath.h
 test_random.o: ../zrandom.h
+test_random.o: test_random.c
--- a/string.h
+++ b/string.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: string.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: string.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/string.h,v $
 *
 * Under source code control:	1990/02/15 01:48:36
@@ -32,7 +32,11 @@
 #define __CALCSTRING_H__


-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif


 struct string {
--- a/symbol.h
+++ b/symbol.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: symbol.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: symbol.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/symbol.h,v $
 *
 * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,11 @@
 #define __SYMBOL_H__


-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif


 /*
--- a/token.h
+++ b/token.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: token.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: token.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/token.h,v $
 *
 * Under source code control:	1990/02/15 01:48:37
@@ -32,7 +32,11 @@
 #define __TOKEN_H__


-#include "zmath.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "zmath.h"
+#else
+# include <calc/zmath.h>
+#endif


 /*
--- a/value.h
+++ b/value.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: value.h,v 29.5 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: value.h,v 29.6 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/value.h,v $
 *
 * Under source code control:	1993/07/30 19:42:47
@@ -32,15 +32,28 @@
 #define __VALUE_H__


-#include "win32dll.h"
-#include "cmath.h"
-#include "config.h"
-#include "shs.h"
-#include "calcerr.h"
-#include "hash.h"
-#include "block.h"
-#include "nametype.h"
-#include "string.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+# include "cmath.h"
+# include "config.h"
+# include "shs.h"
+# include "calcerr.h"
+# include "hash.h"
+# include "block.h"
+# include "nametype.h"
+# include "string.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/cmath.h>
+# include <calc/config.h>
+# include <calc/shs.h>
+# include <calc/calcerr.h>
+# include <calc/hash.h>
+# include <calc/block.h>
+# include <calc/nametype.h>
+# include <calc/string.h>
+#endif
+

 #define MAXDIM		4	/* maximum number of dimensions in matrices */
 #define USUAL_ELEMENTS	4	/* usual number of elements for objects */
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.26 $
- * @(#) $Id: version.c,v 29.26 2001/05/28 22:00:22 chongo Exp $
+ * @(#) $Revision: 29.29 $
+ * @(#) $Id: version.c,v 29.29 2001/06/01 21:44:44 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
 *
 * Under source code control:	1990/05/22 11:00:58
@@ -43,7 +43,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
 #define MAJOR_PATCH	5	/* patch level or 0 if no patch */
-#define MINOR_PATCH	"4"	/* test number or empty string if no patch */
+#define MINOR_PATCH	"4.3"	/* test number or empty string if no patch */

 /*
 * calc version constants
--- a/zmath.h
+++ b/zmath.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: zmath.h,v 29.5 2001/03/17 21:31:47 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: zmath.h,v 29.6 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/zmath.h,v $
 *
 * Under source code control:	1993/07/30 19:42:48
@@ -38,13 +38,21 @@
 #define __ZMATH_H__


-#include "win32dll.h"
-#include "alloc.h"
-#include "endian_calc.h"
-#include "longbits.h"
-#include "byteswap.h"
-
-#include "have_stdlib.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "win32dll.h"
+# include "alloc.h"
+# include "endian_calc.h"
+# include "longbits.h"
+# include "byteswap.h"
+# include "have_stdlib.h"
+#else
+# include <calc/win32dll.h>
+# include <calc/alloc.h>
+# include <calc/endian_calc.h>
+# include <calc/longbits.h>
+# include <calc/byteswap.h>
+# include <calc/have_stdlib.h>
+#endif
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
--- a/zrand.h
+++ b/zrand.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.3 $
- * @(#) $Id: zrand.h,v 29.3 2001/04/14 22:47:21 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: zrand.h,v 29.4 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/zrand.h,v $
 *
 * Under source code control:	1995/01/07 09:45:26
@@ -37,8 +37,13 @@
 #define __ZRAND_H__


-#include "value.h"
-#include "have_const.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "value.h"
+# include "have_const.h"
+#else
+# include <calc/value.h>
+# include <calc/have_const.h>
+#endif


 /*
--- a/zrandom.h
+++ b/zrandom.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: zrandom.h,v 29.2 2000/06/07 14:02:13 chongo Exp $
+ * @(#) $Revision: 29.3 $
+ * @(#) $Id: zrandom.h,v 29.3 2001/05/29 00:16:53 chongo Exp $
 * @(#) $Source: /usr/local/src/cmd/calc/RCS/zrandom.h,v $
 *
 * Under source code control:	1997/02/15 04:01:56
@@ -33,8 +33,13 @@
 #define __ZRANDOM_H__


-#include "value.h"
-#include "have_const.h"
+#if defined(SRC)	/* if we are building from the calc source tree */
+# include "value.h"
+# include "have_const.h"
+#else
+# include <calc/value.h>
+# include <calc/have_const.h>
+#endif


 /*
Author	SHA1	Message	Date
Landon Curt Noll	10c0bd2d95	Release calc version 2.11.5t4.3	2017-05-21 15:38:41 -07:00
Landon Curt Noll	ad44f1e3ab	Release calc version 2.11.5t4.2	2017-05-21 15:38:41 -07:00
Landon Curt Noll	fd436d7c15	Release calc version 2.11.5t4.1	2017-05-21 15:38:40 -07:00