diff options
author | Werner Koch <wk@gnupg.org> | 2004-03-06 18:47:46 +0000 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2004-03-06 18:47:46 +0000 |
commit | c156dab1067faf1a948a6c2e3b0aa024c3866399 (patch) | |
tree | daadaada200619c129e042523f0ad749e548f48a | |
parent | bbd78f1be20c12b26593c62193e604e21701e2e4 (diff) | |
download | libgcrypt-c156dab1067faf1a948a6c2e3b0aa024c3866399.tar.gz |
* configure.ac (LIBGCRYPT_CONFIG_SONAME_NUMBER): Replaced by
LIBGCRYPT_CONPIG_API_VERSION. Set it to 1. Set LT to C11/A0/R1.
* libgcrypt-config.in: s/--soname-number/--api-version/
* libgcrypt.m4: Changed test for API version.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/libgcrypt-config.in | 16 | ||||
-rw-r--r-- | src/libgcrypt.m4 | 38 |
6 files changed, 46 insertions, 32 deletions
@@ -1,3 +1,10 @@ +2004-03-06 Werner Koch <wk@gnupg.org> + + Released 1.1.93. + + * configure.ac (LIBGCRYPT_CONFIG_SONAME_NUMBER): Replaced by + LIBGCRYPT_CONPIG_API_VERSION. Set it to 1. Set LT to C11/A0/R1. + 2004-03-05 Werner Koch <wk@gnupg.org> * configure.ac (LIBGCRYPT_CONFIG_SONAME_NUMBER): New. @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.1.93 +Noteworthy changes in version 1.1.93 (2004-03-06) ------------------------------------------------- * The automatic thread library detection has finally been removed. diff --git a/configure.ac b/configure.ac index 792d4381..edb2fd11 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ min_automake_version="1.7.6" # but remove a "-cvs" prefix right *before* a release and append it # soon later. -AC_INIT(libgcrypt, 1.1.93-cvs, bug-libgcrypt@gnupg.org) +AC_INIT(libgcrypt, 1.1.93, bug-libgcrypt@gnupg.org) # LT Version numbers, remember to change them just *before* a release. # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) @@ -35,7 +35,10 @@ AC_INIT(libgcrypt, 1.1.93-cvs, bug-libgcrypt@gnupg.org) # (No interfaces changed: REVISION++) LIBGCRYPT_LT_CURRENT=11 LIBGCRYPT_LT_AGE=0 -LIBGCRYPT_LT_REVISION=0 +LIBGCRYPT_LT_REVISION=1 + +# If the API is changed in an incompatible way: increment the next counter. +LIBGCRYPT_CONFIG_API_VERSION=1 NEED_GPG_ERROR_VERSION=0.5 @@ -80,7 +83,6 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package]) ########################## # Used by libgcrypt-config -LIBGCRYPT_CONFIG_SONAME_NUMBER=`expr $LIBGCRYPT_LT_CURRENT - $LIBGCRYPT_LT_AGE` LIBGCRYPT_CONFIG_LIBS="-lgcrypt" LIBGCRYPT_CONFIG_CFLAGS="" LIBGCRYPT_CONFIG_LIBS_PTHREAD="-lgcrypt-pthread" @@ -655,7 +657,7 @@ fi # GNUPG_FIX_HDR_VERSION([src/gcrypt.h], GCRYPT_VERSION) -AC_SUBST(LIBGCRYPT_CONFIG_SONAME_NUMBER) +AC_SUBST(LIBGCRYPT_CONFIG_API_VERSION) AC_SUBST(LIBGCRYPT_CONFIG_LIBS) AC_SUBST(LIBGCRYPT_CONFIG_CFLAGS) AC_SUBST(LIBGCRYPT_CONFIG_LIBS_PTHREAD) diff --git a/src/ChangeLog b/src/ChangeLog index b4dac775..e4c20b66 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-03-06 Werner Koch <wk@gnupg.org> + + * libgcrypt-config.in: s/--soname-number/--api-version/ + * libgcrypt.m4: Changed test for API version. + 2004-03-05 Werner Koch <wk@gnupg.org> * libgcrypt.m4: Optionally check the SONAME number. diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in index 8792f720..5bdbd083 100644 --- a/src/libgcrypt-config.in +++ b/src/libgcrypt-config.in @@ -27,8 +27,8 @@ cflags="@LIBGCRYPT_CONFIG_CFLAGS@" cflags_pthread="@LIBGCRYPT_CONFIG_CFLAGS_PTHREAD@" cflags_pth="@LIBGCRYPT_CONFIG_CFLAGS_PTH@" -# SONAME info -soname_number="@LIBGCRYPT_CONFIG_SONAME_NUMBER@" +# API info +api_version="@LIBGCRYPT_CONFIG_API_VERSION@" # Misc information. symmetric_ciphers="@LIBGCRYPT_CIPHERS@" @@ -43,7 +43,7 @@ echo_prefix=no echo_algorithms=no echo_exec_prefix=no echo_version=no -echo_soname_number=no +echo_api_version=no # Prints usage information. usage() @@ -55,7 +55,7 @@ Options: [--prefix] [--exec-prefix] [--version] - [--soname-number] + [--api-version] [--libs] [--cflags] [--algorithms] @@ -105,8 +105,8 @@ while test $# -gt 0; do --version) echo_version=yes ;; - --soname-number) - echo_soname_number=yes + --api-version) + echo_api_version=yes ;; --cflags) echo_cflags=yes @@ -192,8 +192,8 @@ if test "$echo_version" = "yes"; then echo "$version" fi -if test "$echo_soname_number" = "yes"; then - echo "$soname_number" +if test "$echo_api_version" = "yes"; then + echo "$api_version" fi if test "$echo_algorithms" = "yes"; then diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 index fedebe04..e5f2a43c 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -12,13 +12,13 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for liblibgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS -dnl MINIMUN-VERSION is a string with the version number optionalliy suffixed -dnl with the SONAME number to also check the ABI compatibility. Example: -dnl a MINIMUN-VERSION of 1.2.5:11 won't pass the test unless the installed -dnl version of libgcrypt is at least 1.2.5 *and* the ABI number is 11. Using -dnl this features allows to prevent build agains newer versions of libgcrypt -dnl with a changed ABI. +dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +dnl with the API version to also check the API compatibility. Example: +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using +dnl this features allows to prevent build against newer versions of libgcrypt +dnl with a changed API. dnl AC_DEFUN(AM_PATH_LIBGCRYPT, [ AC_ARG_WITH(libgcrypt-prefix, @@ -32,12 +32,12 @@ AC_DEFUN(AM_PATH_LIBGCRYPT, fi AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) - tmp=ifelse([$1], ,1.2.0,$1) + tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_soname_no=`echo "$tmp" | sed 's/[[^:]]*:\([[0-9]]*\).*/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):.*/\1/'` + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` else - req_libgcrypt_soname_no=0 + req_libgcrypt_api=0 min_libgcrypt_version="$tmp" fi @@ -80,16 +80,16 @@ AC_DEFUN(AM_PATH_LIBGCRYPT, fi if test $ok = yes; then # If we have a recent libgcrypt, we should also check that the - # ABI is compatible; i.e. that the SONAME number matches. - if test "$req_libgcrypt_soname_no" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --soname-number 2>/dev/null || echo 0` + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then + tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING(for LIBGCRYPT ABI $req_libgcrypt_soname_no) - if test "$req_libgcrypt_soname_no" -eq "$tmp" ; then - AC_MSG_RESULT(yes) + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then + AC_MSG_RESULT(okay) else - ok=no - AC_MSG_RESULT([no (have $tmp)]) + ok=no + AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)]) fi fi fi |