mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Various changes
This commit is contained in:
Werner Koch
parent
4d770bedc1
commit
2e8481c03b
56 changed files with 527 additions and 337 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2006-10-09 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gnupg-pth.m4: New. Taken from ../acinclude.m4.
|
||||
(GNUPG_PATH_PTH): New.
|
||||
|
||||
2006-10-06 Werner Koch <wk@g10code.com>
|
||||
|
||||
* libassuan.m4: Updated.
|
||||
|
||||
2006-07-27 Werner Koch <wk@g10code.com>
|
||||
|
||||
* autobuild.m4: New.
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_
|
|||
|
||||
EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4
|
||||
|
||||
EXTRA_DIST += gnupg-pth.m4
|
||||
|
||||
EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4
|
||||
|
||||
EXTRA_DIST += autobuild.m4
|
||||
|
|
|
|||
114
m4/gnupg-pth.m4
Normal file
114
m4/gnupg-pth.m4
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
dnl GnuPG's check for Pth.
|
||||
dnl Copyright (C) 2003 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.
|
||||
|
||||
|
||||
# GNUPG_PTH_VERSION_CHECK(REQUIRED)
|
||||
#
|
||||
# If the version is sufficient, HAVE_PTH will be set to yes.
|
||||
#
|
||||
# Taken and modified from the m4 macros which come with Pth.
|
||||
AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
|
||||
[
|
||||
_pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
|
||||
_req_version="ifelse([$1],,1.2.0,$1)"
|
||||
|
||||
AC_MSG_CHECKING(for PTH - version >= $_req_version)
|
||||
for _var in _pth_version _req_version; do
|
||||
eval "_val=\"\$${_var}\""
|
||||
_major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
|
||||
_minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
|
||||
_rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
|
||||
_micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
|
||||
case $_rtype in
|
||||
"a" ) _rtype=0 ;;
|
||||
"b" ) _rtype=1 ;;
|
||||
"." ) _rtype=2 ;;
|
||||
esac
|
||||
_hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \
|
||||
"major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
|
||||
eval "${_var}_hex=\"\$_hex\""
|
||||
done
|
||||
have_pth=no
|
||||
if test ".$_pth_version_hex" != .; then
|
||||
if test ".$_req_version_hex" != .; then
|
||||
if test $_pth_version_hex -ge $_req_version_hex; then
|
||||
have_pth=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test $have_pth = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_MSG_CHECKING([whether PTH installation is sane])
|
||||
AC_CACHE_VAL(gnupg_cv_pth_is_sane,[
|
||||
_gnupg_pth_save_cflags=$CFLAGS
|
||||
_gnupg_pth_save_ldflags=$LDFLAGS
|
||||
_gnupg_pth_save_libs=$LIBS
|
||||
CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
|
||||
LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
|
||||
LIBS="$LIBS `$PTH_CONFIG --libs`"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
|
||||
],
|
||||
[[ pth_init ();]])],
|
||||
gnupg_cv_pth_is_sane=yes,
|
||||
gnupg_cv_pth_is_sane=no)
|
||||
CFLAGS=$_gnupg_pth_save_cflags
|
||||
LDFLAGS=$_gnupg_pth_save_ldflags
|
||||
LIBS=$_gnupg_pth_save_libs
|
||||
])
|
||||
if test $gnupg_cv_pth_is_sane != yes; then
|
||||
have_pth=no
|
||||
fi
|
||||
AC_MSG_RESULT($gnupg_cv_pth_is_sane)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
#
|
||||
# GNUPG_PATH_PTH([MINIMUM_VERSION])
|
||||
#
|
||||
# This is a special version of the check whioch assumes that a
|
||||
# emulation for W32 systems is available. The test assumes that
|
||||
# $have_w32_system has already been set. On return $have_pth is set
|
||||
# as well as HAVE_PTH is defined and PTH_CLFAGS and PTH_LIBS are AS_SUBST.
|
||||
#
|
||||
AC_DEFUN([GNUPG_PATH_PTH],
|
||||
[ AC_ARG_WITH(pth-prefix,
|
||||
AC_HELP_STRING([--with-pth-prefix=PFX],
|
||||
[prefix where GNU Pth is installed (optional)]),
|
||||
pth_config_prefix="$withval", pth_config_prefix="")
|
||||
if test x$pth_config_prefix != x ; then
|
||||
PTH_CONFIG="$pth_config_prefix/bin/pth-config"
|
||||
fi
|
||||
AC_PATH_PROG(PTH_CONFIG, pth-config, no)
|
||||
tmp=ifelse([$1], ,1.3.7,$1)
|
||||
if test "$have_w32_system" = no; then
|
||||
if test "$PTH_CONFIG" != "no"; then
|
||||
GNUPG_PTH_VERSION_CHECK($tmp)
|
||||
if test $have_pth = yes; then
|
||||
PTH_CFLAGS=`$PTH_CONFIG --cflags`
|
||||
PTH_LIBS=`$PTH_CONFIG --ldflags`
|
||||
PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
|
||||
AC_DEFINE(HAVE_PTH, 1,
|
||||
[Defined if the GNU Pth is available])
|
||||
fi
|
||||
fi
|
||||
else
|
||||
have_pth=yes
|
||||
PTH_CFLAGS=""
|
||||
PTH_LIBS=""
|
||||
AC_DEFINE(HAVE_PTH, 1)
|
||||
fi
|
||||
AC_SUBST(PTH_CFLAGS)
|
||||
AC_SUBST(PTH_LIBS)
|
||||
])
|
||||
|
||||
140
m4/libassuan.m4
140
m4/libassuan.m4
|
|
@ -9,68 +9,152 @@ 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 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],
|
||||
dnl Common code used for libassuan detection [internal]
|
||||
dnl Returns ok set to yes or no.
|
||||
dnl
|
||||
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
[ AC_ARG_WITH(libassuan-prefix,
|
||||
AC_HELP_STRING([--with-libassuan-prefix=PFX],
|
||||
[prefix where LIBASSUAN is installed (optional)]),
|
||||
AC_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
|
||||
libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
||||
if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
fi
|
||||
libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
||||
if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
fi
|
||||
fi
|
||||
AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
|
||||
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_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
min_libassuan_version=ifelse([$1], ,0.0.1,$1)
|
||||
AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
||||
if test "$LIBASSUAN_CONFIG" != "no" ; then
|
||||
libassuan_version=`$LIBASSUAN_CONFIG --version`
|
||||
fi
|
||||
libassuan_version_major=`echo $libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
libassuan_version_minor=`echo $libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
libassuan_version_micro=`echo $libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||
|
||||
AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version)
|
||||
ok=no
|
||||
if test "$LIBASSUAN_CONFIG" != "no" ; then
|
||||
ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; 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/'`
|
||||
libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version`
|
||||
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
|
||||
if test "$libassuan_version_major" -gt "$req_major"; then
|
||||
ok=yes
|
||||
else
|
||||
if test "$major" -eq "$req_major"; then
|
||||
if test "$minor" -gt "$req_minor"; then
|
||||
if test "$libassuan_version_major" -eq "$req_major"; then
|
||||
if test "$libassuan_version_minor" -gt "$req_minor"; then
|
||||
ok=yes
|
||||
else
|
||||
if test "$minor" -eq "$req_minor"; then
|
||||
if test "$micro" -ge "$req_micro"; then
|
||||
if test "$libassuan_version_minor" -eq "$req_minor"; then
|
||||
if test "$libassuan_version_micro" -ge "$req_micro"; then
|
||||
ok=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
ifelse([$2], ,,[fi])
|
||||
fi
|
||||
|
||||
if test $ok = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
if test $ok = yes; then
|
||||
if test "$req_libassuan_api" -gt 0 ; then
|
||||
tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])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
|
||||
|
||||
])
|
||||
|
||||
|
||||
|
||||
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 $libassuan_config_args --cflags`
|
||||
LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_CFLAGS=""
|
||||
LIBASSUAN_LIBS=""
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBASSUAN_CFLAGS)
|
||||
AC_SUBST(LIBASSUAN_LIBS)
|
||||
])
|
||||
|
||||
|
||||
dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
|
||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
if test $ok = yes; then
|
||||
LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
|
||||
LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_PTH_CFLAGS=""
|
||||
LIBASSUAN_PTH_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBASSUAN_PTH_CFLAGS)
|
||||
AC_SUBST(LIBASSUAN_PTH_LIBS)
|
||||
])
|
||||
|
||||
|
||||
dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION,
|
||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS
|
||||
dnl and LIBASSUAN_PTHREAD_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
if test $ok = yes; then
|
||||
LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
|
||||
LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_PTHREAD_CFLAGS=""
|
||||
LIBASSUAN_PTHREAD_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS)
|
||||
AC_SUBST(LIBASSUAN_PTHREAD_LIBS)
|
||||
])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue