Skip to content

Fix generated mongoc/libbson version #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2015
Merged

Fix generated mongoc/libbson version #150

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30d29a0
Revert "Unblock compile by copying VERSION_CURRENT and VERSION_RELEAS…
bjori Dec 4, 2015
423c4b9
Generate the mongoc and libbson version files correctly
bjori Dec 4, 2015
1e33505
bump mongoc & libbson
bjori Dec 4, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Generate the mongoc and libbson version files correctly
  • Loading branch information
@bjori
bjori committed Dec 4, 2015
commit 423c4b92846a86ffceeda36bdac1cb24d417d46e
14 changes: 6 additions & 8 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,12 +510,11 @@ dnl }}}
AC_SUBST(BSON_HAVE_SNPRINTF)

if test "$PHP_LIBMONGOC" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libmongoc/
m4_include(src/libmongoc/build/autotools/Versions.m4)
MONGOC_MAJOR_VERSION=mongoc_major_version
MONGOC_MINOR_VERSION=mongoc_minor_version
MONGOC_MICRO_VERSION=mongoc_micro_version
srcdir=${backup_srcdir}
MONGOC_API_VERSION=1.0
MONGOC_VERSION=mongoc_version
AC_SUBST(MONGOC_MAJOR_VERSION)
AC_SUBST(MONGOC_MINOR_VERSION)
AC_SUBST(MONGOC_MICRO_VERSION)
Expand All @@ -525,12 +524,11 @@ dnl }}}
AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
fi
if test "$PHP_LIBBSON" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libbson/
m4_include(src/libbson/build/autotools/Versions.m4)
BSON_MAJOR_VERSION=bson_major_version
BSON_MINOR_VERSION=bson_minor_version
BSON_MICRO_VERSION=bson_micro_version
srcdir=${backup_srcdir}
BSON_API_VERSION=1.0
BSON_VERSION=bson_version
AC_SUBST(BSON_MAJOR_VERSION)
AC_SUBST(BSON_MINOR_VERSION)
AC_SUBST(BSON_MICRO_VERSION)
Expand Down