Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 12322)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 12323)
@@ -308,24 +308,4 @@
 	AC_MSG_RESULT($HAVE_BOOST)
 	dnl }}}
-	dnl python-version{{{
-	AC_ARG_WITH([python-version],
-	  AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]),
-	  [PYTHONVERSION=$withval],[PYTHONVERSION=""])
-	AC_MSG_CHECKING(for python version)
-
-	HAVE_PYTHON3="no"
-
-	dnl recover major: 
-	PYTHON_MAJOR=${PYTHONVERSION%.*}
-
-	if test x$PYTHON_MAJOR = x3; then
-		dnl are we running python 3?
-		HAVE_PYTHON3="yes"
-	fi
-	AC_DEFINE_UNQUOTED([_PYTHON_MAJOR_],$PYTHON_MAJOR,[python version major])
-
-	AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
-	AC_MSG_RESULT($PYTHON_MAJOR)
-	dnl }}}
 	dnl python{{{
 	AC_ARG_WITH([python-dir],
@@ -353,4 +333,24 @@
 	AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes])
 	AC_MSG_RESULT($HAVE_PYTHON)
+
+	dnl python-version
+	HAVE_PYTHON3="no"
+	if test x$HAVE_PYTHON = xyes; then
+		AC_ARG_WITH([python-version],
+		  AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]),
+		  [PYTHONVERSION=$withval],[PYTHONVERSION=""])
+		AC_MSG_CHECKING(for python version)
+
+		dnl recover major: 
+		PYTHON_MAJOR=${PYTHONVERSION%.*}
+
+		if test x$PYTHON_MAJOR = x3; then
+			dnl are we running python 3?
+			HAVE_PYTHON3="yes"
+		fi
+		AC_DEFINE_UNQUOTED([_PYTHON_MAJOR_],$PYTHON_MAJOR,[python version major])
+		AC_MSG_RESULT($PYTHON_MAJOR)
+	fi
+	AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
 	dnl }}}
 	dnl python-numpy{{{
@@ -944,25 +944,34 @@
 	dnl }}}
 	dnl fortran{{{
-	dnl fortran library  option
-	AC_MSG_CHECKING(for fortran library)
-	AC_ARG_WITH([fortran-lib],
-	  AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]),
-		[FORTRAN_LIB=$withval],[FORTRAN_LIB=""])
-
-	dnl check that --with-fortran-lib may have been provided
-	HAVE_FORTRAN=no
-	if test -n "$FORTRAN_LIB" ; then
-        if test "x$FORTRAN_LIB" = "xno"; then
-            HAVE_FORTRAN=NO
-        else
-            HAVE_FORTRAN=yes
-            FORTRANLIB="$FORTRAN_LIB"
-
-            AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
-            AC_SUBST([FORTRANLIB])
-        fi
-	fi
-	AM_CONDITIONAL([FORTRAN], [test x$HAVE_FORTRAN = xyes])
-	AC_MSG_RESULT(done)
+	AC_ARG_WITH([fortran],
+		AS_HELP_STRING([--with-fortran = YES], [do we compile fortran code (default is yes)]),
+		[FORTRAN=$withval],[FORTRAN=yes]) 
+	AC_MSG_CHECKING(for fortran compilation)
+	if test "x$FORTRAN" = "xyes"; then
+		dnl defaults
+		HAVE_FORTRAN=yes
+
+		AC_DEFINE([_HAVE_FORTRAN_],[1],[with fortran capability])
+	else
+		HAVE_FORTRAN=no
+	fi
+	AM_CONDITIONAL([FORTRAN], [test x$FORTRAN = xyes])
+	AC_MSG_RESULT($FORTRAN)
+
+	if test "x$FORTRAN" = "xyes"; then
+		dnl fortran library  option
+		AC_MSG_CHECKING(for fortran library)
+		AC_ARG_WITH([fortran-lib],
+		  AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]),
+			[FORTRAN_LIB=$withval],[FORTRAN_LIB=""])
+
+		dnl check that --with-fortran-lib may have been provided
+		if test -n "$FORTRAN_LIB" ; then
+			FORTRANLIB="$FORTRAN_LIB"
+			AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
+			AC_SUBST([FORTRANLIB])
+		fi
+		AC_MSG_RESULT(done)
+	fi
 	dnl }}}
 	dnl graphics{{{