remove what looks like a tag related to the merging of the bobWinPort work, some artifact tag that was retained through conversion from cvs. (svn branch delete)

svn:revision:46336 svn:tag:temp_tag svn:account:brlcad
Synthetic commit for incomplete tag temp_tag
2011-08-23 15:47:55 +00:00 · 2005-12-24 02:44:08 +00:00
1878 changed files with 21123 additions and 27894 deletions
@@ -15,30 +15,10 @@ on-going issues.
 Recent Bugs
 -----------

-* wavelet isn't working correctly on a simple image decomposition &
-  reconstruction.
-
-* query_ray can't find nirt if not installed
-
-* fbed is looking for /usr/lib/vfont/nonie.r.12
-
-* mged doesn't check if html_dir does not exist when searching for
-  docs/browser.
-
-* permute then translate doesn't refresh the graphics window
-    permute 4378
-    translate menus
-    p 0 0 0
-    p 0 0 0
-
-* constrained axis translation bindings on OS X don't work
-    object/matrix edit
-    shift-alt mouse (left/mid/right for x/y/z respectively) should work
-
-* mged documentation doesn't open on OS X
-   
 * the findfont directive in gv postscript is reporting font not found

+* our awf doesn't understand ./" manpage comments
+
 * concave arbs give correct wireframe but do not raytrace correctly.

 * rtwizard/rtedge creates incorrect "fuzzy" edge overlay when creating
@@ -122,16 +102,6 @@ Older Bugs
  displays. (e.g. 15 or 16 bit depth)


-Annoyances
----------
-
-* matrix edits on objects in mged require you to select a primitive
-  for a coordinate system reference.  this can be counterintuitive and
-  confusing.
-
-* there are frequently modality errors when entering edit mode as
-  control and middle mouse rebind to model edit instead of view edit.
-
 ---
 Bugs should be reported to the bug tracker on the project website at
 http://sourceforge.net/tracker/?atid=640802&group_id=105292
@@ -94,7 +94,7 @@ terms for their respective contributions unless otherwise noted or
 arranged.  The following notice should be prominent in the BRL-CAD
 sources:

-  Copyright (c) 2005-2006 United States Government as represented by
+  Copyright (C) 2005 United States Government as represented by
  the U.S. Army Research Laboratory.  All Rights Reserved.

 Trademark
@@ -250,10 +250,8 @@ system declarations and preprocessor defines.
 FILESYSTEM ORGANIZATION
 -----------------------

-Included below is a sample (not comprehensive) of how some of the
-sources are organized in the source distribution.  For the directories
-under src/, see the src/README file for more details on subdirectories
-not covered here.
+Here is a sample (not comprehensive) of how some of the sources are
+organized in the source distribution:

 bench/
 	The BRL-CAD Benchmark Suite
@@ -264,53 +262,57 @@ doc/
 include/
 	Public headers
 m4/
-	Autoconf compilation resource files
+	Compilation resource files
 misc/
-	Anything not categorized or is sufficently en masse
+	Anything not categorized or sufficently en masse
 pix/
-	Sample raytrace images, includes benchmark reference images
+	Sample raytrace images
 regress/
-	Scripts and resources for regression testing
+	Test suite
 sh/
-	Utility scripts, used primarily by the build system
+	Utility scripts
 src/
-	Sources, see src/README for more details
+	Sources
+src/anim/
+	Animation utilities
 src/conv/
-	Various geometry converters
+	Geometry converters (most, but not all)
 src/conv/iges/
 	IGES converter
 src/fb/
-	Tools for displaying data to or reading from framebuffers
+	Framebuffer services
 src/fbserv/
 	Framebuffer server
 src/java/
-	Java geometry server interface to librt
+	Java raytrace interface to librt
+src/lib*
+	BRL-CAD libraries
 src/libbn/
-	BRL-CAD numerics library
+	Basic numerics library
 src/libbu
-	BRL-CAD utility library
+	Basic utility library
 src/libfb/
-	BRL-CAD Framebuffer library
+	Framebuffer library
 src/libfft/
 	Fast Fourier transform library
 src/libpkg/
 	Network "package" library
-src/librt/
-	BRL-CAD Ray-trace library
+src/librt
+	Raytrace library
 src/libwdb/
-	Write database library
+	Write-only database library
 src/mged/
-	Multi-device geometry editor
+	Geometry editor
 src/other/
 	External frameworks (Tcl/Tk, libpng, zlib, etc)
 src/proc-db/
-	Procedural geometry tools, create models programmatically
+	Procedural geometry generators
 src/remrt/
 	Distributed raytrace support
 src/rt/
-	Raytracers, various
+	Raytracers
 src/util/
-	Various image processing utilities
+	Various data processing utilities


 CODING STYLE
@@ -650,12 +652,6 @@ days of the iteration, only minor bug and build fixes.  A release
 should then be made within the first couple days of the next month's
 iteration.  Repeat, rinse, recycle.

-In addition to the monthly iteration release, additional releases may
-be made on an as-needed basis.  This is particularly relevant for
-emergency bug-fix releases and in response to security issues.  The
-December/January timeframe is considered a single iteration with only
-one iteration release necessarily being made in that timeframe.
-
 When making a release, certain public repositories, mailing lists, and
 news outlets require updating and notification.  Especially when the
 major or minor version of BRL-CAD is going to be updated, it is very
@@ -1,7 +1,7 @@
 #                     M A K E F I L E . A M
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (c) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,11 @@
 AUTOMAKE_OPTIONS = 1.6 dist-zip dist-bzip2
 ACLOCAL_AMFLAGS = -I m4

+# this shouldn't be here, but rather in the include directory
+# for some reason, putting it there doesn't work
+dist-hook:
+	rm -f $(distdir)/include/brlcad_config.h
+
 required_dirs = \
 	include \
 	src
@@ -292,11 +297,6 @@ package:
 	@$(ECHO) "  make tar	-	Builds a uncompressed tape archive"
 	@$(ECHO)

-# delete files that should not be in the distribution
-dist-hook:
-	rm -f $(distdir)/include/brlcad_config.h
-	rm -rf `find $(distdir) -type d -name CVS`
-

 ##########################
 # summaries and warnings #
@@ -428,7 +428,6 @@ all-local:
 	fi
 	@$(ECHO)

-
 include $(top_srcdir)/misc/Makefile.defs

 # Local Variables:
@@ -8,34 +8,15 @@ see that file and the CVS log for more historic information.  The
 entire history of the project is available through CVS.

 ----------------------------------------------------------------------
--- 2006-02-XX  Release 7.7.0                                      ---
+--- 2006-01-XX  Release 7.6.7                                      ---
 ----------------------------------------------------------------------

 This release marks the one year anniversary of BRL-CAD being released
 as Open Source software.  Thank you to everyone for your support and
 contributions.

