Changeset 91793c for configure.ac

Timestamp:

Oct 23, 2022, 9:08:55 AM (3 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

fc38cb

Parents:

82e5fb

git-author:

Frederik Heber <frederik.heber@…> (12/04/21 22:30:48)

git-committer:

Frederik Heber <frederik.heber@…> (10/23/22 09:08:55)

Message:

Update to boost 1.69.

• boost.m4 from ​https://github.com/tsuna/boost.m4.git (serial 16 + updates).
• needed to re-add BOOST_NUMPY check there.
• needed to re-added AC_SUBST for BOOST_PYTHON_LIBS.
• boost 1.69 has new stupid naming schema mt-x64 for layout tagged which

needed some additional manual replacing "mt" "mt-x64".

• all in all, this is more of a hack than anything else.
• AND: Ubuntu 20.04 has no python-config linking but both python2 and python3-config which boost.m4 does not expect.

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -87 +87 @@
         AS_IF([test x"$have_qtgui_path" != x""],[
                 AC_PATH_PROGS([QT_MOC],
-                        [moc-qt4 moc], 
+                        [moc-qt5 moc], 
                         [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])],
                         [$have_qtgui_path]
                 )
                 AC_PATH_PROGS([QT_RCC],
-                        [rcc-qt4 rcc], 
+                        [rcc-qt5 rcc], 
                         [AC_MSG_ERROR(["Qts rcc not found, please use --with-Qt-bin."])],
                         [$have_qtgui_path]
                 )
                 AC_PATH_PROGS([QT_UIC], 
-                        [uic-qt4 uic], 
+                        [uic-qt5 uic], 
                         [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])],
                         [$have_qtgui_path]
@@ -103 +103 @@
         ],[
                 AC_PATH_PROGS([QT_MOC],
-                        [moc-qt4 moc], 
+                        [moc-qt5 moc], 
                         [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])]
                 )
                 AC_PATH_PROGS([QT_RCC],
-                        [rcc-qt4 rcc], 
+                        [rcc-qt5 rcc], 
                         [AC_MSG_ERROR(["Qts rcc not found, please use --with-Qt-bin."])]
                 )
                 AC_PATH_PROGS([QT_UIC], 
-                        [uic-qt4 uic], 
+                        [uic-qt5 uic], 
                         [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])]
                 )
         ])
-        PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3D], [
-        :
-        ])
+dnl     PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3D], [
+dnl     :
+dnl     ])
         AC_SUBST([QT_CFLAGS])
         AC_SUBST([QT_LIBS])