| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Colin Walters <walters@verbum.org> |
| 3 | Date: Thu, 2 May 2013 14:17:38 -0400 |
| 4 | Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | This now trips up on GStaticRecMutex; I'm not going to bother to port, |
| 10 | realistically no one is actively maintaining this code anymore. |
| 11 | |
| 12 | Upstream-Status: Applied |
| 13 | |
| 14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
| 15 | --- |
| 16 | activation-server/Makefile.am | 1 - |
| 17 | configure.in | 2 +- |
| 18 | 2 files changed, 1 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am |
| 21 | index efb18a8..ffa90f6 100644 |
| 22 | --- a/activation-server/Makefile.am |
| 23 | +++ b/activation-server/Makefile.am |
| 24 | @@ -17,7 +17,6 @@ INCLUDES= \ |
| 25 | $(SERVER_CFLAGS) \ |
| 26 | $(WARN_CFLAGS) \ |
| 27 | -DSERVER_CONFDIR=\"$(sysconfdir)\" \ |
| 28 | - -DG_DISABLE_DEPRECATED \ |
| 29 | -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ |
| 30 | $(NULL) |
| 31 | |
| 32 | diff --git a/configure.in b/configure.in |
| 33 | index 70a4e26..6be2bca 100644 |
| 34 | --- a/configure.in |
| 35 | +++ b/configure.in |
| 36 | @@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS) |
| 37 | AC_SUBST(SERVER_CFLAGS) |
| 38 | |
| 39 | if test "$enable_maintainer_mode" = "yes"; then |
| 40 | - DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" |
| 41 | + DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES" |
| 42 | AC_SUBST(DISABLE_DEPRECATED_CFLAGS) |
| 43 | fi |
| 44 | |
| 45 | -- |
| 46 | 1.7.6.5 |
| 47 | |