security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix

Browse Source 
* m4/gpg-error.m4: Update from git master.
This commit is contained in:
Jim Meyering 2011-11-28 13:47:08 +01:00 committed by Werner Koch
parent 781e9746df
commit 77ee8fd55c
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-28 Jim Meyering <meyering@redhat.com>
accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
* m4/gpg-error.m4: Update from git master.
2011-09-23 Werner Koch <wk@g10code.com> 2011-09-23 Werner Koch <wk@g10code.com>
* configure.ac: Remove check for gcry_kdf_derive. * configure.ac: Remove check for gcry_kdf_derive.

14
m4/gpg-error.m4
View File

@ -15,10 +15,20 @@ dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
dnl dnl
AC_DEFUN([AM_PATH_GPG_ERROR], AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST]) [ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(gpg-error-prefix, dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
AC_HELP_STRING([--with-gpg-error-prefix=PFX], dnl since that is consistent with how our three siblings use the directory/
dnl package name in --with-$dir_name-prefix=PFX.
AC_ARG_WITH(libgpg-error-prefix,
AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
[prefix where GPG Error is installed (optional)]), [prefix where GPG Error is installed (optional)]),
gpg_error_config_prefix="$withval", gpg_error_config_prefix="") gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
dnl Accept --with-gpg-error-prefix and make it work the same as
dnl --with-libgpg-error-prefix above, for backwards compatibility,
dnl but do not document this old, inconsistently-named option.
AC_ARG_WITH(gpg-error-prefix,,
gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
if test x$gpg_error_config_prefix != x ; then if test x$gpg_error_config_prefix != x ; then
if test x${GPG_ERROR_CONFIG+set} != xset ; then if test x${GPG_ERROR_CONFIG+set} != xset ; then
GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config