Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 11847)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 11848)
@@ -93,5 +93,5 @@
 							 [matlab root directory. necessary for serial build.]),
 			 [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 
-	
+
 	if test -d "$MATLAB_ROOT"; then
 
@@ -152,5 +152,6 @@
 		AC_SUBST([MATLABINCL])
 		AC_SUBST([MEX])
-		AC_SUBST([MEXEXT])
+		WRAPPEREXT=$MEXEXT
+		AC_SUBST([WRAPPEREXT])
 		AC_SUBST([MEXLIB]) 
 		AC_SUBST([MEXLINK])
@@ -162,10 +163,4 @@
 
 	
-	if test $HAVE_MATLAB = no; then
-		if test "$SERIAL_VALUE" = "yes" ; then
-			AC_MSG_ERROR([--with-matlab-dir  missing. Matlab is needed to run ISSM serially!])
-		fi
-	fi
-
 	dnl should we use large arrays compilation (Matlab 7.5 and upper?)
 	if test $HAVE_MATLAB = yes; then
@@ -198,4 +193,5 @@
 	fi
 	AM_CONDITIONAL(LARGEARRAYS, test x$largearrays = xyes)
+	AM_CONDITIONAL([MATLAB], [test x$HAVE_MATLAB = xyes])
 	
 	dnl }}}
@@ -273,4 +269,67 @@
 	AM_CONDITIONAL([DAKOTA], [test x$HAVE_DAKOTA = xyes])
 	AC_MSG_RESULT($HAVE_DAKOTA)
+	dnl }}}
+	dnl boost{{{1
+	AC_ARG_WITH([boost-dir],
+			  AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]),
+			 [BOOST_ROOT=$withval],[BOOST_ROOT=""]) 
+	AC_MSG_CHECKING(for Boost)
+	
+	if test -d "$BOOST_ROOT"; then
+		dnl defaults
+		HAVE_BOOST=yes
+		BOOSTINCL=-I$BOOST_ROOT/include
+		BOOSTLIB="-L$BOOST_ROOT/lib -lboost_python"
+
+		AC_DEFINE([_HAVE_BOOST_],[1],[with Boost in ISSM src])
+		AC_SUBST([BOOSTINCL])
+		AC_SUBST([BOOSTLIB])
+	else
+		HAVE_BOOST=no
+	fi
+	AM_CONDITIONAL([BOOST], [test x$HAVE_BOOST = xyes])
+	AC_MSG_RESULT($HAVE_BOOST)
+	dnl }}}
+	dnl python{{{1
+	AC_ARG_WITH([python-dir],
+			  AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]),
+			 [PYTHON_ROOT=$withval],[PYTHON_ROOT=""]) 
+	AC_MSG_CHECKING(for Python)
+	
+	if test -d "$PYTHON_ROOT"; then
+		dnl defaults
+		HAVE_PYTHON=yes
+		PYTHONINCL=-I$PYTHON_ROOT/include
+		PYTHONLIB="-L$PYTHON_ROOT/lib -lpython3.2"
+		PYTHONEXT=.so
+
+		AC_DEFINE([_HAVE_PYTHON_],[1],[with Python in ISSM src])
+		AC_SUBST([PYTHONINCL])
+		AC_SUBST([PYTHONLIB])
+		WRAPPEREXT=$PYTHONEXT
+		AC_SUBST([WRAPPEREXT])
+	else
+		HAVE_PYTHON=no
+	fi
+	AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes])
+	AC_MSG_RESULT($HAVE_PYTHON)
+	dnl }}}
+	dnl python-numpy{{{1
+	AC_ARG_WITH([python-numpy-dir],
+			  AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]),
+			 [PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""]) 
+	AC_MSG_CHECKING(for Python-Numpy)
+	
+	if test -d "$PYTHON_NUMPY_ROOT"; then
+		dnl defaults
+		HAVE_PYTHON_NUMPY=yes
+		PYTHON_NUMPYINCL=-I$PYTHON_NUMPY_ROOT
+
+		AC_DEFINE([_HAVE_PYTHON_NUMPY_],[1],[with Python-Numpy in ISSM src])
+		AC_SUBST([PYTHON_NUMPYINCL])
+	else
+		HAVE_PYTHON_NUMPY=no
+	fi
+	AC_MSG_RESULT($HAVE_PYTHON_NUMPY)
 	dnl }}}
 	dnl chaco{{{1
@@ -1168,4 +1227,17 @@
 		fi
 	fi
+
+	dnl check that we have either python or matlab support if we only compile serially
+	if test "$PARALLEL_VALUE" = "no"  && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then
+		AC_MSG_ERROR([need at least python or matlab support to compile only in serial mode!]);
+	fi
+
+	dnl check that we don't have with-matlab and with-python at the same time
+	if test "$HAVE_PYTHON" = "yes" ; then
+		if test "$HAVE_MATLAB" = "yes";  then
+			AC_MSG_ERROR([cannot create matlab and python wrappers simultaneously! Please choose one or the other.]);
+		fi
+	fi
+
 	AC_MSG_RESULT(done)
 	dnl }}}