From dd997fe94be65615538f66c9dbfa2a628eb16129 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Mon, 25 Oct 2004 14:03:22 +0000
Subject: updated

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1241 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 src/Makefile.in      | 14 ++++++++------
 src/proj_config.h.in |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.in b/src/Makefile.in
index 5b7f33e7..c45b3bd9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,7 +83,7 @@ am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \
 	vector1.lo pj_release.lo pj_gauss.lo nad_cvt.lo nad_init.lo \
 	nad_intr.lo emess.lo pj_apply_gridshift.lo pj_datums.lo \
 	pj_datum_set.lo pj_transform.lo geocent.lo pj_utils.lo \
-	pj_gridinfo.lo pj_gridlist.lo
+	pj_gridinfo.lo pj_gridlist.lo jniproj.lo
 libproj_la_OBJECTS = $(am_libproj_la_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -161,10 +161,10 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/gen_cheb.Po ./$(DEPDIR)/geocent.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/geod.Po ./$(DEPDIR)/geod_for.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/geod_inv.Po ./$(DEPDIR)/geod_set.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mk_cheby.Plo ./$(DEPDIR)/nad2bin.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/nad2nad.Po ./$(DEPDIR)/nad_cvt.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/nad_init.Plo ./$(DEPDIR)/nad_intr.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/p_series.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/jniproj.Plo ./$(DEPDIR)/mk_cheby.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/nad2bin.Po ./$(DEPDIR)/nad2nad.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/nad_cvt.Plo ./$(DEPDIR)/nad_init.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/nad_intr.Plo ./$(DEPDIR)/p_series.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_apply_gridshift.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_auth.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pj_datum_set.Plo \
@@ -352,7 +352,8 @@ libproj_la_SOURCES = \
 	\
 	nad_cvt.c nad_init.c nad_intr.c emess.c emess.h \
 	pj_apply_gridshift.c pj_datums.c pj_datum_set.c pj_transform.c \
-	geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c
+	geocent.c geocent.h pj_utils.c pj_gridinfo.c pj_gridlist.c \
+	jniproj.c
 
 all: proj_config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -587,6 +588,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod_for.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod_inv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geod_set.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jniproj.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mk_cheby.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nad2bin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nad2nad.Po@am__quote@
diff --git a/src/proj_config.h.in b/src/proj_config.h.in
index 31bc4886..e4992e2c 100644
--- a/src/proj_config.h.in
+++ b/src/proj_config.h.in
@@ -33,6 +33,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Enabled for Java/JNI Support */
+#undef JNI_ENABLED
+
 /* Name of package */
 #undef PACKAGE
 
-- 
cgit v1.2.3