"fix up config and imake files for PROJ lib"

[<joh...@ie...>]

Patch:    vhclmaps-000609-johnston-030
For:      vhclmaps-0.7.4
Author:   joh...@us...
Subject:  fix up config and imake files for PROJ lib
Requires: 

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

	patch -p0 <ThisFile

Summary of Changes:

- fix up the the config and imake (Imakefile) files to better locate
the include file and library file for PROJ-4.3.3.  Before it required
installation under /usr/local

- disambiguate a call to ComTerp::run in MapServ/mapfunc.c

Index: top_vhclmaps/configure
diff -c top_vhclmaps/configure:1.4 top_vhclmaps/configure:1.5
*** top_vhclmaps/configure:1.4	Tue Mar 14 22:51:49 2000
--- ./configure	Fri Jun  9 02:38:00 2000
***************
*** 779,785 ****
  		if test -f $PROJ/include/projects.h ; then
  			echo "$ac_t""Found projects.h in $PROJ/include " 1>&6
  		        PROJ_LIBS=$PROJ/lib
! 			PROJ=$PROJ/include
  		else
  			{ echo "configure: error: Can not find projects.h in $PROJ given with option --with-proj=$PROJ " 1>&2; exit 1; }
  		fi
--- 779,785 ----
  		if test -f $PROJ/include/projects.h ; then
  			echo "$ac_t""Found projects.h in $PROJ/include " 1>&6
  		        PROJ_LIBS=$PROJ/lib
! 			PROJ=$PROJ
  		else
  			{ echo "configure: error: Can not find projects.h in $PROJ given with option --with-proj=$PROJ " 1>&2; exit 1; }
  		fi
***************
*** 1584,1590 ****
  else
  ice_file=`grep '^# 1' conftest.ii | grep iostream.h | \
          head -1 | sed 's/^.*"\(.*\)".*$/\1/'`
! ice_cv_cxx_include_dir=`echo $ice_file | sed 's%/[^/][^/]*$%%'`
  fi
  if test "$ice_cv_cxx_include_dir" = ""; then
  ice_cv_cxx_include_dir="$prefix/include"
--- 1584,1590 ----
  else
  ice_file=`grep '^# 1' conftest.ii | grep iostream.h | \
          head -1 | sed 's/^.*"\(.*\)".*$/\1/'`
! ice_cv_cxx_include_dir=`echo $ice_file | sed 's%iostream.h%%'`
  fi
  if test "$ice_cv_cxx_include_dir" = ""; then
  ice_cv_cxx_include_dir="$prefix/include"
Index: top_vhclmaps/configure.in
diff -c top_vhclmaps/configure.in:1.6 top_vhclmaps/configure.in:1.7
*** top_vhclmaps/configure.in:1.6	Tue Mar 14 22:51:50 2000
--- ./configure.in	Fri Jun  9 02:38:01 2000
***************
*** 188,194 ****
  		if test -f $PROJ/include/projects.h ; then
  			AC_MSG_RESULT( Found projects.h in $PROJ/include )
  		        PROJ_LIBS=$PROJ/lib
! 			PROJ=$PROJ/include
  		else
  			AC_MSG_ERROR( Can not find projects.h in $PROJ given with option --with-proj=$PROJ )
  		fi
--- 188,194 ----
  		if test -f $PROJ/include/projects.h ; then
  			AC_MSG_RESULT( Found projects.h in $PROJ/include )
  		        PROJ_LIBS=$PROJ/lib
! 			PROJ=$PROJ
  		else
  			AC_MSG_ERROR( Can not find projects.h in $PROJ given with option --with-proj=$PROJ )
  		fi
Index: Map/Imakefile
diff -c Map/Imakefile:1.2 Map/Imakefile:1.3
*** Map/Imakefile:1.2	Tue Jan 25 03:21:43 2000
--- src/Map/Imakefile	Fri Jun  9 02:38:03 2000
***************
*** 8,13 ****
--- 8,16 ----
  
  LIB = Map
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ 
  Use_2_6()
  
  MakeLibrary($(LIB),$(VERSION))
Index: Vpf/Imakefile
diff -c Vpf/Imakefile:1.2 Vpf/Imakefile:1.3
*** Vpf/Imakefile:1.2	Tue Jan 25 03:21:47 2000
--- src/Vpf/Imakefile	Fri Jun  9 02:38:05 2000
***************
*** 8,13 ****
--- 8,16 ----
  
  LIB = Vpf
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ 
  Use_2_6()
  
  MakeLibrary($(LIB),$(VERSION))
