[mapserver-commits] r13165 - trunk/mapserver/mapscript/java

[svn at osgeo.org]

Author: unicoletti
Date: 2012-02-23 04:48:30 -0800 (Thu, 23 Feb 2012)
New Revision: 13165

Modified:
   trunk/mapserver/mapscript/java/Makefile.in
Log:
Make Java mapscript compile and work again after libtool changes, still need to fix the .so name

Modified: trunk/mapserver/mapscript/java/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/java/Makefile.in	2012-02-22 17:25:14 UTC (rev 13164)
+++ trunk/mapserver/mapscript/java/Makefile.in	2012-02-23 12:48:30 UTC (rev 13165)
@@ -49,7 +49,7 @@
 	$(LINK) -o $@ mapscript_wrap.lo $(MS_LIB)
 
 %.lo: %.c
-	$(LTCC) $(CC) $(CFLAGS) $(JAVA_INCLUDE) -c -o $@ $<
+	$(LTCC) $(CC) -fno-strict-aliasing -fpic -c $(CFLAGS) $(JAVA_INCLUDE) -c -o $@ $<
 
 mapscript_wrap.c: ../mapscript.i
 	mkdir -p edu/umn/gis/mapscript 
@@ -71,8 +71,8 @@
 	rm -rf tests/threadtest/*.class
 
 
-ifneq ($(PROJ),)
-ifneq ($(GDAL),)
+ifneq ($(findstring PROJ, $(DEFINES)),)
+ifneq ($(findstring GDAL, $(DEFINES)),)
 test:
 	$(JAVAC) -classpath ./:examples/:./mapscript.jar -d examples/ examples/RFC24.java examples/ConnPool.java examples/DrawMap.java examples/DumpShp.java examples/MakePoint.java examples/QueryByAttribute.java examples/ShapeInfo.java examples/WxSTest.java examples/Metadata.java examples/RunTimeBuiltWMSClient.java
 	$(JAVAC) -encoding utf8 -classpath ./:examples/:./mapscript.jar -d examples/ examples/QueryByAttributeUnicode.java 
@@ -81,7 +81,7 @@
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. DrawMap ../../tests/test.map ./map.png
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. ConnPool
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. QueryByAttribute ../../tests/test.map
-ifneq ($(findstring USE_WCS_SVR, $(OWS)),)
+ifneq ($(findstring USE_WCS_SVR, $(DEFINES)),)
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. WxSTest ../../tests/test.map
 else
 	@echo "WARN: Skipping WxSTest because OWS is not enabled"