Changeset 1ca493a for src/Makefile.am


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/Makefile.am

    r912a6f r1ca493a  
    323323        Actions/Action_impl_python.hpp \
    324324        Actions/GlobalListOfActions.hpp
    325 molecuilder_CPPFLAGS += -I$(PYTHON_INCLUDE_DIR)
     325molecuilder_CPPFLAGS += $(BOOST_PYTHON_CPPFLAGS)
    326326molecuilder_LDFLAGS += $(BOOST_PYTHON_LDFLAGS)
    327327molecuilder_LDADD += \
    328328        $(BOOST_PYTHON_LIBS) \
    329         ${CodePatterns_LIBS} \
    330         -l$(PYTHON_LIB)
     329        $(BOOST_PYTHON_LIB) \
     330        ${CodePatterns_LIBS}
    331331endif
    332332
    … …  
    363363        Actions/Action_impl_python.hpp \
    364364        Actions/GlobalListOfActions.hpp
    365 molecuildergui_CPPFLAGS += -I$(PYTHON_INCLUDE_DIR)
     365molecuildergui_CPPFLAGS += $(BOOST_PYTHON_CPPFLAGS)
    366366molecuildergui_LDFLAGS += $(BOOST_PYTHON_LDFLAGS)
    367367molecuildergui_LDADD += \
    368368        $(BOOST_PYTHON_LIBS) \
    369         ${CodePatterns_LIBS} \
    370         -l$(PYTHON_LIB)
     369        $(BOOST_PYTHON_LIB) \
     370        ${CodePatterns_LIBS}
    371371endif
    372372
Note: See TracChangeset for help on using the changeset viewer.