summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--xlators/cluster/nsr-recon/src/Makefile.am5
-rw-r--r--xlators/cluster/nsr-server/src/Makefile.am5
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index a365a5354..d1302ba58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,6 +276,7 @@ fi
AC_CHECK_TOOL([LD],[ld])
AC_CHECK_LIB([crypto], [MD5], , AC_MSG_ERROR([OpenSSL crypto library is required to build glusterfs]))
+AC_CHECK_LIB([curl], curl_version, ,AC_MSG_ERROR([libcurl library is required to build glusterfs]))
AC_CHECK_LIB([pthread], [pthread_mutex_init], , AC_MSG_ERROR([Posix threads library is required to build glusterfs]))
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 \