[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-116-g0ecd136

[by Werner Koch]

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 "The GNU crypto library".

The branch, master has been updated
       via  0ecd136a6ca02252f63ad229fa5240897bfe6544 (commit)
      from  1e8b86494cf8fa045696bd447b16267ffd1797f0 (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 0ecd136a6ca02252f63ad229fa5240897bfe6544
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 2 14:49:31 2014 +0200

    build: Document SYSROOT.
    
    * configure.ac: Mark SYSROOT as arg var.

diff --git a/configure.ac b/configure.ac
index baed3ec..18db662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,8 @@ AC_CANONICAL_HOST
 AM_MAINTAINER_MODE
 AM_SILENT_RULES
 
+AC_ARG_VAR(SYSROOT,[locate config scripts also below that directory])
+
 AH_TOP([
 #ifndef _GCRYPT_CONFIG_H_INCLUDED
 #define _GCRYPT_CONFIG_H_INCLUDED
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index ecd4d7f..58671df 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -267,9 +267,9 @@ example shows how it can be used at the command line:
 gcc -c foo.c `libgcrypt-config --cflags`
 @end example
 
-Adding the output of @samp{libgcrypt-config --cflags} to the compilers
-command line will ensure that the compiler can find the Libgcrypt header
-file.
+Adding the output of @samp{libgcrypt-config --cflags} to the
+compiler’s command line will ensure that the compiler can find the
+Libgcrypt header file.
 
 A similar problem occurs when linking the program with the library.
 Again, the compiler has to find the library files.  For this to work,
@@ -314,7 +314,20 @@ found, execute @var{action-if-found}, otherwise do
 Additionally, the function defines @code{LIBGCRYPT_CFLAGS} to the
 flags needed for compilation of the program to find the
 @file{gcrypt.h} header file, and @code{LIBGCRYPT_LIBS} to the linker
-flags needed to link the program to the Libgcrypt library.
+flags needed to link the program to the Libgcrypt library.  If the
+used helper script does not match the target type you are building for
+a warning is printed and the string @code{libgcrypt} is appended to the
+variable @code{gpg_config_script_warn}.
+
+This macro searches for @command{libgcrypt-config} along the PATH.  If
+you are cross-compiling, it is useful to set the environment variable
+ at code{SYSROOT} to the top directory of your target.  The macro will
+then first look for the helper program in the @file{bin} directory
+below that top directory.  An absolute directory name must be used for
+ at code{SYSROOT}.  Finally, if the configure command line option
+ at code{--libgcrypt-prefix} is used, only its value is used for the top
+directory below which the helper script is expected.
+
 @end defmac
 
 You can use the defined Autoconf variables like this in your

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |    2 ++
 doc/gcrypt.texi |   21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits