autotools: Simplify fcgiapp.h include for rgw

This commit updates autotools to add /usr/include/fastcgi to the include
directories if necessary for rgw, so we can always just include
<fcgiapp.h> (see previous commit for further commentary).

Signed-off-by: Tim Serong <tserong@suse.com>

diff --git a/configure.ac b/configure.ac
index 9aaef7d8b9102a5bd0ae8f9ae62774628e70dc49..b24c35eb4e8d2dde58b527fd132de487ce7ee3fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -516,7 +516,7 @@ AS_IF([test "x$with_radosgw" != xno],
               [AC_CHECK_LIB([curl], [curl_easy_init],
                [RADOSGW=1
                AC_CHECK_HEADER([fastcgi/fcgiapp.h],
-                [AC_DEFINE([FASTCGI_INCLUDE_DIR], [1], [FastCGI headers are in /usr/include/fastcgi])])
+                [RGW_CXXFLAGS="-I/usr/include/fastcgi"])
               ],
               [if test "x$with_radosgw" != "xcheck"; then
                    AC_MSG_FAILURE([--with-radosgw was given but libcurl (libcurl-dev on debian) not found])
@@ -529,6 +529,7 @@ AS_IF([test "x$with_radosgw" != xno],
             [if test "x$with_radosgw" != "xcheck"; then
                AC_MSG_FAILURE([--with-radosgw was given but libfcgi (libfcgi-dev on debian) not found])
             fi])])
+AC_SUBST(RGW_CXXFLAGS)
 AM_CONDITIONAL(WITH_RADOSGW, test "$RADOSGW" = "1")
 
 AS_IF([test "$RADOSGW" = "1"], [AC_DEFINE([WITH_RADOSGW], [1], [define if radosgw enabled])])

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 25931cfefd35246ad92d0140710d48cdb34e4d5c..c9c2ced482ab1a3d1ad6d3397b25a1bce31f9b83 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -158,6 +158,7 @@ radosgw_SOURCES = \
        rgw/rgw_main.cc
 
 radosgw_CFLAGS = -I$(srcdir)/civetweb/include -fPIC -I$(srcdir)/xxHash
+radosgw_CXXFLAGS = ${RGW_CXXFLAGS} ${AM_CXXFLAGS}
 radosgw_LDADD = $(LIBRGW) $(LIBCIVETWEB) $(LIBCIVETWEB_DEPS) $(LIBRGW_DEPS) $(RESOLV_LIBS) \
        $(CEPH_GLOBAL)
 bin_PROGRAMS += radosgw

diff --git a/src/rgw/rgw_fcgi.cc b/src/rgw/rgw_fcgi.cc
index 245d4075613bb7ec79e36df5f20f6e6ed4e6b34e..8e89ffe181ac5c5a76f2784a8241ceed2a48983b 100644 (file)
--- a/src/rgw/rgw_fcgi.cc
+++ b/src/rgw/rgw_fcgi.cc
@@ -4,12 +4,7 @@
 #include "rgw_fcgi.h"
 
 #include "acconfig.h"
-#ifdef FASTCGI_INCLUDE_DIR
-# include "fastcgi/fcgiapp.h"
-#else
-# include <fcgiapp.h>
-#endif
-
+#include <fcgiapp.h>
 
 int RGWFCGX::write_data(const char *buf, int len)
 {

diff --git a/src/rgw/rgw_fcgi.h b/src/rgw/rgw_fcgi.h
index 7b906840d97e9aa37c5a69ec73d44bf26bc1cefb..90928c4f7be64af731810be990626c32b351d7b8 100644 (file)
--- a/src/rgw/rgw_fcgi.h
+++ b/src/rgw/rgw_fcgi.h
@@ -5,11 +5,7 @@
 #define CEPH_RGW_FCGI_H
 
 #include "acconfig.h"
-#ifdef FASTCGI_INCLUDE_DIR
-# include "fastcgi/fcgiapp.h"
-#else
-# include <fcgiapp.h>
-#endif
+#include <fcgiapp.h>
 
 #include "rgw_client_io.h"
 

diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index 983047102a290194f390e4d526e7a303073afab1..a5164a3eab88063e9ee875e973fc711b6a49e1ec 100644 (file)
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -802,7 +802,7 @@ librgw_file_aw_LDADD = $(UNITTEST_LDADD) \
 noinst_PROGRAMS += librgw_file_aw
 
 librgw_file_nfsns_SOURCES = test/librgw_file_nfsns.cc
-librgw_file_nfsns_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS)
+librgw_file_nfsns_CXXFLAGS = -I$(srcdir)/xxHash $(UNITTEST_CXXFLAGS) ${RGW_CXXFLAGS}
 librgw_file_nfsns_LDADD = $(UNITTEST_LDADD) \
        $(LIBRGW) $(LIBRGW_DEPS) librados.la $(PTHREAD_LIBS) $(CEPH_GLOBAL) $(EXTRALIBS)
 noinst_PROGRAMS += librgw_file_nfsns