debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: Make VERSION macros agree with soname version

Browse source 
We have two distinct "library version" numbers: the soname version and
the version macros.  We need both for different reasons: the version
macros enable easy compile-time version detection (and conditional
compilation), while the soname version enables runtime version
detection (which includes the version checking done by things like the
Python bindings).

However, currently, these two version numbers are different, which is
unnecessary and can lead to confusion (especially in things like
Debian, which include the soname version in the package name).  This
patch makes them the same by bumping the version macros up to agree
with the soname version.

(We should probably keep the version number in just one place so they
can't get out of sync, but that can be done in another patch.)
This commit is contained in:
Austin Clements 2013-12-04 11:19:44 -05:00 committed by David Bremner
parent b121a386d7
commit 4b14ccf0d6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Makefile.local
View file

@ -18,6 +18,9 @@ LIBNOTMUCH_VERSION_MINOR = 0
# simply compatible changes to the implementation). # simply compatible changes to the implementation).
LIBNOTMUCH_VERSION_RELEASE = 0 LIBNOTMUCH_VERSION_RELEASE = 0
# Note: Don't forget to change the VERSION macros in notmuch.h when
# any of the above change.
ifeq ($(PLATFORM),MACOSX) ifeq ($(PLATFORM),MACOSX)
LIBRARY_SUFFIX = dylib LIBRARY_SUFFIX = dylib
# On OS X, library version numbers go before suffix. # On OS X, library version numbers go before suffix.

8
lib/notmuch.h
View file

@ -41,8 +41,12 @@ NOTMUCH_BEGIN_DECLS
#define TRUE 1 #define TRUE 1
#endif #endif
#define NOTMUCH_MAJOR_VERSION 0 /*
#define NOTMUCH_MINOR_VERSION 17 * The library version number. This must agree with the soname
* version in Makefile.local.
*/
#define NOTMUCH_MAJOR_VERSION 3
#define NOTMUCH_MINOR_VERSION 0
#define NOTMUCH_MICRO_VERSION 0 #define NOTMUCH_MICRO_VERSION 0
/* /*