[git] GPGME - branch, master, updated. gpgme-1.12.0-51-g60828a5
by NIIBE Yutaka
cvs at cvs.gnupg.org
Mon Nov 12 02:05:23 CET 2018
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 "GnuPG Made Easy".
The branch, master has been updated
via 60828a505a1c74fd34476c181df2a588ea6f9c83 (commit)
via a76e145a1057e11953b71f804cf3a499c3ad5362 (commit)
from f3e60521899e6126229b6efedc9f011b84122e11 (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 60828a505a1c74fd34476c181df2a588ea6f9c83
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Nov 12 10:01:16 2018 +0900
build: Make gpgme.m4 use gpgrt-config with *.pc.
* src/gpgme.m4 (_AM_PATH_GPGME_CONFIG): Use gpgrt-config with gpgme.pc
when possible.
(AM_PATH_GPGME_GLIB): Likewise with gpgme-glib.pc.
--
Keeping AM_PATH_GPGME_PTHREAD, as is, untouched.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/gpgme.m4 b/src/gpgme.m4
index 6c2be44..2a72f18 100644
--- a/src/gpgme.m4
+++ b/src/gpgme.m4
@@ -1,5 +1,5 @@
# gpgme.m4 - autoconf macro to detect GPGME.
-# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2014-10-02
+# Last-changed: 2018-11-12
AC_DEFUN([_AM_PATH_GPGME_CONFIG],
@@ -36,10 +36,24 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
fi
fi
- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+ use_gpgrt_config=""
+ if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if $GPGRT_CONFIG gpgme --exists; then
+ GPGME_CONFIG="$GPGRT_CONFIG gpgme"
+ AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
+ use_gpgrt_config=yes
+ fi
+ fi
+ if test -z "$use_gpgrt_config"; then
+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+ fi
if test "$GPGME_CONFIG" != "no" ; then
- gpgme_version=`$GPGME_CONFIG --version`
+ if test -z "$use_gpgrt_config"; then
+ gpgme_version=`$GPGME_CONFIG --version`
+ else
+ gpgme_version=`$GPGME_CONFIG --modversion`
+ fi
fi
gpgme_version_major=`echo $gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -52,12 +66,16 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
[
- gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+ if test -z "$use_gpgrt_config"; then
+ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
+ else
+ gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none`
+ fi
if test x"$gpgme_config_host" != xnone ; then
if test x"$gpgme_config_host" != x"$host" ; then
AC_MSG_WARN([[
***
-*** The config script $GPGME_CONFIG was
+*** The config script "$GPGME_CONFIG" was
*** built for $gpgme_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-gpgme-prefix
@@ -118,7 +136,11 @@ AC_DEFUN([AM_PATH_GPGME],
# If we have a recent GPGME, we should also check that the
# API is compatible.
if test "$req_gpgme_api" -gt 0 ; then
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test -z "$use_gpgrt_config"; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ else
+ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ fi
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
@@ -258,7 +280,11 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
# If we have a recent GPGME, we should also check that the
# API is compatible.
if test "$req_gpgme_api" -gt 0 ; then
- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ if test -z "$use_gpgrt_config"; then
+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+ else
+ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+ fi
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
@@ -267,8 +293,20 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
fi
fi
if test $ok = yes; then
- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+ if test -z "$use_gpgrt_config"; then
+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
+ else
+ if $GPGRT_CONFIG gpgme-glib --exists; then
+ GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
+ else
+ ok = no
+ fi
+ fi
+ fi
+ if test $ok = yes; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
_AM_PATH_GPGME_CONFIG_HOST_CHECK
commit a76e145a1057e11953b71f804cf3a499c3ad5362
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Nov 12 09:59:05 2018 +0900
build: Provide gpgme-glib.pc too.
* src/gpgme-glib.pc.in: New.
* src/gpgme.pc.in (avail_lang): Remove.
--
Provide gpgme-glib.pc for gpgme-glib library. The avial_lang
information is no use because *.pc is for C.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/src/Makefile.am b/src/Makefile.am
index e6148fc..435544a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,10 +19,11 @@
## Process this file with automake to produce Makefile.in
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gpgme.pc
+pkgconfig_DATA = gpgme.pc gpgme-glib.pc
EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
- gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in
+ gpgme.h.in versioninfo.rc.in gpgme.def \
+ gpgme.pc.in gpgme-glib.pc.in
bin_SCRIPTS = gpgme-config
m4datadir = $(datadir)/aclocal
diff --git a/src/gpgme.pc.in b/src/gpgme-glib.pc.in
similarity index 69%
copy from src/gpgme.pc.in
copy to src/gpgme-glib.pc.in
index 35d8564..bd42a31 100644
--- a/src/gpgme.pc.in
+++ b/src/gpgme-glib.pc.in
@@ -4,11 +4,10 @@ includedir=@includedir@
libdir=@libdir@
host=@GPGME_CONFIG_HOST@
api_version=@GPGME_CONFIG_API_VERSION@
-avail_lang=c @GPGME_CONFIG_AVAIL_LANG@
-Name: gpgme
-Description: GnuPG Made Easy to access GnuPG
-Requires: gpg-error, libassuan
+Name: gpgme-glib
+Description: GnuPG Made Easy to access GnuPG with Glib
+Requires: gpg-error, libassuan, glib-2.0
Version: @PACKAGE_VERSION@
Cflags: @GPGME_CONFIG_CFLAGS@
Libs: @GPGME_CONFIG_LIBS@
diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
index 35d8564..be288b8 100644
--- a/src/gpgme.pc.in
+++ b/src/gpgme.pc.in
@@ -4,7 +4,6 @@ includedir=@includedir@
libdir=@libdir@
host=@GPGME_CONFIG_HOST@
api_version=@GPGME_CONFIG_API_VERSION@
-avail_lang=c @GPGME_CONFIG_AVAIL_LANG@
Name: gpgme
Description: GnuPG Made Easy to access GnuPG
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 5 +--
src/{gpgme.pc.in => gpgme-glib.pc.in} | 7 ++---
src/gpgme.m4 | 58 +++++++++++++++++++++++++++++------
src/gpgme.pc.in | 1 -
4 files changed, 54 insertions(+), 17 deletions(-)
copy src/{gpgme.pc.in => gpgme-glib.pc.in} (69%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list