diff --git a/ChangeLog b/ChangeLog index 95f24cf1..ceba8ea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-08-30 Martin Baulig + + * LIBGTOP-VERSION (LIBGTOP_VERSION_CODE): Added. This is a numerical + constant ("1.234.567" -> 1234567) to be used in C preprocessor + conditionals. + 1998-08-29 Martin Baulig * LIBGTOP-VERSION (LIBGTOP_INTERFACE_AGE, LIBGTOP_BINARY_AGE): Added. diff --git a/LIBGTOP-VERSION b/LIBGTOP-VERSION index f61039a3..6d6a0133 100644 --- a/LIBGTOP-VERSION +++ b/LIBGTOP-VERSION @@ -13,11 +13,13 @@ LIBGTOP_MICRO_VERSION=0 LIBGTOP_INTERFACE_AGE=0 LIBGTOP_BINARY_AGE=0 -LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION - # Increase each time you change the client/server protocol. LIBGTOP_SERVER_VERSION=1 +# Don't change this +LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION +LIBGTOP_VERSION_CODE=$(($LIBGTOP_MAJOR_VERSION*1000000+$LIBGTOP_MINOR_VERSION*1000+$LIBGTOP_MICRO_VERSION)) + # For automake. VERSION=$LIBGTOP_VERSION PACKAGE=libgtop diff --git a/Makefile.am b/Makefile.am index 30a08d7a..32b78695 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile -e 's,\@LIBGTOP_MINOR_VERSION\@,$(LIBGTOP_MINOR_VERSION),g' \ -e 's,\@LIBGTOP_MICRO_VERSION\@,$(LIBGTOP_MICRO_VERSION),g' \ -e 's,\@LIBGTOP_VERSION\@,$(LIBGTOP_VERSION),g' \ + -e 's,\@LIBGTOP_VERSION_CODE\@,$(LIBGTOP_VERSION_CODE),g' \ -e 's,\@LIBGTOP_SERVER_VERSION\@,$(LIBGTOP_SERVER_VERSION),g' \ -e 's,\@libgtop_sysdeps_dir\@,$(libgtop_sysdeps_dir),g' \ -e 's,\@libgtop_need_server\@,$(libgtop_need_server),g' \ diff --git a/configure.in b/configure.in index ea240eb7..ce5bc140 100644 --- a/configure.in +++ b/configure.in @@ -16,6 +16,7 @@ AC_SUBST(LIBGTOP_INTERFACE_AGE) AC_SUBST(LIBGTOP_BINARY_AGE) AC_SUBST(LIBGTOP_SERVER_VERSION) AC_SUBST(LIBGTOP_VERSION) +AC_SUBST(LIBGTOP_VERSION_CODE) # libtool versioning LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION diff --git a/libgtopConf.sh.in b/libgtopConf.sh.in index 33ff4d4d..af01ed25 100644 --- a/libgtopConf.sh.in +++ b/libgtopConf.sh.in @@ -25,7 +25,9 @@ LIBGTOP_SERVER="@LIBGTOP_SERVER@" LIBGTOP_MAJOR_VERSION="@LIBGTOP_MAJOR_VERSION@" LIBGTOP_MINOR_VERSION="@LIBGTOP_MINOR_VERSION@" LIBGTOP_MICRO_VERSION="@LIBGTOP_MICRO_VERSION@" + LIBGTOP_VERSION="@LIBGTOP_VERSION@" +LIBGTOP_VERSION_CODE="@LIBGTOP_VERSION_CODE@" LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@"