Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Python/Makefile.am

    r912a6f r1ca493a  
    1919noinst_LTLIBRARIES += libMolecuilderPython.la
    2020libMolecuilderPython_la_includedir = $(includedir)/MoleCuilder/
    21 libMolecuilderPython_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PYTHON_INCLUDE_DIR)
     21libMolecuilderPython_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_PYTHON_CPPFLAGS)
    2222libMolecuilderPython_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PYTHON_LDFLAGS)
    2323libMolecuilderPython_la_LIBADD = \
    2424        $(BOOST_PYTHON_LIBS) \
    25         ${CodePatterns_LIBS} \
    26         -l$(PYTHON_LIB)
     25        $(BOOST_PYTHON_LIB) \
     26        ${CodePatterns_LIBS}
    2727
    2828nobase_libMolecuilderPython_la_include_HEADERS = ${PYTHONHEADER}
Note: See TracChangeset for help on using the changeset viewer.