[Nsclspectcl-cvscommits] SpecTcl Makefile.am,4.2,4.3 config.h.in,4.1,4.2 configure.in,1.2,1.3

[<ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl
In directory sc8-pr-cvs1:/tmp/cvs-serv18079

Modified Files:
	Makefile.am config.h.in configure.in 
Log Message:
Force build of GRI and installation at configuration time if it is not already
locatable on the system.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Makefile.am,v
retrieving revision 4.2
retrieving revision 4.3
diff -C2 -d -r4.2 -r4.3
*** Makefile.am	16 Sep 2003 12:06:48 -0000	4.2
--- Makefile.am	28 Oct 2003 13:57:25 -0000	4.3
***************
*** 13,17 ****
  	$(ac_aux_dir)/ylwrap
  
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap
  
  dist-hook:
--- 13,17 ----
  	$(ac_aux_dir)/ylwrap
  
! EXTRA_DIST = fixdos ReleaseNotesNSCL4.0.txt SpecTclRC.tcl bootstrap Gri
  
  dist-hook:

Index: config.h.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/config.h.in,v
retrieving revision 4.1
retrieving revision 4.2
diff -C2 -d -r4.1 -r4.2
*** config.h.in	25 Aug 2003 16:25:29 -0000	4.1
--- config.h.in	28 Oct 2003 13:57:25 -0000	4.2
***************
*** 295,296 ****
--- 295,299 ----
  #undef HAVE_GRI
  
+ /* True since Gri was provided by us */
+ #undef HAVE_GRI
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	25 Aug 2003 16:23:19 -0000	1.2
--- configure.in	28 Oct 2003 13:57:25 -0000	1.3
***************
*** 681,686 ****
     GRI=""
  else
!    AC_MSG_RESULT([Can't find gri. help me out with --with-gri-dir=path])
!    mygri="no"
     GRI=""
  
--- 681,699 ----
     GRI=""
  else
!    #
!    #  Configure GRI and build it into SpecTcl's directories:
!    AC_MSG_NOTICE([Cannot find GRI so I'll build my copy of it])
!    #
!    (cd Gri;                                          \
!     configure --prefix=$prefix;                      \
!     make;                                            \
!     make install)
! 
!    AC_MSG_NOTICE([Now that GRI is build I know where I put stuff])
!    
!    gri_dir=$prefix/bin
!    gri_cmd_dir=$prefix/share
!    mygri="yes"
!    gri_found="yes"
     GRI=""
  
***************
*** 746,750 ****
    fi
  else
!    gri_cmd_dir=${prefix}/share/gri
  fi
  
--- 759,764 ----
    fi
  else
!    AC_DEFINE(HAVE_GRI, 1, [True since Gri was provided by us])
!    gri_cmd_dir=$prefix/share/gri
  fi
  
***************
*** 785,787 ****
  	Sorter/Makefile SpectrumIO/Makefile Filter/Makefile \
  	 SpecTcl/Makefile \
! 	TestFiles/Makefile contrib/Makefile doc/Makefile)
--- 799,801 ----
  	Sorter/Makefile SpectrumIO/Makefile Filter/Makefile \
  	 SpecTcl/Makefile \
! 	 contrib/Makefile doc/Makefile)