Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 13218)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 13219)
@@ -1151,4 +1151,19 @@
 
 	dnl Capabilities
+	dnl with-kml{{{
+	AC_ARG_WITH([kml],
+		AS_HELP_STRING([--with-kml = YES],[compile with kml capabilities (default is yes)]),
+		[KML=$withval],[KML=yes]) 
+	AC_MSG_CHECKING(for kml capability compilation)
+
+	if test "x$KML" = "xyes"; then
+		HAVE_KML=yes
+		AC_DEFINE([_HAVE_KML_],[1],[with kml capability])
+	else
+		HAVE_KML=no
+	fi
+	AM_CONDITIONAL([KML], [test x$HAVE_KML = xyes])
+	AC_MSG_RESULT($HAVE_KML)
+	dnl }}}
 	dnl with-kriging{{{
 	AC_ARG_WITH([kriging],
Index: /issm/trunk-jpl/src/modules/matlab/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/modules/matlab/Makefile.am	(revision 13218)
+++ /issm/trunk-jpl/src/modules/matlab/Makefile.am	(revision 13219)
@@ -1,3 +1,3 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
+AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @ADOLCINCL@
 
 EXEEXT=$(MATLABWRAPPEREXT)
@@ -13,5 +13,4 @@
 				   ElementConnectivity.la\
 				   EnumToString.la\
-				   Exp2Kml.la\
 				   HoleFiller.la\
 				   InternalFront.la\
@@ -21,9 +20,4 @@
 				   InterpFromMeshToGrid.la\
 				   InterpFromMesh2d.la\
-				   KMLFileRead.la\
-				   KMLMeshWrite.la\
-				   KMLOverlay.la\
-				   Kml2Exp.la\
-				   Kriging.la\
 				   Ll2xy.la\
 				   NodeConnectivity.la\
@@ -32,5 +26,4 @@
 				   PointCloudFindNeighbors.la\
 				   PropagateFlagsFromConnectivity.la\
-				   Shp2Kml.la\
 				   StringToEnum.la\
 				   TriaSearch.la\
@@ -40,5 +33,18 @@
 				   Xy2ll.la\
                    Chaco.la
+
+if KRIGING
+lib_LTLIBRARIES +=  Kriging.la
+endif
+if KML
+lib_LTLIBRARIES +=  KMLFileRead.la\
+				   KMLMeshWrite.la\
+				   KMLOverlay.la\
+				   Shp2Kml.la\
+				   Exp2Kml.la\
+				   Kml2Exp.la
+endif
 endif 
+
 #}}}
 #Flags and libraries {{{1