[git] GPG-ERROR - branch, master, updated. libgpg-error-1.26-6-g19de4ce

[by Daniel Kahn Gillmor]

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  19de4cef279272d3969e36dd8cd2fa05a7bf5276 (commit)
      from  704c31992e8716bbe61e6d5751e125a64badeef0 (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 19de4cef279272d3969e36dd8cd2fa05a7bf5276
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Jan 10 17:49:31 2017 -0500

    doc,configure: Be consistent about preferring --with-libgpg-error-prefix
    
    * doc/gpgrt.texi: Say "--with-libgpg-error-prefix" instead of
      "--with-gpg-error-prefix".
    * src/gpg-error.m4: When warning about library locations, warn with
      the preferred "--with-libgpg-error-prefix" name.
    
    --
    
    in src/gpg-error.m4, it already says:
    
    >  dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
    >  dnl since that is consistent with how our three siblings use the directory/
    >  dnl package name in --with-$dir_name-prefix=PFX.
    
    so this is an attempt to live up to that expectation.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpgrt.texi b/doc/gpgrt.texi
index 53beef8..857973a 100644
--- a/doc/gpgrt.texi
+++ b/doc/gpgrt.texi
@@ -275,8 +275,8 @@ you are cross-compiling, it is useful to set the environment variable
 then first look for the helper program in the @file{bin} directory
 below that top directory.  An absolute directory name must be used for
 @code{SYSROOT}.  Finally, if the configure command line option
- at code{--with-gpg-error-prefix} is used, only its value is used for the top
-directory below which the helper script is expected.
+ at code{--with-libgpg-error-prefix} is used, only its value is used for
+the top directory below which the helper script is expected.
 
 @end defmac
 
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 1661204..60c88d8 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -100,7 +100,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
 *** The config script $GPG_ERROR_CONFIG was
 *** built for $gpg_error_config_host and thus may not match the
 *** used host $host.
-*** You may want to use the configure option --with-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***]])
         gpg_config_script_warn="$gpg_config_script_warn libgpg-error"

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

Summary of changes:
 doc/gpgrt.texi   | 4 ++--
 src/gpg-error.m4 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org