rgw: update makefile to enable civetweb config

Fixes: #10965
Backport: hammer, firefly

Civetweb compilation now includes conf header to enable ipv6.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit caa90225bad9fe5e9c275e6189b3396b4d396e3f)

Conflicts:
	src/rgw/Makefile.am
           radosgw_CFLAGS = -Icivetweb/include
        was not yet changed into
           radosgw_CFLAGS = -I$(srcdir)/civetweb/include
        in firefly

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index d62247b37a1f6a3438bef883cbdaa8bc0df5df59..b45b156a4987a448f8d4b1dd32affc5ca5529bd2 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -150,6 +150,7 @@ LIBCLIENT = libclient.la
 LIBCLIENT_FUSE = libclient_fuse.la
 LIBRADOS = librados.la
 LIBRGW = librgw.la
+LIBCIVETWEB = libcivetweb.la
 LIBRBD = librbd.la
 LIBCEPHFS = libcephfs.la
 LIBERASURE_CODE = liberasure_code.la

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 6bf9804479d21e95949a50a15cc5e98a9d752734..78c022ba4bdc3e63019beee9f24153c07fa721ea 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -53,6 +53,18 @@ LIBRGW_DEPS += \
        -lfcgi \
        -ldl
 
+CIVETWEB_INCLUDE = --include civetweb/include/civetweb_conf.h
+
+libcivetweb_la_SOURCES =  \
+       rgw/rgw_civetweb.cc \
+       rgw/rgw_civetweb_log.cc \
+       civetweb/src/civetweb.c
+
+libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -Woverloaded-virtual ${AM_CXXFLAGS}
+libcivetweb_la_CFLAGS = -Icivetweb/include ${CIVETWEB_INCLUDE}
+
+noinst_LTLIBRARIES += libcivetweb.la
+
 radosgw_SOURCES = \
        rgw/rgw_resolve.cc \
        rgw/rgw_rest.cc \
@@ -71,12 +83,9 @@ radosgw_SOURCES = \
        rgw/rgw_swift.cc \
        rgw/rgw_swift_auth.cc \
        rgw/rgw_loadgen.cc \
-       rgw/rgw_civetweb.cc \
-       rgw/rgw_civetweb_log.cc \
-       civetweb/src/civetweb.c \
        rgw/rgw_main.cc
-radosgw_CFLAGS = -Icivetweb/include
-radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
+radosgw_CFLAGS = -I$(srcdir)/civetweb/include
+radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
 bin_PROGRAMS += radosgw
 
 radosgw_admin_SOURCES = rgw/rgw_admin.cc
@@ -162,5 +171,6 @@ noinst_HEADERS += \
        rgw/rgw_civetweb_log.h \
        civetweb/civetweb.h \
        civetweb/include/civetweb.h \
+       civetweb/include/civetweb_conf.h \
        civetweb/src/md5.h