From c5a76aa8e63eb614a4e77e98f4e1ce6efe467d6d Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 16 Apr 2015 17:46:49 +0530 Subject: build: correct the version in glusterfs-api.pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The version in glusterfs-api.pc has moved backwards, breaking existing versioned dependencies in QEMU. The following table contains the GlusterFS version and the version for glusterfs-api.pc: .------------------------. | GlusterFS | pkg-config | |-----------+------------| | 3.4.x | 4.3.4.x | | 3.5.x | 6.3.5.x | | 3.6.x | 7.3.6.x | | 3.7.x | 7.3.7.x | | master | 7.x.y.z | '------------------------' BUG: 1211840 Change-Id: I62168a0ab4f0c78e61987371ae75a0d2dd56ced8 URL: http://thread.gmane.org/gmane.comp.emulators.qemu/330176 Reported-by: Andreas Färber Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10310 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0e5a6c1f9b1..e5bdcc59d3a 100644 --- a/configure.ac +++ b/configure.ac @@ -1086,15 +1086,15 @@ AM_CONDITIONAL([GF_INSTALL_GLUSTERD_WORKDIR], test ! -d ${GLUSTERD_WORKDIR} && t dnl pkg-config versioning dnl -dnl Once we released gluster-api.pc with version=4. Since then we undid the -dnl library versioning and replaced it with symbol-versioning. The current +dnl Once we released gluster-api.pc in 3.6 with version=7. Since then we undid +dnl the library versioning and replaced it with symbol-versioning. The current dnl libgfapi.so has version 0, but the symbols have the version from the main dnl package at the time they were added. dnl dnl Because other packages (like samba) use the pkg-config version, we can not dnl drop it, or decrease the version easily. The simplest solution is to keep -dnl the version=4 and add sub-digits for the actual package/symbol versions. -GFAPI_VERSION="4."${PACKAGE_VERSION} +dnl the version=7 and add sub-digits for the actual package/symbol versions. +GFAPI_VERSION="7."${PACKAGE_VERSION} LIBGFCHANGELOG_VERSION="0.0.1" AC_SUBST(GFAPI_VERSION) AC_SUBST(LIBGFCHANGELOG_VERSION) -- cgit