diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-30 16:53:31 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-30 16:53:31 +0000 |
| commit | cf004b55a5b847fd0d0d7846f1819936f511c807 (patch) | |
| tree | a2132bb18763235ce56f0cbc7a7f5409ae2cfe74 /src | |
| parent | 549886b46e33db54ffa19c5932181fb66cff3afb (diff) | |
| download | PROJ-cf004b55a5b847fd0d0d7846f1819936f511c807.tar.gz PROJ-cf004b55a5b847fd0d0d7846f1819936f511c807.zip | |
* Improved --with-jni support in configure to allow specification
of an include directory.
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1276 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2b90d6ef..43187bb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = proj nad2nad nad2bin geod cs2cs -INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @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 5b2c9270..130771dd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -240,6 +240,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JNI_INCLUDE = @JNI_INCLUDE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -304,7 +305,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" +INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" @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 |