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 /src | |
| 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 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 205d1ed2..a22343a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ bin_PROGRAMS = proj nad2nad nad2bin geod cs2cs -INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@ +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ + -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h diff --git a/src/Makefile.in b/src/Makefile.in index cde094f3..c917ed21 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -174,6 +174,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +MUTEX_SETTING = @MUTEX_SETTING@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -239,7 +240,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @JNI_INCLUDE@ +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ + -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ + include_HEADERS = projects.h nad_list.h proj_api.h org_proj4_Projections.h EXTRA_DIST = makefile.vc proj.def proj_SOURCES = proj.c gen_cheb.c p_series.c |