Win32 bugfix: peeking the signal_pipe at capture_loop start seems to be unreliable

[metze/wireshark/wip.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index b2a47e74c85891cd5c4b34eda43e7927eda2fe4e..edf612b033e4840d309c7bcadfe6a3b3688c9fdd 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,9 @@
+NOTE: this document applies to the Ethereal source releases.  It also
+applies to buildbot source tarballs, but it does not apply to source
+code checked out directly from Subversion, as files such as the
+configuration script are not checked into Subversion, but need to be
+generated from the autoconf and automake files.
+
 Installation
 ============
 
@@ -6,7 +12,7 @@ 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.
 
-0. This is alpha software.  Beware.
+0. This is beta software.  Beware.
 
 1. If you wish to build Ethereal, make sure you have GTK+ and GLIB
     installed. Try running 'gtk-config --version' and
@@ -23,6 +29,10 @@ README.win32 for those instructions.
     header files and the like.  For example, Red Hat users will
     need to install a "gtk-devel" .rpm.
 
+    Note also that Ethereal configuration defaults to using GTK+ and
+    GLib 2.x; you need to configure with --disable-gtk2 to use GTK+
+    1.2[.x].
+
 2. If you wish to build Tethereal, the line-mode version of Ethereal,
     make sure you have GLIB installed.  See note #1 above for instructions
     on checking if you have GLIB installed. You can download GLIB from
@@ -50,8 +60,8 @@ README.win32 for those instructions.
 4. Run './configure' in the Ethereal distribution directory.
     Running './configure --help' displays a list of options.
     The file 'INSTALL.configure' contains general instructions for
-    using 'configure' and 'make'. Ethereal has some
-    non-generic configure options:
+    using 'configure' and 'make'. Ethereal has some non-generic configure 
+    options:
 
     --sysconfdir=DIR
         Ethereal installs a support file (manuf) in ${PREFIX}/etc by
@@ -70,6 +80,9 @@ README.win32 for those instructions.
         build Ethereal, the GUI packet analyzer. You can disable the
         build of the GUI version of Ethereal with this switch.
 
+    --disable-gtk2
+        Build Glib/Gtk+ 1.2[.x]-based ethereal.
+
     --disable-tethereal
         By default the line-mode packet analyzer, Tethereal, is built.
         Use this switch to avoid building it.
@@ -139,13 +152,24 @@ README.win32 for those instructions.
         SSL library is installed in a non-standard location,
         you can specify where your SSL library is with this switch.
 
-    --without-ucdsnmp
+    --without-net-snmp
+        If 'configure' finds a supported version of the NET SNMP library
+        on your system,  the SNMP dissector will be enhanced to use
+        routines from that SNMP library. Use this switch to avoid
+        using the NET SNMP library even if you have it installed.
+
+    --with-net-snmp=PATH
+        Tell the 'configure' script where your net-snmp-config shell script 
+        that comes with the net-snmp package is located, if not in a standard 
+        location.
+
+    --without-ucd-snmp
         If 'configure' finds a supported version of the UCD SNMP library
         on your system,  the SNMP dissector will be enhanced to use
-        routines from that SNMP library.   Use this switch to avoid
+        routines from that SNMP library. Use this switch to avoid
         using the UCD SNMP library even if you have it installed.
 
-    --with-ucdsnmp=DIR
+    --with-ucd-snmp=DIR
         Tell the 'configure' script where your UCD SNMP library
         is located, if not in a standard location.