Skip to content

Commit 0e7b7f4

Browse files
committed
Use glibmm-2.60 instead of glibmm-2.58, require C++17
We have changed the ABI name in glibmm. Require C++17. Glib::ustring in glibmm-2.60 requires C++17.
1 parent 78c2fef commit 0e7b7f4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ MM_CONFIG_DOCTOOL_DIR([docs])
3030
AC_SUBST([LIBXMLXX_SO_VERSION], [1:0:0])
3131

3232
AC_PROG_CXX
33-
MM_AX_CXX_COMPILE_STDCXX([14], [noext],[mandatory])
33+
MM_AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
3434

3535
LT_PREREQ([2.2.6])
3636
LT_INIT([dlopen win32-dll disable-static])
3737

38-
AC_SUBST([LIBXMLXX_MODULES], ['libxml-2.0 >= 2.7.7 glibmm-2.58 >= 2.32.0'])
38+
AC_SUBST([LIBXMLXX_MODULES], ['libxml-2.0 >= 2.7.7 glibmm-2.60 >= 2.59.1'])
3939
PKG_CHECK_MODULES([LIBXMLXX], [$LIBXMLXX_MODULES])
4040

4141
AC_LANG([C++])
@@ -45,7 +45,7 @@ LIBXMLXX_CXX_HAS_EXCEPTION_PTR
4545
MM_ARG_ENABLE_DOCUMENTATION
4646
MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
4747
MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
48-
MM_ARG_WITH_TAGFILE_DOC([glibmm-2.58.tag], [glibmm-2.58])
48+
MM_ARG_WITH_TAGFILE_DOC([glibmm-2.60.tag], [glibmm-2.60])
4949

5050
# Evaluate the --enable-warnings=level option.
5151
MM_ARG_ENABLE_WARNINGS([LIBXMLXX_WXXFLAGS],

0 commit comments

Comments
 (0)