Changeset 1ca493a for python

Timestamp:

Jun 25, 2020, 8:26:37 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

b56827

Parents:

912a6f

git-author:

Frederik Heber <frederik.heber@…> (04/16/19 23:09:54)

git-committer:

Frederik Heber <frederik.heber@…> (06/25/20 20:26:37)

Message:

Allowing python3 usage.

• Init function name changes on python2/3.
• added test and AC_DEFINEs to configure.ac.
• PythonScripting branches on these preprocessor defines.
• removed ax_python.m4.
• FIX: boost.m4 overwrites BOOST_PYTHON_LIBS pulled from python-config which caused the issues with ax_python.m4 and boost.m4 checking for different python versions. Added BOOST_PYTHON_LIB which contains the python libs needed.

File:

• python/Makefile.am (modified) (1 diff)

python/Makefile.am

@@ -18 +18 @@
         ../src/Actions/GlobalListOfActions.hpp \
         ../src/Actions/ActionHistory.hpp
-pyMoleCuilder_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
-pyMoleCuilder_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info $(MOLECUILDER_SO_VERSION) -shared $(BOOST_PYTHON_LDFLAGS) 
+pyMoleCuilder_la_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        ${BOOST_CPPFLAGS} \
+        ${CodePatterns_CFLAGS} \
+        $(JobMarket_CFLAGS) \
+        $(BOOST_PYTHON_CPPFLAGS)
+pyMoleCuilder_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info $(MOLECUILDER_SO_VERSION) -shared $(BOOST_PYTHON_LDFLAGS) $(BOOST_PYTHON_LDFLAGS)
 pyMoleCuilder_la_LIBADD = \
         $(top_builddir)/src/libMolecuilderUI.la
 pyMoleCuilder_la_LIBADD += \
         $(BOOST_PYTHON_LIBS) \
-        ${CodePatterns_LIBS} \
-        -l$(PYTHON_LIB)
+        $(BOOST_PYTHON_LIB) \
+        ${CodePatterns_LIBS}
 endif