[sword-svn] r3517 - branches/sword-1-8-x

[scribe at crosswire.org]

Author: scribe
Date: 2017-11-01 05:08:15 -0700 (Wed, 01 Nov 2017)
New Revision: 3517

Modified:
   branches/sword-1-8-x/
   branches/sword-1-8-x/configure.ac
Log:
Merged in build fix which required option to enable experimental google apis support



Property changes on: branches/sword-1-8-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3459-3471,3473,3475,3477-3482,3485-3514
   + /trunk:3459-3471,3473,3475,3477-3482,3485-3514,3516

Modified: branches/sword-1-8-x/configure.ac
===================================================================
--- branches/sword-1-8-x/configure.ac	2017-11-01 12:06:38 UTC (rev 3516)
+++ branches/sword-1-8-x/configure.ac	2017-11-01 12:08:15 UTC (rev 3517)
@@ -76,6 +76,8 @@
 	AS_HELP_STRING([--with-icuregex], [use ICU regex engine]))
 AC_ARG_WITH(xapian,
 	AC_HELP_STRING([--with-xapian],[use xapian search engine (default=yes)]),,with_xapian=yes)
+AC_ARG_WITH([gapi],
+	AS_HELP_STRING([--with-gapi], [build SWORD with support for google apis]),,with_gapi=no)
 
 
 # ---------------------------------------------------------------------
@@ -447,6 +449,7 @@
 AM_CONDITIONAL(USECXX11REGEX, test x$with_cxx11regex = xyes)
 AM_CONDITIONAL(USEICUREGEX, test x$with_icuregex = xyes)
 AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes)
+AM_CONDITIONAL(WITHGAPI, test x$with_gapi = xyes)
 AM_CONDITIONAL(WITHCURLSFTP, test x$with_curl_sftp = xyes)
 AM_CONDITIONAL(INTERNALFTPLIB, test x$with_internalftplib = xyes)
 AM_CONDITIONAL(USE_INTERNAL_REGEX, test x$with_internalregex = xyes)
@@ -489,5 +492,6 @@
 echo     "     CXX11-REGEX:          $with_cxx11regex"
 echo     "     ICU-REGEX:            $with_icuregex"
 echo     "     XAPIAN-CORE:          $with_xapian"
+echo     "     GAPI:                 $with_gapi"