Change default gtk build from version 2 to version 3 for

autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863

CMakeOptions.txt

@@ -19,7 +19,7 @@ option(AUTOGEN_pidl      "Autogenerate pidl dissectors" OFF)
 
 option(DISABLE_WERROR    "Do not treat Warnings as errors" OFF)
 option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF)
-option(ENABLE_GTK3       "Use GTK3 instead of GTK2 to build wireshark" OFF)
+option(ENABLE_GTK3       "Use GTK3 instead of GTK2 to build wireshark" ON)
 option(ENABLE_QT5        "Use Qt5 instead of Qt4 to build qtshark" OFF)
 option(ENABLE_PCAP       "Enable libpcap support (required for capturing)" ON)
 #

config.nmake

@@ -251,7 +251,7 @@ GLIB_VERSION=2.0
 # directory in which the "include" and "lib" directories reside.
 #
 # Set the name to gtk3 if you want to use gtk3
-GTK_NAME=gtk2
+GTK_NAME=gtk3
 GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME)
 
 

configure.ac

@@ -404,8 +404,8 @@ AC_ARG_WITH([gtk2],
 
 AC_ARG_WITH([gtk3],
   AC_HELP_STRING( [--with-gtk3=@<:@yes/no@:>@],
-                  [use GTK+ 3.0 instead of 2.0 @<:@default=no@:>@]),
-  with_gtk3="$withval", with_gtk3="no")
+                  [use GTK+ 3.0 instead of 2.0 @<:@default=yes@:>@]),
+  with_gtk3="$withval", with_gtk3="yes")
 
 # GnuTLS
 # Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to

macosx-setup.sh

@@ -391,7 +391,7 @@ if [[ $DARWIN_MAJOR_VERSION -le 9 ]]; then
 fi
 
 # To set up a GTK3 environment
-# GTK3=1
+GTK3=1
 # To build cmake
 # CMAKE=1
 #