Merge branch 'feature/upstream' into develop

1 files changed, 52 insertions, 0 deletions

diff --git a/patches/ax_create_stdint_h.19-20.m4.patch b/patches/ax_create_stdint_h.19-20.m4.patch
new file mode 100644
index 0000000..ef54329
--- /dev/null
+++ b/patches/ax_create_stdint_h.19-20.m4.patch
@@ -0,0 +1,52 @@
+From: Guido Draheim <guidod@gmx.de>
+Date: Sat, 21 Jul 2018 10:31:26 +0000 (+0200)
+Subject: all-permissive for macros from Guido Draheim (only author)
+X-Git-Tag: v2019.01.06~19^2~22
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commitdiff_plain;h=817d63c5660776f8504381e769bf8aa4235571e4
+
+all-permissive for macros from Guido Draheim (only author)
+---
+
+diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
+index 440069b..8fccde1 100644
+--- a/m4/ax_create_stdint_h.m4
++++ b/m4/ax_create_stdint_h.m4
+@@ -48,33 +48,12 @@
+ #
+ #   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+ #
+-#   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 <https://www.gnu.org/licenses/>.
+-#
+-#   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.
++#   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 19
++#serial 20
+ 
+ AC_DEFUN([AX_CHECK_DATA_MODEL],[
+    AC_CHECK_SIZEOF(char)