diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0921aa2a8f96d929beb9ee42588ea4823ac044be
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+compile
+config.status
+config.h*
+config.log
+configure
+Makefile
+Makefile.in
+aclocal.m4
+*.cache
+
+build*
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index b85e8f7093e8a8acd619cecd24c5dac32c55d594..0000000000000000000000000000000000000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-set(LIBVLCPP_MAJOR_VERSION 2)
-set(LIBVLCPP_MINOR_VERSION 2)
-set(LIBVLCPP_PATCH_VERSION 0)
-set(LIBVLCPP_VERSION ${LIBVLCPP_MAJOR_VERSION}.${LIBVLCPP_MINOR_VERSION}.${LIBVLCPP_PATCH_VERSION})
-
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-include_directories("${CMAKE_SOURCE_DIR}")
-find_package(LIBVLC REQUIRED)
-
-include_directories("${LIBVLC_INCLUDE_DIR}")
-
-subdirs(examples)
-subdirs(test)
-
-include(cpp11)
-add_definitions("-Wall -Wextra -pedantic")
-EnableCpp11()
-
-file(GLOB LIBVLCPP_HEADERS "${CMAKE_SOURCE_DIR}/vlcpp/*.hpp")
-
-
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..2c6b26f50f88c6b2d92de15bcefe80e7dc769072
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,36 @@
+ACLOCAL_AMFLAGS = -I m4
+
+MEDIALIB_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src
+
+libvlcppdir = $(includedir)/vlcpp
+
+libvlcpp_HEADERS = \
+ vlcpp/common.hpp \
+ vlcpp/Equalizer.hpp \
+ vlcpp/EventManager.hpp \
+ vlcpp/Instance.hpp \
+ vlcpp/Internal.hpp \
+ vlcpp/MediaDiscoverer.hpp \
+ vlcpp/Media.hpp \
+ vlcpp/MediaLibrary.hpp \
+ vlcpp/MediaList.hpp \
+ vlcpp/MediaListPlayer.hpp \
+ vlcpp/MediaPlayer.hpp \
+ vlcpp/structures.hpp \
+ vlcpp/vlc.hpp \
+ $(NULL)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libvlcpp.pc
+
+if HAVE_EXAMPLES
+noinst_PROGRAMS = helloworld tests imem
+
+AM_CPPFLAGS = ${vlc_CFLAGS}
+AM_LDFLAGS = ${vlc_LIBS}
+
+helloworld_SOURCES = examples/helloworld/main.cpp
+imem_SOURCES = examples/imem/imem.cpp
+tests_SOURCES = test/main.cpp
+
+endif
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000000000000000000000000000000000000..b956b997a4e3c2c17e328f56b44ca7674cb37e61
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,6 @@
+#! /bin/sh
+set -x
+
+cd "$(dirname "$0")"
+
+autoreconf -fis
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000000000000000000000000000000000000..3ce50286141b862f5a4b95d1c07e960d3d901f36
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,27 @@
+m4_define([VLCPP_MAJOR], [0])
+m4_define([VLCPP_MINOR], [1])
+m4_define([VLCPP_MICRO], [0])
+
+AC_COPYRIGHT([Copyright 2014-2016 VideoLAN - VideoLabs])
+
+AC_INIT([medialibrary], [VLCPP_MAJOR.VLCPP_MINOR.VLCPP_MICRO])
+
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [
+ AM_SILENT_RULES([yes])
+])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_PROG_CXX
+AX_CXX_COMPILE_STDCXX_11([noext])
+
+AC_ARG_ENABLE(examples, [build examples programs],[have_examples="yes"])
+AS_IF([test "${have_examples}" = "yes"], [PKG_CHECK_MODULES(vlc, libvlc)])
+AM_CONDITIONAL([HAVE_EXAMPLES], [test "${have_examples}" = "yes"])
+
+AC_CONFIG_FILES([
+Makefile
+libvlcpp.pc
+])
+
+AC_OUTPUT
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
deleted file mode 100644
index 30eab5feb6764f40fe49cff05be0886aeacf8021..0000000000000000000000000000000000000000
--- a/examples/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-subdirs(helloworld)
-subdirs(imem)
diff --git a/examples/helloworld/CMakeLists.txt b/examples/helloworld/CMakeLists.txt
deleted file mode 100644
index dac752c1cfeb2ad143350612ded2b47be060ab80..0000000000000000000000000000000000000000
--- a/examples/helloworld/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-project(helloworld)
-
-add_executable(${PROJECT_NAME}
- main.cpp
-)
-target_link_libraries( ${PROJECT_NAME} ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY} )
diff --git a/examples/imem/CMakeLists.txt b/examples/imem/CMakeLists.txt
deleted file mode 100644
index b0a33f149484ebbeada0462e1d2cd6bdcf117989..0000000000000000000000000000000000000000
--- a/examples/imem/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-project(imem)
-
-add_executable(${PROJECT_NAME}
- imem.cpp
-)
-target_link_libraries( ${PROJECT_NAME} ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY} )
diff --git a/libvlcpp.pc.in b/libvlcpp.pc.in
new file mode 100644
index 0000000000000000000000000000000000000000..a38cc8960f266b377b802c5f427b8d49374f51dc
--- /dev/null
+++ b/libvlcpp.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libvlcpp
+Description: libvlc C++ bindings
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
diff --git a/m4/stdcxx_11.m4 b/m4/stdcxx_11.m4
new file mode 100644
index 0000000000000000000000000000000000000000..28535458f2b6f1ac69106275422c62486318218e
--- /dev/null
+++ b/m4/stdcxx_11.m4
@@ -0,0 +1,166 @@
+# ============================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+# Check for baseline language coverage in the compiler for the C++11
+# standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+# The first argument, if specified, indicates whether you insist on an
+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+# -std=c++11). If neither is specified, you get whatever works, with
+# preference for an extended mode.
+#
+# The second argument, if specified 'mandatory' or if left unspecified,
+# indicates that baseline C++11 support is required and that the macro
+# should error out if no mode with that support is found. If specified
+# 'optional', then configuration proceeds regardless, after defining
+# HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+# Copyright (c) 2014 Alexey Sokolov <sokolov@google.com>
+# Copyright (c) 2014, 2015 Google Inc.
+# Copyright (c) 2015 VLC authors and VideoLAN
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 7
+
+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ struct Base {
+ virtual void f() {}
+ };
+ struct Child : public Base {
+ virtual void f() override {}
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);
+
+ auto d = a;
+ auto l = [](){};
+
+ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this
+ namespace test_template_alias_sfinae {
+ struct foo {};
+
+ template<typename T>
+ using member = typename T::member_type;
+
+ template<typename T>
+ void func(...) {}
+
+ template<typename T>
+ void func(member<T>*) {}
+
+ void test() {
+ func<foo>(0);
+ }
+ }
+
+ #include <cinttypes>
+ constexpr uint64_t constantname = UINT64_C(0x100000000);
+]])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
+ m4_if([$1], [], [],
+ [$1], [ext], [],
+ [$1], [noext], [],
+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+ [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
+ AC_LANG_PUSH([C++])dnl
+ ac_success=no
+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+ ax_cv_cxx_compile_cxx11,
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [ax_cv_cxx_compile_cxx11=yes],
+ [ax_cv_cxx_compile_cxx11=no])])
+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+ ac_success=yes
+ fi
+
+ m4_if([$1], [noext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=gnu++11 -std=gnu++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+
+ m4_if([$1], [ext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=c++11 -std=c++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+ AC_LANG_POP([C++])
+ if test x$ax_cxx_compile_cxx11_required = xtrue; then
+ if test x$ac_success = xno; then
+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+ fi
+ else
+ if test x$ac_success = xno; then
+ HAVE_CXX11=0
+ AC_MSG_NOTICE([No compiler with C++11 support was found])
+ else
+ HAVE_CXX11=1
+ AC_DEFINE(HAVE_CXX11,1,
+ [define if the compiler supports basic C++11 syntax])
+ fi
+
+ AC_SUBST(HAVE_CXX11)
+ fi
+])
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index bce43cc31a642e15e2e69e80de554f4232cdbcbc..0000000000000000000000000000000000000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-project(vlcpptest)
-
-file(GLOB LIBVLCPP_HEADERS "${CMAKE_SOURCE_DIR}/vlcpp/*.hpp")
-add_executable(${PROJECT_NAME}
- main.cpp
-# Forcing cmake to load & display libvlcpp files
- ${LIBVLCPP_HEADERS}
-)
-target_link_libraries( ${PROJECT_NAME} ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY} )
-option(WITH_ASAN "Build with address sanitizer" OFF)
-
-if(${WITH_ASAN})
- add_definitions("-fsanitize=address -fno-omit-frame-pointer")
- target_link_libraries(${PROJECT_NAME} "asan")
-endif()