[libgdamm] Build: Use glibmm-2.56.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdamm] Build: Use glibmm-2.56.
- Date: Wed, 25 Oct 2017 20:46:09 +0000 (UTC)
commit 8aa7eb7e7e5eb802026482c6c9e9b91964aa7338
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 25 22:43:09 2017 +0200
Build: Use glibmm-2.56.
Instead of glibmm-2.54, whose (unstable) ABI name was changed.
configure.ac | 6 +++---
tools/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c8d72a8..2f1e94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,14 +46,14 @@ AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
-AC_SUBST([LIBGDAMM_MODULES], ['glibmm-2.54 >= 2.45.31 libgda-6.0 >= 5.0.2'])
+AC_SUBST([LIBGDAMM_MODULES], ['glibmm-2.56 >= 2.45.31 libgda-6.0 >= 5.0.2'])
PKG_CHECK_MODULES([LIBGDAMM], [$LIBGDAMM_MODULES])
PKG_CHECK_EXISTS([libgda-bdb-6.0], [libgdamm_have_bdb=yes], [libgdamm_have_bdb=no])
AS_IF([test "x$libgdamm_have_bdb" = xyes],
[AC_DEFINE([HAVE_LIBGDA_BDB], [1], [Define if the libgda-bdb plugin is available.])])
-MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.54])
+MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.56])
AC_LANG([C++])
MM_ARG_ENABLE_WARNINGS([LIBGDAMM_WXXFLAGS],
@@ -64,7 +64,7 @@ MM_ARG_ENABLE_WARNINGS([LIBGDAMM_WXXFLAGS],
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.54.tag], [glibmm-2.54])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.56.tag], [glibmm-2.56])
AC_CONFIG_FILES([Makefile
tools/Makefile
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d92f050..ec9fbf1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ dist_noinst_DATA = $(addprefix m4/,$(files_codegen_m4))
noinst_PROGRAMS = extra_defs_gen/generate_extra_defs
extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_gda.cc
-extra_defs_gen_generate_extra_defs_LDADD = $(LIBGDAMM_LIBS) -lglibmm_generate_extra_defs-2.54
+extra_defs_gen_generate_extra_defs_LDADD = $(LIBGDAMM_LIBS) -lglibmm_generate_extra_defs-2.56
extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
AM_CPPFLAGS = -I$(top_builddir) $(LIBGDAMM_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]