Warn the developer if we're building with GTK+.

Move The Slowest Migration In The History Of Ever a little further
along.

Change-Id: Ib8b49708e7036dd412a7ffc8660ded9f681374c0
Reviewed-on: https://code.wireshark.org/review/24006
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03ee1caab718fd8ab5eda49859728a29c3134e1b..b25529cd1a48bdc04f0445fac493814774b3c8de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1136,6 +1136,7 @@ endif()
 
 # No matter which version of GTK is present
 if(GTK2_FOUND OR GTK3_FOUND)
+       message(WARNING "The GTK+ UI is deprecated and will be removed in a future release.")
        set(GTK_FOUND ON)
 endif()
 

diff --git a/configure.ac b/configure.ac
index 3535ad952e5a09a6175c2fb22f788afd4610531c..1708d920461b8620706936a7dec1aea7b932b6b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1328,9 +1328,11 @@ if test "x$enable_wireshark" = "xyes"; then
        done
 
        if test "$have_gtk" = "yes" ; then
-               # If we have GTK then add flags for it.
+               # If we're building with GTK, complain and then add flags for it
                #
-               # GLib flags first
+               AC_MSG_WARN([The GTK+ UI is deprecated and will be removed in a future release.])
+
+               # GLib flags
                #
                GTK_CONFIG="$GLIB_CONFIG"
 

diff --git a/doc/README.developer b/doc/README.developer
index 766ef560353da49943eaf18fdc0721337127b96f..e494e9e7b951fdbfd1921b2ebb56392563678bd3 100644 (file)
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -410,10 +410,15 @@ tmpnam is insecure and should not be used any more. Wireshark brings its
 own mkstemp implementation for use on platforms that lack mkstemp.
 Note: mkstemp does not accept NULL as a parameter.
 
-Wireshark supports platforms with GLib 2.22[.x]/GTK+ 2.12[.x]/Qt 4.8[.x] or
-newer. If a Glib/GTK+/Qt mechanism is available only in newer Glib/GTK+/Qt
-versions then use "#if GLIB_CHECK_VERSION(...)", "#if GTK_CHECK_VERSION(...)" or
-"#if QT_VERSION_CHECK(...)" to conditionally compile code using that mechanism.
+Wireshark requires mininum versions of each of the libraries it uses, in
+particular GLib 2.22.0, Qt 4.8.0, and GTK+ 2.12.0 or newer. If you
+require a mechanism that is available only in a newer version of a
+library then use its version detection macros, e.g. "#if
+GLIB_CHECK_VERSION(...)", "#if QT_VERSION_CHECK(...)", and "#if
+GTK_CHECK_VERSION(...)" to conditionally compile code using that
+mechanism. If you're using GTK_CHECK_VERSION be aware that GTK+ will be
+removed in a future release. Adding new features to the GTK+ UI is
+discouraged.
 
 When different code must be used on UN*X and Win32, use a #if or #ifdef
 that tests _WIN32, not WIN32.  Try to write code portably whenever