From 00a1b41e0c73e81e46305bcf1ab271c2937ae534 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Thu, 2 Apr 2009 19:29:51 +0000
Subject: fix testvarious to use local grid shift files, and skip without

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1559 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 ChangeLog       |  5 +++++
 nad/Makefile.am | 18 +++++++++++++++---
 nad/Makefile.in | 18 +++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10c6e647..3c70629a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-04-02  Frank Warmerdam  <warmerdam@pobox.com>
 
+	* nad/Makefile.am: Changes to ensure grid shift files are processed
+	before running check-local, and to use the local grid shift files
+	if available, and to avoid testvarious if grid shift files are
+	not available.
+
 	* src: Fix various warnings. 
 
 2009-03-11  Frank Warmerdam  <warmerdam@pobox.com>
diff --git a/nad/Makefile.am b/nad/Makefile.am
index f9cf781b..5d54b136 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -21,7 +21,16 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \
 		IGNF testIGNF proj_outIGNF.dist \
 		makefile.vc
 
-install-data-local:
+process-nad2bin:
+	@if [ -f conus.lla -a ! -f conus ] ; then \
+	  for x in *.lla ; do \
+	    DEST=`basename $$x .lla`; \
+	    echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
+	    ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
+	  done; \
+	fi 
+	
+install-data-local: process-nad2bin
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	@if [ -f conus.lla ] ; then \
 	  for x in *.lla ; do \
@@ -43,10 +52,13 @@ install-data-local:
           fi; \
 	done
 
-check-local:
+check-local: process-nad2bin
 	$(TEST27) $(PROJEXE)
 	$(TEST83) $(PROJEXE)
-	$(TESTVARIOUS) $(CS2CSEXE)
+	@if [ -f conus ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTVARIOUS) $(CS2CSEXE) ; \
+	fi
 
 #	$(TESTNTV2) $(CS2CSEXE)
 #	$(TESTIGNF) $(CS2CSEXE)
diff --git a/nad/Makefile.in b/nad/Makefile.in
index 09dca7a0..ead0b83e 100644
--- a/nad/Makefile.in
+++ b/nad/Makefile.in
@@ -374,7 +374,16 @@ uninstall-am: uninstall-pkgdataDATA
 	uninstall-pkgdataDATA
 
 
-install-data-local:
+process-nad2bin:
+	@if [ -f conus.lla -a ! -f conus ] ; then \
+	  for x in *.lla ; do \
+	    DEST=`basename $$x .lla`; \
+	    echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
+	    ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
+	  done; \
+	fi 
+
+install-data-local: process-nad2bin
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	@if [ -f conus.lla ] ; then \
 	  for x in *.lla ; do \
@@ -396,10 +405,13 @@ install-data-local:
           fi; \
 	done
 
-check-local:
+check-local: process-nad2bin
 	$(TEST27) $(PROJEXE)
 	$(TEST83) $(PROJEXE)
-	$(TESTVARIOUS) $(CS2CSEXE)
+	@if [ -f conus ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTVARIOUS) $(CS2CSEXE) ; \
+	fi
 
 #	$(TESTNTV2) $(CS2CSEXE)
 #	$(TESTIGNF) $(CS2CSEXE)
-- 
cgit v1.2.3