Always build with -DGTK_DISABLE_DEPRECATED. The files that

fail when built in specific configurations will disable this
option when required.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38588 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.nmake b/config.nmake
index 392c7c711ce7210bf9da856d4a02c4e8e16ae5b6..1bbb962af400a9c17c7fdf104e134b021da98e25 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1032,10 +1032,8 @@ GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \
        /I$(GTK_DIR)\include\cairo \
        /I$(GTK_DIR)\include\pango-1.0 \
        -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGTK_DISABLE_DEPRECATED \
        -DGSEAL_ENABLE
-!IFDEF MAIN_MENU_USE_UIMANAGER
-GTK_CFLAGS=$(GTK_CFLAGS) -DGTK_DISABLE_DEPRECATED
-!ENDIF
 GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK_DIR)\lib\gdk-win32-2.0.lib \
        $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \

diff --git a/configure.in b/configure.in
index ba353d9c767f3bc0ecd79192d208ea1338d3631c..95f5119f42bdc337b48fe16a21c7bf8899b7de3c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -876,9 +876,7 @@ else
        AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
 
        CFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CFLAGS"
-       if test x$enable_uimanager = xyes; then
-               CFLAGS="-DGTK_DISABLE_DEPRECATED $CFLAGS"
-       fi
+       CFLAGS="-DGTK_DISABLE_DEPRECATED $CFLAGS"
        # CFLAGS="-DGDK_DISABLE_DEPRECATED $CFLAGS"
        if test $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -ge 20; then
                # Enable GSEAL when building with GTK > 2.20 and < 3.0

diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 1881325a2cb5bd0c7a171216d70a2135917e2f00..5e9fe99e5c3764cb9f369d191573ef2f60960a43 100644 (file)
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -224,7 +224,6 @@ endif()
 if (UI_MANAGER)
        add_definitions(
                -DMAIN_MENU_USE_UIMANAGER=1
-               -DGTK_DISABLE_DEPRECATED
        )
 endif()
 
@@ -243,6 +242,7 @@ if (NOT ENABLE_GTK3)
                # To verify that your program does not use any deprecated symbols,
                # you can use defines to remove deprecated symbols from the header files
                #-DGDK_DISABLE_DEPRECATED
+               -DGTK_DISABLE_DEPRECATED
        )
 endif()