Changeset 19148

Timestamp:

02/24/15 09:22:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: allow python to be in other locations

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -531 +531 @@
         dnl python specifics
         if test "x$HAVE_PYTHON" = "xyes"; then
-                AC_MSG_CHECKING(for python version)
+                AC_MSG_CHECKING([for python version])
                 dnl Query Python for its version number.  Getting [:3] seems to be the
                 dnl best way to do this; it's what "site.py" does in the standard library.
@@ -546 +546 @@
                 fi
 
-                PYTHONINCL=-I$PYTHON_ROOT/include
+                AC_MSG_CHECKING([for python header file Python.h])
+                dnl Python.h mighty be in different locations:
+                if test -f "$PYTHON_ROOT/include/Python.h"; then
+                        PYTHONINCL=-I$PYTHON_ROOT/include
+                else if test -f "$PYTHON_ROOT/include/python2.7/Python.h"; then
+                        PYTHONINCL=-I$PYTHON_ROOT/include/python2.7
+                else
+                        AC_MSG_ERROR([Python.h not found, locate this file and contact ISSM developers]);
+                fi
+                fi
+                AC_MSG_RESULT(found)
+
                 PYTHONLIB="-L$PYTHON_ROOT/lib -lpython$PYTHON_VERSION"
                 PYTHONEXT=.so