Skip to content

Commit

Permalink
New link configury.
Browse files Browse the repository at this point in the history
New configuration requirements because sdskv no longer depends on ssg or
ch-placement.
  • Loading branch information
samuelkgutierrez committed May 17, 2018
1 parent 4cf9cda commit c349be8
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 13 deletions.
38 changes: 30 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,16 @@ sdsdkv-impl.h \
sdsdkv.cc

libsdsdkv_la_CFLAGS = \
@SDSKV_CLIENT_CFLAGS@ \
@SDSKV_SERVER_CFLAGS@ \
@SDSKV_CLIENT_CFLAGS@
@SSG_CFLAGS@ \
@CH_PLACEMENT_CFLAGS@

libsdsdkv_la_LIBADD = \
@SSG_LIBS@ \
@CH_PLACEMENT_LIBS@ \
@SDSKV_CLIENT_LIBS@ \
@SDSKV_SERVER_LIBS@

libsdsdkv_la_LDFLAGS = \
-version-info @SDSDKV_LIBVINFO@

libsdsdkv_la_LIBADD = \
@SDSKV_SERVER_LIBS@ \
@SDSKV_CLIENT_LIBS@

0 comments on commit c349be8

Please sign in to comment.