[atkmm] Use glibmm-2.54 instead of glibmm-2.52
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atkmm] Use glibmm-2.54 instead of glibmm-2.52
- Date: Wed, 22 Mar 2017 10:21:50 +0000 (UTC)
commit 9ae05e7f8fe871859080010ddfc4b7937e4b2087
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Mar 21 17:32:22 2017 +0100
Use glibmm-2.54 instead of glibmm-2.52
We changed the ABI name of the currently-unstable glibmm series.
codegen/Makefile.am | 2 +-
configure.ac | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 2385b19..1d82ba3 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -30,7 +30,7 @@ dist_noinst_SCRIPTS = generate_defs_and_docs.sh
noinst_PROGRAMS = extradefs/generate_extra_defs
extradefs_generate_extra_defs_SOURCES = extradefs/generate_extra_defs_atk.cc
-extradefs_generate_extra_defs_LDADD = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.52
+extradefs_generate_extra_defs_LDADD = $(ATKMM_LIBS) -lglibmm_generate_extra_defs-2.54
extradefs_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(ATKMM_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 4f9ac9f..d764dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,18 @@ MM_AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
AC_DISABLE_STATIC
LT_INIT([win32-dll])
-AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.52 >= 2.46.2'])
+AC_SUBST([ATKMM_MODULES], ['atk >= 1.18 glibmm-2.54 >= 2.46.2'])
PKG_CHECK_MODULES([ATKMM], [$ATKMM_MODULES])
MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.52])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.54])
MM_ARG_DISABLE_DEPRECATED_API
MM_ARG_ENABLE_DOCUMENTATION
MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
MM_ARG_WITH_TAGFILE_DOC([libsigc++-3.0.tag], [sigc++-3.0])
-MM_ARG_WITH_TAGFILE_DOC([glibmm-2.52.tag], [glibmm-2.52])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.54.tag], [glibmm-2.54])
AC_LANG([C++])
MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]