Created
June 10, 2015 00:29
-
-
Save ChrisLundquist/ccf37f699011cd5777b9 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure.ac b/configure.ac | |
index f713ce1..94b986c 100644 | |
--- a/configure.ac | |
+++ b/configure.ac | |
@@ -2552,8 +2552,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([--with-libmongoc@<:@=PREFIX@:>@], [Path | |
with_libmongoc="no" | |
else | |
with_libmongoc="yes" | |
- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include" | |
- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib" | |
+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0" | |
+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib/" | |
fi; fi | |
], | |
[with_libmongoc="yes"]) | |
@@ -2570,9 +2570,9 @@ then | |
then | |
AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS]) | |
fi | |
- AC_CHECK_HEADERS(mongo.h, | |
+ AC_CHECK_HEADERS(mongoc.h, | |
[with_libmongoc="yes"], | |
- [with_libmongoc="no ('mongo.h' not found)"], | |
+ [with_libmongoc="no ('mongoc.h' not found)"], | |
[#if HAVE_STDINT_H | |
# define MONGO_HAVE_STDINT 1 | |
#else | |
@@ -2586,9 +2586,11 @@ then | |
then | |
AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS]) | |
fi | |
- AC_CHECK_LIB(mongoc, mongo_run_command, | |
+ AC_CHECK_LIB(mongoc-1.0, mongoc_init, | |
[with_libmongoc="yes"], | |
- [with_libmongoc="no (symbol 'mongo_run_command' not found)"]) | |
+ [with_libmongoc="no (symbol 'mongoc_init' not found)"], | |
+ [$with_mongoc_libs] | |
+ ) | |
fi | |
CPPFLAGS="$SAVE_CPPFLAGS" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment