Changeset 705

Show
Ignore:
Timestamp:
01/04/10 16:11:54 (2 months ago)
Author:
erikd
Message:

Add --disable-gtk-deprecated configure option to disallow use of deprecated GTK features.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sweep/trunk/configure.ac

    r678 r705  
    425425 
    426426dnl Use -Wall if we have gcc. 
    427 dnl changequote(,)dnl 
    428427if test "x$ac_cv_prog_gcc" = xyes ; then 
    429428  CFLAGS="$CFLAGS -Wall" 
    430  
    431429  if test x$enable_gcc_werror = "xyes" ; then 
    432430    CFLAGS="$CFLAGS -Werror" 
    433431        fi 
    434  
    435 fi 
    436 dnl changequote([,])dnl 
     432fi 
     433 
     434AC_ARG_ENABLE(gtk-deprecated, 
     435        AC_HELP_STRING([--disable-gtk-deprecated], [disallow use of deprecated GTK functions])) 
     436 
     437GTK_DISABLE_DEPRECATED="" 
     438if test x$enable_gtk_deprecated = "xno" ; then 
     439  GTK_DISABLE_DEPRECATED="-DGTK_DISABLE_DEPRECATED" # -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED" 
     440  fi 
     441 
     442AC_SUBST(GTK_DISABLE_DEPRECATED) 
     443 
     444 
    437445 
    438446dnl - Modified from www.nagios.org who modified it from www.erlang.org  

  • sweep/trunk/src/Makefile.am

    r672 r705  
    33SUBDIRS = tdb 
    44 
    5 INCLUDES = \ 
     5AM_CFLAGS = \ 
     6        $(GTK_DISABLE_DEPRECATED) \ 
    67        -DPACKAGE_DATA_DIR='@PACKAGE_DATA_DIR@' \ 
    7         -I$(top_srcdir)/intl \ 
    8         -I$(top_srcdir)/include \ 
    9         -I$(top_srcdir)/src/tdb \ 
    108        @SNDFILE_CFLAGS@ \ 
    119        @OGG_CFLAGS@ @VORBIS_CFLAGS@ \ 
    …… 
    1614        @ALSA_CFLAGS@ \ 
    1715        @PULSEAUDIO_CFLAGS@ 
     16 
     17INCLUDES = \ 
     18        -I$(top_srcdir)/intl \ 
     19        -I$(top_srcdir)/include \ 
     20        -I$(top_srcdir)/src/tdb 
    1821 
    1922TDB_LIBS = $(top_builddir)/src/tdb/libtdb.a