Mercurial > pidgin.yaz
comparison configure.ac @ 12384:718106aec3d4
[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>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 07 Dec 2005 06:54:02 +0000 |
parents | c57935373cc4 |
children | 515a4630d960 |
comparison
equal
deleted
inserted
replaced
12383:3f70719e375d | 12384:718106aec3d4 |
---|---|
316 AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) | 316 AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) |
317 AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) | 317 AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) |
318 AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR directory containing tkConfig.sh]) | 318 AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR directory containing tkConfig.sh]) |
319 AC_ARG_ENABLE(gtkspell, [ --disable-gtkspell compile without GtkSpell automatic spell checking],,enable_gtkspell=yes) | 319 AC_ARG_ENABLE(gtkspell, [ --disable-gtkspell compile without GtkSpell automatic spell checking],,enable_gtkspell=yes) |
320 AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) | 320 AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) |
321 AC_ARG_ENABLE(deprecated, [ --disable-deprecated compile without deprecated API usage],,enable_deprecated=yes) | 321 dnl We know Gaim won't compile with deprecated APIs disabled. |
322 dnl We have no desire to support two different versions of the | |
323 dnl same code when it's not necessary, so we're sticking with | |
324 dnl the deprecated APIs in many cases. | |
325 dnl This option is being left in case things change. | |
326 dnl AC_ARG_ENABLE(deprecated, [ --disable-deprecated compile without deprecated API usage],,enable_deprecated=yes) | |
322 AC_ARG_ENABLE(screensaver, [ --disable-screensaver compile without X screensaver extension],,enable_xss=yes) | 327 AC_ARG_ENABLE(screensaver, [ --disable-screensaver compile without X screensaver extension],,enable_xss=yes) |
323 AC_ARG_ENABLE(sm, [ --disable-sm compile without X session management support],,enable_sm=yes) | 328 AC_ARG_ENABLE(sm, [ --disable-sm compile without X session management support],,enable_sm=yes) |
324 AC_ARG_WITH(krb4, [ --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") | 329 AC_ARG_WITH(krb4, [ --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") |
325 AC_ARG_WITH(zephyr, [ --with-zephyr=PREFIX compile Zephyr plugin against external libzephyr],zephyr="$withval",zephyr="no") | 330 AC_ARG_WITH(zephyr, [ --with-zephyr=PREFIX compile Zephyr plugin against external libzephyr],zephyr="$withval",zephyr="no") |
326 AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") | 331 AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") |
343 CFLAGS="$orig_CFLAGS" | 348 CFLAGS="$orig_CFLAGS" |
344 ]) | 349 ]) |
345 done | 350 done |
346 fi | 351 fi |
347 | 352 |
348 if test "x$enable_deprecated" = no; then | 353 if test "x$enable_deprecated" = "xno"; then |
349 DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" | 354 CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" |
350 fi | 355 fi |
351 | 356 |
352 if test "x$GCC" = "xyes"; then | 357 if test "x$GCC" = "xyes"; then |
353 CFLAGS="$CFLAGS -Wall -g" | 358 CFLAGS="$CFLAGS -Wall -g" |
354 fi | 359 fi |