Merge branch 'master' into bindings/python

[babeltrace.git] / README

diff --git a/README b/README
index 718bb68e5b73265c806ab056d902398d69347383..9df02e7094b7f7748dbe644c540934bbc8111690 100644 (file)
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ BUILDING
        make install
        ldconfig
 
+       If you do not want Python bindings, run ./configure --disable-python.
 
 DEPENDENCIES
 ------------
@@ -32,18 +33,23 @@ DEPENDENCIES
 To compile Babeltrace, you will need:
 
        gcc 3.2 or better
-       glib 2.22 or better development libraries
-         (Debian : libglib2.0-0, libglib2.0-dev)
-         (Fedora : glib2, glib2-devel)
        libc6 development librairies
          (Debian : libc6, libc6-dev)
          (Fedora : glibc, glibc)
+       glib 2.22 or better development libraries
+         (Debian : libglib2.0-0, libglib2.0-dev)
+         (Fedora : glib2, glib2-devel)
        uuid development libraries
          (Debian : uuid-dev)
          (Fedora : uuid-devel)
-       libpopt development libraries
-         (Debian : libpopt0, libpopt-dev)
+       libpopt >= 1.13 development libraries
+         (Debian : libpopt-dev)
          (Fedora : popt)
+       python headers (optional)
+         (Debian/Ubuntu : python-dev)
+       swig >= 2.0 (optional)
+         (Debian/Ubuntu : swig2.0)
+
 
 For developers using the git tree:
 
@@ -53,7 +59,7 @@ compile the git repository tree :
 
 - GNU autotools (automake >=1.10, autoconf >=2.50, autoheader >=2.50)
   (make sure your system wide "automake" points to a recent version!)
-- GNU Libtool
+- GNU Libtool >=2.2
   (for more information, go to http://www.gnu.org/software/autoconf/)
 - Flex >=2.5.35.
 - Bison >=2.4.
@@ -61,3 +67,5 @@ compile the git repository tree :
 If you get the tree from the repository, you will need to use the "bootstrap"
 script in the root of the tree. It calls all the GNU tools needed to prepare the
 tree configuration.
+
+Running "make check": bash is required.