Add ssg and ch-placement config tests.

brobey · May 15, 2018 · 1707222 · 1707222
1 parent 4cf9cda
commit 1707222
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -76,17 +76,39 @@ inttypes.h sys/types.h unistd.h stdint.h
 ################################################################################
 # Sets SDSKV_SERVER_CFLAGS
 #      SDSKV_SERVER_LIBS
-PKG_CHECK_MODULES([SDSKV_SERVER],dnl
-                  [sdskv-server],dnl
-                  [], dnl
-                  [AC_MSG_ERROR([sdskv-server pkg-config not found. ***])])
+PKG_CHECK_MODULES(
+[SDSKV_SERVER],dnl
+[sdskv-server],dnl
+[], dnl
+[AC_MSG_ERROR([sdskv-server pkg-config not found. ***])]
+)
 
 # Sets SDSKV_CLIENT_CFLAGS
 #      SDSKV_CLIENT_LIBS
-PKG_CHECK_MODULES([SDSKV_CLIENT],dnl
-                  [sdskv-client],dnl
-                  [], dnl
-                  [AC_MSG_ERROR([sdskv-client pkg-config not found. ***])])
+PKG_CHECK_MODULES(
+[SDSKV_CLIENT],dnl
+[sdskv-client],dnl
+[], dnl
+[AC_MSG_ERROR([sdskv-client pkg-config not found. ***])]
+)
+
+# Sets SSG_CFLAGS
+#      SSG_LIBS
+PKG_CHECK_MODULES(
+[SSG],dnl
+[ssg],dnl
+[], dnl
+[AC_MSG_ERROR([ssg pkg-config not found. ***])]
+)
+
+# Sets CH_PLACEMENT_CFLAGS
+#      CH_PLACEMENT_LIBS
+PKG_CHECK_MODULES(
+[CH_PLACEMENT],dnl
+[ch-placement],dnl
+[], dnl
+[AC_MSG_ERROR([ch-placement pkg-config not found. ***])]
+)
 
 AC_CONFIG_FILES([
     Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -27,11 +27,15 @@ sdsdkv.cc
 
 libsdsdkv_la_CFLAGS = \
 @SDSKV_SERVER_CFLAGS@ \
-@SDSKV_CLIENT_CFLAGS@
+@SDSKV_CLIENT_CFLAGS@ \
+@SSG_CFLAGS@ \
+@CH_PLACEMENT_CFLAGS@
 
 libsdsdkv_la_LDFLAGS = \
 -version-info @SDSDKV_LIBVINFO@
 
 libsdsdkv_la_LIBADD = \
 @SDSKV_SERVER_LIBS@ \
-@SDSKV_CLIENT_LIBS@
+@SDSKV_CLIENT_LIBS@ \
+@SSG_LIBS@ \
+@CH_PLACEMENT_LIBS@