[vlmc-devel] [PATCH 3/6] Added libjsoncpp dependency.

Paweł Wegner pawel.wegner95 at gmail.com
Mon May 9 13:29:46 CEST 2016


---
 configure.ac    | 5 ++++-
 src/Makefile.am | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 028f6e7..e3ab10d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,10 @@ AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX_11
 
 PKG_CHECK_MODULES([libcurlpp], [curlpp], [have_libcurlpp=yes], [have_libcurlpp=no])
-AM_CONDITIONAL([libcurlpp], [test "$have_libcurlpp" = "yes"])
+AS_IF([test "$have_libcurlpp" != "yes"], [AC_MSG_ERROR([Unable to find libcurlpp])])
+
+PKG_CHECK_MODULES([libjsoncpp], [jsoncpp], [have_jsoncpp=yes], [have_jsoncpp=no])
+AS_IF([test "$have_jsoncpp" != "yes"], [AC_MSG_ERROR([Unable to find jsoncpp])])
 
 AC_CONFIG_FILES([
   Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b7b8aa..4264ecc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CXXFLAGS = $(libcurlpp_CXXFLAGS)
+AM_CXXFLAGS = $(libcurlpp_CXXFLAGS) $(libjsoncpp_CXXFLAGS)
 
 lib_LTLIBRARIES = libcloudstorage.la
 libcloudstorage_la_SOURCES = \
-	ICloudStorage.cpp ICloudStorage.h \
-	GoogleDrive.cpp GoogleDrive.h
+	ICloudStorage.cpp ICloudStorage.h
 
-libcloudstorage_la_LIBADD = $(libcurlpp_LIBS)
+libcloudstorage_la_LIBADD = $(libcurlpp_LIBS) $(libjsoncpp_LIBS)
 
-- 
2.7.4



More information about the Vlmc-devel mailing list