From a9a6974b4c419762f9fa927a0b9b8397c74bd5f0 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Thu, 24 Sep 2009 18:58:46 +0000
Subject: add ignf and ntv2 testing when grid shift files available

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

diff --git a/ChangeLog b/ChangeLog
index bfb73644..e1657f64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-24  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* nad/Makefile.am: add ntv2 and ignf testing if grid shift files
+	are available.
+
 2009-09-23  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* Preparing for 4.7.0 release.
diff --git a/nad/Makefile.am b/nad/Makefile.am
index 15627c09..5973a10f 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -61,9 +61,14 @@ check-local: process-nad2bin
 	  export PROJ_LIB=. ; \
 	  $(TESTDATUMFILE) $(CS2CSEXE) ; \
 	fi
-
-#	$(TESTNTV2) $(CS2CSEXE)
-#	$(TESTIGNF) $(CS2CSEXE)
+	@if [ -f ntf_r93.gsb ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTIGN) $(CS2CSEXE) ; \
+	fi
+	@if [ -f ntv2_0.gsb ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTNTV2) $(CS2CSEXE) ; \
+	fi
 
 clean-local:
 	$(RM) $(TEST_DB)
diff --git a/nad/Makefile.in b/nad/Makefile.in
index cd6824d2..1510e015 100644
--- a/nad/Makefile.in
+++ b/nad/Makefile.in
@@ -415,9 +415,14 @@ check-local: process-nad2bin
 	  export PROJ_LIB=. ; \
 	  $(TESTDATUMFILE) $(CS2CSEXE) ; \
 	fi
-
-#	$(TESTNTV2) $(CS2CSEXE)
-#	$(TESTIGNF) $(CS2CSEXE)
+	@if [ -f ntf_r93.gsb ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTIGN) $(CS2CSEXE) ; \
+	fi
+	@if [ -f ntv2_0.gsb ] ; then \
+	  export PROJ_LIB=. ; \
+	  $(TESTNTV2) $(CS2CSEXE) ; \
+	fi
 
 clean-local:
 	$(RM) $(TEST_DB)
-- 
cgit v1.2.3