Merge branch 'master' into bindings/python

diff --combined configure.ac
index 16679b84ae09dd7527b17cac343d1b7f4c8c1ad5,6ea5ef3c96fa97c83f7edf73e7bef32540ca3d12..637daa56761370c9a7c19f5f45e5ada72d396b4a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -101,41 -101,6 +101,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)
@@@ -150,6 -115,9 +150,9 @@@ AC_SUBST(babeltraceincludedir
  babeltracectfincludedir="${includedir}/babeltrace/ctf"
  AC_SUBST(babeltracectfincludedir)
  
+ babeltracectfwriterincludedir="${includedir}/babeltrace/ctf-writer"
+ AC_SUBST(babeltracectfwriterincludedir)
+ 
  AC_CONFIG_FILES([
        Makefile
        types/Makefile
@@@ -162,13 -130,12 +165,14 @@@
        formats/ctf-metadata/Makefile
        formats/bt-dummy/Makefile
        formats/ctf/metadata/Makefile
+       formats/ctf/writer/Makefile
        converter/Makefile
        doc/Makefile
        lib/Makefile
        lib/prio_heap/Makefile
        include/Makefile
 +      bindings/Makefile
 +      bindings/python/Makefile
        tests/Makefile
        tests/bin/Makefile
        tests/lib/Makefile