[easytag/wip/application-window: 6/20] Set maximum allowed GLib version to 2.32
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/application-window: 6/20] Set maximum allowed GLib version to 2.32
- Date: Sat, 16 Aug 2014 21:09:55 +0000 (UTC)
commit a9b5f0fc0dbfdce4fb6fbe95e9234bcfa93aa19b
Author: David King <amigadave amigadave com>
Date: Sat Aug 9 22:43:38 2014 +0100
Set maximum allowed GLib version to 2.32
This corresponds with the version required by GTK+ 3.4, so that API
introduced in post-2.32 releases will emit warnings when used.
configure.ac | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0d02f7e..152b2ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,10 +160,6 @@ dnl -------------------------------
dnl Checks for libraries.
dnl -------------------------------
-dnl GTK+ libraries
-GTK_DEPS="gtk+-3.0 >= 3.4.0"
-GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
-
dnl Patch from Ben Taylor to fix a Solaris bug (for CDDB)
AC_CHECK_LIB([socket], [recv])
@@ -327,6 +323,9 @@ AM_CONDITIONAL([ENABLE_NAUTILUS_ACTIONS], [test x"$have_libnautilus_extension" !
dnl Check the pkg-config dependencies
GIO_DEPS="gio-2.0 >= 2.32.0" dnl For g_file_new_tmp()
+GLIB_DEPRECATION_FLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+GTK_DEPS="gtk+-3.0 >= 3.4.0"
+GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
PKG_CHECK_MODULES([EASYTAG], [$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS
$TAGLIB_DEPS $WAVPACK_DEPS])
dnl Check for winsock
@@ -379,7 +378,7 @@ CXXFLAGS="$realsave_CXXFLAGS"
AC_LANG_POP([C++])
AC_SUBST([WARN_CXXFLAGS], ["$tested_cxx_warning_flags"])
-AC_SUBST([DEPRECATED_CPPFLAGS], ["-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
-DG_DISABLE_DEPRECATED $GTK_DEPRECATION_FLAGS"])
+AC_SUBST([DEPRECATED_CPPFLAGS], ["-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
-DG_DISABLE_DEPRECATED $GLIB_DEPRECATION_FLAGS $GTK_DEPRECATION_FLAGS"])
dnl To enable 'gprof' profiling
dnl CFLAGS="$CFLAGS -pg"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]