Index: Dlg/Imakefile
diff -c Dlg/Imakefile:1.2 Dlg/Imakefile:1.3
*** Dlg/Imakefile:1.2	Tue Jan 25 03:21:48 2000
--- src/Dlg/Imakefile	Fri Jun  9 02:38:06 2000
***************
*** 8,13 ****
--- 8,16 ----
  
  LIB = Dlg
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ 
  Use_2_6()
  
  MakeLibrary($(LIB),$(VERSION))
Index: Dem/Imakefile
diff -c Dem/Imakefile:1.2 Dem/Imakefile:1.3
*** Dem/Imakefile:1.2	Tue Jan 25 03:21:50 2000
--- src/Dem/Imakefile	Fri Jun  9 02:38:08 2000
***************
*** 8,13 ****
--- 8,16 ----
  
  LIB = Dem
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ 
  Use_2_6()
  
  MakeLibrary($(LIB),$(VERSION))
Index: dcwdemprint/Imakefile
diff -c dcwdemprint/Imakefile:1.1 dcwdemprint/Imakefile:1.2
*** dcwdemprint/Imakefile:1.1	Mon Aug  2 13:52:57 1999
--- src/utils/dcwdemprint/Imakefile	Fri Jun  9 02:38:10 2000
***************
*** 11,16 ****
--- 11,20 ----
  APP_CCDEPLIBS = $(DEPDEM) $(DEPTOPOFACE)
  #endif
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ OTHER_CCLDLIBS = $(PROJ_CCLDLIBS)
+ 
  Use_libUnidraw()
  
  ComplexProgramTarget(dcwdemprint)
Index: vpftableprint/Imakefile
diff -c vpftableprint/Imakefile:1.1 vpftableprint/Imakefile:1.2
*** vpftableprint/Imakefile:1.1	Mon Aug  2 13:52:59 1999
--- src/utils/vpftableprint/Imakefile	Fri Jun  9 02:38:12 2000
***************
*** 13,18 ****
--- 13,22 ----
  APP_CCDEPLIBS = $(DEPVPF) $(DEPMAP) $(DEPATTRIBUTE) $(DEPCOMUTIL) $(DEPTOPOFACE) $(DEPVPFUTIL)
  #endif
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ OTHER_CCLDLIBS = $(PROJ_CCLDLIBS)
+ 
  Use_libUnidraw()
  
  ComplexProgramTarget(vpftableprint)
Index: vpfdbprint/Imakefile
diff -c vpfdbprint/Imakefile:1.1 vpfdbprint/Imakefile:1.2
*** vpfdbprint/Imakefile:1.1	Mon Aug  2 13:53:01 1999
--- src/utils/vpfdbprint/Imakefile	Fri Jun  9 02:38:13 2000
***************
*** 11,16 ****
--- 11,20 ----
  APP_CCDEPLIBS = $(DEPVPF) $(DEPMAP) $(DEPATTRIBUTE) $(DEPCOMUTIL) $(DEPTOPOFACE) $(DEPVPFUTIL)
  #endif
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ OTHER_CCLDLIBS = $(PROJ_CCLDLIBS)
+ 
  Use_libUnidraw()
  
  ComplexProgramTarget(vpfdbprint)
Index: usgsdemprint/Imakefile
diff -c usgsdemprint/Imakefile:1.1 usgsdemprint/Imakefile:1.2
*** usgsdemprint/Imakefile:1.1	Mon Aug  2 13:53:02 1999
--- src/utils/usgsdemprint/Imakefile	Fri Jun  9 02:38:15 2000
***************
*** 11,16 ****
--- 11,20 ----
  APP_CCDEPLIBS = $(DEPDEM) $(DEPTOPOFACE)
  #endif
  
+ OTHER_CCDEFINES = $(PROJ_CCDEFINES)
+ OTHER_CCINCLUDES = $(PROJ_CCINCLUDES)
+ OTHER_CCLDLIBS = $(PROJ_CCLDLIBS)
+ 
  Use_libUnidraw()
  
  ComplexProgramTarget(usgsdemprint)
Index: MapUnidraw/Imakefile
diff -c MapUnidraw/Imakefile:1.2 MapUnidraw/Imakefile:1.3
*** MapUnidraw/Imakefile:1.2	Tue Jan 25 03:21:53 2000
--- src/MapUnidraw/Imakefile	Fri Jun  9 02:38:17 2000
***************
*** 8,15 ****
  
  LIB = MapUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  Use_2_6()
  
--- 8,15 ----
  
  LIB = MapUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  Use_2_6()
  
Index: VpfUnidraw/Imakefile
diff -c VpfUnidraw/Imakefile:1.2 VpfUnidraw/Imakefile:1.3
*** VpfUnidraw/Imakefile:1.2	Tue Jan 25 03:21:56 2000
--- src/VpfUnidraw/Imakefile	Fri Jun  9 02:38:20 2000
***************
*** 8,15 ****
  
  LIB = VpfUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
