Signed-off-by: Slávek Banko <slavek.banko@axis.cz>pull/30/head
parent
6d225e65e1
commit
ae40ab062f
@ -0,0 +1,182 @@
|
||||
Description: Delete outdated m4/libassuan.m4
|
||||
Allows building against libassuan 3.
|
||||
Author: Andreas Metzler <ametzler@debian.org>
|
||||
Origin: vendor
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2024-08-26
|
||||
|
||||
--- pinentry-1.2.1.orig/m4/libassuan.m4
|
||||
+++ /dev/null
|
||||
@@ -1,172 +0,0 @@
|
||||
-dnl Autoconf macros for libassuan
|
||||
-dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
|
||||
-dnl
|
||||
-dnl This file is free software; as a special exception the author gives
|
||||
-dnl unlimited permission to copy and/or distribute it, with or without
|
||||
-dnl modifications, as long as this notice is preserved.
|
||||
-dnl
|
||||
-dnl This file is distributed in the hope that it will be useful, but
|
||||
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
-dnl SPDX-License-Identifier: FSFULLR
|
||||
-# Last-changed: 2020-11-17
|
||||
-
|
||||
-dnl
|
||||
-dnl Common code used for libassuan detection [internal]
|
||||
-dnl Returns ok set to yes or no.
|
||||
-dnl
|
||||
-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
-[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
- AC_ARG_WITH(libassuan-prefix,
|
||||
- AS_HELP_STRING([--with-libassuan-prefix=PFX],
|
||||
- [prefix where LIBASSUAN is installed (optional)]),
|
||||
- libassuan_config_prefix="$withval", libassuan_config_prefix="")
|
||||
- if test x$libassuan_config_prefix != x ; then
|
||||
- if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- use_gpgrt_config=""
|
||||
- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
- if $GPGRT_CONFIG libassuan --exists; then
|
||||
- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
|
||||
- use_gpgrt_config=yes
|
||||
- fi
|
||||
- fi
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
- fi
|
||||
-
|
||||
- tmp=ifelse([$1], ,1:0.9.2,$1)
|
||||
- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
- req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
||||
- min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
|
||||
- else
|
||||
- req_libassuan_api=0
|
||||
- min_libassuan_version="$tmp"
|
||||
- fi
|
||||
-
|
||||
- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
||||
- ok=no
|
||||
- if test "$LIBASSUAN_CONFIG" != "no"; then
|
||||
- req_major=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
-
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
|
||||
- else
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
|
||||
- fi
|
||||
- major=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
- minor=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
- micro=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||
-
|
||||
- if test "$major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$major" -eq "$req_major"; then
|
||||
- if test "$minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$minor" -eq "$req_minor"; then
|
||||
- if test "$micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- if test $ok = yes; then
|
||||
- AC_MSG_RESULT([yes ($libassuan_config_version)])
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- fi
|
||||
-
|
||||
- if test $ok = yes; then
|
||||
- if test "$req_libassuan_api" -gt 0 ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- else
|
||||
- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
||||
- fi
|
||||
- if test "$tmp" -gt 0 ; then
|
||||
- AC_MSG_CHECKING([LIBASSUAN API version])
|
||||
- if test "$req_libassuan_api" -eq "$tmp" ; then
|
||||
- AC_MSG_RESULT(okay)
|
||||
- else
|
||||
- ok=no
|
||||
- AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- if test $ok = yes; then
|
||||
- if test x"$host" != x ; then
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
|
||||
- else
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
|
||||
- fi
|
||||
- if test x"$libassuan_config_host" != xnone ; then
|
||||
- if test x"$libassuan_config_host" != x"$host" ; then
|
||||
- AC_MSG_WARN([[
|
||||
-***
|
||||
-*** The config script "$LIBASSUAN_CONFIG" was
|
||||
-*** built for $libassuan_config_host and thus may not match the
|
||||
-*** used host $host.
|
||||
-*** You may want to use the configure option --with-libassuan-prefix
|
||||
-*** to specify a matching config script.
|
||||
-***]])
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-])
|
||||
-
|
||||
-dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
|
||||
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
-dnl Test whether libassuan has at least MINIMUM-VERSION. This is
|
||||
-dnl used to test for features only available in newer versions.
|
||||
-dnl
|
||||
-AC_DEFUN([AM_CHECK_LIBASSUAN],
|
||||
-[ _AM_PATH_LIBASSUAN_COMMON($1)
|
||||
- if test $ok = yes; then
|
||||
- ifelse([$2], , :, [$2])
|
||||
- else
|
||||
- ifelse([$3], , :, [$3])
|
||||
- fi
|
||||
-])
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
|
||||
-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
-dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
|
||||
-dnl
|
||||
-AC_DEFUN([AM_PATH_LIBASSUAN],
|
||||
-[ _AM_PATH_LIBASSUAN_COMMON($1)
|
||||
- if test $ok = yes; then
|
||||
- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
|
||||
- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
|
||||
- ifelse([$2], , :, [$2])
|
||||
- else
|
||||
- LIBASSUAN_CFLAGS=""
|
||||
- LIBASSUAN_LIBS=""
|
||||
- ifelse([$3], , :, [$3])
|
||||
- fi
|
||||
- AC_SUBST(LIBASSUAN_CFLAGS)
|
||||
- AC_SUBST(LIBASSUAN_LIBS)
|
||||
-])
|
||||
Loading…
Reference in new issue