Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --combined .gitignore
index d7b0ca1bead3f24a66be024f672a83088e5d4821,8c6a20b60607b38c205d8a1adbea818767f2f263..e4562869ae1de93909c82cf64dc475491c112e4a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
  /tests/test-bitfield
 +*~
+ /tests/lib/test-seeks
  *.o
  *.a
  *.la
@@@ -16,12 -16,7 +17,12 @@@ ctf-parser-tes
  /config.h.in
  /config.status
  *.log
 -*.m4
 +aclocal.m4
 +/m4/libtool.m4
 +/m4/lt~obsolete.m4
 +/m4/ltoptions.m4
 +/m4/ltsugar.m4
 +/m4/ltversion.m4
  libtool
  /configure
  Makefile
@@@ -32,6 -27,3 +33,6 @@@ converter/babeltrace-lo
  core
  formats/ctf/metadata/ctf-parser.output
  stamp-h1
 +bindings/python/babeltrace.i
 +bindings/python/babeltrace.py
 +bindings/python/babeltrace_wrap.c

diff --combined Makefile.am
index 6584c5d2985c8498b01b63db94c9a0fd0c7829fd,b25b58fe3e4fa002e4cf361ebcc648f88d7cc95f..d28fbc0f78f2e233e172bfc5b774c40eb0ae6011
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -2,9 -2,12 +2,12 @@@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_s
  
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = include types lib formats converter bindings tests doc
 -SUBDIRS = include types lib formats converter tests doc extras
++SUBDIRS = include types lib formats converter bindings tests doc extras
  
  dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
                std-ext-lib.txt
  
  dist_noinst_DATA = CodingStyle
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = babeltrace.pc

diff --combined README
index 1687075bba2ce9b065d1ce1fec622800dec927af,8195cd3ef695956d5f610b0d1a5227e741689fce..9df02e7094b7f7748dbe644c540934bbc8111690
--- 1/README
--- 2/README
+++ b/README
@@@ -25,7 -25,6 +25,7 @@@ BUILDIN
        make install
        ldconfig
  
 +      If you do not want Python bindings, run ./configure --disable-python.
  
  DEPENDENCIES
  ------------
@@@ -45,11 -44,6 +45,11 @@@ To compile Babeltrace, you will need
        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:
  
@@@ -67,3 -61,5 +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.

diff --combined configure.ac
index 24ee2a6290046c6baac0be9ef344f6bfd865dcea,601025f7c245ab74b531c66fdc5ff9fa7dfa799a..aab61999ecf32229c65b4ae23dbabda58bb31066
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,7 @@@
  #                                               -*- Autoconf -*-
  # Process this file with autoconf to produce a configure script.
  
- AC_INIT([babeltrace],[1.0.0-rc5],[mathieu dot desnoyers at efficios dot com])
+ AC_INIT([babeltrace],[1.0.2],[mathieu dot desnoyers at efficios dot com])
  AC_CONFIG_AUX_DIR([config])
  AC_CANONICAL_TARGET
  AC_CANONICAL_HOST
@@@ -76,41 -76,6 +76,41 @@@ AC_CHECK_LIB([popt], [poptGetContext], 
          [AC_MSG_ERROR([Cannot find popt.])]
  )
  
 +
 +# For Python
 +# SWIG version needed or newer:
 +swig_version=2.0.0
 +
 +AC_ARG_ENABLE([python],
 +              [AC_HELP_STRING([--disable-python],
 +                              [do not compile Python bindings])],
 +              [], [enable_python=yes])
 +
 +AM_CONDITIONAL([USE_PYTHON], [test "x${enable_python:-yes}" = xyes])
 +
 +if test "x${enable_python:-yes}" = xyes; then
 +  AC_MSG_NOTICE([You may configure with --disable-python ]dnl
 +[if you do not want Python bindings.])
 +
 +  AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
 +  AM_PATH_PYTHON
 +
 +  AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
 +  AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
 +  AS_IF([test -z "$PYTHON_INCLUDE"], [
 +    AS_IF([test -z "$PYTHON_CONFIG"], [
 +      AC_PATH_PROGS([PYTHON_CONFIG],
 +                    [python$PYTHON_VERSION-config python-config],
 +                    [no],
 +                    [`dirname $PYTHON`])
 +      AS_IF([test "$PYTHON_CONFIG" = no], [AC_MSG_ERROR([cannot find python-config for $PYTHON.])])
 +    ])
 +    AC_MSG_CHECKING([python include flags])
 +    PYTHON_INCLUDE=`$PYTHON_CONFIG --includes`
 +    AC_MSG_RESULT([$PYTHON_INCLUDE])
 +  ])
 +fi
 +
  pkg_modules="gmodule-2.0 >= 2.0.0"
  PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
  AC_SUBST(PACKAGE_LIBS)
@@@ -140,8 -105,10 +140,12 @@@ AC_CONFIG_FILES(
        lib/Makefile
        lib/prio_heap/Makefile
        include/Makefile
 +      bindings/Makefile
 +      bindings/python/Makefile
        tests/Makefile
+       tests/lib/Makefile
+       extras/Makefile
+       extras/valgrind/Makefile
+       babeltrace.pc
  ])
  AC_OUTPUT