summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTeus Benschop <teusjannette@gmail.com>2018-10-28 11:51:26 +0100
committerTeus Benschop <teusjannette@gmail.com>2018-10-28 11:51:26 +0100
commit1d0ff54794b5edea7cdf1d2d66710a0fa885bcc5 (patch)
tree8ece5f9ef437fbb151f2b22ed0c6e1a714879c7c /configure
parentc7dbdc9161a7c460526b80fe01af49d714856126 (diff)
New upstream version 1.8.1
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure649
1 files changed, 497 insertions, 152 deletions
diff --git a/configure b/configure
index 60aaa3c..b062979 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 1.45 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sword 1.7.4.
+# Generated by GNU Autoconf 2.69 for sword 1.8.1.
#
# Report bugs to <sword-bugs@crosswire.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sword'
PACKAGE_TARNAME='sword'
-PACKAGE_VERSION='1.7.4'
-PACKAGE_STRING='sword 1.7.4'
+PACKAGE_VERSION='1.8.1'
+PACKAGE_STRING='sword 1.8.1'
PACKAGE_BUGREPORT='sword-bugs@crosswire.org'
PACKAGE_URL='http://crosswire.org/sword'
@@ -653,8 +653,12 @@ INTERNALFTPLIB_FALSE
INTERNALFTPLIB_TRUE
WITHCURLSFTP_FALSE
WITHCURLSFTP_TRUE
+WITHGAPI_FALSE
+WITHGAPI_TRUE
WITHCURL_FALSE
WITHCURL_TRUE
+USEICUREGEX_FALSE
+USEICUREGEX_TRUE
USECXX11REGEX_FALSE
USECXX11REGEX_TRUE
INSTCONF_FALSE
@@ -669,6 +673,10 @@ HAVE_ICUSWORD_FALSE
HAVE_ICUSWORD_TRUE
HAVE_ICU_FALSE
HAVE_ICU_TRUE
+HAVE_XZ_FALSE
+HAVE_XZ_TRUE
+HAVE_BZIP2_FALSE
+HAVE_BZIP2_TRUE
HAVE_LIBZ_FALSE
HAVE_LIBZ_TRUE
ICU_IOLIBS
@@ -684,6 +692,8 @@ dir_confdef
with_conf
with_icusword
with_icu
+with_xz
+with_bzip2
with_zlib
SWORD_VERSION_NANO
SWORD_VERSION_MICRO
@@ -846,6 +856,8 @@ with_sysroot
enable_libtool_lock
with_clucene
with_zlib
+with_bzip2
+with_xz
with_icu
with_icusword
with_conf
@@ -853,6 +865,9 @@ with_cxx11regex
with_curl
with_curl_sftp
with_internalregex
+with_icuregex
+with_xapian
+with_gapi
enable_debug
enable_warnings
enable_profile
@@ -1422,7 +1437,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sword 1.7.4 to adapt to many kinds of systems.
+\`configure' configures sword 1.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1493,7 +1508,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sword 1.7.4:";;
+ short | recursive ) echo "Configuration of sword 1.8.1:";;
esac
cat <<\_ACEOF
@@ -1534,6 +1549,8 @@ Optional Packages:
--with-clucene=<path> prefix of CLucene-Core installation. e.g. /usr/local
or /usr
--with-zlib allow zlib compressed modules (default=yes)
+ --with-bzip2 allow bzip2 compressed modules (default=no)
+ --with-xz allow xz compressed modules (default=no)
--with-icu use ICU for unicode (default=yes)
--with-icusword use custom SWORD ICU (default=no)
--with-conf install a new sword.conf (default=yes)
@@ -1543,6 +1560,9 @@ Optional Packages:
--with-curl_sftp build install manager support using libcurl+sftp
(requires --with-curl, default=yes)
--with-internalregex Compile using SWORDs internal copy of regex
+ --with-icuregex use ICU regex engine
+ --with-xapian use xapian search engine (default=yes)
+ --with-gapi build SWORD with support for google apis
--with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)
--with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)
@@ -1635,7 +1655,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sword configure 1.7.4
+sword configure 1.8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2143,7 +2163,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sword $as_me 1.7.4, which was
+It was created by sword $as_me 1.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2634,7 +2654,7 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version='1.14'
+am__api_version='1.13'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3120,7 +3140,7 @@ fi
# Define the identity of the package.
PACKAGE='sword'
- VERSION='1.7.4'
+ VERSION='1.8.1'
cat >>confdefs.h <<_ACEOF
@@ -3171,47 +3191,9 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
+# this doesn't work
+#AM_INIT_AUTOMAKE([subdir-objects])
ac_config_headers="$ac_config_headers include/config.h"
@@ -4025,65 +4007,6 @@ ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -7299,7 +7222,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7317,10 +7240,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- powerpc64le-*linux*)
- LD="${LD-ld} -m elf32lppclinux"
- ;;
- powerpc64-*linux*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7339,10 +7259,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*linux*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -16220,6 +16137,22 @@ else
fi
+# Check whether --with-bzip2 was given.
+if test "${with_bzip2+set}" = set; then :
+ withval=$with_bzip2;
+else
+ with_bzip2=no
+fi
+
+
+# Check whether --with-xz was given.
+if test "${with_xz+set}" = set; then :
+ withval=$with_xz;
+else
+ with_xz=no
+fi
+
+
# Check whether --with-icu was given.
if test "${with_icu+set}" = set; then :
withval=$with_icu;
@@ -16276,6 +16209,28 @@ if test "${with_internalregex+set}" = set; then :
fi
+# Check whether --with-icuregex was given.
+if test "${with_icuregex+set}" = set; then :
+ withval=$with_icuregex;
+fi
+
+
+# Check whether --with-xapian was given.
+if test "${with_xapian+set}" = set; then :
+ withval=$with_xapian;
+else
+ with_xapian=yes
+fi
+
+
+# Check whether --with-gapi was given.
+if test "${with_gapi+set}" = set; then :
+ withval=$with_gapi;
+else
+ with_gapi=no
+fi
+
+
# ---------------------------------------------------------------------
# Enable options
@@ -16361,23 +16316,94 @@ fi
if test x$enable_debug = xyes; then
GCJFLAGS="-g -O0"
if test x$ac_cv_prog_cc_g = xyes; then
- AM_CFLAGS="-g3 -O0 -Wall -Werror"
+ AM_CFLAGS="-g3 -O0 -Wall"
else
- AM_CFLAGS="-O0 -Wall -Werror"
+ AM_CFLAGS="-O0 -Wall"
fi
if test x$ac_cv_prog_cxx_g = xyes; then
- AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual"
+ AM_CXXFLAGS="-g3 -O0 -Wall -Woverloaded-virtual"
else
- AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual"
+ AM_CXXFLAGS="-O0 -Wall -Woverloaded-virtual"
fi
else
- AM_CFLAGS="-O3"
- AM_CXXFLAGS="-O3"
+ my_save_cxxflags="$CXXFLAGS"
+ CXXFLAGS=-Ofast
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX supports -Ofast" >&5
+$as_echo_n "checking whether CXX supports -Ofast... " >&6; }
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ AM_CFLAGS=-Ofast
+ AM_CXXFLAGS=-Ofast
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ AM_CFLAGS=-O3
+ AM_CXXFLAGS=-O3
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$my_save_cxxflags"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
fi
AM_CFLAGS="$AM_CFLAGS -fPIC"
AM_CXXFLAGS="$AM_CXXFLAGS -fPIC"
+#stupid check for old or new g++ compiler param syntax for this compiler option
+saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -ftemplate-depth=100"
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ CXXFLAGS="$saved_CXXFLAGS -ftemplate-depth-100";
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
# ---------------------------------------------------------------------
# Check libraries
# ---------------------------------------------------------------------
@@ -16438,8 +16464,122 @@ if test x$with_zlib = xno; then
AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB"
fi
+if test x$with_bzip2 = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbz2 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzBuffToBuffCompress ();
+int
+main ()
+{
+return BZ2_bzBuffToBuffCompress ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes
+else
+ ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBBZ2 1
+_ACEOF
+
+ LIBS="-lbz2 $LIBS"
+
+else
+ with_bzip2="no"
+fi
+
+else
+ with_bzip2="no"
+fi
+
+if test x$with_bzip2 = xno; then
+ AM_CFLAGS="$AM_CFLAGS -DEXCLUDEBZIP2"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEBZIP2"
+fi
+
+if test x$with_xz = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_buffer_encode in -llzma" >&5
+$as_echo_n "checking for lzma_easy_buffer_encode in -llzma... " >&6; }
+if ${ac_cv_lib_lzma_lzma_easy_buffer_encode+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llzma $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lzma_easy_buffer_encode ();
+int
+main ()
+{
+return lzma_easy_buffer_encode ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_lzma_lzma_easy_buffer_encode=yes
+else
+ ac_cv_lib_lzma_lzma_easy_buffer_encode=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_buffer_encode" >&5
+$as_echo "$ac_cv_lib_lzma_lzma_easy_buffer_encode" >&6; }
+if test "x$ac_cv_lib_lzma_lzma_easy_buffer_encode" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBLZMA 1
+_ACEOF
+
+ LIBS="-llzma $LIBS"
+
+else
+ with_xz="no"
+fi
+
+else
+ with_xz="no"
+fi
+
+if test x$with_xz = xno; then
+ AM_CFLAGS="$AM_CFLAGS -DEXCLUDEXZ"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEXZ"
+fi
+
if test "x$with_internalregex" = "xyes"; then :
- have_systemregex="no"
+ have_systemregex="no, using internal regex"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regexec" >&5
$as_echo_n "checking for library containing regexec... " >&6; }
@@ -16496,7 +16636,7 @@ if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_systemregex="yes"
else
- have_systemregex="no"
+ have_systemregex="no, using internal regex"
fi
fi
@@ -16792,9 +16932,6 @@ AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_"
AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
fi
-
-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-
if test x$enable_warnings = xyes; then
AM_CFLAGS="$AM_CFLAGS -Werror"
AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual"
@@ -16860,7 +16997,7 @@ fi
if test "$CURL_CONFIG" = "no" ; then
echo "*** The curl-config script installed by curl could not be found"
echo "*** compiling without libcurl support"
- with_curl=no
+ with_curl="no, using internal ftplib"
with_curl_sftp=no
with_internalftplib=yes
else
@@ -16880,13 +17017,13 @@ fi
fi
fi
else
- with_curl=no;
+ with_curl="no, using internal ftplib"
with_curl_sftp=no;
with_internalftplib=yes
fi
if test x$with_cxx11regex = xyes; then
- AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11"
fi
# ---------------------------------------------------------------------
@@ -16914,6 +17051,79 @@ else
fi
fi
+if test x$with_xapian = xyes; then
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxapian" >&5
+$as_echo_n "checking for main in -lxapian... " >&6; }
+if ${ac_cv_lib_xapian_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxapian $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_xapian_main=yes
+else
+ ac_cv_lib_xapian_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xapian_main" >&5
+$as_echo "$ac_cv_lib_xapian_main" >&6; }
+if test "x$ac_cv_lib_xapian_main" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXAPIAN 1
+_ACEOF
+
+ LIBS="-lxapian $LIBS"
+
+else
+ with_xapian="no"
+fi
+
+else
+ with_xapian="no"
+fi
+
+if test x$with_icuregex = xyes; then
+ if test x$with_icu = xno; then
+ with_icuregex="requested; but using ICU not enabled"
+ else
+ AM_CFLAGS="$AM_CFLAGS -DUSEICUREGEX"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DUSEICUREGEX"
+ fi
+else
+ with_icuregex="no"
+fi
+
+if test x$with_xapian = xyes; then
+ AM_CFLAGS="$AM_CFLAGS -DUSEXAPIAN"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DUSEXAPIAN"
+ if test x$with_clucene = xno; then
+ with_clucene="no"
+ else
+ with_clucene="$with_clucene; but using XAPIAN instead"
+ fi
+fi
+
for ac_func in vsnprintf
do :
ac_fn_cxx_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
@@ -16955,6 +17165,83 @@ if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi
if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi
SWORD_VERSION_NUM=$V1$V2$V3$V4
+echo "checking compiler warnings"
+
+ saved_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -Wno-address"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ WARNING_CHECK=-Wno-address
+else
+ WARNING_CHECK=;
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ CXXFLAGS="$saved_CXXFLAGS"
+ echo "WARNING_CHECK: $WARNING_CHECK"
+ WARNINGS_OFF="$WARNINGS_OFF $WARNING_CHECK"
+
+ saved_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -Wno-nonnull-compare"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ WARNING_CHECK=-Wno-nonnull-compare
+else
+ WARNING_CHECK=;
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ CXXFLAGS="$saved_CXXFLAGS"
+ echo "WARNING_CHECK: $WARNING_CHECK"
+ WARNINGS_OFF="$WARNINGS_OFF $WARNING_CHECK"
+
+
+echo "WARNINGS_OFF: $WARNINGS_OFF"
+AM_CXXFLAGS="$AM_CXXFLAGS $WARNINGS_OFF"
+
+
@@ -16992,6 +17279,8 @@ SWORD_VERSION_NUM=$V1$V2$V3$V4
+
+
# ---------------------------------------------------------------------
# Conditional variables
# ---------------------------------------------------------------------
@@ -17004,6 +17293,22 @@ else
HAVE_LIBZ_FALSE=
fi
+ if test x$with_bzip2 = xyes; then
+ HAVE_BZIP2_TRUE=
+ HAVE_BZIP2_FALSE='#'
+else
+ HAVE_BZIP2_TRUE='#'
+ HAVE_BZIP2_FALSE=
+fi
+
+ if test x$with_xz = xyes; then
+ HAVE_XZ_TRUE=
+ HAVE_XZ_FALSE='#'
+else
+ HAVE_XZ_TRUE='#'
+ HAVE_XZ_FALSE=
+fi
+
if test x$with_icu = xyes; then
HAVE_ICU_TRUE=
HAVE_ICU_FALSE='#'
@@ -17061,6 +17366,14 @@ else
USECXX11REGEX_FALSE=
fi
+ if test x$with_icuregex = xyes; then
+ USEICUREGEX_TRUE=
+ USEICUREGEX_FALSE='#'
+else
+ USEICUREGEX_TRUE='#'
+ USEICUREGEX_FALSE=
+fi
+
if test x$with_curl = xyes; then
WITHCURL_TRUE=
WITHCURL_FALSE='#'
@@ -17069,6 +17382,14 @@ else
WITHCURL_FALSE=
fi
+ if test x$with_gapi = xyes; then
+ WITHGAPI_TRUE=
+ WITHGAPI_FALSE='#'
+else
+ WITHGAPI_TRUE='#'
+ WITHGAPI_FALSE=
+fi
+
if test x$with_curl_sftp = xyes; then
WITHCURLSFTP_TRUE=
WITHCURLSFTP_FALSE='#'
@@ -17137,7 +17458,7 @@ fi
# ---------------------------------------------------------------------
# Final output
# ---------------------------------------------------------------------
-ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec"
+ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/testsuite/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile examples/tasks/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -17288,6 +17609,14 @@ if test -z "${HAVE_LIBZ_TRUE}" && test -z "${HAVE_LIBZ_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_BZIP2_TRUE}" && test -z "${HAVE_BZIP2_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_BZIP2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_XZ_TRUE}" && test -z "${HAVE_XZ_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_XZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_ICU_TRUE}" && test -z "${HAVE_ICU_FALSE}"; then
as_fn_error $? "conditional \"HAVE_ICU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17316,10 +17645,18 @@ if test -z "${USECXX11REGEX_TRUE}" && test -z "${USECXX11REGEX_FALSE}"; then
as_fn_error $? "conditional \"USECXX11REGEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${USEICUREGEX_TRUE}" && test -z "${USEICUREGEX_FALSE}"; then
+ as_fn_error $? "conditional \"USEICUREGEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${WITHCURL_TRUE}" && test -z "${WITHCURL_FALSE}"; then
as_fn_error $? "conditional \"WITHCURL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WITHGAPI_TRUE}" && test -z "${WITHGAPI_FALSE}"; then
+ as_fn_error $? "conditional \"WITHGAPI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${WITHCURLSFTP_TRUE}" && test -z "${WITHCURLSFTP_FALSE}"; then
as_fn_error $? "conditional \"WITHCURLSFTP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17749,7 +18086,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sword $as_me 1.7.4, which was
+This file was extended by sword $as_me 1.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17816,7 +18153,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sword config.status 1.7.4
+sword config.status 1.8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -18328,6 +18665,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "tests/testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES tests/testsuite/Makefile" ;;
"tests/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cppunit/Makefile" ;;
"utilities/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
@@ -19867,23 +20205,30 @@ fi
echo
echo
echo "Configuration:"
-echo " LIBDIR: $libdir"
-echo " DEBUG: $enable_debug"
-echo " PROFILE: $enable_profile"
-echo " BUILD TESTS: $enable_tests"
-echo " BUILD EXAMPLES: $enable_examples"
-echo " BUILD UTILITIES: $enable_utilities"
-echo " LIBZ: $with_zlib"
-echo " ICU: $with_icu"
-echo " ICUSWORD: $with_icusword"
-echo " CXX11REGEX: $with_cxx11regex"
-echo " CURL: $with_curl"
-echo " CURL SFTP: $with_curl_sftp"
-echo " INTERNAL FTPLIB: $with_internalftplib"
-echo " INTERNAL REGEX: $with_internalregex"
-echo " CLUCENE: $with_clucene"
-echo
-echo
-
+echo ""
+echo " Settings:"
+echo " LIBDIR: $libdir"
+echo " DEBUG: $enable_debug"
+echo " PROFILE: $enable_profile"
+echo " BUILD TESTS: $enable_tests"
+echo " BUILD EXAMPLES: $enable_examples"
+echo " BUILD UTILITIES: $enable_utilities"
+echo ""
+echo " Dependencies for standard use:"
+echo " REGEX: $have_systemregex"
+echo " ZLIB: $with_zlib"
+echo " LIBICU: $with_icu"
+echo " LIBCURL: $with_curl"
+echo " CLUCENE-CORE: $with_clucene"
+echo ""
+echo " Optional / Experimental:"
+echo " LIBCURL SFTP: $with_curl_sftp"
+echo " BZIP2: $with_bzip2"
+echo " XZ: $with_xz"
+echo " ICUSWORD: $with_icusword"
+echo " CXX11-REGEX: $with_cxx11regex"
+echo " ICU-REGEX: $with_icuregex"
+echo " XAPIAN-CORE: $with_xapian"
+echo " GAPI: $with_gapi"