Merge branch 'master' into bindings/python

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

diff --combined .gitignore
index e4562869ae1de93909c82cf64dc475491c112e4a,752308e7b38a2c732d48688eed2dbfeafd26ba0e..c60c0e4b00092d6df13395aba313e85cce08953e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,4 +1,5 @@@
- /tests/test-bitfield
 +*~
+ /tests/lib/test-bitfield
  /tests/lib/test-seeks
  *.o
  *.a
@@@ -17,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
@@@ -33,6 -27,4 +33,7 @@@ 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
+ babeltrace.pc

diff --combined configure.ac
index aab61999ecf32229c65b4ae23dbabda58bb31066,b21aa7ef3a4e7968f6fe20bb1eb7962f470356ec..4563c35c575ae216ac83f63b8b717fff079fa128
--- 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.2],[mathieu dot desnoyers at efficios dot com])
+ AC_INIT([babeltrace],[1.1.1],[mathieu dot desnoyers at efficios dot com])
  AC_CONFIG_AUX_DIR([config])
  AC_CANONICAL_TARGET
  AC_CANONICAL_HOST
@@@ -10,14 -10,14 +10,14 @@@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_
  
  AC_CONFIG_MACRO_DIR([m4])
  
- AM_PROG_MKDIR_P
+ AC_PROG_MKDIR_P
  
  AC_CONFIG_HEADERS([config.h])
  
  AC_SYS_LARGEFILE
  
  # Checks for programs.
- AC_PROG_CC
+ AC_PROG_CC_STDC
  AC_PROG_MAKE_SET
  LT_INIT
  AC_PROG_YACC
@@@ -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)
@@@ -133,6 -98,7 +133,7 @@@ AC_CONFIG_FILES(
        formats/ctf/types/Makefile
        formats/ctf-text/Makefile
        formats/ctf-text/types/Makefile
+       formats/ctf-metadata/Makefile
        formats/bt-dummy/Makefile
        formats/ctf/metadata/Makefile
        converter/Makefile
@@@ -140,8 -106,6 +141,8 @@@
        lib/Makefile
        lib/prio_heap/Makefile
        include/Makefile
 +      bindings/Makefile
 +      bindings/python/Makefile
        tests/Makefile
        tests/lib/Makefile
        extras/Makefile