diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2009-06-17 04:41:34 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2009-06-17 04:41:34 +0000 |
| commit | a8fa064d5820b5ab9b4dac4bdb002fa1994bb21d (patch) | |
| tree | 9c863f9659f8655fe0fb0eda034ef29097e9b144 /nad | |
| parent | 6c9ed6d932a69db21b9001cee62c125f4b0f84bb (diff) | |
| download | PROJ-a8fa064d5820b5ab9b4dac4bdb002fa1994bb21d.tar.gz PROJ-a8fa064d5820b5ab9b4dac4bdb002fa1994bb21d.zip | |
added --without-mutex handling
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1593 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'nad')
| -rw-r--r-- | nad/Makefile.am | 2 | ||||
| -rw-r--r-- | nad/Makefile.in | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nad/Makefile.am b/nad/Makefile.am index 98575381..15627c09 100644 --- a/nad/Makefile.am +++ b/nad/Makefile.am @@ -56,7 +56,7 @@ install-data-local: process-nad2bin check-local: process-nad2bin $(TEST27) $(PROJEXE) $(TEST83) $(PROJEXE) - $(TESTVARIOUS) $(CS2CSEXE) ; \ + $(TESTVARIOUS) $(CS2CSEXE) @if [ -f conus ] ; then \ export PROJ_LIB=. ; \ $(TESTDATUMFILE) $(CS2CSEXE) ; \ diff --git a/nad/Makefile.in b/nad/Makefile.in index 66eaf560..cd6824d2 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -96,6 +96,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MUTEX_SETTING = @MUTEX_SETTING@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -171,7 +172,8 @@ CS2CSEXE = $(EXEPATH)/cs2cs TEST27 = ./test27 TEST83 = ./test83 TESTNTV2 = ./testntv2 -TESTVARIOUS = ./testdatumfile +TESTVARIOUS = ./testvarious +TESTDATUMFILE = ./testdatumfile TESTIGN = ./testIGNF pkgdata_DATA = GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri \ esri.extra other.extra \ @@ -408,10 +410,10 @@ install-data-local: process-nad2bin check-local: process-nad2bin $(TEST27) $(PROJEXE) $(TEST83) $(PROJEXE) - $(TESTVARIOUS) $(CS2CSEXE) ; \ + $(TESTVARIOUS) $(CS2CSEXE) @if [ -f conus ] ; then \ export PROJ_LIB=. ; \ - $(TESTVARIOUS) $(CS2CSEXE) ; \ + $(TESTDATUMFILE) $(CS2CSEXE) ; \ fi # $(TESTNTV2) $(CS2CSEXE) |