Changeset 26927

Timestamp:

03/11/22 01:17:32 (3 years ago)

Author:

bdef

Message:

BUG: removing default choice for libpython and throwing error if not found

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -205 +205 @@
         AC_MSG_RESULT([${IS_MAC}])
 
-        dnl If macOS, check if system copy of libc has fmemopen (if it is not 
+        dnl If macOS, check if system copy of libc has fmemopen (if it is not
         dnl macOS, we do not check, but still must set SYSTEM_HAS_FMEMOPEN)
         AC_MSG_CHECKING([if system copy of libc has fmemopen])
@@ -604 +604 @@
                 AC_MSG_CHECKING(for Dakota version)
                 dnl TODO:
-                dnl - Check if this method applies to all other versions of Dakota (it 
-                dnl   should as long as the Dakota binaries have been compiled). If so, 
+                dnl - Check if this method applies to all other versions of Dakota (it
+                dnl   should as long as the Dakota binaries have been compiled). If so,
                 dnl   we can remove the other methods of getting the version.
-                dnl - Modify src/wrappers/IssmConfig/IssmConfig.cpp so that strlen is 
-                dnl   not called with _DAKOTA_VERSION_ as an argument so that we can 
+                dnl - Modify src/wrappers/IssmConfig/IssmConfig.cpp so that strlen is
+                dnl   not called with _DAKOTA_VERSION_ as an argument so that we can
                 dnl   do,
                 dnl
@@ -818 +818 @@
                 fi
                 AC_MSG_RESULT([found])
+
+                AC_MSG_CHECKING([for Python libraries libpython])
                 if ls ${PYTHON_ROOT}/lib/x86_64-linux-gnu/libpython${PYTHON_VERSION}m.* 1> /dev/null 2>&1; then
                         PYTHONLIB="-L${PYTHON_ROOT}/lib/x86_64-linux-gnu -lpython${PYTHON_VERSION}m"
@@ -824 +826 @@
                 elif ls ${PYTHON_ROOT}/lib/libpython${PYTHON_VERSION}m.* 1> /dev/null 2>&1; then
                         PYTHONLIB="-L${PYTHON_ROOT}/lib -lpython${PYTHON_VERSION}m"
+                elif ls ${PYTHON_ROOT}/lib64/libpython${PYTHON_VERSION}m.* 1> /dev/null 2>&1; then
+                        PYTHONLIB="-L${PYTHON_ROOT}/lib64 -lpython${PYTHON_VERSION}m"
                 else
-                        PYTHONLIB="-L${PYTHON_ROOT}/lib -lpython${PYTHON_VERSION}"
-                fi
+                        AC_MSG_ERROR([libpython not found! Please locate this file and contact ISSM developers via forum or email.]);
+                fi
+                AC_MSG_RESULT([found])
+
                 PYTHONEXT=.so
                 case "${host_os}" in
@@ -2596 +2602 @@
                 AC_MSG_RESULT([${GMSH_VERSION_MAJOR}])
                 AC_DEFINE_UNQUOTED([_GMSH_VERSION_MAJOR_], ${GMSH_VERSION_MAJOR}, [Gmsh major version])
-        fi      
+        fi
         dnl }}}
         dnl Capabilities