ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

INTEGRATION: CWS configure14 (1.130.2); FILE MERGED

Browse Source 
2006/01/26 12:07:49 rene 1.130.2.13: #i61185# fix hunspell check for system-hunspell
2006/01/26 11:10:45 rene 1.130.2.12: #i61183# fix myspell dicts check
2006/01/23 19:19:40 rene 1.130.2.11: RESYNC: (1.131-1.133); FILE MERGED
2006/01/23 12:38:38 rene 1.130.2.10: fail if neon is 0.25.x
2006/01/22 16:22:04 rene 1.130.2.9: #i10000# regenerate configure
2006/01/22 11:48:31 rene 1.130.2.8: system-zlib only default on Darwin, Sun might want to postpone this cws otherwise.... *sigh*
2006/01/16 09:56:30 rene 1.130.2.7: RESYNC: (1.130-1.131); FILE MERGED
2006/01/07 18:58:28 rene 1.130.2.6: fix system-python check
2006/01/07 18:40:23 rene 1.130.2.5: cross-merge cws configure13
2006/01/07 18:10:47 rene 1.130.2.4: #i60119# make --with-system-zlib default on Darwin and Linux
2006/01/07 17:53:02 rene 1.130.2.3: #i60090# fix --with-myspell-dicts
2006/01/07 17:44:19 rene 1.130.2.2: #i59160# allow usage of tcmalloc and system-malloc
2006/01/07 17:32:44 rene 1.130.2.1: #i53414# use AC_LANG_CPLUSPLUS at the system-boost check
This commit is contained in:
Kurt Zenker
2006-01-31 17:28:26 +00:00
parent 54efc5ed83
commit 0abd71b441
1 changed files with 490 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config_office/configure
Vendored
+490 -7
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision: 1.150 .
# From configure.in Revision: 1.146.2.12 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1242,6 +1242,9 @@ Optional Packages:
Usage: --with-build-version="Built by Jim"
--with-alloc Define which allocator to build with
choices are oo, system, tcmalloc
--with-x use the X Window System
Some influential environment variables:
@@ -2315,6 +2318,12 @@ if test "${enable_sgistl+set}" = set; then
fi;
# Check whether --with-alloc or --without-alloc was given.
if test "${with_alloc+set}" = set; then
withval="$with_alloc"
fi;
BUILD_TYPE="OOo EXT"
echo "********************************************************************"
@@ -2968,7 +2977,7 @@ echo "${ECHO_T}$ENABLE_RPATH" >&6
echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5
echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6
if test -z "$with_myspell_dicts"; then
if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
WITH_MYSPELL_DICTS=YES
@@ -6868,6 +6877,212 @@ fi
echo "$as_me:$LINENO: checking which memory allocator to use" >&5
echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6
if test "$with_alloc" = "system"; then
echo "$as_me:$LINENO: result: system" >&5
echo "${ECHO_T}system" >&6
ALLOC="SYS_ALLOC";
for ac_func in malloc realloc calloc free
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
fi
if test "$with_alloc" = "tcmalloc"; then
echo "$as_me:$LINENO: result: tcmalloc" >&5
echo "${ECHO_T}tcmalloc" >&6
if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
{ { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5
echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;}
{ (exit 1); exit 1; }; }
fi
echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5
echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltcmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char malloc ();
int
main ()
{
malloc ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_tcmalloc_malloc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tcmalloc_malloc=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6
if test $ac_cv_lib_tcmalloc_malloc = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBTCMALLOC 1
_ACEOF
LIBS="-ltcmalloc $LIBS"
else
{ { echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5
echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;}
{ (exit 1); exit 1; }; }
fi
ALLOC="TCMALLOC";
fi
if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
echo "$as_me:$LINENO: result: internal" >&5
echo "${ECHO_T}internal" >&6
fi
if test "$USE_SYSTEM_STL" = "YES"; then
echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5
echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6
@@ -8844,6 +9059,9 @@ echo "${ECHO_T}yes" >&6
fi
if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then
with_system_zlib=yes
fi
echo "$as_me:$LINENO: checking which zlib to use" >&5
echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6
if test -n "$with_system_zlib" -o -n "$with_system_libs" && \
@@ -9893,12 +10111,12 @@ fi
if test "$_os" = "Darwin" && test -z "$with_system_python"; then
if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
with_system_python=yes
fi
echo "$as_me:$LINENO: checking which python to use" >&5
echo $ECHO_N "checking which python to use... $ECHO_C" >&6
if test -n "$with_system_python"; then
if test -n "$with_system_python" && test "$with_system_python" != "no"; then
SYSTEM_PYTHON=YES
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
@@ -10091,7 +10309,12 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
PYTHON_LIBS="-lpython$python_version"
if test "$_os" = "Darwin"; then
PYTHON_LIBS="-framework Python"
else
PYTHON_LIBS="-lpython$python_version"
fi
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
@@ -10396,7 +10619,7 @@ fi
ac_cv_lib_db=ac_cv_lib_db_main
if test "$SOLAR_JAVA" = "TRUE"; then
if test -z $DB_JAR; then
if test -z "$DB_JAR"; then
# three different naming methods *grumble* Are there even more?
echo "$as_me:$LINENO: checking for /usr/share/java/db.jar" >&5
echo $ECHO_N "checking for /usr/share/java/db.jar... $ECHO_C" >&6
@@ -10650,6 +10873,14 @@ if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
SYSTEM_BOOST=YES
ac_ext=cc
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
if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6
@@ -10942,6 +11173,12 @@ echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;}
fi
ac_ext=cc
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
else
echo "$as_me:$LINENO: result: internal" >&5
echo "${ECHO_T}internal" >&6
@@ -15867,6 +16104,104 @@ echo "$as_me: error: Library requirements (neon >= 0.24.0) not met; consider adj
{ (exit 1); exit 1; }; }
fi
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo "$as_me:$LINENO: checking for neon < 0.25.0" >&5
echo $ECHO_N "checking for neon < 0.25.0... $ECHO_C" >&6
if $PKG_CONFIG --exists "neon < 0.25.0" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6
NEON_CFLAGS=`$PKG_CONFIG --cflags "neon < 0.25.0"`
echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
echo "${ECHO_T}$NEON_CFLAGS" >&6
echo "$as_me:$LINENO: checking NEON_LIBS" >&5
echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6
NEON_LIBS=`$PKG_CONFIG --libs "neon < 0.25.0"`
echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
echo "${ECHO_T}$NEON_LIBS" >&6
else
NEON_CFLAGS=""
NEON_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon < 0.25.0"`
fi
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
:
else
{ { echo "$as_me:$LINENO: error: you need neon 0.24.x for system-neon" >&5
echo "$as_me: error: you need neon 0.24.x for system-neon" >&2;}
{ (exit 1); exit 1; }; }
fi
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
else
@@ -16480,6 +16815,147 @@ fi
if test $ac_cv_header_hunspell_hxx = yes; then
:
else
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5
echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <hunspell/hunspell.hxx>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5
echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <hunspell/hunspell.hxx>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
## Report this to the AC_PACKAGE_NAME lists. ##
## ------------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5
echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6
if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5
echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6
fi
if test $ac_cv_header_hunspell_hunspell_hxx = yes; then
HUNSPELL_CFLAGS=-I/usr/include/hunspell
else
{ { echo "$as_me:$LINENO: error: hunspell headers not found." >&5
echo "$as_me: error: hunspell headers not found." >&2;}
{ (exit 1); exit 1; }; }
@@ -16487,6 +16963,10 @@ fi
fi
echo "$as_me:$LINENO: checking for main in -lhunspell" >&5
echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6
if test "${ac_cv_lib_hunspell_main+set}" = set; then
@@ -16565,6 +17045,7 @@ echo "${ECHO_T}internal" >&6
fi
echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5
echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6
if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
@@ -20576,6 +21057,7 @@ s,@EXCEPTIONS@,$EXCEPTIONS,;t t
s,@CXXCPP@,$CXXCPP,;t t
s,@STLPORT4@,$STLPORT4,;t t
s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
s,@ALLOC@,$ALLOC,;t t
s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t
s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
s,@LANG@,$LANG,;t t
@@ -20680,6 +21162,7 @@ s,@MYSPELL_CFLAGS@,$MYSPELL_CFLAGS,;t t
s,@MYSPELL_LIBS@,$MYSPELL_LIBS,;t t
s,@SYSTEM_MYSPELL@,$SYSTEM_MYSPELL,;t t
s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t
s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t
s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t
s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t
s,@PSDK_HOME@,$PSDK_HOME,;t t