[gupnp-igd] Require GLib 2.26 and ignore later deprecations
- From: Olivier CrÃte <Tester src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp-igd] Require GLib 2.26 and ignore later deprecations
- Date: Fri, 4 Jan 2013 17:22:49 +0000 (UTC)
commit 43a59e5098133bef66b684579c86f4487f43d318
Author: Olivier CrÃte <olivier crete collabora com>
Date: Fri Jan 4 12:22:00 2013 -0500
Require GLib 2.26 and ignore later deprecations
configure.ac | 9 ++++-----
tests/gtest/Makefile.am | 4 ----
2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c4f7d47..4b64163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_STDC_HEADERS
AC_PROG_LIBTOOL
AC_FUNC_MMAP
-PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gupnp-1.0 >= 0.18)
# glib-genmarshal
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
@@ -23,6 +23,9 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
GTK_DOC_CHECK([1.0])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_26], [Version 2.26 is required])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_26], [Ignore post 2.26 deprecations])
+
GOBJECT_INTROSPECTION_CHECK([0.10])
if test "x$found_introspection" = "xyes"; then
INTROSPECTION_TYPELIBDIR=`$PKG_CONFIG --variable=typelibdir --define-variable="libdir=${libdir}" gobject-introspection-1.0`
@@ -31,10 +34,6 @@ if test "x$found_introspection" = "xyes"; then
AC_SUBST(INTROSPECTION_GIRDIR)
fi
-PKG_CHECK_MODULES(GTest, glib-2.0 >= 2.16, [gtest=yes], [gtest=no])
-
-AM_CONDITIONAL(HAVE_GTEST, [test x$gtest = xyes])
-
AC_ARG_ENABLE([python],
AC_HELP_STRING([--disable-python], [Disable Python bindings]),
[case "${enableval}" in
diff --git a/tests/gtest/Makefile.am b/tests/gtest/Makefile.am
index 5555b41..c1375e8 100644
--- a/tests/gtest/Makefile.am
+++ b/tests/gtest/Makefile.am
@@ -1,6 +1,4 @@
-if HAVE_GTEST
-
TESTS_ENVIRONMENT = XML_PATH=$(srcdir) \
G_SLICE=debug-blocks \
LD_LIBRARY_PATH=$(top_builddir)/libgupnp-igd/.libs:$(LD_LIBRARY_PATH)
@@ -11,8 +9,6 @@ check_PROGRAMS = gupnp-simple-igd
gupnp_simple_igd_SOURCES = gupnp-simple-igd.c
-endif
-
LDADD = \
$(top_builddir)/libgupnp-igd/libgupnp-igd-1.0.la \
$(LIBGUPNP_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]