From: Xavier Claessens <xclaesse@gmail.com>
Date: Sun, 19 Apr 2009 08:22:33 +0000 (+0200)
Subject: Merge commit 'bigon/configure-deprecated-flag'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=c01c53db88c603b3f7150c6f763e5bd810ddf8ea;hp=-c

Merge commit 'bigon/configure-deprecated-flag'
---

c01c53db88c603b3f7150c6f763e5bd810ddf8ea
diff --combined configure.ac
index 16f8f354,397e61bb..c3926fdb
--- a/configure.ac
+++ b/configure.ac
@@@ -36,11 -36,8 +36,8 @@@ ISO_CODES_REQUIRED=0.3
  LIBNOTIFY_REQUIRED=0.4.4
  LIBCANBERRA_GTK_REQUIRED=0.4
  
- # Uncomment that to build with deprecated symbols disabled
- #AC_DEFINE(G_DISABLE_DEPRECATED, [], [Disable deprecated GLib symbols])
- #AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED, [], [Disable deprecated GDK pixbuf symbols])
- #AC_DEFINE(GDK_DISABLE_DEPRECATED, [], [Disable deprecated GDK symbols])
- #AC_DEFINE(GTK_DISABLE_DEPRECATED, [], [Disable deprecated GTK symbols])
+ # Use --enable-maintainer-mode to disabled deprecated symbols
+ GNOME_MAINTAINER_MODE_DEFINES
  
  # Uncomment that to build with single include disabled
  #AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
@@@ -55,6 -52,7 +52,6 @@@ AC_CONFIG_AUX_DIR(.
  GNOME_COMMON_INIT
  
  AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
 -AM_MAINTAINER_MODE
  AC_ISC_POSIX
  AC_PROG_CC
  AC_HEADER_STDC