Changeset 984 for trunk/zoo-project/zoo-kernel/configure.ac

Timestamp:

Mar 3, 2021, 3:41:55 PM (3 years ago)

Author:

djay

Message:

Take into account building ZOO-Project on ubuntu focal (cf. ​https://trac.osgeo.org/osgeolive/ticket/2282). Add the OTB and SAGA support to the Dockerfile to make the corresponding demos using docker WPS server. Add OGC API - Processes demo to the demos list.

File:

• trunk/zoo-project/zoo-kernel/configure.ac (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -415 +415 @@
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$PROJ_CPPFLAGS"
-AC_CHECK_HEADERS([proj_api.h],
-                 [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
 
 AC_SUBST([PROJ_CPPFLAGS])
@@ -607 +605 @@
         echo $PYTHONCONFIG
         # Extract the linker and include flags 
-        PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
+        #PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
+        PYTHON_LDFLAGS=$($PYTHONCONFIG --ldflags | sed "s:python${PYTHON_VERS}/config-${PYTHON_VERS}-::g")
         PYTHON_CPPFLAGS=`$PYTHONCONFIG --includes`
 
@@ -618 +617 @@
         # Ensure we can link against libphp
         LIBS_SAVE="$LIBS"
-        LIBS="$PYTHON_LDFLAGS"
-        PY_LIB=`$PYTHONCONFIG --libs | sed \
-                              -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
-        AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        #LIBS="$PYTHON_LDFLAGS"
+        #PY_LIB=`$PYTHONCONFIG --libs | sed \
+        #                     -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
+        #AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        LIBS="m $PYTHON_LDFLAGS -lpython${PYTHON_VERS}"
+        PYTHON_LDFLAGS="-l$LIBS"
+        LDFLAGS=$PYTHON_LDFLAGS
+        AC_CHECK_LIB([], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
         LIBS="$LIBS_SAVE"
 fi