-* added manual page for benchmark tool - Sean Morrison
-* fixed g-dxf export compatibility issue - John Anderson
-* smoother sketch primitive spline drawing - Sean Morrison
-* fixed read bug in giftorle - Sean Morrison
-* fixed multiply referenced object illumination bug - Sean Morrison
-* improved nmg tesselation support reliability - Sean Morrison
-* new tpkg ttcp-style example application using libpkg - Sean Morrison
-* new roots_example root solving sample application - Sean Morrison
-* prevent several g-nmg segfaults during tesselation - Sean Morrison
-* fixed brlman/awf `./"' unsupported or unknown issue - Sean Morrison
-* new g_transfer in-memory geometry example program - Sean Morrison
-* new reshoot program to reshoot rays & compare results - Lee Butler
-* added support for -F framebuffer option to fb-bw - Sean Morrison
-* reid mged command, recursively assign region IDs - Sean Morrison
-* remat mged command, recursively assign a material ID - Sean Morrison
-* get_regions mged command, list assembly regions - Sean Morrison
-* extensive Windows build support enhancements - Bob Parker
-* new Archer modeling and visualization tool - Bob Parker, Doug Howard
 * raytracers use image size for default aspect ratio - Sean Morrison
 * fixed benchmark sqrt of negative numbers error - Sean Morrison
-* raytracer performance enhancements - Sean Morrison


 ----------------------------------------------------------------------
@@ -1,5 +1,5 @@
                             BRL-CAD
-                         Release 7.8.0
+                         Release 7.6.8
                       http://brlcad.org/

 BRL-CAD is a powerful Combinatorial/Constructive Solid Geometry (CSG)
@@ -110,6 +110,10 @@ You will need to add /usr/brlcad/bin to your path (or whatever was
 used as a --prefix during configure) in order for the BRL-CAD binaries
 to be in your path.

+Warning: Libtool 1.5.x may be incompatible due to changes the libtool
+project made that were backwards-incompatible.  Using an earlier 1.4.x
+version is recommended for the time being.
+

 BENCHMARK
 ---------
@@ -17,22 +17,20 @@ http://sf.net/pm/?group_id=105292
 THESE SHOULD HAPPEN BEFORE THE NEXT RELEASE
 -------------------------------------------

-* restore functionality to tests and benchmark
+* begin merging of windows branch
+
+* write .g in-memory transfer example
+
+* clone and tracker
+
+* add geometry examples for toy jeep and building
+
+* ensure successful build on mingw


 THESE SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 -------------------------------------------------

-* get archer working
-
-* clone and tracker
-
-* ensure successful build on mingw
-
-* Mac OS X SGI dial knobs support
-
-* add geometry examples for toy jeep and building
-
 * test pic/nonpic build problems with librtms/libmultispectral

 * run-time path identification of mged resources was never completed,
@@ -40,64 +38,14 @@ THESE SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS

 * use environ for run-time path tracing lookups

-* add support to restore the backups when an autogen.sh step aborts
-
 * support variable overrides for autogen.sh

-
-THESE ARE LOWER PRIORITY OR FOR FUTURE RELEASES
-----------------------------------------------
-
-* short introductory documentation on using various BRL-CAD command
-  line tools such as rt, mged, nirt, fbserv, converters, etc.
-
-* short introductory documentation on using mged, covering a majority
-  of the various commands.
-
-* reference sheet of useful BRL-CAD command-line tools grouped
-  categorically.
-
-* reference sheet of common mged commands, keybindings, gui elements
-  and scripting facilities.
-
-* support to the raytracers for multiple image file formats,
-  recognizing an option and/or the file suffix of the -o filename.
-
-* libfb + font rendering (perhaps through libbn's plot interface) for
-  a posix terminal.
-
-* gpgpu for enhanced performance boolweave sorting
-
-* getexecname, "/proc/self/cmdline", program_invocation_short_name.
-  separate out into new file.
-
-* write an introduction to brl-cad document that overviews the primary
-  tools and how they can be used together.
-
-* test out -Wfloat-equal
-
-* geometry viewing commands/visualizations of exploded levels
-
-* add command line help options to 'benchmark' tool
-
-* default mged text editor invokes ed, should invoke jove or system
-  gui editor like TextEdit on OS X if it's known.
-
-* mirror around an arbitrary plane (maybe point+vector) in mged
-
-* mirror around point/distance along axis operation in mged
-
-* librt-based path tracer
-
-* system identifier application with sysctl-style information
-  database, with some back-end functionality placed into libbu.
-
 * write scripts that parse the sf.net tracker data and generate
  automatic reports for release.

-* add callback data parameters to libpkg hook functions

-* test intel compiler performance on Altix, add performance options
+THESE ARE LOWER PRIORITY OR FOR FUTURE RELEASES
+-----------------------------------------------

 * pix-png should make sure output is not to a terminal

@@ -155,9 +103,6 @@ ODDITIES
 THESE BREAK PROTOCOL OR ARE BACKWARDS-INCOMPATIBLE
 --------------------------------------------------

-* support for features either as primitives or operations or both
-  e.g. chamfer, fillet, round, etc
-
 * fix the database I/O writing to properly support the addition of new
  primitive types.  this includes modifying the major/minor code or
  combinations/regions and binary objects
@@ -1,7 +1,7 @@
 #!/bin/sh
 #                        a u t o g e n . s h
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -503,7 +503,7 @@ done
 #######################################
 if test -d autom4te.cache ; then
    $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it"
-    $VERBOSE_ECHO "rm -rf autom4te.cache"
+    $VERBOSE_ECHO "rm -f autom4te.cache"
    rm -rf autom4te.cache
 fi

@@ -602,12 +602,10 @@ if [ "x$reconfigure_manually" = "xyes" ] ; then
    if [ ! $ret = 0 ] ; then
 	# retry without the -f and with backwards support for missing macros
 	configure_ac_changed="no"
-	configure_ac_backupd="no"
 	if test "x$HAVE_SED" = "xyes" ; then
 	    if test ! -f configure.ac.backup ; then
 		$VERBOSE_ECHO cp $_configure_file configure.ac.backup
 		cp $_configure_file configure.ac.backup
-		configure_ac_backupd="yes"
 	    fi

 	    ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE"
@@ -656,11 +654,8 @@ if [ "x$reconfigure_manually" = "xyes" ] ; then

 	    # failed so restore the backup
 	    if test -f configure.ac.backup ; then
-		# make sure we made the backup file
-		if test "x$configure_ac_backupd" = "xyes" ; then
-		    $VERBOSE_ECHO cp configure.ac.backup $_configure_file
-		    cp configure.ac.backup $_configure_file
-		fi
+		$VERBOSE_ECHO cp configure.ac.bacukp $_configure_file
+		cp configure.ac.backup $_configure_file
 	    fi

 	    # test if libtool is busted
@@ -13,11 +13,7 @@ clobber:
 dist_bin_SCRIPTS = \
 	benchmark

-man_MANS = \
-	benchmark.1
-
 EXTRA_DIST = \
-	$(man_MANS) \
 	${dist_bin_SCRIPTS} \
 	lgt.sh \
 	run.sh \
@@ -1,130 +0,0 @@
-.TH BENCHMARK 1 BRL-CAD
-.\"                     B E N C H M A R K . 1
-.\" BRL-CAD
-.\"
-.\" Copyright (c) 2006 United States Government as represented by
-.\" the U.S. Army Research Laboratory.
-.\"
-.\" This document is made available under the terms of the GNU Free
-.\" Documentation License or, at your option, under the terms of the
-.\" GNU General Public License as published by the Free Software
-.\" Foundation.  Permission is granted to copy, distribute and/or
-.\" modify this document under the terms of the GNU Free Documentation
-.\" License, Version 1.2 or any later version published by the Free
-.\" Software Foundation; with no Invariant Sections, no Front-Cover
-.\" Texts, and no Back-Cover Texts.  Permission is also granted to
-.\" redistribute this document under the terms of the GNU General
-.\" Public License; either version 2 of the License, or (at your
-.\" option) any later version.
-.\"
-.\" You should have received a copy of the GNU Free Documentation
-.\" License and/or the GNU General Public License along with this
-.\" document; see the file named COPYING for more information.
-.\"
-.\".\".\"
-.SH NAME
-benchmark \- runs the BRL-CAD benchmark
-.SH SYNOPSIS
-.B benchmark
-.SH DESCRIPTION
-.PP
-The benchmark suite will test the performance of a given system by
-iteratively rendering several well-known datasets into 512x512 images
-where performance metrics are documented and fairly well understood.
-The local machine's performance is compared to the base system (called
-VGR) and a numeric "VGR" mulitplier of performance is computed.  This
-number is a simplified metric from which one may qualitatively compare
-cpu and cache performance, versions of BRL-CAD, and different compiler
-characteristics.
-.PP
-There are several environment variables that will modify how the
-BRL-CAD benchmark behaves so that it may be run in a stand-alone
-environment:
-.PP
-\&
-.B RT
-\- the rt binary (e.g. ../src/rt/rt or /usr/brlcad/bin/rt)
-.br
-\&
-.B DB
-\- the directory containing the reference geometry (e.g. ../db)
-.br
-\&
-.B PIX
-\- the directory containing the reference images (e.g. ../pix)
-.br
-\&
-.B LOG
-\- the directory containing the reference logs (e.g. ../pix)
-.br
-\&
-.B CMP
-\- the name of a pixcmp tool (e.g. ./pixcmp)
-.br
-\&
-.B ELP
-\- the name of an elapsed time tool (e.g. ../sh/elapsed.sh)
-.br
-\&
-.B TIMEFRAME
-\- the minimum number of seconds each trace needs to take
-.br
-\&
-.B MAXTIME
-\- the maximum number of seconds to spend on any test
-.br
-\&
-.B DEVIATION
-\- the minimum sufficient % deviation from the average
-.br
-\&
-.B AVERAGE
-\- how many frames to average together
-.br
-\&
-.B DEBUG
-\- turn on extra debug output for testing/development
-.PP
-The \fITIMEFRAME\fR, \fIMAXTIME\fR, \fIDEVIATION\fR, and \fIAVERAGE\fR options control how the
-benchmark will proceed including how long it should take.  Each
-individual benchmark run will consume at least a minimum \fITIMEFRAME\fR of
-wallclock time so that the results can stabilize.  After consuming at
-least the minimum \fITIMEFRAME\fR, additional frames may be computed until
-the standard deviation from the last \fIAVERAGE\fR count of frames is below
-the specified \fIDEVIATION\fR.  When a test is run and it completes in less
-than \fITIMEFRAME\fR, the raytrace is restarted using double the number of
-rays from the previous run.  If the machine is fast enough, the
-benchmark may accelerate the number or rays being fired.  These
-additional rays are hypersampled but without any jitter, so it's
-effectively performing a multiplier amount of work over the initial
-frame.
-.PP
-Plese send your BRL-CAD Benchmark results to the developers along with
-detailed system information to <devs@brlcad.org>.  Include at least:
-.PP
-   0) Operating system type and version (e.g. uname -a)
-   1) Compiler name and version (e.g. gcc --version)
-   2) CPU configuration (e.g. cat /proc/cpuinfo or hinv or sysctl -a)
-   3) Cache (data and/or instruction) details for L1/L2/L3 and system
-      (e.g. cat /proc/cpuinfo or hinv or sysctl -a)
-   4) Output from this script (e.g. ./run.sh > run.sh.log 2>&1)
-   5) All generated log files (e.g. *.log* after running run.sh)
-   6) Anything else you think might be relevant to performance
-.SH "SEE ALSO"
-brlcad(1), rt(1), pix-fb(1), librt(3), pix(5).
-.SH AUTHOR
-Michael John Muuss
-.br
-Susan Muuss
-.br
-Christopher Sean Morrison
-.SH SOURCE
-BRL-CAD Open Source
-.SH COPYRIGHT
-This software is Copyright (c) 2006 United States Government as
-represented by the U.S. Army Research Laboratory. All rights reserved.
-.SH BUGS
-None known.
-.SH "BUG REPORTS"
-Reports of bugs or problems should be submitted via electronic
-mail to <devs@brlcad.org>.
@@ -2,7 +2,7 @@
 #                          L G T . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2006 United States Government as represented by
+# Copyright (C) 2004-2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 /*                        P I X C M P . C
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This program is free software; you can redistribute it and/or
@@ -2,7 +2,7 @@
 #                          R U N . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2006 United States Government as represented by
+# Copyright (C) 2004-2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,12 @@
 ###
 #
 # This shell script runs the BRL-CAD Benchmark.  The benchmark suite
-# will test the performance of a system by iteratively rendering
-# several well-known datasets into 512x512 images where performance
-# metrics are documented and fairly well understood.  The local
-# machine's performance is compared to the base system (called VGR)
-# and a numeric "VGR" mulitplier of performance is computed.  This
-# number is a simplified metric from which one may qualitatively
+# will test the performance of a given compiler by iteratively
+# rendering several well-known datasets into 512x512 images where
+# performance metrics are documented and fairly well understood.  The
+# local machine's performance is compared to the base system (called
+# VGR) and a numeric "VGR" mulitplier of performance is computed.
+# This number is a simplified metric from which one may qualitatively
 # compare cpu and cache performance, versions of BRL-CAD, and
 # different compiler characteristics.
 #
@@ -2,7 +2,7 @@
 #                          T R Y . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2006 United States Government as represented by
+# Copyright (C) 2004-2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 #                      R E C H E C K . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2006 United States Government as represented by
+# Copyright (C) 2004-2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 /*                         D B . P H P
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -9,6 +9,7 @@ same as the UNIX, BSD, and Linux platforms.

 X11 Window Server
 -----------------
+
 You'll need to install an X11 server if you would like to build Tk and
 have a graphical user interface.  Apple's X11 is the recommended X
 Window Server, though XDarwin should work suitably as well.  Be sure
@@ -18,30 +19,17 @@ package.

 Supported Versions
 ------------------
-BRL-CAD is generally only "extensively" tested by the developers on
-the latest released version of Mac OS X only.  That is to say that
-although the BRL-CAD package should build on prior versions of the Mac
-OS X operating system, they are generally and eventually not
-maintained and will require additional effort to obtain a build.
-Compiling on 10.3 or 10.4 should complete successfully.  Due to a
-variety of significant application programming interface issues in
-early releases of Mac OS X, versions prior to 10.2 are unsupported.

-Mac OS X 10.2
-------------
-Compiling directly on Mac OS X 10.2 requires additional effort.  When
-compiling from source, a libtool script is generated after running
-autogen.sh that gets used during compilation.  The version of
-glibtoolize shipped with 10.2 is non-functional with respect to
-convenience libraries, a feature that BRL-CAD requires.  That means
-that you will need to obtain the generated libtool script from other
-means.  You can either run autogen.sh on a different machine that has
-a newer version of libtool installed or you can download a source
-disribution where autogen.sh has already been run for you on a
-relatively new system.
+BRL-CAD is generally extensively tested by the developers on the
+latest released version of Mac OS X only.  That is to say that
+although the package should build on prior versions of the operating
+system, they are generally unmaintained.  Due to a variety of
+significant application programming interface issues in early releases
+of Mac OS X, versions prior to 10.2 are unsupported.

 Parallel Builds
 ---------------
+
 As many workstation and server systems shipped by Apple are
 multiprocessor systems, you can enjoy the benefits of decreased
 compile times by utilizing the "-j" option to make.  After running
@@ -49,6 +37,7 @@ configure, run "make -j2" to build on a 2-processor system.

 Bugs
 ----
+
 The only known bugs specific to Mac OS X are limitations of Tk or the
 X11 event handler that our generally outside of BRL-CAD's domain.
 Refer to BUGS for more general details on known bugs and reporting
@@ -1,27 +1,27 @@
 .TH BW 5 BRL-CAD
-.\"                           B W . 5
-.\" BRL-CAD
-.\"
-.\" Copyright (c) 2005-2006 United States Government as represented by
-.\" the U.S. Army Research Laboratory.
-.\"
-.\" This document is made available under the terms of the GNU Free
-.\" Documentation License or, at your option, under the terms of the
-.\" GNU General Public License as published by the Free Software
-.\" Foundation.  Permission is granted to copy, distribute and/or
-.\" modify this document under the terms of the GNU Free Documentation
-.\" License, Version 1.2 or any later version published by the Free
-.\" Software Foundation; with no Invariant Sections, no Front-Cover
-.\" Texts, and no Back-Cover Texts.  Permission is also granted to
-.\" redistribute this document under the terms of the GNU General
-.\" Public License; either version 2 of the License, or (at your
-.\" option) any later version.
-.\"
-.\" You should have received a copy of the GNU Free Documentation
-.\" License and/or the GNU General Public License along with this
-.\" document; see the file named COPYING for more information.
-.\"
-.\".\".\"
+./"                           B W . 5
+./" BRL-CAD
+./"
+./" Copyright (c) 2005 United States Government as represented by
+./" the U.S. Army Research Laboratory.
+./"
+./" This document is made available under the terms of the GNU Free
+./" Documentation License or, at your option, under the terms of the
+./" GNU General Public License as published by the Free Software
+./" Foundation.  Permission is granted to copy, distribute and/or
+./" modify this document under the terms of the GNU Free Documentation
+./" License, Version 1.2 or any later version published by the Free
+./" Software Foundation; with no Invariant Sections, no Front-Cover
+./" Texts, and no Back-Cover Texts.  Permission is also granted to
+./" redistribute this document under the terms of the GNU General
+./" Public License; either version 2 of the License, or (at your
+./" option) any later version.
+./"
+./" You should have received a copy of the GNU Free Documentation
+./" License and/or the GNU General Public License along with this
+./" document; see the file named COPYING for more information.
+./"
+./"./"./"
 .SH NAME
 bw \- Black and White image file format and utilities
 .SH FORMAT
@@ -1,27 +1,27 @@
 .TH CMAP 5 BRL-CAD
-.\"                         C M A P . 5
-.\" BRL-CAD
-.\"
-.\" Copyright (c) 2005-2006 United States Government as represented by
-.\" the U.S. Army Research Laboratory.
-.\"
-.\" This document is made available under the terms of the GNU Free
-.\" Documentation License or, at your option, under the terms of the
-.\" GNU General Public License as published by the Free Software
-.\" Foundation.  Permission is granted to copy, distribute and/or
-.\" modify this document under the terms of the GNU Free Documentation
-.\" License, Version 1.2 or any later version published by the Free
-.\" Software Foundation; with no Invariant Sections, no Front-Cover
-.\" Texts, and no Back-Cover Texts.  Permission is also granted to
-.\" redistribute this document under the terms of the GNU General
-.\" Public License; either version 2 of the License, or (at your
-.\" option) any later version.
-.\"
-.\" You should have received a copy of the GNU Free Documentation
-.\" License and/or the GNU General Public License along with this
-.\" document; see the file named COPYING for more information.
-.\"
-.\".\".\"
+./"                         C M A P . 5
+./" BRL-CAD
+./"
+./" Copyright (c) 2005 United States Government as represented by
+./" the U.S. Army Research Laboratory.
+./"
+./" This document is made available under the terms of the GNU Free
+./" Documentation License or, at your option, under the terms of the
+./" GNU General Public License as published by the Free Software
+./" Foundation.  Permission is granted to copy, distribute and/or
+./" modify this document under the terms of the GNU Free Documentation
+./" License, Version 1.2 or any later version published by the Free
+./" Software Foundation; with no Invariant Sections, no Front-Cover
+./" Texts, and no Back-Cover Texts.  Permission is also granted to
+./" redistribute this document under the terms of the GNU General
+./" Public License; either version 2 of the License, or (at your
+./" option) any later version.
+./"
+./" You should have received a copy of the GNU Free Documentation
+./" License and/or the GNU General Public License along with this
+./" document; see the file named COPYING for more information.
+./"
+./"./"./"
 .SH NAME
 cmap \- Framebuffer colormap file format and utilities
 .SH FORMAT
@@ -20,8 +20,7 @@ htmldocs_DATA = \
 	index.html \
 	small-eagleCAD.gif

-EXTRA_DIST = \
-	$(htmldocs_DATA) \
+EXTRA_DIST = $(htmldocs_DATA) \
 	small-eagleCAD.ico

 include $(top_srcdir)/misc/Makefile.defs
@@ -1,12 +1,5 @@
-# $Id$

 htmldocsdir = $(BRLCAD_DATA)/html/manuals/archer

 htmldocs_DATA = \
-	Archer_Documentation.chm \
 	archer.ico
-
-EXTRA_DIST = \
-	$(htmldocs_DATA)
-
-include $(top_srcdir)/misc/Makefile.defs
@@ -380,7 +380,7 @@ The U. S. Army Research Laboratory
 <br>
 Aberdeen Proving Ground, Maryland  21005
 <h1>COPYRIGHT</h1>
-This software is Copyright (c) 1985-2006 United States Government as
+This software is Copyright (C) 1985-2005 United States Government as
 represented by the U.S. Army Research Laboratory. All rights reserved.
 <h1>BUGS</h1>
 Most deficiencies observed while using the
@@ -1132,36 +1132,31 @@ mged <B>db form tgc</B> <BR>
 -- Display the format used by the <I>get</I> and <I>put</I> commands for the </FONT><A HREF="#TGC"><FONT SIZE=2>TGC</FONT></A><FONT SIZE=2> shape type. </P></DIR>

 <P><HR ALIGN="RIGHT"></P>
-
-</FONT> <B>
-<DL>
-<DT><A NAME="db_glob"></a>
-
-
-<A NAME="dbbinary"></A>dbbinary </B><I>[-o|-i pattern type] dest source</I> </DT>
-<DD>The &quot;dbbinary&quot; command is used to create or retrieve binary opaque objects.  One of <I>-i</I> or <I>-o</I> must be specified.</DD>
-<dd>The <i>-o</i> option &quot;outputs&quot; or extracts a binary object from the database object <i>source</i> to a file called <i>dest</i>.</dd>
-<dd>The <i>-i</i> option &quot;inputs&quot; or imports a file called <i>source</i> into a binary object called <i>dest</i> in the database.  There are two additional arguments that must be specified with the <i>-i</i> option:  pattern and type.  Currently, only uniform binary objects (arrays of values) are supported.  As a result, the <i>pattern</i> is always <i>u</i> for &quot;uniform&quot; pattern.  The <i>type</i> can be one of the following:
-<DD><i>f </I>-&gt; float</DD>
-<DD><I>d </I>-&gt; double</DD>
-<DD><I>c </I>-&gt; char (8 bit)</DD>
-<DD><I>s </I>-&gt; short (16 bit)</DD>
-<DD><I>i </I>-&gt; int (32 bit)</DD>
-<DD><I>l </I>-&gt; long (64 bit)</DD>
-<DD><I>C </I>-&gt; unsigned char (8 bit)</DD>
-<DD><I>S </I>-&gt; unsigned short (16 bit)</DD>
-<DD><I>I </I>-&gt; unsigned int (32 bit)</DD>
-<DD><I>L </I>-&gt; unsigned long (64 bit)</DD>
-<DD> </DD>
-
-<DT><FONT SIZE=4>Examples: </DT></FONT>
-<DD> <TT>mged&gt;</TT> <B>dbbinary -i -u c cmds /usr/brlcad/html/manuals/mged/mged_cmds.html</B></DD>
-<DD>-- Create an opaque uniform binary object of characters with the name <I>cmds</I> that contains the contents of the file <I>/usr/brlcad/html/manuals/mged/mged_cmds.html.</I></DD>
+</FONT><B><DL>
+<DT><A NAME="db_glob"><A NAME="dbbinary"></A></A>dbbinary </B><I>[-i|-o] -u type dest source </DT>
+</I><DD>The &quot;dbbinary&quot; command is used to create or retrieve binary opaque objects.  Currently, only uniform binary objects (arrays of values) are supported.  One of <I>-i </I>or</DD>
+<I><DD>-o</I> must be specified.  The <I>-i</I> is for &quot;input,&quot; or creating a binary object, and the <I>-o</I> option is used for &quot;output," or retrieving a binary object.  The <I>-u</I> type argument must be supplied when <I>-i</I> is used, to indicate the type of uniform binary object to be created.  On input, the <I>dest</I> is the name of the object to be created, and the <I>source</I> is the path to a file containing the values in the local host format.  On output, <I>dest</I> is the path to a file to receive the contents of the binary object whose name appears in source.  The <I>type</I> may be one of:</DD>
+<I><DD>f </I>-&gt; float</DD>
+<I><DD>d </I>-&gt; double</DD>
+<I><DD>c </I>-&gt; char (8 bit)</DD>
+<I><DD>s </I>-&gt; short (16 bit)</DD>
+<I><DD>i </I>-&gt; int (32 bit)</DD>
+<I><DD>l </I>-&gt; long (64 bit)</DD>
+<I><DD>C </I>-&gt; unsigned char (8 bit)</DD>
+<I><DD>S </I>-&gt; unsigned short (16 bit)</DD>
+<I><DD>I </I>-&gt; unsigned int (32 bit)</DD>
+<I><DD>L </I>-&gt; unsigned long (64 bit)</DD>
 <DD></DD>
-<DD><TT>mged&gt;</TT> <B>dbbinary -o /home/jim/cmds.html cmds</B></DD>
-<DD>-- Copy the contents of the binary object named <I>cmds</I> into the file named <i>/home/jim/cmds.html.</i></DD>
-</dl>
-<DT><HR ALIGN="RIGHT"></DT>
+<FONT SIZE=4><DD>Examples: </DD>
+</FONT><DD></DD>
+<TT><DD>mged&gt;</TT> <B>dbbinary -i -u c cmds /usr/brlcad/html/manuals/mged/mged_cmds.html</DD>
+</B><DD>-- Create an opaque uniform binary object of characters with the name <I>cmds</I> that</DD>
+<DD>contains the contents of the file <I>/usr/brlcad/html/manuals/mged/mged_cmds.html.</DD>
+</I><DD></DD>
+<TT><DD>mged&gt;</TT> <B>dbbinary -o /home/jim/cmds.html cmds</DD>
+</B><DD>-- Copy the contents of the binary object named <I>cmds</I> into the file named</DD>
+<I><DD>/home/jim/cmds.html.</DD>
+</I><DT><HR ALIGN="RIGHT"></DT>
 <B><DT>db_glob</B> <I>cmd_string</DT>
 </I><DD>Globs <I>cmd_string</I> against the MGED database resulting in an expanded command string.</DD>
 <FONT SIZE=4><DT>Examples:</DT>
@@ -1176,9 +1171,9 @@ l r230 r231 r232 r233 r234 r235 r236 r237 r238 r239 <BR>
 </FONT>
 <B>
 <DL>
-<DT><A NAME="dbconcat"></A>dbconcat</B> <I>database_file</I> [<I>prefix</I>]</DT>
-<DT><A NAME="dbconcat"></A><B>dbconcat</B> <I>-s/p database_file</I></DT>
-<DD><p>The &quot;dbconcat&quot; command concatenates an existing <I>BRL-CAD</I> database to the database currently being edited.  If a <I>prefix</I> is supplied, then all objects from the <I>database_file</I> will have <I>prefix</I> added to the beginning of their names.  Note that each <I>BRL-CAD</I> object must have a unique name, so care must be taken not to &quot;dbconcat&quot; a database that has objects with names the same as objects in the current database.  The <A HREF="#dup">dup</A> command may be used to check for duplicate names.  If the <I>dup</I> command finds duplicate names, use the <I>prefix</I> option to both the <I>dup</I> and <I>dbconcat</I> commands to find a <I>prefix</I> that produces no duplicates.  If duplicate names are encountered during the &quot;dbconcat&quot; process, computer-generated prefixes will be added to the object names coming from the <I>database_file</I> (but member names appearing in combinations will not be modified, so this is a dangerous practice and should be avoided).</p></DD>
+  <DT><A NAME="dbconcat"></A>dbconcat</B> <I>database_file</I> [<I>prefix</I>]</DT>
+  <DT><A NAME="dbconcat"></A><B>dbconcat</B> <I>-s/p database_file</I></DT>
+  <DD><p>The &quot;dbconcat&quot; command concatenates an existing <I>BRL-CAD</I> database to the database currently being edited.  If a <I>prefix</I> is supplied, then all objects from the <I>database_file</I> will have <I>prefix</I> added to the beginning of their names.  Note that each <I>BRL-CAD</I> object must have a unique name, so care must be taken not to &quot;dbconcat&quot; a database that has objects with names the same as objects in the current database.  The <A HREF="#dup">dup</A> command may be used to check for duplicate names.  If the <I>dup</I> command finds duplicate names, use the <I>prefix</I> option to both the <I>dup</I> and <I>dbconcat</I> commands to find a <I>prefix</I> that produces no duplicates.  If duplicate names are encountered during the &quot;dbconcat&quot; process, computer-generated prefixes will be added to the object names coming from the <I>database_file</I> (but member names appearing in combinations will not be modified, so this is a dangerous practice and should be avoided).</p></DD>

  <DD><p>The second form also concatenates an existing <I>BRL-CAD</I> database to the database currently being edited; however, no prefix is required.  If the <I>-s</I> option is specified,then a computer-generated suffix is added wherever required to ensure unique object names.  Similarly, the <I>-p</I> option will create computer-generated prefixes where needed.  If a name in the existing database does not conflict with names in the database currently being edited, that name will not be changed.  Member names appearing in combinations in the existing database will be modified if needed.</p></DD>

@@ -1,27 +1,27 @@
 .TH PIX 5 BRL-CAD
-.\"                          P I X . 5
-.\" BRL-CAD
-.\"
-.\" Copyright (c) 2005-2006 United States Government as represented by
-.\" the U.S. Army Research Laboratory.
-.\"
-.\" This document is made available under the terms of the GNU Free
-.\" Documentation License or, at your option, under the terms of the
-.\" GNU General Public License as published by the Free Software
-.\" Foundation.  Permission is granted to copy, distribute and/or
-.\" modify this document under the terms of the GNU Free Documentation
-.\" License, Version 1.2 or any later version published by the Free
-.\" Software Foundation; with no Invariant Sections, no Front-Cover
-.\" Texts, and no Back-Cover Texts.  Permission is also granted to
-.\" redistribute this document under the terms of the GNU General
-.\" Public License; either version 2 of the License, or (at your
-.\" option) any later version.
-.\"
-.\" You should have received a copy of the GNU Free Documentation
-.\" License and/or the GNU General Public License along with this
-.\" document; see the file named COPYING for more information.
-.\"
-.\".\".\"
+./"                          P I X . 5
+./" BRL-CAD
+./"
+./" Copyright (c) 2005 United States Government as represented by
+./" the U.S. Army Research Laboratory.
+./"
+./" This document is made available under the terms of the GNU Free
+./" Documentation License or, at your option, under the terms of the
+./" GNU General Public License as published by the Free Software
+./" Foundation.  Permission is granted to copy, distribute and/or
+./" modify this document under the terms of the GNU Free Documentation
+./" License, Version 1.2 or any later version published by the Free
+./" Software Foundation; with no Invariant Sections, no Front-Cover
+./" Texts, and no Back-Cover Texts.  Permission is also granted to
+./" redistribute this document under the terms of the GNU General
+./" Public License; either version 2 of the License, or (at your
+./" option) any later version.
+./"
+./" You should have received a copy of the GNU Free Documentation
+./" License and/or the GNU General Public License along with this
+./" document; see the file named COPYING for more information.
+./"
+./"./"./"
 .SH NAME
 pix \- Color RGB image file format and utilities
 .SH FORMAT
@@ -1,27 +1,27 @@
 .TH PLOT3 5 BRL-CAD
-.\"                        P L O T 3 . 5
-.\" BRL-CAD
-.\"
-.\" Copyright (c) 2005-2006 United States Government as represented by
-.\" the U.S. Army Research Laboratory.
-.\"
-.\" This document is made available under the terms of the GNU Free
-.\" Documentation License or, at your option, under the terms of the
-.\" GNU General Public License as published by the Free Software
-.\" Foundation.  Permission is granted to copy, distribute and/or
-.\" modify this document under the terms of the GNU Free Documentation
-.\" License, Version 1.2 or any later version published by the Free
-.\" Software Foundation; with no Invariant Sections, no Front-Cover
-.\" Texts, and no Back-Cover Texts.  Permission is also granted to
-.\" redistribute this document under the terms of the GNU General
-.\" Public License; either version 2 of the License, or (at your
-.\" option) any later version.
-.\"
-.\" You should have received a copy of the GNU Free Documentation
-.\" License and/or the GNU General Public License along with this
-.\" document; see the file named COPYING for more information.
-.\"
-.\".\".\"
+./"                        P L O T 3 . 5
+./" BRL-CAD
+./"
+./" Copyright (c) 2005 United States Government as represented by
+./" the U.S. Army Research Laboratory.
+./"
+./" This document is made available under the terms of the GNU Free
+./" Documentation License or, at your option, under the terms of the
+./" GNU General Public License as published by the Free Software
+./" Foundation.  Permission is granted to copy, distribute and/or
+./" modify this document under the terms of the GNU Free Documentation
+./" License, Version 1.2 or any later version published by the Free
+./" Software Foundation; with no Invariant Sections, no Front-Cover
+./" Texts, and no Back-Cover Texts.  Permission is also granted to
+./" redistribute this document under the terms of the GNU General
+./" Public License; either version 2 of the License, or (at your
+./" option) any later version.
+./"
+./" You should have received a copy of the GNU Free Documentation
+./" License and/or the GNU General Public License along with this
+./" document; see the file named COPYING for more information.
+./"
+./"./"./"
 .SH NAME
 plot3 \- 3-D and color graphic plotting interface
 .SH DESCRIPTION
@@ -123,10 +123,6 @@ brlcadinclude_wanted = \
 	zconf.h \
 	zlib.h

-# headers used by multiple packages but still considered private
-noinst_HEADERS = \
-	fbmsg.h
-
 EXTRA_DIST = \
 	sed4

@@ -1,7 +1,7 @@
 /*                          A N I M . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                            B N . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                        B R L C A D . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                            B U . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -56,16 +56,16 @@
 *  $Header$
 */

-#ifndef __BU_H__
-#define __BU_H__
+#ifndef SEEN_BU_H
+#define SEEN_BU_H seen

 #include "common.h"

-__BEGIN_DECLS
-
 /* Included for Tcl_Interp definition */
 #include "tcl.h"

+__BEGIN_DECLS
+
 #ifndef BU_EXPORT
 #  if defined(_WIN32) && !defined(__CYGWIN__) && defined(BRLCAD_DLL)
 #    ifdef BU_EXPORT_DLL
@@ -82,6 +82,14 @@ __BEGIN_DECLS

 #define BU_H_VERSION	"@(#)$Header$ (BRL)"

+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+

 /** define BU_DIR_SEPARATOR to the directory separator character
 */
@@ -116,6 +124,23 @@ __BEGIN_DECLS
 #endif  /* PATH_SEPARATOR */


+/*----------------------------------------------------------------------*/
+/*
+ *  System library routines used by LIBBS.
+ *  If header files are to be included, this should happen first,
+ *  to prevent accidentally redefining important stuff.
+ */
+#if HAVE_STDLIB_H
+/*	NOTE:  Nested includes, gets malloc(), offsetof(), etc */
+#	include <stdlib.h>
+#	include <stddef.h>
+#else
+extern char	*malloc();
+extern char	*calloc();
+extern char	*realloc();
+/**extern void	free(); **/
+#endif
+
 /*
 * BU_FLSTR   Macro for getting a concatenated string of the current
 * file and line number.  Produces something of the form:
@@ -769,8 +794,6 @@ BU_EXPORT BU_EXTERN(struct bu_list *bu_list_pop, (struct bu_list *hp));
 *  eu = BU_LIST_MAIN_PTR( edgeuse, midway, l2 );
 *
 *  eu1 = BU_LIST_MAIN_PTR(edgeuse, BU_LIST_FIRST(bu_list, &eg1->eu_hd2), l2);
- *
- *  Files using BU_LIST_MAIN_PTR will need to include stddef.h
 */
 #define BU_LIST_MAIN_PTR(_type, _ptr2, _name2)	\
 	((struct _type *)(((char *)(_ptr2)) - offsetof(struct _type, _name2.magic)))
@@ -1016,7 +1039,7 @@ struct bu_mapped_file {
 	char		*appl;		/* bu_strdup() of tag for application using 'apbuf' */
 	genptr_t	apbuf;		/* opt: application-specific buffer */
 	long		apbuflen;	/* opt: application-specific buflen */
-	long		modtime;	/* date stamp, in case file is modified */
+	time_t		modtime;	/* date stamp, in case file is modified */
 	int		uses;		/* # ptrs to this struct handed out */
 	int		dont_restat;	/* 1=on subsequent opens, don't re-stat() */
 };
@@ -1213,34 +1236,24 @@ BU_EXPORT extern int	bu_debug;
 *  Definitions and data structures needed for routines that assign values
 *  to elements of arbitrary data structures, the layout of which is
 *  described by tables of "bu_structparse" structures.
- */
-
-/**
- * b u _ o f f s e t o f
- * b u _ o f f s e t o f a r r a y
 *
- * The general problem of word-addressed hardware where (int *) and
- * (char *) have different representations is handled in the parsing
- * routines that use sp_offset, because of the limitations placed on
- * compile-time initializers.
- *
- * Files using bu_offsetof or bu_offsetofarray will need to include
- * stddef.h
+ *  The general problem of word-addressed hardware
+ *  where (int *) and (char *) have different representations
+ *  is handled in the parsing routines that use sp_offset,
+ *  because of the limitations placed on compile-time initializers.
 */
 #if __STDC__ && !defined(ipsc860)
 #	define bu_offsetofarray(_t, _m)	offsetof(_t, _m[0])
 #else
+#	if !defined(offsetof)
+#		define bu_offsetof(_t, _m)		(int)(&(((_t *)0)->_m))
+#	else
+#		define bu_offsetof(_t, _m)	offsetof(_t, _m)
+#	endif
 #	define bu_offsetofarray(_t, _m)	(int)( (((_t *)0)->_m))
 #endif
-#if !defined(offsetof)
-#	define bu_offsetof(_t, _m) (int)(&(((_t *)0)->_m))
-#else
-#	define bu_offsetof(_t, _m) offsetof(_t, _m)
-#endif

-/**
- *  b u _ b y t e o f f s e t
- *
+/*
 *  Convert address of global data object into byte "offset" from address 0.
 *
 *  Strictly speaking, the C language only permits initializers of the
@@ -1674,14 +1687,15 @@ BU_EXPORT BU_EXTERN(void bu_printfile,
 BU_EXPORT BU_EXTERN(int	bu_file_exists, (const char *path));

 /* brlcad_path.c */
-BU_EXPORT BU_EXTERN(const char *bu_getprogname, (void));
-BU_EXPORT BU_EXTERN(void bu_setprogname, (const char *path));
+BU_EXPORT BU_EXTERN(const char *bu_argv0, (const char *path));
 BU_EXPORT BU_EXTERN(char *bu_brlcad_path, /* deprecated call */
 		    (const char *rhs, int fail_quietly));
 BU_EXPORT BU_EXTERN(char *bu_brlcad_root,
 		    (const char *rhs, int fail_quietly));
 BU_EXPORT BU_EXTERN(char *bu_brlcad_data,
 		    (const char *rhs, int fail_quietly));
+BU_EXPORT BU_EXTERN(const char *bu_argv0,
+		    (const char *path));

 /* fopen_uniq */
 BU_EXPORT BU_EXTERN(FILE *bu_fopen_uniq,
@@ -2546,7 +2560,7 @@ BU_EXPORT BU_EXTERN(struct bu_hash_entry *bu_hash_tbl_next,

 __END_DECLS

-#endif  /* __BU_H__ */
+#endif /* SEEN_BU_H */

 /*
 * Local Variables:
@@ -1,7 +1,7 @@
 /*                          C M D . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -21,13 +21,11 @@
 /** @file cmd.h
 *
 */
-#ifndef __CMD_H__
-#define __CMD_H__
+#ifndef SEEN_CMD_H
+#define SEEN_CMD_H

-#include "common.h"
-
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
+#ifdef USE_SYS_TIME_H
+#include <sys/time.h>
 #endif
 #include <time.h>
 #include "bu.h"
@@ -72,7 +70,7 @@ BU_EXPORT BU_EXTERN(int bu_cmdhist_prev,
 BU_EXPORT BU_EXTERN(int cho_open_tcl,
 		    ());

-#endif  /* __CMD_H__ */
+#endif /* SEEN_CMD_H */

 /*
 * Local Variables:
@@ -1,7 +1,7 @@
 /*                        C O M M O N . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -43,15 +43,14 @@
 #define __COMMON_H__

 /* include the venerable config.h file.  use a pregenerated one for
- * windows when we cannot autogenerate it easily. do not include
- * config.h if this file has been installed.  (public header files
- * should not use config defines)
- */
-#ifdef HAVE_CONFIG_H
-#  ifdef _WIN32
+ * windows when we cannot autogenerate it easily. */
+#ifdef _WIN32
 #    include "config_win.h"
-#  else
+#else
+#  ifdef HAVE_CONFIG_H
 #    include "brlcad_config.h"
+#  else
+#    include <brlcad/brlcad_config.h>
 #  endif
 #endif  /* _WIN32 */

@@ -1,7 +1,7 @@
 /*                       C O M P A T 4 . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          C O N F . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          C O N F I G _ W I N . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -50,8 +50,8 @@
 #endif

 #define MAJOR_VERSION        7
-#define MINOR_VERSION        7
-#define PATCH_VERSION        0
+#define MINOR_VERSION        6
+#define PATCH_VERSION        7
 #define MAJOR_VERSION_STRING EXPAND_IN_STRING(MAJOR_VERSION)
 #define MINOR_VERSION_STRING EXPAND_IN_STRING(MINOR_VERSION)
 #define PATCH_VERSION_STRING EXPAND_IN_STRING(PATCH_VERSION)
@@ -1,7 +1,7 @@
 /*                            D B . H
 * BRL-CAD
 *
- * Copyright (c) 1985-2006 United States Government as represented by
+ * Copyright (C) 1985-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           D B 5 . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - N U L L . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - X . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - G L X . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - O G L . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - P E X . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - P L O T . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M - P S . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M _ C O L O R . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          D M _ X V A R S . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                            F B . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -35,27 +35,25 @@

 #include "fbio.h"

-/* Needed for fd_set, avoid including sys/select.h outright since it
- * conflicts on some systems (e.g. freebsd4).
- *
- * XXX would be nice to decouple this interface from fd_set as it's
- * only used in one place right now.
- */
-#if defined(HAVE_SYS_TYPES_H)
-#  include <sys/types.h>
-#endif
-#if defined(HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#endif
-#if defined(HAVE_UNISTD_H)
-#  include <unistd.h>
+/* Needed for fd_set */
+#if defined (HAVE_SYS_SELECT_H)
+#  include <sys/select.h>
 #else
-#  if defined(HAVE_SYS_UNISTD_H)
-#    include <sys/unistd.h>
+#  if defined(HAVE_SYS_TYPES_H)
+#    include <sys/types.h>
+#  endif
+#  if defined(HAVE_SYS_TIME_H)
+#    include <sys/time.h>
+#  endif
+#  if defined(HAVE_UNISTD_H)
+#    include <unistd.h>
+#  else
+#    if defined(HAVE_SYS_UNISTD_H)
+#      include <sys/unistd.h>
+#    endif
 #  endif
 #endif

-
 /* Library entry points which are macros. */
 #define fb_gettype(_ifp)		(_ifp->if_type)
 #define fb_getwidth(_ifp)		(_ifp->if_width)
@@ -230,6 +228,16 @@ FB_EXPORT extern int fb_refresh(FBIO *ifp, int x, int y, int w, int h);
 /* vers.c (created by libfb/Cakefile) */
 FB_EXPORT extern char fb_version[];

+/* server.c */
+FB_EXPORT extern FBIO	*fb_server_fbp;
+FB_EXPORT extern fd_set	*fb_server_select_list;
+FB_EXPORT extern int	*fb_server_max_fd;
+FB_EXPORT extern int	fb_server_got_fb_free;       /* !0 => we have received an fb_free */
+FB_EXPORT extern int	fb_server_refuse_fb_free;    /* !0 => don't accept fb_free() */
+FB_EXPORT extern int	fb_server_retain_on_close;   /* !0 => we are holding a reusable FB open */
+FB_EXPORT extern const struct pkg_switch fb_server_pkg_switch[];
+
+
 #endif /* FB_H */

 /*
@@ -1,7 +1,7 @@
 /*                         F B I O . H
 * BRL-CAD
 *
- * Copyright (c) 2005-2006 United States Government as represented by
+ * Copyright (C) 2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,78 +0,0 @@
-/*                          F B M S G . H
- * BRL-CAD
- *
- * Copyright (c) 2004-2006 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** \addtogroup libfb */
-/*@{*/
-/** @file fbmsg.h
- *  Types of packages used for the remote frame buffer
- *  communication between libfb/if_remote.c and fbserv/fbserv.c.
- *  This file is shared by those two modules.
- *
- *  Authors -
- *	Phil Dykstra
- *	Michael John Muuss
- *
- *  Source -
- *	SECAD/VLD Computing Consortium, Bldg 394
- *	The U. S. Army Ballistic Research Laboratory
- *	Aberdeen Proving Ground, Maryland  21005
- */
-/*@}*/
-
-#define	MSG_FBOPEN	1
-#define	MSG_FBCLOSE	2
-#define	MSG_FBCLEAR	3
-#define	MSG_FBREAD	4
-#define	MSG_FBWRITE	5
-#define	MSG_FBCURSOR	6		/* fb_cursor() */
-#define	MSG_FBWINDOW	7		/* OLD */
-#define	MSG_FBZOOM	8		/* OLD */
-#define	MSG_FBSCURSOR	9		/* OLD */
-#define	MSG_FBVIEW	10		/* NEW */
-#define	MSG_FBGETVIEW	11		/* NEW */
-#define	MSG_FBRMAP	12
-#define	MSG_FBWMAP	13
-#define	MSG_FBHELP	14
-#define	MSG_FBREADRECT	15
-#define	MSG_FBWRITERECT	16
-#define	MSG_FBFLUSH	17
-#define	MSG_FBFREE	18
-#define	MSG_FBGETCURSOR	19		/* NEW */
-#define	MSG_FBPOLL	30		/* NEW */
-#define MSG_FBSETCURSOR	31		/* NEW in Release 4.4 */
-#define	MSG_FBBWREADRECT 32		/* NEW in Release 4.6 */
-#define	MSG_FBBWWRITERECT 33		/* NEW in Release 4.6 */
-
-#define	MSG_DATA	20
-#define	MSG_RETURN	21
-#define	MSG_CLOSE	22
-#define	MSG_ERROR	23
-
-#define	MSG_NORETURN	100
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
@@ -1,7 +1,7 @@
 /*                    F B S E R V _ O B J . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                     L I B T E R M I O . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                         L I G H T . H
 * BRL-CAD
 *
- * Copyright (c) 1990-2006 United States Government as represented by
+ * Copyright (C) 1990-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                       M A C H I N E . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                         M A T E R . H
 * BRL-CAD
 *
- * Copyright (c) 1985-2006 United States Government as represented by
+ * Copyright (C) 1985-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           M S R . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           N M G . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                  N O A L I A S - P R A G . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                       N O A L I A S . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          N U R B . H
 * BRL-CAD
 *
- * Copyright (c) 1991-2006 United States Government as represented by
+ * Copyright (C) 1991-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                            O P T I C A L . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                     P H O T O N M A P . H
 * BRL-CAD
 *
- * Copyright (c) 2002-2006 United States Government as represented by
+ * Copyright (C) 2002-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           P K G . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -73,7 +73,7 @@ struct pkg_header {
 #define	PKG_STREAMLEN	(32*1024)
 struct pkg_conn {
 	int		pkc_fd;		/* TCP connection fd */
-	const struct pkg_switch *pkc_switch;	/* Array of message handlers */
+	struct pkg_switch *pkc_switch;	/* Array of message handlers */
 	void		(*pkc_errlog)(); /* Error message logger */
 	struct pkg_header pkc_hdr;	/* hdr of cur msg */
 	long		pkc_len;	/* pkg_len, in host order */
@@ -108,7 +108,7 @@ PKG_EXPORT extern int pkg_suckin(register struct pkg_conn *);
 PKG_EXPORT extern struct pkg_conn *pkg_open();
 PKG_EXPORT extern struct pkg_conn *pkg_transerver();
 PKG_EXPORT extern int pkg_permserver();
-PKG_EXPORT extern struct pkg_conn *pkg_getclient(int fd, const struct pkg_switch *switchp, void (*errlog) (/* ??? */), int nodelay);
+PKG_EXPORT extern struct pkg_conn *pkg_getclient(int fd, struct pkg_switch *switchp, void (*errlog) (/* ??? */), int nodelay);
 PKG_EXPORT extern void pkg_close();
 PKG_EXPORT extern int pkg_send();
 PKG_EXPORT extern int pkg_2send();
@@ -1,7 +1,7 @@
 /*                          P L A S T I C . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                         P L O T 3 . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      R A Y T R A C E . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -2892,10 +2892,6 @@ RT_EXPORT BU_EXTERN(int db5_import_attributes,
 		    (struct bu_attribute_value_set *avs,
 		     const struct bu_external *ap));

-RT_EXPORT BU_EXTERN(void db5_export_attributes,
-		    (struct bu_external *ap,
-		     const struct bu_attribute_value_set *avs));
-
 RT_EXPORT BU_EXTERN(int db5_get_raw_internal_fp,
 		    (struct db5_raw_internal	*rip,
 		     FILE			*fp));
@@ -3154,10 +3150,11 @@ RT_EXPORT BU_EXTERN(int rt_extrude_import5,
 		     const int			minor_type));


-/* db_inmem.c */
-RT_EXPORT BU_EXTERN(struct db_i * db_open_inmem, (void));
-
-RT_EXPORT BU_EXTERN(struct db_i * db_create_inmem, (void));
+/* db_lookup.c */
+RT_EXPORT BU_EXTERN(int db_get_directory_size,
+		    (const struct db_i	*dbip));
+RT_EXPORT BU_EXTERN(void db_ck_directory,
+		    (const struct db_i *dbip));

 RT_EXPORT BU_EXTERN(void db_inmem,
 		    (struct directory	*dp,
@@ -3165,12 +3162,6 @@ RT_EXPORT BU_EXTERN(void db_inmem,
 		     int		flags,
 		     struct db_i	*dbip));

-/* db_lookup.c */
-RT_EXPORT BU_EXTERN(int db_get_directory_size,
-		    (const struct db_i	*dbip));
-RT_EXPORT BU_EXTERN(void db_ck_directory,
-		    (const struct db_i *dbip));
-
 RT_EXPORT BU_EXTERN(int db_is_directory_non_empty,
 		    (const struct db_i	*dbip));

@@ -3239,15 +3230,10 @@ RT_EXPORT BU_EXTERN(int db_regexp_match_all,
 		     struct db_i *dbip,
 		     const char *pattern));

-/* db_flags.c */
+/* db_alloc.c */
 RT_EXPORT BU_EXTERN(int db_flags_internal,
 		    (const struct rt_db_internal *intern));

-RT_EXPORT BU_EXTERN(int db_flags_raw_internal,
-		    (const struct db5_raw_internal *intern));
-
-/* db_alloc.c */
-
 /* allocate "count" granules */
 RT_EXPORT BU_EXTERN(int db_alloc,
 		    (struct db_i *,
@@ -6512,10 +6498,7 @@ RT_EXPORT BU_EXTERN(void dgo_color_soltab,
 RT_EXPORT BU_EXTERN(void dgo_drawH_part2,
 		    ());
 RT_EXPORT BU_EXTERN(void dgo_eraseobjall_callback,
-		    (struct db_i	*dbip,
-		     Tcl_Interp		*interp,
-		     struct directory	*dp,
-		     int		notify));
+		    ());
 RT_EXPORT BU_EXTERN(void dgo_eraseobjpath,
 		    ());
 RT_EXPORT BU_EXTERN(void dgo_impending_wdb_close,
@@ -6523,11 +6506,7 @@ RT_EXPORT BU_EXTERN(void dgo_impending_wdb_close,
 RT_EXPORT BU_EXTERN(int dgo_invent_solid,
 		    ());
 RT_EXPORT BU_EXTERN(void dgo_notify,
-		    (struct dg_obj	*dgop,
-		     Tcl_Interp		*interp));
-RT_EXPORT BU_EXTERN(void dgo_notifyWdb,
-		    (struct rt_wdb *wdbp,
-		     Tcl_Interp    *interp));
+		    ());
 RT_EXPORT BU_EXTERN(void dgo_zapall,
 		    ());

@@ -1,7 +1,7 @@
 /*                      R E D B L A C K . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -33,7 +33,6 @@
 #include "rle_config.h"		/* Configuration parameters. */

 #include <stdio.h>		/* Declare FILE. */
-#include <stdlib.h>

 #ifdef c_plusplus
 #define USE_PROTOTYPES
@@ -120,4 +120,3 @@ extern char *getenv();
 * compilation support issues.  e.g. sys_errlist on solaris. 
 */
 #include "common.h"
-
@@ -1,7 +1,7 @@
 /*                        R T G E O M . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                        R T L I S T . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                     R T P R I V A T E . H
 * BRL-CAD
 *
- * Copyright (c) 1985-2006 United States Government as represented by
+ * Copyright (C) 1985-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      R T S E R V E R . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      R T S T R I N G . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*			S H A D E F U N C S . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                          S H A D E W O R K . H
 * BRL-CAD
 *
- * Copyright (c) 1993-2006 United States Government as represented by
+ * Copyright (C) 1993-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                  S H O R T V E C T - P R . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                     S H O R T V E C T . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                         S O L I D . H
 * BRL-CAD
 *
- * Copyright (c) 1985-2006 United States Government as represented by
+ * Copyright (C) 1985-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      S P E C T R U M . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           S P M . H
 * BRL-CAD
 *
- * Copyright (c) 1986-2006 United States Government as represented by
+ * Copyright (C) 1986-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                        T C L C A D . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      V E C T F O N T . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                      V F O N T - I F . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                         V M A T H . H
 * BRL-CAD
 *
- * Copyright (c) 2004-2006 United States Government as represented by
+ * Copyright (C) 2004-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -1,7 +1,7 @@
 /*                           W D B . H
 * BRL-CAD
 *
- * Copyright (c) 1988-2006 United States Government as represented by
+ * Copyright (C) 1988-2005 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -4,16 +4,15 @@ brlcad_m4 = \
 	args.m4 \
 	cache.m4 \
 	compiler.m4 \
-	epsilon.m4 \
 	restore.m4 \
 	retry.m4 \
+	sdl.m4 \
 	search.m4 \
 	stage.m4

 EXTRA_DIST = \
 	$(brlcad_m4) \
-	mkdirp.m4 \
-	sdl.m4
+	mkdirp.m4

 MAINTAINERCLEANFILES = Makefile.in

@@ -1,7 +1,7 @@
 #                        A R G S . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 #                       C A C H E . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 #                   C O M P I L E R . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,6 @@
 #
 # BC_PREPROCESSOR_RECOGNIZES
 # checks if the preprocessor will work with the specified cppflags
-#
 ###

 AC_DEFUN([BC_COMPILER_AND_LINKER_RECOGNIZES], [
@@ -1,205 +0,0 @@
-#                    E P S I L O N . M 4
-# BRL-CAD
-#
-# Copyright (c) 2005-2006 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# BC_TRY_RUN_OUTPUT
-# attempts to compile and run the provided program, saving the output
-# in the provided variable
-#
-# BC_FLOAT_EPSILON
-# determine the single-precision floating point tolerance epsilon
-#
-# BC_DOUBLE_EPSILON
-# determine the double-precision floating point tolerance epsilon
-#
-# BC_COMPLIANT_FLOAT
-# determine whether the single-precision floating point epsilon seems
-# IEEE 754 compliant by computing the power of -23
-#
-# BC_COMPLIANT_DOUBLE
-# determine whether the double-precision floating point epsilon seems
-# IEEE 754 compliant by computing the power of -52
-#
-###
-
-dnl BC_TRY_RUN_OUTPUT(VARIABLE, PROGRAM)
-AC_DEFUN([BC_TRY_RUN_OUTPUT], [
-AC_REQUIRE([AC_PROG_CC])
-cat > conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
-#include "confdefs.h"
-[$2]
-EOF
-if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest > conftest.stdout; exit) 2>/dev/null ; then
-	$1=`cat ./conftest.stdout`
-else
-	echo "configure: failed program was:" >&AC_FD_CC
-	cat conftest.$ac_ext >&AC_FD_CC
-	$1=""
-fi
-rm -fr conftest*
-])
-
-
-# BC_FLOAT_EPSILON()
-AC_DEFUN([BC_FLOAT_EPSILON], [
-dnl determine the minimum single-precision floating point tolerance
-dnl value at compile time such that: 1.0 + value != 1.0
-dnl ANSI defines this as FLT_EPSILON but float.h may not provide it.
-AC_MSG_CHECKING([single-precision floating point tolerance])
-BC_TRY_RUN_OUTPUT(bc_flt_epsilon, [
-#include <stdio.h>
-int main (int ac, char *av[]) {
-    /* must be volatile to avoid long registers */
-    volatile float tol = 1.0f;
-    while (1.0f + (tol * 0.5f) != 1.0f) {
-	tol *= 0.5f;
-    }
-    printf("%.20e", tol);
-    return 0;
-}
-])
-AC_MSG_RESULT([$bc_flt_epsilon])
-])
-
-
-# BC_DOUBLE_EPSILON()
-AC_DEFUN([BC_DOUBLE_EPSILON], [
-dnl determine the minimum double-precision floating point tolerance
-dnl value at compile time such that: 1.0 + value != 1.0
-dnl ANSI defines this as DBL_EPSILON but float.h may not provide it.
-AC_MSG_CHECKING([double-precision floating point tolerance])
-BC_TRY_RUN_OUTPUT(bc_dbl_epsilon, [
-#include <stdio.h>
-int main (int ac, char *av[]) {
-    /* must be volatile to avoid long registers */
-    volatile double tol = 1.0;
-    while (1.0 + (tol * 0.5) != 1.0) {
-	tol *= 0.5;
-    }
-    printf("%.20e", tol);
-    return 0;
-}
-])
-AC_MSG_RESULT([$bc_dbl_epsilon])
-])
-
-
-# BC_COMPLIANT_FLOAT()
-AC_DEFUN([BC_COMPLIANT_FLOAT], [
-dnl determine whether the floating point implementation seems to be
-dnl IEEE 754 compliant by checking whether the tolerance epsilon 
-dnl matches or is better than -23 power.  make sure 0 == -0 too.
-AC_MSG_CHECKING([whether floats conform to IEEE 754])
-AC_TRY_RUN([
-typedef union {
-    float f;
-    unsigned short int i[2];
-} S;
-int main (int ac, char *av[]) {
-    /* must be volatile to avoid long registers */
-    volatile float tol = 1.0f;
-    volatile float power = 1.0f;
-    int n = 23;
-    S f;
-    while (1.0f + (tol * 0.5f) != 1.0f) {
-	tol *= 0.5f;
-    }
-    while (n-- > 0) {
-	power *= 0.5f;
-    }
-    if (tol > power) {
-	return 1;
-    }
-    /* make sure 0 == -0 */
-    tol = 0.0f; power = -tol;
-    if (tol != power) {
-	return 2;
-    }
-    /* make sure -0 is implemented */
-    f.f = power;
-    n = (f.i[0] != 0) ? 0 : 1;
-    if (f.i[n] != 0x8000) {
-	return 3;
-    }
-    return 0;
-}
-], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) ]
-)
-])
-
-
-# BC_COMPLIANT_DOUBLE()
-AC_DEFUN([BC_COMPLIANT_DOUBLE], [
-dnl determine whether the floating point implementation seems to be
-dnl IEEE 754 compliant by checking whether the tolerance epsilon 
-dnl matches or is better than -23 power.  make sure 0 == -0 too.
-AC_MSG_CHECKING([whether doubles conform to IEEE 754])
-AC_TRY_RUN([
-typedef union {
-    double d;
-    unsigned short int i[4];
-} D;
-int main (int ac, char *av[]) {
-    /* must be volatile to avoid long registers */
-    volatile double tol = 1.0;
-    volatile double power = 1.0;
-    int n = 52;
-    D d;
-    while (1.0f + (tol * 0.5) != 1.0) {
-	tol *= 0.5;
-    }
-    while (n-- > 0) {
-	power *= 0.5;
-    }
-    if (tol > power) {
-	return 1;
-    }
-    /* make sure 0 == -0 */
-    tol = 0.0; power = -tol;
-    if (tol != power) {
-	return 2;
-    }
-    /* make sure -0 is implemented */
-    d.d = power;
-    n = (d.i[0] != 0) ? 0 : (d.i[1] != 0) ? 1 : (d.i[2] != 0) ? 2 : 3;
-    if (d.i[n] != 0x8000) {
-	return 3;
-    }
-    return 0;
-}
-], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) ]
-)
-])
@@ -1,7 +1,7 @@
 #                     R E S T O R E . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 #                       R E T R Y . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 #                      S E A R C H . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 #                       S T A G E . M 4
 # BRL-CAD
 #
-# Copyright (c) 2005-2006 United States Government as represented by
+# Copyright (C) 2005 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -47,23 +47,15 @@
 ###

 AC_DEFUN([BC_BOLD], [
-if test -t 1 ; then
-	if test -f "${srcdir}/sh/shtool" ; then
-		${srcdir}/sh/shtool echo -n -e %B
-	elif test -f "${srcdir}/misc/shtool" ; then
-		${srcdir}/misc/shtool echo -n -e %B
-	fi
+if test -f "${srcdir}/sh/shtool" ; then
+    ${srcdir}/sh/shtool echo -n -e %B
 fi
 ])


 AC_DEFUN([BC_UNBOLD], [
-if test -t 1 ; then
-	if test -f "${srcdir}/sh/shtool" ; then
-		${srcdir}/sh/shtool echo -n -e %b
-	elif test -f "${srcdir}/misc/shtool" ; then
-		${srcdir}/misc/shtool echo -n -e %b
-	fi
+if test -f "${srcdir}/sh/shtool" ; then
+    ${srcdir}/sh/shtool echo -n -e %b
 fi
 ])

@@ -24,8 +24,7 @@ SUBDIRS = \
 	$(PROE_DIR) \
 	macosx \
 	vfont \
-	win32-msvc \
-	win32-msvc7
+	win32-msvc

 DISTCLEANFILES = \
 	COPYING.backup \
@@ -31,7 +31,6 @@
 *	Aberdeen Proving Ground, Maryland  21005-5066
 */

-#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <wchar.h>
@@ -50,11 +50,11 @@ RSC=rc.exe
 # ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -79,11 +79,11 @@ LINK32=link.exe
 # ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -108,11 +108,11 @@ LINK32=link.exe
 # ADD BASE F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD F90 /compile_only /dll /nologo /warn:nofileopt
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -137,11 +137,11 @@ LINK32=link.exe
 # ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -166,11 +166,11 @@ LINK32=link.exe
 # ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -195,11 +195,11 @@ LINK32=link.exe
 # ADD BASE F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD F90 /check:bounds /compile_only /dbglibs /debug:full /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG" /d "HAVE_CONFIG_H"
+# ADD RSC /l 0x409 /i "../../../include" /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -28,7 +28,7 @@ BEGIN
            VALUE "FileDescription", "BRL-CAD for Windows Dynamic-Link Library\0"
            VALUE "FileVersion", BRLCAD_VERSION
            VALUE "InternalName", "brlcad\0"
-            VALUE "LegalCopyright", "Copyright © 2006 United States Government as represented by the U.S. Army Research Laboratory. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright © 2005 United States Government as represented by the U.S. Army Research Laboratory. All Rights Reserved.\0"
            VALUE "LegalTrademarks", "The word mark ""BRL-CAD"" and the ""BRL-CAD Eagle"" image are registered trademarks of the Department of the Army, United States Government. All rights are reserved.\0"
            VALUE "OriginalFilename", "brlcad.dll\0"
            VALUE "ProductName", "BRL-CAD\0"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christopher Sean Morrison	00e7f2a45c	remove what looks like a tag related to the merging of the bobWinPort work, some artifact tag that was retained through conversion from cvs. (svn branch delete) svn:revision:46336 svn:tag:temp_tag svn:account:brlcad	2011-08-23 15:47:55 +00:00
cvs-fast-export	3a39e428b4	Synthetic commit for incomplete tag temp_tag svn:revision:25915 cvs:account:cvs-fast-export	2005-12-24 02:44:08 +00:00