# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1054673288 0
# Node ID 29cded5d1ccf46e0d8470ec473709e62ef3d18b6
# Parent  c19cc2a3d65e74c845373b6918761d5ca04945c1
[gaim-migrate @ 6141]
Evan Martin points out that it's probably not a good thing to include the
DISABLE_DEPRECATED #defines in released code.  This makes it only define
those flags on --enable-debug.

committer: Tailor Script <tailor@pidgin.im>

diff -r c19cc2a3d65e -r 29cded5d1ccf configure.ac
--- a/configure.ac	Tue Jun 03 20:25:21 2003 +0000
+++ b/configure.ac	Tue Jun 03 20:48:08 2003 +0000
@@ -133,7 +133,7 @@
 AC_ARG_WITH(krb4,      [  --with-krb4=PREFIX      Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no")
 
 if test "$enable_debug" = yes ; then
-	CFLAGS="$CFLAGS -Wall -g3"
+	CFLAGS="$CFLAGS -Wall -g3 -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
@@ -147,7 +147,7 @@
 *** always available at http://www.gtk.org/.]))
 
 AC_PATH_PROG(gaimpath, gaim)
-CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+CFLAGS="$CFLAGS $GTK_CFLAGS" 
 
 AC_PATH_XTRA
 # We can't assume that $x_libraries will be set, because autoconf does not
diff -r c19cc2a3d65e -r 29cded5d1ccf configure.in
--- a/configure.in	Tue Jun 03 20:25:21 2003 +0000
+++ b/configure.in	Tue Jun 03 20:48:08 2003 +0000
@@ -123,7 +123,7 @@
 AC_ARG_WITH(krb4,      [  --with-krb4=PREFIX      Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no")
 
 if test "$enable_debug" = yes ; then
-	CFLAGS="$CFLAGS -Wall -g3"
+	CFLAGS="$CFLAGS -Wall -g3 -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
@@ -138,7 +138,7 @@
 *** always available at http://www.gtk.org/.]))
 
 AC_PATH_PROG(gaimpath, gaim)
-CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+CFLAGS="$CFLAGS $GTK_CFLAGS" 
 
 AC_PATH_X