"add gcc-2.96 warning, other cleanups"

Patch:    ivtools-020610-johnston-050
For:      ivtools-1.0.3
Author:   [email protected]
Subject:  add gcc-2.96 warning, other cleanups
Requires: 

This is an intermediate patch to ivtools-1.0.3.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- add gcc-2.96 warning

- remove installation of extraneous scripts when non-local install.

Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.6 top_ivtools/INSTALL:1.7
*** top_ivtools/INSTALL:1.6	Mon Mar 11 12:03:47 2002
--- ./INSTALL	Mon Jun 10 16:33:32 2002
***************
*** 31,36 ****
--- 31,40 ----
  libstdc++ version numbers stay roughly in synch with the gcc version
  numbers.  If you have gcc-2.8.1 you'd want libstdc++-2.8.1, etc..
  
+ ** NOTE ** Do not use gcc-2.96.  See
+ http://www.ivtools.org/ivtools/faq.html#gcc-2.96-problem for more
+ details.
+ 
  Be aware that sometimes the include files for libstdc++ are in
  /usr/local/include/g++-2, a place that cannot be auto-determined by
  the configure script.  Establishing a symbolic link to
Index: top_ivtools/README
diff -c top_ivtools/README:1.5 top_ivtools/README:1.6
*** top_ivtools/README:1.5	Mon Mar 11 12:03:47 2002
--- ./README	Mon Jun 10 16:33:32 2002
***************
*** 130,135 ****
--- 130,140 ----
  (http://www.ivtools.org) and ivtools download page
  (http://www.ivtools.org/ivtools/download.html)
  
+ ** NOTE **  Do not use gcc-2.96, the default compiler shipped with
+ RedHat 7.*.  This branch of gcc was never approved by the gcc
+ steering committee.  The workaround is to upgrade to gcc-3.* or 
+ downgrade to gcc-2.95.*.
+ 
  If you have a question about this software, desire to add code, found
  a bug, want to request a feature, or wonder how to get further
  assistance, please send e-mail to the general purpose ivtools mailing
Index: scripts_ivtools/Imakefile
diff -c scripts_ivtools/Imakefile:1.1 scripts_ivtools/Imakefile:1.2
*** scripts_ivtools/Imakefile:1.1	Fri Nov  2 13:07:51 2001
--- src/scripts/Imakefile	Mon Jun 10 16:33:44 2002
***************
*** 6,12 ****
  
  IvmkcmTargets($(PACKAGE))
  
! PROGRAMS = ivmkmf ivct ivdt ivcd ivfb ivgd ivds
  #if InstallRelative
  CONFIGDIRSPEC = -T IMAKE_TEMPLATE -I$(CONFIGDIR) -I$(XCONFIGDIR)
  MAKEMAKESPEC = ARCH=$(CPU) CONFIGSRC=$(CONFIGDIR) XCONFIGDIR=$(XCONFIGDIR)
--- 6,12 ----
  
  IvmkcmTargets($(PACKAGE))
  
! PROGRAMS = ivmkmf
  #if InstallRelative
  CONFIGDIRSPEC = -T IMAKE_TEMPLATE -I$(CONFIGDIR) -I$(XCONFIGDIR)
  MAKEMAKESPEC = ARCH=$(CPU) CONFIGSRC=$(CONFIGDIR) XCONFIGDIR=$(XCONFIGDIR)
***************
*** 27,43 ****
  
  LDLIB_SPEC = LD_LIBRARY_PATH='$(LIBABSDIR)':$$LD_LIBRARY_PATH
  PATH_SPEC = PATH='$(BINDIR)':$$PATH
- CppScriptTarget(ivct,ivct.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
- CppScriptTarget(ivdt,ivdt.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
- CppScriptTarget(ivcd,ivcd.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
- CppScriptTarget(ivfb,ivfb.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
- CppScriptTarget(ivgd,ivgd.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
- CppScriptTarget(ivds,ivds.cpp,-DLDLIB_SPEC='$(LDLIB_SPEC)' -DPATH_SPEC='$(PATH_SPEC)',)
  
  InstallScriptAs(mkgif89a.bash,$(BINDIR),mkgif89a)
  InstallScriptAs(mkgif89ac.bash,$(BINDIR),mkgif89ac)
  InstallScriptAs(ivgetjpg.bash,$(BINDIR),ivgetjpg)
  InstallScriptAs(cntsrclines.bash,$(BINDIR),cntsrclines)
  InstallScriptAs(ivtiftopnm.bash,$(BINDIR),ivtiftopnm)
  
  InstallScriptAs(pnmtopgm.sh,$(BINDIR),pnmtopgm)
--- 27,41 ----
  
  LDLIB_SPEC = LD_LIBRARY_PATH='$(LIBABSDIR)':$$LD_LIBRARY_PATH
  PATH_SPEC = PATH='$(BINDIR)':$$PATH
  
+ #if InstallRelative
  InstallScriptAs(mkgif89a.bash,$(BINDIR),mkgif89a)
  InstallScriptAs(mkgif89ac.bash,$(BINDIR),mkgif89ac)
+ #endif
  InstallScriptAs(ivgetjpg.bash,$(BINDIR),ivgetjpg)
+ #if InstallRelative
  InstallScriptAs(cntsrclines.bash,$(BINDIR),cntsrclines)
+ #endif
  InstallScriptAs(ivtiftopnm.bash,$(BINDIR),ivtiftopnm)
  
  InstallScriptAs(pnmtopgm.sh,$(BINDIR),pnmtopgm)
*** /dev/null	 Mon Jun 10 16:33:46 PDT 2002
--- patches/ivtools-020610-johnston-050
*************** patches/ivtools-020610-johnston-050
*** 0 ****
--- 1 ----
+ ivtools-020610-johnston-050

_______________________________________________________________

Multimillion Dollar Computer Inventory
Live Webcast Auctions Thru Aug. 2002 - http://www.cowanalexander.com/calendar