|
 |
0e281a |
From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001
|
|
|
0e281a |
From: Colin Walters <walters@verbum.org>
|
|
|
0e281a |
Date: Thu, 2 May 2013 14:17:38 -0400
|
|
|
0e281a |
Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED
|
|
|
0e281a |
|
|
|
0e281a |
This now trips up on GStaticRecMutex; I'm not going to bother to port,
|
|
|
0e281a |
realistically no one is actively maintaining this code anymore.
|
|
|
0e281a |
---
|
|
|
0e281a |
activation-server/Makefile.am | 1 -
|
|
|
0e281a |
configure.in | 2 +-
|
|
|
0e281a |
2 files changed, 1 insertions(+), 2 deletions(-)
|
|
|
0e281a |
|
|
|
0e281a |
diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am
|
|
|
0e281a |
index efb18a8..ffa90f6 100644
|
|
|
0e281a |
--- a/activation-server/Makefile.am
|
|
|
0e281a |
+++ b/activation-server/Makefile.am
|
|
|
0e281a |
@@ -17,7 +17,6 @@ INCLUDES= \
|
|
|
0e281a |
$(SERVER_CFLAGS) \
|
|
|
0e281a |
$(WARN_CFLAGS) \
|
|
|
0e281a |
-DSERVER_CONFDIR=\"$(sysconfdir)\" \
|
|
|
0e281a |
- -DG_DISABLE_DEPRECATED \
|
|
|
0e281a |
-DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
|
|
|
0e281a |
$(NULL)
|
|
|
0e281a |
|
|
|
0e281a |
diff --git a/configure.in b/configure.in
|
|
|
0e281a |
index 70a4e26..6be2bca 100644
|
|
|
0e281a |
--- a/configure.in
|
|
|
0e281a |
+++ b/configure.in
|
|
|
0e281a |
@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS)
|
|
|
0e281a |
AC_SUBST(SERVER_CFLAGS)
|
|
|
0e281a |
|
|
|
0e281a |
if test "$enable_maintainer_mode" = "yes"; then
|
|
|
0e281a |
- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
|
|
|
0e281a |
+ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
|
|
|
0e281a |
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
|
|
|
0e281a |
fi
|
|
|
0e281a |
|
|
|
0e281a |
--
|
|
|
0e281a |
1.7.1
|
|
|
0e281a |
|