Changeset 12072

Timestamp:

04/20/12 08:39:58 (13 years ago)

Author:

Eric.Larour

Message:

Better handling of python versions

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (4 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -302 +302 @@
         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],
@@ -312 +332 @@
                 HAVE_PYTHON=yes
                 PYTHONINCL=-I$PYTHON_ROOT/include
-                PYTHONLIB="-L$PYTHON_ROOT/lib -lpython3.2"
+                PYTHONLIB="-L$PYTHON_ROOT/lib -lpython$PYTHONVERSION"
                 PYTHONEXT=.so
                 PYTHONLINK="-dynamiclib"
@@ -327 +347 @@
         AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes])
         AC_MSG_RESULT($HAVE_PYTHON)
-        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
-
-        AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
-        AC_MSG_RESULT($PYTHON_MAJOR)
         dnl }}}
         dnl python-numpy{{{
@@ -1222 +1223 @@
         fi
 
-        dnl check that we python version if python compile is specified
-        dnl if test "$HAVE_PYTHON" = "yes"  && test "$HAVE_PYTHONVERSION" = "no" ; then
-        dnl     AC_MSG_ERROR([need python-version if python compile is required!]);
-        dnl fi
-
+        check that we python version if python compile is specified
+        if test "$HAVE_PYTHON" = "yes"  && test "$PYTHONVERSION" = "" ; then
+        AC_MSG_ERROR([need python-version if python compile is required!]);
+        fi
 
         AC_MSG_RESULT(done)