summaryrefslogtreecommitdiffstats
path: root/xlators/cluster
diff options
context:
space:
mode:
authorLuis Pabon <lpabon@redhat.com>2014-03-28 15:41:31 -0400
committerLuis Pabon <lpabon@redhat.com>2014-03-28 15:41:31 -0400
commit9ca7aba27a96c61371da08325856d88ac9783db1 (patch)
tree9631a84a0ac6d37890f18128c1273641fdc66231 /xlators/cluster
parentefbb23837761bda6c526baca1b5ea72d227e2ae3 (diff)
build: NSR requirement on curl
* Added a libcurl requirement to the configure script * Fixed the Makefile to use the built libgfapi version, not an installed one. * Tested recon.t and it worked. Change-Id: Ie2fc07da33e4bdb8a8aa911ac8225b82025775a7 Signed-off-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'xlators/cluster')
-rw-r--r--xlators/cluster/nsr-recon/src/Makefile.am5
-rw-r--r--xlators/cluster/nsr-server/src/Makefile.am5
2 files changed, 6 insertions, 4 deletions
diff --git a/xlators/cluster/nsr-recon/src/Makefile.am b/xlators/cluster/nsr-recon/src/Makefile.am
index 8fa344864..e639e4437 100644
--- a/xlators/cluster/nsr-recon/src/Makefile.am
+++ b/xlators/cluster/nsr-recon/src/Makefile.am
@@ -1,10 +1,11 @@
xlator_LTLIBRARIES = nsr_recon.la
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
-nsr_recon_la_LDFLAGS = -module -avoid-version -lgfapi
+nsr_recon_la_LDFLAGS = -module -avoid-version
nsr_recon_la_SOURCES = recon_driver.c recon_xlator.c
-nsr_recon_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+nsr_recon_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/api/src/libgfapi.la
noinst_HEADERS = recon_driver.h recon_xlator.h
diff --git a/xlators/cluster/nsr-server/src/Makefile.am b/xlators/cluster/nsr-server/src/Makefile.am
index 7153352ad..ab2af6425 100644
--- a/xlators/cluster/nsr-server/src/Makefile.am
+++ b/xlators/cluster/nsr-server/src/Makefile.am
@@ -3,7 +3,7 @@ python_PYTHON = codegen.py gen-fops.py
xlator_LTLIBRARIES = nsr.la
xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
-nsr_la_LDFLAGS = -module -avoid-version -lgfapi -lcurl
+nsr_la_LDFLAGS = -module -avoid-version -lcurl
if ENABLE_ETCD_SIM
nsr_la_SOURCES = nsr.c leader.c recon_notify.c etcd-sim.c
@@ -14,7 +14,8 @@ nsr_la_SOURCES = nsr.c leader.c recon_notify.c etcd-api.c \
endif
-nsr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+nsr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/api/src/libgfapi.la
noinst_HEADERS = nsr-internal.h etcd-api.h all-templates.c \
yajl_alloc.h yajl_buf.h yajl_bytestack.h yajl_encode.h \