From: Marcus Brinkmann <mb@g10code.com>
Date: Fri, 21 May 2004 19:49:38 +0000 (+0000)
Subject: 2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~424
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82edb12c9894b8cd59884c931bb4c91ced5fcf73;p=gpgme.git

2004-05-21  Marcus Brinkmann  <marcus@g10code.de>

	* configure.ac (GPGME_CONFIG_API_VERSION): New variable,
	substitute it.

gpgme/
2004-05-21  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme-config.in (Options): Support --api-version.
---

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 3478ec3..f351395 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac (GPGME_CONFIG_API_VERSION): New variable,
+	substitute it.
+
 2004-04-29  Marcus Brinkmann  <marcus@g10code.de>
 
 	Released 0.4.7.
diff --git a/trunk/configure.ac b/trunk/configure.ac
index 2f88724..141e230 100644
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -36,6 +36,10 @@ LIBGPGME_LT_CURRENT=13
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=2
 LIBGPGME_LT_REVISION=2
+
+# If the API is changed in an incompatible way: increment the next counter.
+GPGME_CONFIG_API_VERSION=1
+
 NEED_GPG_VERSION=1.2.2
 NEED_GPGSM_VERSION=1.9.6
 ##############################################
@@ -309,6 +313,7 @@ GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION)
 # Substitution used for gpgme-config 
 GPGME_CONFIG_LIBS="-lgpgme"
 GPGME_CONFIG_CFLAGS=""
+AC_SUBST(GPGME_CONFIG_API_VERSION)
 AC_SUBST(GPGME_CONFIG_LIBS)
 AC_SUBST(GPGME_CONFIG_CFLAGS)
 
diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 42aba9e..1aa370f 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-config.in (Options): Support --api-version.
+
 	* libgpgme.vers: List all gpgme symbols under version GPGME_1.0.
 
 	* decrypt.c (_gpgme_decrypt_status_handler): Fix last change.
diff --git a/trunk/gpgme/gpgme-config.in b/trunk/gpgme/gpgme-config.in
index 28f1448..81e599d 100644
--- a/trunk/gpgme/gpgme-config.in
+++ b/trunk/gpgme/gpgme-config.in
@@ -40,6 +40,7 @@ Options:
 	[--prefix]
 	[--exec-prefix]
 	[--version]
+        [--api-version]
 	[--libs]
 	[--cflags]
 EOF
@@ -77,6 +78,10 @@ while test $# -gt 0; do
             echo "@VERSION@"
 	    exit 0
 	    ;;
+        --api-version)
+	    echo "@GPGME_CONFIG_API_VERSION@"
+	    exit 0
+	    ;;
         --cflags)
 	    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
 		output="$output -I$includedir"