diff --git a/m4/ax_build_versions.m4 b/m4/ax_build_versions.m4
index 59967cab0667ffd5a87a404651daac443303cdec..cd442a699fbb8a8367bd50d8b21efe5068cc17aa 100644
--- a/m4/ax_build_versions.m4
+++ b/m4/ax_build_versions.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -10,35 +29,6 @@
# Check whether OpenCL path to the headers and libraries are correctly specified.
# Also checks that the library version is OpenCL 1.1 or greater.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_BUILD_VERSIONS],[
diff --git a/m4/ax_check_bgq.m4 b/m4/ax_check_bgq.m4
index 80c9b203934a02d1fe086ace4e0fed6cdbc18ce9..1cb3834f129da7b59aa5fe7a158033ee171eb890 100644
--- a/m4/ax_check_bgq.m4
+++ b/m4/ax_check_bgq.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -12,35 +31,6 @@
# More information can be found at
# http://www-01.ibm.com/support/knowledgecenter/SSAT4T_15.1.0/com.ibm.xlf151.linux.doc/compiler_ref/opt_staticlink.html?lang=en
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_BGQ],
[
diff --git a/m4/ax_check_cuda.m4 b/m4/ax_check_cuda.m4
index e431b7846c3ed40cd17e0a486ee266f2a8721363..a59c943ec67541c781d1efe8b9b1263c9ca374ae 100644
--- a/m4/ax_check_cuda.m4
+++ b/m4/ax_check_cuda.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -10,35 +29,6 @@
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_CUDA],[
AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
diff --git a/m4/ax_check_gasnet.m4 b/m4/ax_check_gasnet.m4
index 315e112c7dd4e461679753bed3984e110df1ef2c..e12e2517a2e267b6b60af0dfbc96010f6954a3c6 100644
--- a/m4/ax_check_gasnet.m4
+++ b/m4/ax_check_gasnet.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -7,35 +26,6 @@
#
# Check whether GASNet path to the headers and libraries are correctly specified.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_GASNET],
[
diff --git a/m4/ax_check_hwloc.m4 b/m4/ax_check_hwloc.m4
index 637cac6be75545cc25392c2286ac24e39a72545b..abf97b63ef0a624e0654f67f0d862e0dd6223ffe 100644
--- a/m4/ax_check_hwloc.m4
+++ b/m4/ax_check_hwloc.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -7,35 +26,6 @@
#
# Check whether hwloc path to the headers and libraries are correctly specified.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_HWLOC],[
AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
diff --git a/m4/ax_check_memkind.m4 b/m4/ax_check_memkind.m4
index 96c2df61d3de902f83981861cc05deb578fe5e93..c25609acde9d6f0c58f189b40cfbf1da01c6c5e5 100644
--- a/m4/ax_check_memkind.m4
+++ b/m4/ax_check_memkind.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -8,35 +27,6 @@
# Check whether Memkind path to the headers and libraries are correctly specified.
# Also checks Jemalloc library availability (required by libmemkind).
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_MEMKIND],[
diff --git a/m4/ax_check_mic.m4 b/m4/ax_check_mic.m4
index 92411b48be4fd510f4faf954201034d1e810a149..96b8efeb538b29d39e5593a64ace2685089fe22b 100644
--- a/m4/ax_check_mic.m4
+++ b/m4/ax_check_mic.m4
@@ -1,6 +1,22 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -16,35 +32,6 @@
# required.
# Allowed host triplets: x86_64-k1om-linux k1om-mpss-linux
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_MIC],
[
diff --git a/m4/ax_check_mpi.m4 b/m4/ax_check_mpi.m4
index 1699dc6dae3d759c40bdfc22ea15f0533aa95626..cb98ffe672b428e09eb3511b6978243d8c8e8e8b 100644
--- a/m4/ax_check_mpi.m4
+++ b/m4/ax_check_mpi.m4
@@ -1,6 +1,22 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -14,36 +30,6 @@
# MPI dependent plugin source code will be compiled in the user program
# build stage.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
-#
AC_DEFUN([AX_CHECK_MPI],[
AC_BEFORE([AC_PROG_CXX],[$0])
diff --git a/m4/ax_check_opencl.m4 b/m4/ax_check_opencl.m4
index e53d533c19d378f8b82f9450f1bd9957918ac8e5..223b4c4e16e9cdea02e105faa7efe97c2c46b494 100644
--- a/m4/ax_check_opencl.m4
+++ b/m4/ax_check_opencl.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -8,35 +27,6 @@
# Check whether OpenCL path to the headers and libraries are correctly specified.
# Also checks that the library version is OpenCL 1.1 or greater.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_OPENCL],
[
diff --git a/m4/ax_check_sqlite3.m4 b/m4/ax_check_sqlite3.m4
index c0fe48640ade980f5fd2dc39013252e354afa6bf..f65d9a79471c8dd522e4b4417ef25d73e8731493 100644
--- a/m4/ax_check_sqlite3.m4
+++ b/m4/ax_check_sqlite3.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -8,35 +27,6 @@
# Check whether a valid SQLite3 library is available, and the path to the headers
# and libraries are correctly specified.
#
-# LICENSE
-#
-# Copyright (c) 2015 Diego Nieto
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_SQLITE3],
[
diff --git a/m4/ax_check_xdma.m4 b/m4/ax_check_xdma.m4
index 192ee89f0c1ae1f36c1b4bbefccd3dd6b903d54d..d9319b673dcf1d92dcdf69adfe0a041aef538626 100644
--- a/m4/ax_check_xdma.m4
+++ b/m4/ax_check_xdma.m4
@@ -1,3 +1,22 @@
+#####################################################################################
+# Copyright 2009-2018 Barcelona Supercomputing Center #
+# #
+# This file is part of the NANOS++ library. #
+# #
+# NANOS++ is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# NANOS++ is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public License #
+# along with NANOS++. If not, see . #
+#####################################################################################
+
#
# SYNOPSIS
#
@@ -8,35 +27,6 @@
# Check whether a valid Zynq Xilinx DMA library is available, and the path to the headers
# and libraries are correctly specified.
#
-# LICENSE
-#
-# Copyright (c) 2015 Jorge Bellon
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see .
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
AC_DEFUN([AX_CHECK_XDMA],
[