--- 8,15 ----
  
  LIB = VpfUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
Index: vpfviewer/Imakefile
diff -c vpfviewer/Imakefile:1.1 vpfviewer/Imakefile:1.2
*** vpfviewer/Imakefile:1.1	Mon Aug  2 13:53:14 1999
--- src/vpfviewer/Imakefile	Fri Jun  9 02:38:22 2000
***************
*** 46,54 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 46,54 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: DlgUnidraw/Imakefile
diff -c DlgUnidraw/Imakefile:1.2 DlgUnidraw/Imakefile:1.3
*** DlgUnidraw/Imakefile:1.2	Tue Jan 25 03:21:58 2000
--- src/DlgUnidraw/Imakefile	Fri Jun  9 02:38:23 2000
***************
*** 8,15 ****
  
  LIB = DlgUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
--- 8,15 ----
  
  LIB = DlgUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
Index: dlgviewer/Imakefile
diff -c dlgviewer/Imakefile:1.1 dlgviewer/Imakefile:1.2
*** dlgviewer/Imakefile:1.1	Mon Aug  2 13:53:18 1999
--- src/dlgviewer/Imakefile	Fri Jun  9 02:38:25 2000
***************
*** 43,51 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 43,51 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: MapServ/Imakefile
diff -c MapServ/Imakefile:1.3 MapServ/Imakefile:1.4
*** MapServ/Imakefile:1.3	Fri Apr  7 04:24:53 2000
--- src/MapServ/Imakefile	Fri Jun  9 02:38:27 2000
***************
*** 8,15 ****
  
  LIB = MapServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  Use_2_6()
  
--- 8,15 ----
  
  LIB = MapServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  Use_2_6()
  
