[git] Assuan - branch, master, updated. libassuan-2.0.1-38-g2adbf87
by Werner Koch
cvs at cvs.gnupg.org
Wed Apr 20 14:34:22 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 2adbf87bd18c6a7fe78fcd849026871f7a1603d1 (commit)
via 76d3001b1fe28f64bb78ff27c748c97362208534 (commit)
from a0e05baf1b11fa30e1dd949350b2066a902deab8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2adbf87bd18c6a7fe78fcd849026871f7a1603d1
Author: Werner Koch <wk at gnupg.org>
Date: Wed Apr 20 14:05:24 2011 +0200
Fix Makefile for rename of README.SVN to README.GIT.
diff --git a/ChangeLog b/ChangeLog
index 39a7d0f..64145a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-20 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (EXTRA_DIST): s/README.SVN/README.GIT/
+
2011-04-06 Werner Koch <wk at g10code.com>
* autogen.sh: Check the git setup. Add option --build-w64.
diff --git a/Makefile.am b/Makefile.am
index b97a1be..55040e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-EXTRA_DIST = config.rpath autogen.sh README.SVN
+EXTRA_DIST = config.rpath autogen.sh README.GIT
SUBDIRS = m4 src doc tests
@@ -30,5 +30,5 @@ dist-hook:
echo "$(VERSION)" > $(distdir)/VERSION
-stowinstall:
+stowinstall:
$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libassuan
commit 76d3001b1fe28f64bb78ff27c748c97362208534
Author: Werner Koch <wk at gnupg.org>
Date: Mon Apr 11 14:33:59 2011 +0200
Add option --host to libassuan-config.
Also enhanced the m4 test marcos and removed some cruft.
diff --git a/ChangeLog b/ChangeLog
index 821ab7e..39a7d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* autogen.sh: Check the git setup. Add option --build-w64.
* configure.ac (HAVE_W64_SYSTEM): Define.
+ (LIBGCRYPT_CONFIG_HOST): New.
* m4/gpg-error.m4: Update from current libgpg-error repo.
diff --git a/configure.ac b/configure.ac
index 582c01e..c371a37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,12 +252,14 @@ fi
# For src/libassuan-config.in
LIBASSUAN_CONFIG_LIB="-lassuan"
LIBASSUAN_CONFIG_CFLAGS=""
+LIBASSUAN_CONFIG_HOST="$host"
LIBASSUAN_CONFIG_EXTRA_LIBS=
if test x"$NETLIBS" != x; then
LIBASSUAN_CONFIG_EXTRA_LIBS="$LIBASSUAN_CONFIG_EXTRA_LIBS $NETLIBS"
fi
AC_SUBST(LIBASSUAN_CONFIG_LIB)
AC_SUBST(LIBASSUAN_CONFIG_CFLAGS)
+AC_SUBST(LIBASSUAN_CONFIG_HOST)
AC_SUBST(LIBASSUAN_CONFIG_API_VERSION)
AC_SUBST(LIBASSUAN_CONFIG_EXTRA_LIBS)
diff --git a/src/ChangeLog b/src/ChangeLog
index a552201..261c605 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-06 Werner Koch <wk at g10code.com>
+
+ * libassuan-config.in: Add option --host.
+ * libassuan.m4: Remove cruft. Add check for correct HOST.
+
2011-03-30 Werner Koch <wk at g10code.com>
* sysutils.c (_assuan_sysutils_blurb): Add version string.
diff --git a/src/libassuan-config.in b/src/libassuan-config.in
index 561ff96..dd25a4c 100644
--- a/src/libassuan-config.in
+++ b/src/libassuan-config.in
@@ -18,6 +18,7 @@ lib="@LIBASSUAN_CONFIG_LIB@"
extralibs="@LIBASSUAN_CONFIG_EXTRA_LIBS@ $gpg_error_libs"
cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags"
api_version="@LIBASSUAN_CONFIG_API_VERSION@"
+my_host="@LIBASSUAN_CONFIG_HOST@"
prefix=@prefix@
exec_prefix=@exec_prefix@
includes=""
@@ -27,6 +28,7 @@ echo_libs=no
echo_cflags=no
echo_prefix=no
echo_exec_prefix=no
+echo_host=no
usage()
@@ -39,6 +41,7 @@ Options:
[--version]
[--libs]
[--cflags]
+ [--host]
EOF
exit $1
}
@@ -79,6 +82,9 @@ while test $# -gt 0; do
--libs)
echo_libs=yes
;;
+ --host)
+ echo_host=yes
+ ;;
*)
usage 1 1>&2
;;
@@ -98,6 +104,9 @@ if test "$echo_api_version" = "yes"; then
echo $api_version
fi
+if test "$echo_host" = "yes"; then
+ echo "$my_host"
+fi
if test "$echo_cflags" = "yes"; then
if test "@includedir@" != "/usr/include" ; then
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index bac1be8..4b196a5 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -1,5 +1,5 @@
dnl Autoconf macros for libassuan
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+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
@@ -14,7 +14,8 @@ 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_REQUIRE([AC_CANONICAL_HOST])
+ AC_ARG_WITH(libassuan-prefix,
AC_HELP_STRING([--with-libassuan-prefix=PFX],
[prefix where LIBASSUAN is installed (optional)]),
libassuan_config_prefix="$withval", libassuan_config_prefix="")
@@ -24,7 +25,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
fi
fi
- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
+
+ AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
tmp=ifelse([$1], ,1:0.9.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
@@ -35,46 +37,44 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
min_libassuan_version="$tmp"
fi
- 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)
+ AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
ok=no
- if test "$LIBASSUAN_CONFIG" != "no" ; then
- ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then])
+ if test "$LIBASSUAN_CONFIG" != "no" \
+ && test -f "$LIBASSUAN_CONFIG" ; 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 "$libassuan_version_major" -gt "$req_major"; then
+
+ libassuan_config_version=`$LIBASSUAN_CONFIG --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
ok=yes
else
- if test "$libassuan_version_major" -eq "$req_major"; then
- if test "$libassuan_version_minor" -gt "$req_minor"; then
+ if test "$major" -eq "$req_major"; then
+ if test "$minor" -gt "$req_minor"; then
ok=yes
else
- if test "$libassuan_version_minor" -eq "$req_minor"; then
- if test "$libassuan_version_micro" -ge "$req_micro"; then
+ if test "$minor" -eq "$req_minor"; then
+ if test "$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 ($libassuan_version)])
+ AC_MSG_RESULT([yes ($libassuan_config_version)])
else
AC_MSG_RESULT(no)
fi
@@ -83,7 +83,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
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])
+ AC_MSG_CHECKING([LIBASSUAN API version])
if test "$req_libassuan_api" -eq "$tmp" ; then
AC_MSG_RESULT(okay)
else
@@ -94,6 +94,23 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
fi
fi
+ if test $ok = yes; then
+ if test x"$host" != x ; then
+ libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
+ 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,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++
Makefile.am | 4 +-
configure.ac | 2 +
src/ChangeLog | 5 +++
src/libassuan-config.in | 9 ++++++
src/libassuan.m4 | 65 +++++++++++++++++++++++++++++-----------------
6 files changed, 64 insertions(+), 26 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list