Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 16225)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 16226)
@@ -484,4 +484,5 @@
 	fi
 	AC_MSG_RESULT($HAVE_SCOTCH)
+	AM_CONDITIONAL([SCOTCH],[test x$HAVE_SCOTCH = xyes])
 	
 	dnl scotch libraries
Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 16225)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 16226)
@@ -817,9 +817,4 @@
 			./shared/TriMesh/SplitMeshForRifts.cpp\
 			./shared/TriMesh/TriMeshUtils.cpp\
-			./modules/Chacox/Chacox.h\
-			./modules/Chacox/Chacox.cpp\
-			./modules/Chacox/input_parse.cpp\
-			./modules/Chacox/chaco_seconds.cpp\
-			./modules/Chacox/user_params.cpp\
 			./modules/TriaSearchx/TriaSearchx.h\
 			./modules/TriaSearchx/TriaSearchx.cpp\
@@ -861,8 +856,17 @@
 			./modules/ElementConnectivityx/ElementConnectivityx.cpp\
 			./modules/ElementConnectivityx/ElementConnectivityx.h\
-			./modules/Scotchx/Scotchx.cpp\
-			./modules/Scotchx/Scotchx.h\
 			./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\
 			./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h
+if CHACO
+modules_sources+= ./modules/Chacox/Chacox.h\
+						./modules/Chacox/Chacox.cpp\
+						./modules/Chacox/input_parse.cpp\
+						./modules/Chacox/chaco_seconds.cpp\
+						./modules/Chacox/user_params.cpp
+endif
+if SCOTCH
+modules_sources+= ./modules/Scotchx/Scotchx.cpp\
+						./modules/Scotchx/Scotchx.h
+endif
 #}}}
 
@@ -962,5 +966,4 @@
 issm_sources +=  $(damage_sources)
 endif
-
 #}}}
 #Library flags and sources {{{