Index: MapServ/mapfunc.c
diff -c MapServ/mapfunc.c:1.4 MapServ/mapfunc.c:1.5
*** MapServ/mapfunc.c:1.4	Fri Mar 24 23:20:54 2000
--- src/MapServ/mapfunc.c	Fri Jun  9 02:38:27 2000
***************
*** 1574,1580 ****
      for (fccomp->First(i); !fccomp->Done(i); fccomp->Next(i)) {
          MapFeatureComp* fcomp = (MapFeatureComp*)fccomp->GetComp(i);
  	attrterp->set_attributes(fcomp->GetAttributeList());
! 	ComValue& value = attrterp->run(nil);
      	if (value.is_true()) {
  	    MapFeature* newf = new MapFeature(*fcomp->feature());
  	    newf->graphic((void*)new MapFeatureComp(newf));
--- 1574,1580 ----
      for (fccomp->First(i); !fccomp->Done(i); fccomp->Next(i)) {
          MapFeatureComp* fcomp = (MapFeatureComp*)fccomp->GetComp(i);
  	attrterp->set_attributes(fcomp->GetAttributeList());
! 	ComValue& value = attrterp->run((const char*)nil);
      	if (value.is_true()) {
  	    MapFeature* newf = new MapFeature(*fcomp->feature());
  	    newf->graphic((void*)new MapFeatureComp(newf));
***************
*** 1673,1679 ****
  
  	if (touchline) {
  	  attrterp->set_attributes(fcomp->GetAttributeList());
! 	  ComValue& value = attrterp->run(nil);
  	  if (value.is_true()) {
  	    MapFeature* newf = new MapFeature(*fcomp->feature());
  	    newf->graphic((void*)new MapFeatureComp(newf));
--- 1673,1679 ----
  
  	if (touchline) {
  	  attrterp->set_attributes(fcomp->GetAttributeList());
! 	  ComValue& value = attrterp->run((const char*)nil);
  	  if (value.is_true()) {
  	    MapFeature* newf = new MapFeature(*fcomp->feature());
  	    newf->graphic((void*)new MapFeatureComp(newf));
***************
*** 2268,2274 ****
  	    attr = new Attribute(attrname.string_ptr(), val);
  	    alist->add_attribute(attr);
  	}
! 	*val = _terp->run(nil);
      }
  }
  
--- 2268,2274 ----
  	    attr = new Attribute(attrname.string_ptr(), val);
  	    alist->add_attribute(attr);
  	}
! 	*val = _terp->run((const char*)nil);
      }
  }
  
Index: mapserv/Imakefile
diff -c mapserv/Imakefile:1.1 mapserv/Imakefile:1.2
*** mapserv/Imakefile:1.1	Mon Aug  2 13:53:23 1999
--- src/mapserv/Imakefile	Fri Jun  9 02:38:29 2000
***************
*** 43,51 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 43,51 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: UtmUnidraw/Imakefile
diff -c UtmUnidraw/Imakefile:1.2 UtmUnidraw/Imakefile:1.3
*** UtmUnidraw/Imakefile:1.2	Tue Jan 25 03:22:03 2000
--- src/UtmUnidraw/Imakefile	Fri Jun  9 02:38:32 2000
***************
*** 8,15 ****
  
  LIB = UtmUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
--- 8,15 ----
  
  LIB = UtmUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
Index: utmviewer/Imakefile
diff -c utmviewer/Imakefile:1.1 utmviewer/Imakefile:1.2
*** utmviewer/Imakefile:1.1	Mon Aug  2 13:53:27 1999
--- src/utmviewer/Imakefile	Fri Jun  9 02:38:33 2000
***************
*** 45,53 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 45,53 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: LosServ/Imakefile
diff -c LosServ/Imakefile:1.2 LosServ/Imakefile:1.3
*** LosServ/Imakefile:1.2	Tue Jan 25 03:22:07 2000
--- src/LosServ/Imakefile	Fri Jun  9 02:38:37 2000
***************
*** 8,15 ****
  
  LIB = LosServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  Use_2_6()
  
--- 8,15 ----
  
  LIB = LosServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  Use_2_6()
  
Index: losserv/Imakefile
diff -c losserv/Imakefile:1.1 losserv/Imakefile:1.2
*** losserv/Imakefile:1.1	Mon Aug  2 13:53:37 1999
--- src/losserv/Imakefile	Fri Jun  9 02:38:39 2000
***************
*** 47,55 ****
  $(DEPCOMUTIL)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 47,55 ----
  $(DEPCOMUTIL)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: ProjServ/Imakefile
diff -c ProjServ/Imakefile:1.2 ProjServ/Imakefile:1.3
*** ProjServ/Imakefile:1.2	Tue Jan 25 03:22:09 2000
--- src/ProjServ/Imakefile	Fri Jun  9 02:38:41 2000
***************
*** 8,15 ****
  
  LIB = ProjServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  Use_2_6()
  
--- 8,15 ----
  
  LIB = ProjServ
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  Use_2_6()
  
Index: ProjUnidraw/Imakefile
diff -c ProjUnidraw/Imakefile:1.2 ProjUnidraw/Imakefile:1.3
*** ProjUnidraw/Imakefile:1.2	Tue Jan 25 03:22:11 2000
--- src/ProjUnidraw/Imakefile	Fri Jun  9 02:38:43 2000
***************
*** 8,15 ****
  
  LIB = ProjUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
--- 8,15 ----
  
  LIB = ProjUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
Index: projviewer/Imakefile
diff -c projviewer/Imakefile:1.1 projviewer/Imakefile:1.2
*** projviewer/Imakefile:1.1	Mon Aug  2 13:53:45 1999
--- src/projviewer/Imakefile	Fri Jun  9 02:38:44 2000
***************
*** 59,67 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 59,67 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES) 
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
Index: VhclUnidraw/Imakefile
diff -c VhclUnidraw/Imakefile:1.3 VhclUnidraw/Imakefile:1.4
*** VhclUnidraw/Imakefile:1.3	Mon Feb 28 17:28:05 2000
--- src/VhclUnidraw/Imakefile	Fri Jun  9 02:38:47 2000
***************
*** 8,15 ****
  
  LIB = VhclUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
--- 8,15 ----
  
  LIB = VhclUnidraw
  
! OTHER_CCDEFINES = $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
  
  MakeLibrary($(LIB),$(VERSION))
  
Index: vhclviewer/Imakefile
diff -c vhclviewer/Imakefile:1.1 vhclviewer/Imakefile:1.2
*** vhclviewer/Imakefile:1.1	Mon Aug  2 13:53:54 1999
--- src/vhclviewer/Imakefile	Fri Jun  9 02:38:49 2000
***************
*** 65,73 ****
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
--- 65,73 ----
  $(DEPIVGLYPH)
  #endif
  
! OTHER_CCDEFINES = $(ACE_CCDEFINES) $(PROJ_CCDEFINES)
! OTHER_CCINCLUDES = $(ACE_CCINCLUDES) $(PROJ_CCINCLUDES)
! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(PROJ_CCLDLIBS)
  
  Use_libUnidraw()
  Use_2_6()
*** /dev/null	 Fri Jun 9 02:38:53 PDT 2000
--- patches/vhclmaps-000609-johnston-030
*************** patches/vhclmaps-000609-johnston-030
*** 0 ****
--- 1 ----
+ vhclmaps-000609-johnston-030