[Gaim-commits] CVS: gaim configure.ac,1.129,1.130 configure.in,1.171,1.172

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv24348

Modified Files:
	configure.ac configure.in 
Log Message:
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.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- configure.ac	30 May 2003 00:02:41 -0000	1.129
+++ configure.ac	3 Jun 2003 20:48:07 -0000	1.130
@@ -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

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- configure.in	30 May 2003 00:02:42 -0000	1.171
+++ configure.in	3 Jun 2003 20:48:08 -0000	1.172
@@ -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