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

[svn at osgeo.org]

Author: unicoletti
Date: 2007-12-17 06:12:16 -0500 (Mon, 17 Dec 2007)
New Revision: 7180

Modified:
   trunk/mapserver/mapscript/java/Makefile.in
Log:
#2322: only run tests when the minimum requirements are satisfied. Also add XML2_LIB to the linker option (it was XML2_INC instead)

Modified: trunk/mapserver/mapscript/java/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/java/Makefile.in	2007-12-17 09:49:45 UTC (rev 7179)
+++ trunk/mapserver/mapscript/java/Makefile.in	2007-12-17 11:12:16 UTC (rev 7180)
@@ -188,7 +188,7 @@
 SUP_LIBS =  $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
           $(JPEG_LIB) $(SDE_LIB) $(GDAL_LIB) $(MING_LIB) $(POSTGIS_LIB) \
 	  $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) \
-	  $(THREAD_LIB) $(XTRALIBS) $(GEOS_LIB) $(ICONV_INC) $(XML2_INC)
+	  $(THREAD_LIB) $(XTRALIBS) $(GEOS_LIB) $(ICONV_INC) $(XML2_LIB)
 
 # STATIC_LIBS is full filename with path of libs that will be statically linked
 STATIC_LIBS= $(GD_STATIC)
@@ -250,6 +250,8 @@
 	rm -rf examples/*.class
 	rm -rf tests/threadtest/*.class
 
+ifneq ($(PROJ),)
+ifneq ($(GDAL),)
 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 iso-8859-15 -classpath ./:examples/:./mapscript.jar -d examples/ examples/QueryByAttributeUnicode.java 
@@ -258,9 +260,21 @@
 	$(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)),)
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. WxSTest ../../tests/test.map
+else
+	@echo "WARN: Skipping WxSTest because OWS is not enabled"
+endif
 	$(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. RFC24 ../../tests/test.map
 	LC_ALL=de_DE $(JAVA) -classpath ./:examples/:./mapscript.jar -Djava.library.path=. QueryByAttributeUnicode data/subset-umlauts.map
+else
+test:
+	@echo "To run the tests GDAL and PROJ must be enabled"
+endif
+else
+test:
+	@echo "To run the tests GDAL and PROJ must be enabled"
+endif
 
 threadtests:
 	$(JAVAC) -cp ./mapscript.jar -d tests/threadtest/ tests/threadtest/*.java