Permalink
Browse files

Fixes the compilation if sphinxclient.h is not present. Basically jus…

…t prevents handler_sphinx to be compiled at all,

unless you know what you are doing. Hence chance have_sphinxclient to yes.
  • Loading branch information...
1 parent 72dbee1 commit ce54e815cc7baf6ac6c98f088271d86cb255e652 @skinkie committed Oct 14, 2011
Showing with 12 additions and 4 deletions.
  1. +2 −0 cherokee/Makefile.am
  2. +10 −4 configure.in
View
@@ -578,13 +578,15 @@ libplugin_sphinx_la_LDFLAGS = $(module_ldflags) $(SPHINXCLIENT_LDFLAGS)
libplugin_sphinx_la_SOURCES = $(handler_sphinx)
libplugin_sphinx_la_CFLAGS = $(SPHINXCLIENT_CFLAGS)
+if HAVE_SPHINXCLIENT
if STATIC_HANDLER_SPHINX
static_handler_sphinx_src = $(handler_sphinx)
static_handler_sphinx_lib = $(SPHINXCLIENT_LDFLAGS)
static_handler_sphinx_flags = $(SPHINXCLIENT_CFLAGS)
else
dynamic_handler_sphinx_lib = libplugin_sphinx.la
endif
+endif
#
# Handler tile
View
@@ -1288,6 +1288,12 @@ fi
AM_CONDITIONAL(HAVE_FFMPEG, test "x$have_ffmpeg" = "xyes")
+dnl
+dnl Sphinx Client
+dnl
+have_sphinxclient="no"
+
+AM_CONDITIONAL(HAVE_SPHINXCLIENT, test "x$have_sphinxclient" = "xyes")
dnl
dnl WWW root directory, and user/group
@@ -1474,9 +1480,9 @@ fi
if test "x$have_ffmpeg" != "xyes"; then
modules=`echo $modules | sed s/streaming//`
fi
-#if test "x$have_sphinxclient" != "xyes"; then
-# modules=`echo $modules | sed s/sphinx//`
-#fi
+if test "x$have_sphinxclient" != "xyes"; then
+ modules=`echo $modules | sed s/sphinx//`
+fi
add_calls=""
init_calls=""
@@ -1661,7 +1667,7 @@ echo "LDAP $have_ldap"
echo "MySQL $have_mysql"
echo "GeoIP $have_geoip"
echo "FFMpeg $have_ffmpeg"
-#echo "Sphinx Client $have_sphinxclient"
+echo "Sphinx Client $have_sphinxclient"
echo "crypt support $crypt_type"
if test "x$is_beta" = "xyes"; then
echo "Beta release $PACKAGE_PATCH_VERSION"

0 comments on commit ce54e81

Please sign in to comment.