Changeset 745290

Timestamp:

Oct 24, 2022, 8:40:31 PM (3 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

1d9586

Parents:

c8a442

Message:

Revert "FIX: updates to m4/boost.m4."

This reverts commit 67afa38e593616f035fde1cdd37d872f5850522e.

Files:

• ThirdParty/vmg/m4/boost.m4 (modified) (1 diff)
• data/icons/Makefile.am (modified) (3 diffs)
• m4/boost.m4 (modified) (3 diffs)

ThirdParty/vmg/m4/boost.m4

@@ -425 +425 @@
 for boost_tag_ in -$boost_cv_lib_tag ''; do
 for boost_ver_ in -$boost_cv_lib_version ''; do
-for boost_mt_ in $boost_mt -mt -mt-x64 ''; do
+for boost_mt_ in $boost_mt -mt ''; do
 for boost_rtopt_ in $boost_rtopt '' -d; do
   for boost_lib in \

data/icons/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = ${QT_CFLAGS}
 
+if CONDQTGUI
 EXTRA_DIST = \
         icons.qrc \
@@ -11 +12 @@
         molecuildergui_logo.png
 
-if CONDQTGUI
 qrc_%.cpp qrc_%.d: %.qrc
         echo "Compiling qrc files ..."
@@ -19 +19 @@
 
 noinst_LTLIBRARIES = libicons.la
-nodist_libicons_la_SOURCES = qrc_icons.cpp
+libicons_la_SOURCES = qrc_icons.cpp
 
 sinclude qrc_icons.d

m4/boost.m4

@@ -448 +448 @@
 for boost_tag_ in -$boost_cv_lib_tag ''; do
 for boost_ver_ in -$boost_cv_lib_version ''; do
-for boost_mt_ in $boost_mt -mt -mt-x64 ''; do
+for boost_mt_ in $boost_mt -mt ''; do
 for boost_rtopt_ in $boost_rtopt '' -d; do
   for boost_full_suffix in \
@@ -1253 +1253 @@
 [_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes])
 _BOOST_PYTHON_CONFIG([LDFLAGS],   [ldflags])
-_BOOST_PYTHON_CONFIG([LIBS],      [libs])
-AC_SUBST([BOOST_PYTHON_LIB], [$BOOST_PYTHON_LIBS])
+_BOOST_PYTHON_CONFIG([LIBS],      [libs], ["-lpython3.8 "])
+AC_SUBST([BOOST_PYTHON_LIB], [-lpython3.8 $BOOST_PYTHON_LIBS])
 m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
 BOOST_FIND_LIBS([python], [python python3], [$1],
@@ -1676 +1676 @@
     _BOOST_mingw_test(8, 0) \
     _BOOST_gcc_test(8, 0) \
-    _BOOST_mingw_test(7, 5) \
-    _BOOST_gcc_test(7, 5) \
     _BOOST_mingw_test(7, 4) \
     _BOOST_gcc_test(7, 4) \