# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1133938442 0
# Node ID 718106aec3d425f9928a484cac56a73db7500fb3
# Parent  3f70719e375d1bf30d83617f45929846cd328535
[gaim-migrate @ 14690]
Fix --disable-deprecated so it would actually work. ('test x = no' could never be true as one side would always have the x and the other side never would.) Then, since we know Gaim won't compile with it, disable that configure flag.

committer: Tailor Script <tailor@pidgin.im>

diff -r 3f70719e375d -r 718106aec3d4 configure.ac
--- a/configure.ac	Wed Dec 07 05:22:19 2005 +0000
+++ b/configure.ac	Wed Dec 07 06:54:02 2005 +0000
@@ -318,7 +318,12 @@
 AC_ARG_WITH(tkconfig,  [  --with-tkconfig=DIR     directory containing tkConfig.sh])
 AC_ARG_ENABLE(gtkspell, [  --disable-gtkspell      compile without GtkSpell automatic spell checking],,enable_gtkspell=yes)
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(deprecated,    [  --disable-deprecated    compile without deprecated API usage],,enable_deprecated=yes)
+dnl We know Gaim won't compile with deprecated APIs disabled.
+dnl We have no desire to support two different versions of the
+dnl same code when it's not necessary, so we're sticking with
+dnl the deprecated APIs in many cases.
+dnl This option is being left in case things change.
+dnl AC_ARG_ENABLE(deprecated,    [  --disable-deprecated    compile without deprecated API usage],,enable_deprecated=yes)
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver   compile without X screensaver extension],,enable_xss=yes)
 AC_ARG_ENABLE(sm,      [  --disable-sm            compile without X session management support],,enable_sm=yes)
 AC_ARG_WITH(krb4,      [  --with-krb4=PREFIX      compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no")
@@ -345,8 +350,8 @@
 	done
 fi
 
-if test "x$enable_deprecated" = no; then
-	DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+if test "x$enable_deprecated" = "xno"; then
+	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 
 if test "x$GCC" = "xyes"; then