kopia lustrzana https://gitlab.com/sane-project/backends
Suppress obsolete macro warnings. Fixes #122
rodzic
1229b5a3d1
commit
129b53bbca
20
autogen.sh
20
autogen.sh
|
@ -2,6 +2,26 @@
|
|||
test -n "$srcdir" || srcdir=`dirname "$0"`
|
||||
test -n "$srcdir" || srcdir=.
|
||||
|
||||
# Suppress warnings about obsolete macros if still needed (#122)
|
||||
ac_dir=$(aclocal --print-ac-dir)
|
||||
if test -r "$ac_dir/ax_create_stdint_h.m4"; then
|
||||
serial=$(awk '/#serial/{ print $2 }' "$ac_dir/ax_create_stdint_h.m4")
|
||||
if test "$serial" -lt 21; then
|
||||
m4_dir=$(autoconf -t 'AC_CONFIG_MACRO_DIR:$%')
|
||||
target="$srcdir/$m4_dir/ax_create_stdint_h.m4"
|
||||
echo "Copying file to $target"
|
||||
cp "$ac_dir/ax_create_stdint_h.m4" "$srcdir/$m4_dir"
|
||||
if test "$serial" -lt 20; then
|
||||
echo "patching file $target to #serial 20"
|
||||
patch --quiet $target \
|
||||
"$srcdir/ax_create_stdint_h.19-20.m4.patch"
|
||||
fi
|
||||
echo "patching file $target to #serial 21"
|
||||
patch --quiet "$target" \
|
||||
"$srcdir/ax_create_stdint_h.20-21.m4.patch"
|
||||
fi
|
||||
fi
|
||||
|
||||
autoreconf --force --install --verbose --warnings=all "$srcdir"
|
||||
patch "$srcdir/ltmain.sh" "$srcdir/ltmain.sh.patch"
|
||||
patch "$srcdir/po/Rules-quot" "$srcdir/Rules-quot.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)
|
|
@ -0,0 +1,35 @@
|
|||
X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blobdiff_plain;f=m4%2Fax_create_stdint_h.m4;h=94fbeb404829c232787e27193d6c24b2509a6f24;hp=8fccde1d4121ab374aed30b4c78cf287ce3be7c9;hb=b26684dc2f29222d9581089ea8cfb2fc54319fb4;hpb=68e93457f1d6f73f8e5019e7a0a97851085dc0fa
|
||||
|
||||
diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
|
||||
index 8fccde1..94fbeb4 100644
|
||||
--- a/m4/ax_create_stdint_h.m4
|
||||
+++ b/m4/ax_create_stdint_h.m4
|
||||
@@ -53,7 +53,7 @@
|
||||
# and this notice are preserved. This file is offered as-is, without any
|
||||
# warranty.
|
||||
|
||||
-#serial 20
|
||||
+#serial 21
|
||||
|
||||
AC_DEFUN([AX_CHECK_DATA_MODEL],[
|
||||
AC_CHECK_SIZEOF(char)
|
||||
@@ -152,14 +152,14 @@ AC_CACHE_VAL([ac_cv_header_stdint_t],[
|
||||
old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
|
||||
old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
|
||||
old_CFLAGS="$CFLAGS" ; CFLAGS=""
|
||||
-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
|
||||
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[int_least32_t v = 0;]])],
|
||||
[ac_cv_stdint_result="(assuming C99 compatible system)"
|
||||
- ac_cv_header_stdint_t="stdint.h"; ],
|
||||
-[ac_cv_header_stdint_t=""])
|
||||
+ ac_cv_header_stdint_t="stdint.h";],
|
||||
+ [ac_cv_header_stdint_t=""])
|
||||
if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then
|
||||
CFLAGS="-std=c99"
|
||||
-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
|
||||
-[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)])
|
||||
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[int_least32_t v = 0;]])],
|
||||
+[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)], [])
|
||||
fi
|
||||
CXXFLAGS="$old_CXXFLAGS"
|
||||
CPPFLAGS="$old_CPPFLAGS"
|
Ładowanie…
Reference in New Issue