From Kari Vatjus-Anttila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...

[obnox/wireshark/wip.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 588872726060ed474722b2c13ed16d49d14b61d3..4dec804e7abac3daa54cf2ab6d3d0a24c9daf6bb 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ 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 software.  Beware.
 
@@ -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
@@ -93,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.
@@ -114,10 +119,6 @@ README.win32 for those instructions.
         By default the hex-dump-to-capture file conversion program
         is built. Use this switch to avoid building it.
 
-    --disable-idl2wrs
-        By default the IDL-to-wireshark-dissector-source-code converter
-        is built. Use this switch to avoid building it.
-
     --disable-dftest
         By default the display-filter-compiler test program is built.
         Use this switch to avoid building it.
@@ -214,14 +215,15 @@ README.win32 for those instructions.
    working. You must have root privileges in order to capture live data.
 
 9. Run 'make install'.  If you're running a system that supports
-   the Apt, RPM, or System V Release 4 packaging systems, you can
+   the Apt, RPM, OSX, or System V Release 4 packaging systems, you can
    run one of
 
         make debian-package    # Builds a binary package using dpkg
         make rpm-package       # Builds a binary package using rpm
         make srpm-package      # Builds a source package using rpm
-        make svr4-package      # Builds a source package using pkgmk
+        make svr4-package      # Builds a binary package using pkgmk
         make solaris-package   # Same as "make svr4-package"
+        make osx-package       # Builds a binary package for OSX
 
    to make an installable package for your system.