Commit 44801d0e authored by Shane Snyder's avatar Shane Snyder

couple more autotool fixes

parent f13ae914
...@@ -80,9 +80,9 @@ SERVER_CFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CFLAGS" ...@@ -80,9 +80,9 @@ SERVER_CFLAGS="$SDSKEYVALSERVER_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([SDSKEYVALCLIENT],[kv-client],[], PKG_CHECK_MODULES([SDSKEYVALCLIENT],[kv-client],[],
AC_MSG_ERROR([Could not find working sds-keyval client installation!]) ) AC_MSG_ERROR([Could not find working sds-keyval client installation!]) )
SERVER_LIBS="$SDSKEYVALCLIENT_LIBS $CLIENT_LIBS" SERVER_LIBS="$SDSKEYVALCLIENT_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $CLIENT_CPPFLAGS" SERVER_CPPFLAGS="$SDSKEYVALCLIENT_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$SDSKEYVALCLIENT_CFLAGS $CLIENT_CFLAGS" SERVER_CFLAGS="$SDSKEYVALCLIENT_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([PMEM],[libpmemobj],[], PKG_CHECK_MODULES([PMEM],[libpmemobj],[],
AC_MSG_ERROR([Could not find working libpmemobj installation!]) ) AC_MSG_ERROR([Could not find working libpmemobj installation!]) )
...@@ -92,7 +92,7 @@ SERVER_CFLAGS="$PMEM_CFLAGS $SERVER_CFLAGS" ...@@ -92,7 +92,7 @@ SERVER_CFLAGS="$PMEM_CFLAGS $SERVER_CFLAGS"
PKG_CHECK_MODULES([BAKE],[bake-bulk-server],[], PKG_CHECK_MODULES([BAKE],[bake-bulk-server],[],
AC_MSG_ERROR([Could not find working BAKE installation!]) ) AC_MSG_ERROR([Could not find working BAKE installation!]) )
SERVER_LIBS="$BAKE_LIBS $LIBS" SERVER_LIBS="$BAKE_LIBS $SERVER_LIBS"
SERVER_CPPFLAGS="$BAKE_CFLAGS $SERVER_CPPFLAGS" SERVER_CPPFLAGS="$BAKE_CFLAGS $SERVER_CPPFLAGS"
SERVER_CFLAGS="$BAKE_CFLAGS $SERVER_CFLAGS" SERVER_CFLAGS="$BAKE_CFLAGS $SERVER_CFLAGS"
......
...@@ -25,5 +25,5 @@ endif ...@@ -25,5 +25,5 @@ endif
tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS} tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS}
tests_sds_keyval_client_test_LDADD = ${CLIENT_LIBS} tests_sds_keyval_client_test_LDADD = ${SERVER_LIBS}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment