From Brian Ginsbach:

[obnox/wireshark/wip.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 673ccdc43eceb366d811c99c695427780f67318f..476b68a6f78426c2ea4b8b0f6389539492b875c6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,9 +14,9 @@ Installation
 These are installation instructions for Unix and Unix-like systems
 that can run the "configure" script in this same directory. These
 are not the installation instructions for Windows systems; see
-README.win32 for those instructions.
+README.windows for those instructions.
 
-0. This is beta software.  Beware.
+0. This is software.  Beware.
 
 1. If you wish to build Wireshark, make sure you have GTK+ and GLib
    installed. Try running 'pkg-config glib-2.0 --modversion' to see if
@@ -41,6 +41,10 @@ README.win32 for those instructions.
    GLib 2.x; you need to configure with --disable-gtk2 to use GTK+
    1.2[.x].
 
+   Please also note that GTK+ 1.2[.x] is only supported up to 
+   Wireshark 1.0.x. From Wireshark 1.1.x onwards only GTK+ 2.x
+   is supported.
+
 2. If you wish to build TShark, the line-mode version of Wireshark,
    make sure you have GLIB installed.  See note #1 above for instructions
    on checking if you have GLIB installed. You can download GLIB from
@@ -65,7 +69,10 @@ README.win32 for those instructions.
    Similarly, Red Hat 5.x users will need to install a "libpcap-devel"
    .rpm to go along with the "libpcap" .rpm.
 
-4. Run './configure' in the Wireshark distribution directory.
+4. Building Wireshark requires Perl (specifically the pod2man program)
+   so that the documentation can be built.
+
+5. Run './configure' in the Wireshark distribution directory.
    Running './configure --help' displays a complete list of options.
    The file 'INSTALL.configure' contains general instructions for
    using 'configure' and 'make'. Some of the Wireshark non-generic
@@ -90,6 +97,7 @@ README.win32 for those instructions.
 
     --disable-gtk2
         Build Glib/Gtk+ 1.2[.x]-based wireshark.
+        Note: not supported from Wireshark 1.1.x onwards
 
     --disable-tshark
         By default the line-mode packet analyzer, TShark, is built.
@@ -201,16 +209,16 @@ README.win32 for those instructions.
         Use this switch to change the location where plugins
         are installed.
 
-5. After running './configure', you will see a summary of some
+6. After running './configure', you will see a summary of some
    of the options you chose. Ensure that the summary reflects
    what you want. If it doesn't, re-run './configure' with new options.
 
-6. Run 'make'.  Hopefully, you won't run into any problems.
+7. Run 'make'.  Hopefully, you won't run into any problems.
 
-7. Run './wireshark' or './tshark' or ./dumpcap, and make sure things are
+8. Run './wireshark' or './tshark' or ./dumpcap, and make sure things are
    working. You must have root privileges in order to capture live data.
 
-8. Run 'make install'.  If you're running a system that supports
+9. Run 'make install'.  If you're running a system that supports
    the Apt, RPM, or System V Release 4 packaging systems, you can
    run one of