diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-02-11 14:02:43 +0000 |
| commit | 0d92798e88c5444fb2cc23663b4ea9a345887756 (patch) | |
| tree | a71f336115753242e8690547f403405a3373ddf1 /configure.ac | |
| parent | 33939dcde38389373e7ed8b12c6e9916b39411d0 (diff) | |
| parent | 408d50a64b7b3a9d6a4899060baa423ff126cc5f (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
xlators/mgmt/glusterd/src/Makefile.am
Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 0d86b3373..604b53539 100644 --- a/configure.ac +++ b/configure.ac @@ -908,7 +908,7 @@ AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS") AM_CONDITIONAL([GF_INSTALL_VAR_LIB_GLUSTERD], test ! -d ${localstatedir}/lib/glusterd && test -d ${sysconfdir}/glusterd ) dnl pkg-config versioning -GFAPI_VERSION="0.0.6" +GFAPI_VERSION="6.0.0" LIBGFCHANGELOG_VERSION="0.0.1" AC_SUBST(GFAPI_VERSION) AC_SUBST(LIBGFCHANGELOG_VERSION) @@ -918,7 +918,7 @@ LIBGFXDR_LT_VERSION="0:1:0" LIBGFRPC_LT_VERSION="0:1:0" LIBGLUSTERFS_LT_VERSION="0:1:0" LIBGFCHANGELOG_LT_VERSION="0:1:0" -GFAPI_LT_VERSION="0:6:0" +GFAPI_LT_VERSION="6:0:0" AC_SUBST(LIBGFXDR_LT_VERSION) AC_SUBST(LIBGFRPC_LT_VERSION) AC_SUBST(LIBGLUSTERFS_LT_VERSION) |