X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/296ee9a6e2205ff657ea382b240193a246fca434..d4705d6b345f860379076247f3287aa9d1ed8d5c:/configure diff --git a/configure b/configure index 5ff2d9f..869511d 100755 --- a/configure +++ b/configure @@ -650,12 +650,11 @@ ac_ct__LIPO _LIPO SO LTFLAGS -LTLIBICONV -LIBICONV LTLIBTERMCAP LTLIBREADLINE CY_OBJECTIVEC_FALSE CY_OBJECTIVEC_TRUE +LTOBJECTIVEC GNUSTEP_CONFIG CY_OBJECTIVEC LTLIBFFI @@ -664,9 +663,15 @@ LIBFFI_CFLAGS CY_EXECUTE_FALSE CY_EXECUTE_TRUE LTLIBAPR +LTJAVASCRIPTCORE WEBKIT_LIBS WEBKIT_CFLAGS CY_EXECUTE +CY_IOS_SIMULATOR_FALSE +CY_IOS_SIMULATOR_TRUE +CY_XCODE_IOSSIMSDK +CY_XCODE_MACOSXSDK +XCODEBUILD CY_ARCH CY_FILTERS GNUTAR @@ -675,7 +680,6 @@ FLEX BISON TIME GIT -_BASH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG @@ -739,6 +743,9 @@ CPPFLAGS LDFLAGS CXXFLAGS CXX +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -808,6 +815,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules +enable_maintainer_mode enable_dependency_tracking enable_static enable_shared @@ -816,11 +824,8 @@ enable_fast_install with_gnu_ld with_sysroot enable_libtool_lock -with_frameworks enable_javascript with_apr -enable_rpath -with_libiconv_prefix ' ac_precious_vars='build_alias host_alias @@ -1469,6 +1474,9 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -1482,7 +1490,6 @@ Optional Features: use a JavaScript runtime (currently the only available option for ENGINE is JavaScriptCore) [default=yes] - --disable-rpath do not hardcode runtime library paths Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1492,13 +1499,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-frameworks=DIRS add to DIRS (space separated) to the Darwin include - path for frameworks with -F --with-apr=PATH prefix for installed APR or the full path to apr-config - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir Some influential environment variables: CXX C++ compiler command @@ -3089,6 +3091,33 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + +am_cv_CC_dependencies_compiler_type=none +am_cv_CXX_dependencies_compiler_type=none +am_cv_OBJCXX_dependencies_compiler_type=none + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4164,6 +4193,7 @@ else fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -15901,47 +15931,6 @@ $as_echo "no" >&6; } fi fi -# Extract the first word of "bash", so it can be a program name with args. -set dummy bash; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path__BASH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $_BASH in - [\\/]* | ?:[\\/]*) - ac_cv_path__BASH="$_BASH" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path__BASH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path__BASH" && ac_cv_path__BASH="as_fn_error $? "missing \"bash\"" "$LINENO" 5" - ;; -esac -fi -_BASH=$ac_cv_path__BASH -if test -n "$_BASH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_BASH" >&5 -$as_echo "$_BASH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "git", so it can be a program name with args. set dummy git; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -16605,16 +16594,82 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for maximum warnings" >&5 +$as_echo_n "checking CXXFLAGS for maximum warnings... " >&6; } +if ${ac_cv_cxxflags_warn_all+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_cxxflags_warn_all="no, unknown" +ac_save_CXXFLAGS="$CXXFLAGS" +for ac_arg in "-warn all % -warn all" "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_cxxflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +CXXFLAGS="$ac_save_CXXFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_warn_all" >&5 +$as_echo "$ac_cv_cxxflags_warn_all" >&6; } + +case ".$ac_cv_cxxflags_warn_all" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) if ${CXXFLAGS+:} false; then : + case " $CXXFLAGS " in + *" $ac_cv_cxxflags_warn_all "*) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$ac_cv_cxxflags_warn_all"; } >&5 + (: CXXFLAGS already contains $ac_cv_cxxflags_warn_all) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; + *) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$ac_cv_cxxflags_warn_all\""; } >&5 + (: CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_warn_all") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_warn_all" + ;; + esac +else + CXXFLAGS="$ac_cv_cxxflags_warn_all" +fi + ;; +esac + + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-overloaded-virtual" >&5 -$as_echo_n "checking for -Wno-overloaded-virtual... " >&6; } - cy_save=$CXXFLAGS + 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 - for element in -Wno-overloaded-virtual; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc -Werror" >&5 +$as_echo_n "checking for cc -Werror... " >&6; } + + cy_save=$CFLAGS + + for element in -Werror; do haveit= - for x in $CXXFLAGS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16630,7 +16685,7 @@ $as_echo_n "checking for -Wno-overloaded-virtual... " >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done @@ -16639,20 +16694,19 @@ $as_echo_n "checking for -Wno-overloaded-virtual... " >&6; } /* end confdefs.h. */ _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : cy_good=1 else cy_good=0 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS=$cy_save + CFLAGS=$cy_save if test "x$cy_good" = x1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - - for element in -Wno-overloaded-virtual; do + for element in -Werror; do haveit= for x in $CFLAGS; do @@ -16675,7 +16729,31 @@ $as_echo "yes" >&6; } done - for element in -Wno-overloaded-virtual; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + 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 c++ -Werror" >&5 +$as_echo_n "checking for c++ -Werror... " >&6; } + + cy_save=$CXXFLAGS + + for element in -Werror; do haveit= for x in $CXXFLAGS; do @@ -16698,9 +16776,25 @@ $as_echo "yes" >&6; } done - for element in -Wno-overloaded-virtual; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Werror; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16716,27 +16810,38 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-parentheses" >&5 -$as_echo_n "checking for -Wno-parentheses... " >&6; } - cy_save=$CXXFLAGS + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu - for element in -Wno-parentheses; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Werror" >&5 +$as_echo_n "checking for c++ -ObjC -Werror... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Werror; do haveit= - for x in $CXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16752,7 +16857,7 @@ $as_echo_n "checking for -Wno-parentheses... " >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done @@ -16761,22 +16866,21 @@ $as_echo_n "checking for -Wno-parentheses... " >&6; } /* end confdefs.h. */ _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_objcxx_try_compile "$LINENO"; then : cy_good=1 else cy_good=0 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS=$cy_save + OBJCXXFLAGS=$cy_save if test "x$cy_good" = x1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - - for element in -Wno-parentheses; do + for element in -Werror; do haveit= - for x in $CFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16792,14 +16896,41 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done - for element in -Wno-parentheses; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + + + + 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 for cc -Wno-deprecated-declarations" >&5 +$as_echo_n "checking for cc -Wno-deprecated-declarations... " >&6; } + + cy_save=$CFLAGS + + for element in -Wno-deprecated-declarations; do haveit= - for x in $CXXFLAGS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16815,14 +16946,30 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - for element in -Wno-parentheses; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-deprecated-declarations; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16838,25 +16985,36 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } 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 + + + 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 -Wno-unneeded-internal-declaration" >&5 -$as_echo_n "checking for -Wno-unneeded-internal-declaration... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -Wno-deprecated-declarations" >&5 +$as_echo_n "checking for c++ -Wno-deprecated-declarations... " >&6; } cy_save=$CXXFLAGS - for element in -Wno-unneeded-internal-declaration; do + for element in -Wno-deprecated-declarations; do haveit= for x in $CXXFLAGS; do @@ -16895,10 +17053,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - - for element in -Wno-unneeded-internal-declaration; do + for element in -Wno-deprecated-declarations; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16914,14 +17071,38 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in -Wno-unneeded-internal-declaration; do - haveit= - for x in $CXXFLAGS; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Wno-deprecated-declarations" >&5 +$as_echo_n "checking for c++ -ObjC -Wno-deprecated-declarations... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Wno-deprecated-declarations; do + haveit= + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16937,14 +17118,30 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done - for element in -Wno-unneeded-internal-declaration; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + OBJCXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-deprecated-declarations; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16960,28 +17157,41 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done - else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } 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 + -for cy_arch in ppc ppc64 i386 x86_64 armv6; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5 -$as_echo_n "checking for -arch $cy_arch... " >&6; } - cy_save=$CXXFLAGS - for element in "-arch $cy_arch"; do + + 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 for cc -Wno-dangling-else" >&5 +$as_echo_n "checking for cc -Wno-dangling-else... " >&6; } + + cy_save=$CFLAGS + + for element in -Wno-dangling-else; do haveit= - for x in $CXXFLAGS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -16997,7 +17207,7 @@ $as_echo_n "checking for -arch $cy_arch... " >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done @@ -17005,30 +17215,22 @@ $as_echo_n "checking for -arch $cy_arch... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int -main () -{ - - ; - return 0; -} _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : cy_good=1 else cy_good=0 fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS=$cy_save + CFLAGS=$cy_save if test "x$cy_good" = x1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - for element in "-arch $cy_arch"; do + for element in -Wno-dangling-else; do haveit= - for x in $CY_ARCH; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17044,7 +17246,7 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done @@ -17054,21 +17256,28 @@ else $as_echo "no" >&6; } fi -done - + 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 + 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 whether --with-frameworks was given. -if test "${with_frameworks+set}" = set; then : - withval=$with_frameworks; - for cy_framework in $withval; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -Wno-dangling-else" >&5 +$as_echo_n "checking for c++ -Wno-dangling-else... " >&6; } + cy_save=$CXXFLAGS - for element in -F$cy_framework; do + for element in -Wno-dangling-else; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17084,12 +17293,28 @@ if test "${with_frameworks+set}" = set; then : fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in -F$cy_framework; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-dangling-else; do haveit= for x in $CXXFLAGS; do @@ -17112,9 +17337,33 @@ if test "${with_frameworks+set}" = set; then : done - for element in -F$cy_framework; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Wno-dangling-else" >&5 +$as_echo_n "checking for c++ -ObjC -Wno-dangling-else... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Wno-dangling-else; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17130,70 +17379,79 @@ if test "${with_frameworks+set}" = set; then : fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done - done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + OBJCXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + for element in -Wno-dangling-else; do + haveit= + for x in $OBJCXXFLAGS; do + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -# Check whether --enable-javascript was given. -if test "${enable_javascript+set}" = set; then : - enableval=$enable_javascript; - case $enableval in #( - yes) : - - + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" + fi + done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaScriptCore" >&5 -$as_echo_n "checking for framework JavaScriptCore... " >&6; } -if ${ac_cv_framework_JavaScriptCore+:} false; then : - $as_echo_n "(cached) " >&6 else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework JavaScriptCore $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include + 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 -int -main () -{ - JSEvaluateScript(0, 0, 0, 0, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_framework_JavaScriptCore=yes -else - ac_cv_framework_JavaScriptCore=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS + 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 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 -$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } - if test $ac_cv_framework_JavaScriptCore = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc -Wno-overloaded-virtual" >&5 +$as_echo_n "checking for cc -Wno-overloaded-virtual... " >&6; } + cy_save=$CFLAGS - for element in "-framework JavaScriptCore"; do + for element in -Wno-overloaded-virtual; do haveit= - for x in $LIBS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17209,93 +17467,77 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - CY_EXECUTE=1 - - + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cy_good=1 else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do + CFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -$as_echo_n "checking for WEBKIT... " >&6; } - -if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$WEBKIT_LIBS"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi + for element in -Wno-overloaded-virtual; do + haveit= + for x in $CFLAGS; do + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + fi + done -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` - else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$WEBKIT_PKG_ERRORS" >&5 - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&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 - CY_EXECUTE=1 + 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 - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -Wno-overloaded-virtual" >&5 +$as_echo_n "checking for c++ -Wno-overloaded-virtual... " >&6; } + + cy_save=$CXXFLAGS + + for element in -Wno-overloaded-virtual; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17311,12 +17553,28 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-overloaded-virtual; do haveit= for x in $CXXFLAGS; do @@ -17339,9 +17597,33 @@ $as_echo "yes" >&6; } done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Wno-overloaded-virtual" >&5 +$as_echo_n "checking for c++ -ObjC -Wno-overloaded-virtual... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Wno-overloaded-virtual; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17357,15 +17639,30 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + OBJCXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-overloaded-virtual; do haveit= - for x in $LIBS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17381,67 +17678,79 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done -fi; if test "x$CY_EXECUTE" = x1; then break; fi - done - +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - ;; #( - no) : - CY_EXECUTE=0 - ;; #( - JavaScriptCore) : + 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 framework JavaScriptCore" >&5 -$as_echo_n "checking for framework JavaScriptCore... " >&6; } -if ${ac_cv_framework_JavaScriptCore+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework JavaScriptCore $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include + 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 -int -main () -{ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc -Wno-parentheses" >&5 +$as_echo_n "checking for cc -Wno-parentheses... " >&6; } - JSEvaluateScript(0, 0, 0, 0, 0, 0); + cy_save=$CFLAGS - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : + for element in -Wno-parentheses; do + haveit= + for x in $CFLAGS; do - ac_cv_framework_JavaScriptCore=yes + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -else - ac_cv_framework_JavaScriptCore=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + fi + done + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 -$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } - if test $ac_cv_framework_JavaScriptCore = yes; then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - for element in "-framework JavaScriptCore"; do + for element in -Wno-parentheses; do haveit= - for x in $LIBS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17457,93 +17766,38 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - CY_EXECUTE=1 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 -else - for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -$as_echo_n "checking for WEBKIT... " >&6; } - -if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$WEBKIT_LIBS"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` - else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$WEBKIT_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - CY_EXECUTE=1 + 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 c++ -Wno-parentheses" >&5 +$as_echo_n "checking for c++ -Wno-parentheses... " >&6; } + cy_save=$CXXFLAGS - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + for element in -Wno-parentheses; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17559,12 +17813,28 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-parentheses; do haveit= for x in $CXXFLAGS; do @@ -17587,9 +17857,33 @@ $as_echo "yes" >&6; } done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Wno-parentheses" >&5 +$as_echo_n "checking for c++ -ObjC -Wno-parentheses... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Wno-parentheses; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17605,15 +17899,30 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + OBJCXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-parentheses; do haveit= - for x in $LIBS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17629,67 +17938,79 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done -fi; if test "x$CY_EXECUTE" = x1; then break; fi - done - +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - ;; #( - *) : - as_fn_error $? "Unknown JavaScript engine: $enableval" "$LINENO" 5 ;; -esac -else + 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 framework JavaScriptCore" >&5 -$as_echo_n "checking for framework JavaScriptCore... " >&6; } -if ${ac_cv_framework_JavaScriptCore+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework JavaScriptCore $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include + 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 -int -main () -{ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc -Wno-unneeded-internal-declaration" >&5 +$as_echo_n "checking for cc -Wno-unneeded-internal-declaration... " >&6; } - JSEvaluateScript(0, 0, 0, 0, 0, 0); + cy_save=$CFLAGS - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : + for element in -Wno-unneeded-internal-declaration; do + haveit= + for x in $CFLAGS; do - ac_cv_framework_JavaScriptCore=yes + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -else - ac_cv_framework_JavaScriptCore=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + fi + done + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 -$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } - if test $ac_cv_framework_JavaScriptCore = yes; then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - for element in "-framework JavaScriptCore"; do + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $LIBS; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17705,93 +18026,38 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - CY_EXECUTE=1 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 -else - for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 -$as_echo_n "checking for WEBKIT... " >&6; } - -if test -n "$WEBKIT_CFLAGS"; then - pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$WEBKIT_LIBS"; then - pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` - else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$WEBKIT_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS - WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - CY_EXECUTE=1 + 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 c++ -Wno-unneeded-internal-declaration" >&5 +$as_echo_n "checking for c++ -Wno-unneeded-internal-declaration... " >&6; } + cy_save=$CXXFLAGS - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17807,12 +18073,28 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-unneeded-internal-declaration; do haveit= for x in $CXXFLAGS; do @@ -17835,9 +18117,33 @@ $as_echo "yes" >&6; } done - for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 + + + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -ObjC -Wno-unneeded-internal-declaration" >&5 +$as_echo_n "checking for c++ -ObjC -Wno-unneeded-internal-declaration... " >&6; } + + cy_save=$OBJCXXFLAGS + + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $OBJCCXXFLAGS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17853,15 +18159,30 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + OBJCXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $LIBS; do + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -17877,133 +18198,34 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" fi done -fi; if test "x$CY_EXECUTE" = x1; then break; fi - done - -fi - -fi - - - - apr_found="no" - - if test "$target_os" = "os2-emx"; then - # Scripts don't pass test -x on OS/2 - TEST_X="test -f" - else - TEST_X="test -x" - fi - - acceptable_majors="1" - - apr_temp_acceptable_apr_config="" - for apr_temp_major in $acceptable_majors - do - case $apr_temp_major in - 0) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" - ;; - *) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" - ;; - esac - done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5 -$as_echo_n "checking for APR... " >&6; } - -# Check whether --with-apr was given. -if test "${with_apr+set}" = set; then : - withval=$with_apr; - if test "$withval" = "no" || test "$withval" = "yes"; then - as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5 - fi - - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - for lookdir in "$withval/bin" "$withval" - do - if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then - apr_config="$lookdir/$apr_temp_apr_config_file" - - apr_found="yes" - break 2 - fi - done - done - - if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then - apr_config="$withval" - apr_found="yes" - fi - - if test "$apr_found" != "yes"; then - as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5 - fi - else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - if test -n "1" && test "1" = "1"; then - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then - apr_config="$apr_temp_apr_config_file" - - apr_found="yes" - break - else - for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do - if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then - apr_config="$lookdir/bin/$apr_temp_apr_config_file" - - apr_found="yes" - break 2 - fi - done - fi - done - fi - if test "$apr_found" = "no" && test -d ""; then - apr_temp_abs_srcdir="`cd && pwd`" - apr_found="reconfig" - apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`" - case $apr_bundled_major in - "") - as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5 - ;; - 0) - apr_temp_apr_config_file="apr-config" - ;; - *) - apr_temp_apr_config_file="apr-$apr_bundled_major-config" - ;; - esac - if test -n ""; then - apr_config="/$apr_temp_apr_config_file" - else - apr_config="/$apr_temp_apr_config_file" - fi - 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 -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5 -$as_echo "$apr_found" >&6; } -case $apr_found in #( - yes) : +for cy_arch in ppc ppc64 i386 x86_64 armv6; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5 +$as_echo_n "checking for -arch $cy_arch... " >&6; } + cy_save=$CXXFLAGS - for element in `$apr_config --includes`; do + for element in "-arch $cy_arch"; do haveit= - for x in $CPPFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18019,15 +18241,39 @@ case $apr_found in #( fi done if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in `$apr_config --link-libtool`; do - haveit= - for x in $LTLIBAPR; do - + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + for element in "-arch $cy_arch"; do + haveit= + for x in $CY_ARCH; do + acl_save_prefix="$prefix" prefix="$acl_final_prefix" acl_save_exec_prefix="$exec_prefix" @@ -18042,86 +18288,196 @@ case $apr_found in #( fi done if test -z "$haveit"; then - LTLIBAPR="${LTLIBAPR}${LTLIBAPR:+ }$element" + CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element" fi done - ;; #( - *) : - as_fn_error $? "missing \"libapr\"" "$LINENO" 5 ;; -esac +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +done +# Extract the first word of "xcodebuild", so it can be a program name with args. +set dummy xcodebuild; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XCODEBUILD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XCODEBUILD in + [\\/]* | ?:[\\/]*) + ac_cv_path_XCODEBUILD="$XCODEBUILD" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test "x$CY_EXECUTE" = x1; then - CY_EXECUTE_TRUE= - CY_EXECUTE_FALSE='#' + ;; +esac +fi +XCODEBUILD=$ac_cv_path_XCODEBUILD +if test -n "$XCODEBUILD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5 +$as_echo "$XCODEBUILD" >&6; } else - CY_EXECUTE_TRUE='#' - CY_EXECUTE_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +if test "x$XCODEBUILD" != x; then : + + CY_XCODE_MACOSXSDK=`xcodebuild -sdk macosx -version Path` + + CY_XCODE_IOSSIMSDK=`xcodebuild -sdk iphonesimulator -version Path` -case $CY_EXECUTE in #( - 1) : - for ac_header in ffi.h ffi/ffi.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - break fi -done + if test "x$CY_XCODE_IOSSIMSDK" != x; then + CY_IOS_SIMULATOR_TRUE= + CY_IOS_SIMULATOR_FALSE='#' +else + CY_IOS_SIMULATOR_TRUE='#' + CY_IOS_SIMULATOR_FALSE= +fi + + + + + + + + +# Check whether --enable-javascript was given. +if test "${enable_javascript+set}" = set; then : + enableval=$enable_javascript; + case $enableval in #( + yes) : + cy_save=$LIBS LIBS= - if test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaScriptCore" >&5 +$as_echo_n "checking for framework JavaScriptCore... " >&6; } +if ${ac_cv_framework_JavaScriptCore+:} false; then : + $as_echo_n "(cached) " >&6 +else - LIBFFI_CFLAGS - C compiler flags for LIBFFI, overriding pkg-config - LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework JavaScriptCore $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + ac_cv_framework_JavaScriptCore=yes + +else + ac_cv_framework_JavaScriptCore=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_framework_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 +$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } + if test $ac_cv_framework_JavaScriptCore = yes; then : + + + for element in "-framework JavaScriptCore"; do + haveit= + for x in $LIBS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBS="${LIBS}${LIBS:+ }$element" + fi + done + + + CY_EXECUTE=1 + + + +else + + for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFFI" >&5 -$as_echo_n "checking for LIBFFI... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 +$as_echo_n "checking for WEBKIT... " >&6; } -if test -n "$LIBFFI_CFLAGS"; then - pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS" +if test -n "$WEBKIT_CFLAGS"; then + pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` + pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBFFI_LIBS"; then - pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS" +if test -n "$WEBKIT_LIBS"; then + pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` + pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` else pkg_failed=yes fi @@ -18141,29 +18497,30 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBFFI_PKG_ERRORS" >&5 + echo "$WEBKIT_PKG_ERRORS" >&5 - as_fn_error $? "missing \"libffi\"" "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "missing \"libffi\"" "$LINENO" 5 + : else - LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS - LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS + WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS + WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + CY_EXECUTE=1 - for element in `$PKG_CONFIG --cflags libffi`; do + for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do haveit= - for x in $CFLAGS; do + for x in $CPPFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18179,14 +18536,14 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags libffi`; do + for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do haveit= - for x in $CXXFLAGS; do + for x in $LIBS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18202,152 +18559,132 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + LIBS="${LIBS}${LIBS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags libffi`; do - haveit= - for x in $OBJCCXXFLAGS; do +fi; if test "x$CY_EXECUTE" = x1; then break; fi + done - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +fi + LTJAVASCRIPTCORE=$LIBS + LIBS=$cy_save - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" - fi - done + ;; #( + no) : + CY_EXECUTE=0 + ;; #( + JavaScriptCore) : - for element in `$PKG_CONFIG --libs libffi`; do - haveit= - for x in $LIBS; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" - fi - done - - -fi -else + cy_save=$LIBS + LIBS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ffi_call" >&5 -$as_echo_n "checking for library containing ffi_call... " >&6; } -if ${ac_cv_search_ffi_call+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaScriptCore" >&5 +$as_echo_n "checking for framework JavaScriptCore... " >&6; } +if ${ac_cv_framework_JavaScriptCore+:} false; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework JavaScriptCore $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 ffi_call (); + #include + int main () { -return ffi_call (); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } _ACEOF -for ac_lib in '' ffi; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_ffi_call=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ffi_call+:} false; then : - break -fi -done -if ${ac_cv_search_ffi_call+:} false; then : +if ac_fn_cxx_try_link "$LINENO"; then : + + ac_cv_framework_JavaScriptCore=yes else - ac_cv_search_ffi_call=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + ac_cv_framework_JavaScriptCore=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ffi_call" >&5 -$as_echo "$ac_cv_search_ffi_call" >&6; } -ac_res=$ac_cv_search_ffi_call -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_framework_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 +$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } + if test $ac_cv_framework_JavaScriptCore = yes; then : - case $ac_cv_search_ffi_call in #( - no) : + for element in "-framework JavaScriptCore"; do + haveit= + for x in $LIBS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBS="${LIBS}${LIBS:+ }$element" + fi + done + + + CY_EXECUTE=1 + + + +else + + for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFFI" >&5 -$as_echo_n "checking for LIBFFI... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 +$as_echo_n "checking for WEBKIT... " >&6; } -if test -n "$LIBFFI_CFLAGS"; then - pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS" +if test -n "$WEBKIT_CFLAGS"; then + pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` + pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBFFI_LIBS"; then - pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS" +if test -n "$WEBKIT_LIBS"; then + pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` + pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` else pkg_failed=yes fi @@ -18367,29 +18704,30 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBFFI_PKG_ERRORS" >&5 + echo "$WEBKIT_PKG_ERRORS" >&5 - as_fn_error $? "missing \"libffi\"" "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "missing \"libffi\"" "$LINENO" 5 + : else - LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS - LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS + WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS + WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + CY_EXECUTE=1 - for element in `$PKG_CONFIG --cflags libffi`; do + for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do haveit= - for x in $CFLAGS; do + for x in $CPPFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18405,14 +18743,14 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags libffi`; do + for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do haveit= - for x in $CXXFLAGS; do + for x in $LIBS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18428,36 +18766,72 @@ $as_echo "yes" >&6; } fi done if test -z "$haveit"; then - CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + LIBS="${LIBS}${LIBS:+ }$element" fi done - for element in `$PKG_CONFIG --cflags libffi`; do - haveit= - for x in $OBJCCXXFLAGS; do +fi; if test "x$CY_EXECUTE" = x1; then break; fi + done - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +fi + LTJAVASCRIPTCORE=$LIBS + LIBS=$cy_save - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" - fi - done + ;; #( + *) : + as_fn_error $? "Unknown JavaScript engine: $enableval" "$LINENO" 5 ;; +esac +else - for element in `$PKG_CONFIG --libs libffi`; do + + + cy_save=$LIBS + LIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework JavaScriptCore" >&5 +$as_echo_n "checking for framework JavaScriptCore... " >&6; } +if ${ac_cv_framework_JavaScriptCore+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework JavaScriptCore $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + ac_cv_framework_JavaScriptCore=yes + +else + ac_cv_framework_JavaScriptCore=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_framework_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_JavaScriptCore" >&5 +$as_echo "$ac_cv_framework_JavaScriptCore" >&6; } + if test $ac_cv_framework_JavaScriptCore = yes; then : + + + for element in "-framework JavaScriptCore"; do haveit= for x in $LIBS; do @@ -18480,86 +18854,87 @@ $as_echo "yes" >&6; } done -fi ;; #( - *) : - ;; -esac + CY_EXECUTE=1 -fi - LTLIBFFI=$LIBS - LIBS=$cy_save +else - ac_ext=mm -ac_cpp='$OBJCXXCPP $CPPFLAGS' -ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 +$as_echo_n "checking for WEBKIT... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we really have Objective C++" >&5 -$as_echo_n "checking if we really have Objective C++... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -_ACEOF -if ac_fn_objcxx_try_compile "$LINENO"; then : - - CY_OBJECTIVEC=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - +if test -n "$WEBKIT_CFLAGS"; then + pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test "x$CY_OBJECTIVEC" = x1; then : - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework CoreFoundation" >&5 -$as_echo_n "checking for framework CoreFoundation... " >&6; } -if ${ac_cv_framework_CoreFoundation+:} false; then : - $as_echo_n "(cached) " >&6 + else + pkg_failed=untried +fi +if test -n "$WEBKIT_LIBS"; then + pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$cy_webkit_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$cy_webkit_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework CoreFoundation $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include -int -main () -{ -CFAllocatorGetDefault(); - ; - return 0; -} -_ACEOF -if ac_fn_objcxx_try_link "$LINENO"; then : - ac_cv_framework_CoreFoundation=yes +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_cv_framework_CoreFoundation=no + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS + if test $_pkg_short_errors_supported = yes; then + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` + else + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$WEBKIT_PKG_ERRORS" >&5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_CoreFoundation" >&5 -$as_echo "$ac_cv_framework_CoreFoundation" >&6; } - if test $ac_cv_framework_CoreFoundation = yes; then : + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS + WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CY_EXECUTE=1 - for element in "-framework CoreFoundation"; do + for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do haveit= - for x in $LIBS; do + for x in $CPPFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18575,54 +18950,12 @@ $as_echo "$ac_cv_framework_CoreFoundation" >&6; } fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" fi done - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework Foundation" >&5 -$as_echo_n "checking for framework Foundation... " >&6; } -if ${ac_cv_framework_Foundation+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework Foundation $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ -[[NSObject alloc] init]; - ; - return 0; -} -_ACEOF -if ac_fn_objcxx_try_link "$LINENO"; then : - - ac_cv_framework_Foundation=yes - -else - ac_cv_framework_Foundation=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_Foundation" >&5 -$as_echo "$ac_cv_framework_Foundation" >&6; } - if test $ac_cv_framework_Foundation = yes; then : - - - for element in "-framework Foundation"; do + for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do haveit= for x in $LIBS; do @@ -18644,136 +18977,133 @@ $as_echo "$ac_cv_framework_Foundation" >&6; } fi done - cat >>confdefs.h <<_ACEOF -#define HAVE_FRAMEWORK_FOUNDATION 1 -_ACEOF +fi; if test "x$CY_EXECUTE" = x1; then break; fi + done fi + LTJAVASCRIPTCORE=$LIBS + LIBS=$cy_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework WebKit" >&5 -$as_echo_n "checking for framework WebKit... " >&6; } -if ${ac_cv_framework_WebKit+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework WebKit $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include +fi -int -main () -{ -[[WebScriptObject alloc] init]; - ; - return 0; -} -_ACEOF -if ac_fn_objcxx_try_link "$LINENO"; then : - ac_cv_framework_WebKit=yes -else - ac_cv_framework_WebKit=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_framework_save_LIBS + apr_found="no" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_WebKit" >&5 -$as_echo "$ac_cv_framework_WebKit" >&6; } - if test $ac_cv_framework_WebKit = yes; then : + if test "$target_os" = "os2-emx"; then + # Scripts don't pass test -x on OS/2 + TEST_X="test -f" + else + TEST_X="test -x" + fi + acceptable_majors="1" - for element in "-framework WebKit"; do - haveit= - for x in $LIBS; do + apr_temp_acceptable_apr_config="" + for apr_temp_major in $acceptable_majors + do + case $apr_temp_major in + 0) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" + ;; + *) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" + ;; + esac + done - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5 +$as_echo_n "checking for APR... " >&6; } - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" +# Check whether --with-apr was given. +if test "${with_apr+set}" = set; then : + withval=$with_apr; + if test "$withval" = "no" || test "$withval" = "yes"; then + as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5 fi - done - cat >>confdefs.h <<_ACEOF -#define HAVE_FRAMEWORK_WEBKIT 1 -_ACEOF + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + for lookdir in "$withval/bin" "$withval" + do + if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then + apr_config="$lookdir/$apr_temp_apr_config_file" + apr_found="yes" + break 2 + fi + done + done -fi + if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then + apr_config="$withval" + apr_found="yes" + fi + if test "$apr_found" != "yes"; then + as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5 + fi else + if test -n "1" && test "1" = "1"; then + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then + apr_config="$apr_temp_apr_config_file" - for ac_prog in gnustep-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNUSTEP_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GNUSTEP_CONFIG"; then - ac_cv_prog_GNUSTEP_CONFIG="$GNUSTEP_CONFIG" # Let the user override the test. -else -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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GNUSTEP_CONFIG="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GNUSTEP_CONFIG=$ac_cv_prog_GNUSTEP_CONFIG -if test -n "$GNUSTEP_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_CONFIG" >&5 -$as_echo "$GNUSTEP_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + apr_found="yes" + break + else + for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do + if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then + apr_config="$lookdir/bin/$apr_temp_apr_config_file" + apr_found="yes" + break 2 + fi + done + fi + done + fi + if test "$apr_found" = "no" && test -d ""; then + apr_temp_abs_srcdir="`cd && pwd`" + apr_found="reconfig" + apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`" + case $apr_bundled_major in + "") + as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5 + ;; + 0) + apr_temp_apr_config_file="apr-config" + ;; + *) + apr_temp_apr_config_file="apr-$apr_bundled_major-config" + ;; + esac + if test -n ""; then + apr_config="/$apr_temp_apr_config_file" + else + apr_config="/$apr_temp_apr_config_file" + fi + fi - test -n "$GNUSTEP_CONFIG" && break -done +fi - if test "x$GNUSTEP_CONFIG" != x; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5 +$as_echo "$apr_found" >&6; } +case $apr_found in #( + yes) : - for element in `$GNUSTEP_CONFIG --objc-flags`; do + for element in `$apr_config --includes`; do haveit= - for x in $OBJCXXFLAGS; do + for x in $CPPFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18789,14 +19119,14 @@ done fi done if test -z "$haveit"; then - OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" fi done - for element in `$GNUSTEP_CONFIG --base-libs`; do + for element in `$apr_config --link-libtool`; do haveit= - for x in $LIBS; do + for x in $LTLIBAPR; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -18812,105 +19142,32 @@ done fi done if test -z "$haveit"; then - LIBS="${LIBS}${LIBS:+ }$element" + LTLIBAPR="${LTLIBAPR}${LTLIBAPR:+ }$element" fi done -else - CY_OBJECTIVEC=0 - -fi - -fi - -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 - ;; #( *) : - ;; + as_fn_error $? "missing \"libapr\"" "$LINENO" 5 ;; esac - if test "x$CY_OBJECTIVEC" = x1; then - CY_OBJECTIVEC_TRUE= - CY_OBJECTIVEC_FALSE='#' -else - CY_OBJECTIVEC_TRUE='#' - CY_OBJECTIVEC_FALSE= -fi - - - cy_save=$LIBS - LIBS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 -$as_echo_n "checking for a readline compatible library... " >&6; } -if ${ax_cv_lib_readline+:} false; then : - $as_echo_n "(cached) " >&6 + if test "x$CY_EXECUTE" = x1; then + CY_EXECUTE_TRUE= + CY_EXECUTE_FALSE='#' else - - ORIG_LIBS="$LIBS" - for readline_lib in readline edit editline; do - for termcap_lib in "" termcap curses ncurses; do - if test -z "$termcap_lib"; then - TRY_LIB="-l$readline_lib" - else - TRY_LIB="-l$readline_lib -l$termcap_lib" - fi - LIBS="$ORIG_LIBS $TRY_LIB" - 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 readline (); -int -main () -{ -return readline (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ax_cv_lib_readline="$TRY_LIB" + CY_EXECUTE_TRUE='#' + CY_EXECUTE_FALSE= fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -n "$ax_cv_lib_readline"; then - break - fi - done - if test -n "$ax_cv_lib_readline"; then - break - fi - done - if test -z "$ax_cv_lib_readline"; then - ax_cv_lib_readline="no" - fi - LIBS="$ORIG_LIBS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5 -$as_echo "$ax_cv_lib_readline" >&6; } - if test "$ax_cv_lib_readline" != "no"; then - LIBS="$LIBS $ax_cv_lib_readline" -$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h +case $CY_EXECUTE in #( + 1) : - for ac_header in readline.h readline/readline.h + for ac_header in ffi.h ffi/ffi.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -18918,82 +19175,143 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - + break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5 -$as_echo_n "checking whether readline supports history... " >&6; } -if ${ax_cv_lib_readline_history+:} false; then : - $as_echo_n "(cached) " >&6 -else - ax_cv_lib_readline_history="no" - 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 add_history (); -int -main () -{ -return add_history (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ax_cv_lib_readline_history="yes" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + cy_save=$LIBS + LIBS= + if test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno; then : -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5 -$as_echo "$ax_cv_lib_readline_history" >&6; } - if test "$ax_cv_lib_readline_history" = "yes"; then -$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h + LIBFFI_CFLAGS + C compiler flags for LIBFFI, overriding pkg-config + LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config - for ac_header in history.h readline/history.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFFI" >&5 +$as_echo_n "checking for LIBFFI... " >&6; } +if test -n "$LIBFFI_CFLAGS"; then + pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBFFI_LIBS"; then + pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -done + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` + else + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBFFI_PKG_ERRORS" >&5 + + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 +else + LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS + LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + for element in `$PKG_CONFIG --cflags libffi`; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" fi - fi + done - LTLIBREADLINE=$LIBS - LIBS=$cy_save + for element in `$PKG_CONFIG --libs libffi`; do + haveit= + for x in $LIBS; do -case $ax_cv_lib_readline in #( - no) : - as_fn_error $? "missing \"libreadline\"" "$LINENO" 5 ;; #( - *) : - ;; -esac + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBS="${LIBS}${LIBS:+ }$element" + fi + done - cy_save=$LIBS - LIBS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cur_term" >&5 -$as_echo_n "checking for library containing cur_term... " >&6; } -if ${ac_cv_search_cur_term+:} false; then : +fi + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ffi_call" >&5 +$as_echo_n "checking for library containing ffi_call... " >&6; } +if ${ac_cv_search_ffi_call+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -19006,16 +19324,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char cur_term (); +char ffi_call (); int main () { -return cur_term (); +return ffi_call (); ; return 0; } _ACEOF -for ac_lib in '' termcap; do +for ac_lib in '' ffi; do if test -z "$ac_lib"; then ac_res="none required" else @@ -19023,638 +19341,376 @@ for ac_lib in '' termcap; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_search_cur_term=$ac_res + ac_cv_search_ffi_call=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_cur_term+:} false; then : + if ${ac_cv_search_ffi_call+:} false; then : break fi done -if ${ac_cv_search_cur_term+:} false; then : +if ${ac_cv_search_ffi_call+:} false; then : else - ac_cv_search_cur_term=no + ac_cv_search_ffi_call=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cur_term" >&5 -$as_echo "$ac_cv_search_cur_term" >&6; } -ac_res=$ac_cv_search_cur_term +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ffi_call" >&5 +$as_echo "$ac_cv_search_ffi_call" >&6; } +ac_res=$ac_cv_search_ffi_call if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - LTLIBTERMCAP=$LIBS - LIBS=$cy_save + case $ac_cv_search_ffi_call in #( + no) : +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFFI" >&5 +$as_echo_n "checking for LIBFFI... " >&6; } -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 +if test -n "$LIBFFI_CFLAGS"; then + pkg_cv_LIBFFI_CFLAGS="$LIBFFI_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBFFI_LIBS"; then + pkg_cv_LIBFFI_LIBS="$LIBFFI_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libffi") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` + else + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBFFI_PKG_ERRORS" >&5 + + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 +else + LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS + LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + for element in `$PKG_CONFIG --cflags libffi`; do + haveit= + for x in $CPPFLAGS; do + acl_save_prefix="$prefix" prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi + for element in `$PKG_CONFIG --libs libffi`; do + haveit= + for x in $LIBS; do -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which - # contains only /bin. Note that ksh looks also at the FPATH variable, - # so we have to set that as well for the test. - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - || PATH_SEPARATOR=';' - } -fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` - while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${acl_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${acl_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$acl_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$acl_cv_prog_gnu_ld + LTLIBFFI=$LIBS + LIBS=$cy_save + + ac_ext=mm +ac_cpp='$OBJCXXCPP $CPPFLAGS' +ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we really have Objective C++" >&5 +$as_echo_n "checking if we really have Objective C++... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 -$as_echo_n "checking for shared library run path origin... " >&6; } -if ${acl_cv_rpath+:} false; then : - $as_echo_n "(cached) " >&6 -else +_ACEOF +if ac_fn_objcxx_try_compile "$LINENO"; then : - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done + CY_OBJECTIVEC=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 -$as_echo "$acl_cv_rpath" >&6; } - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - # Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then : - enableval=$enable_rpath; : else - enable_rpath=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$CY_OBJECTIVEC" = x1; then : + cy_save=$LIBS + LIBS= - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 -$as_echo_n "checking for 64-bit host... " >&6; } -if ${gl_cv_solaris_64bit+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework CoreFoundation" >&5 +$as_echo_n "checking for framework CoreFoundation... " >&6; } +if ${ac_cv_framework_CoreFoundation+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework CoreFoundation $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef _LP64 -sixtyfour bits -#endif + #include +int +main () +{ +CFAllocatorGetDefault(); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "sixtyfour bits" >/dev/null 2>&1; then : - gl_cv_solaris_64bit=yes +if ac_fn_objcxx_try_link "$LINENO"; then : + + ac_cv_framework_CoreFoundation=yes + else - gl_cv_solaris_64bit=no + ac_cv_framework_CoreFoundation=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_framework_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 -$as_echo "$gl_cv_solaris_64bit" >&6; } - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_CoreFoundation" >&5 +$as_echo "$ac_cv_framework_CoreFoundation" >&6; } + if test $ac_cv_framework_CoreFoundation = yes; then : + + for element in "-framework CoreFoundation"; do + haveit= + for x in $LIBS; do + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBS="${LIBS}${LIBS:+ }$element" + fi + done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework Foundation" >&5 +$as_echo_n "checking for framework Foundation... " >&6; } +if ${ac_cv_framework_Foundation+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework Foundation $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include - use_additional=yes +int +main () +{ +[[NSObject alloc] init]; + ; + return 0; +} +_ACEOF +if ac_fn_objcxx_try_link "$LINENO"; then : - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" + ac_cv_framework_Foundation=yes - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" +else + ac_cv_framework_Foundation=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_framework_save_LIBS - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_framework_Foundation" >&5 +$as_echo "$ac_cv_framework_Foundation" >&6; } + if test $ac_cv_framework_Foundation = yes; then : -# Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then : - withval=$with_libiconv_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then + for element in "-framework Foundation"; do + haveit= + for x in $LIBS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" acl_save_exec_prefix="$exec_prefix" exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - + eval x=\"$x\" exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi + if test "X$x" = "X$element"; then + haveit=yes + break fi + done + if test -z "$haveit"; then + LIBS="${LIBS}${LIBS:+ }$element" fi + done + + cat >>confdefs.h <<_ACEOF +#define HAVE_FRAMEWORK_FOUNDATION 1 +_ACEOF + fi - LIBICONV= - LTLIBICONV= - INCICONV= - LIBICONV_PREFIX= - HAVE_LIBICONV= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +else - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$acl_hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBICONV; do - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" + for ac_prog in gnustep-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GNUSTEP_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GNUSTEP_CONFIG"; then + ac_cv_prog_GNUSTEP_CONFIG="$GNUSTEP_CONFIG" # Let the user override the test. +else +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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GNUSTEP_CONFIG="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = 'iconv'; then - LIBICONV_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = 'iconv'; then - LIBICONV_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCICONV; do +fi +fi +GNUSTEP_CONFIG=$ac_cv_prog_GNUSTEP_CONFIG +if test -n "$GNUSTEP_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_CONFIG" >&5 +$as_echo "$GNUSTEP_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do + test -n "$GNUSTEP_CONFIG" && break +done + + + if test "x$GNUSTEP_CONFIG" != x; then : - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do + + for element in `$GNUSTEP_CONFIG --objc-flags`; do + haveit= + for x in $OBJCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -19664,108 +19720,20 @@ fi exec_prefix="$acl_save_exec_prefix" prefix="$acl_save_prefix" - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi + if test "X$x" = "X$element"; then + haveit=yes + break fi done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done - fi - - - - - - - - - - - + if test -z "$haveit"; then + OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" + fi + done - am_save_CPPFLAGS="$CPPFLAGS" - for element in $INCICONV; do + for element in `$GNUSTEP_CONFIG --base-libs`; do haveit= - for x in $CPPFLAGS; do + for x in $LIBS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -19781,294 +19749,248 @@ fi fi done if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + LIBS="${LIBS}${LIBS:+ }$element" fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : +else + CY_OBJECTIVEC=0 + +fi + +fi + LTOBJECTIVEC=$LIBS + LIBS=$cy_save + + + +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 + + ;; #( + *) : + ;; +esac + + if test "x$CY_OBJECTIVEC" = x1; then + CY_OBJECTIVEC_TRUE= + CY_OBJECTIVEC_FALSE='#' +else + CY_OBJECTIVEC_TRUE='#' + CY_OBJECTIVEC_FALSE= +fi + + + + cy_save=$LIBS + LIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 +$as_echo_n "checking for a readline compatible library... " >&6; } +if ${ax_cv_lib_readline+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ORIG_LIBS="$LIBS" + for readline_lib in readline edit editline; do + for termcap_lib in "" termcap curses ncurses; do + if test -z "$termcap_lib"; then + TRY_LIB="-l$readline_lib" + else + TRY_LIB="-l$readline_lib -l$termcap_lib" + fi + LIBS="$ORIG_LIBS $TRY_LIB" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include - +/* 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 readline (); int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +return readline (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_func_iconv=yes +if ac_fn_cxx_try_link "$LINENO"; then : + ax_cv_lib_readline="$TRY_LIB" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -z "$ax_cv_lib_readline"; then + ax_cv_lib_readline="no" + fi + LIBS="$ORIG_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5 +$as_echo "$ax_cv_lib_readline" >&6; } + + if test "$ax_cv_lib_readline" != "no"; then + LIBS="$LIBS $ax_cv_lib_readline" + +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h + + for ac_header in readline.h readline/readline.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5 +$as_echo_n "checking whether readline supports history... " >&6; } +if ${ax_cv_lib_readline_history+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_cv_lib_readline_history="no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include - +/* 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 add_history (); int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +return add_history (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes +if ac_fn_cxx_try_link "$LINENO"; then : + ax_cv_lib_readline_history="yes" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -$as_echo_n "checking for working iconv... " >&6; } -if ${am_cv_func_iconv_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5 +$as_echo "$ax_cv_lib_readline_history" >&6; } + if test "$ax_cv_lib_readline_history" = "yes"; then -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h -#include -#include -int main () -{ - int result = 0; - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - result |= 1; - iconv_close (cd_utf8_to_88591); - } - } - /* Test against Solaris 10 bug: Failures are not distinguishable from - successful returns. */ - { - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); - if (cd_ascii_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\263"; - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - result |= 2; - iconv_close (cd_ascii_to_88591); - } - } - /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304"; - static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; - size_t inbytesleft = 1; - char *outptr = buf; - size_t outbytesleft = 1; - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) - result |= 4; - iconv_close (cd_88591_to_utf8); - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - result |= 8; - iconv_close (cd_88591_to_utf8); - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - result |= 16; - return result; -} + for ac_header in history.h readline/history.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - am_cv_func_iconv_works=yes -else - am_cv_func_iconv_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + fi - LIBS="$am_save_LIBS" +done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -$as_echo "$am_cv_func_iconv_works" >&6; } - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no + fi fi - if test "$am_func_iconv" = yes; then -$as_echo "#define HAVE_ICONV 1" >>confdefs.h + LTLIBREADLINE=$LIBS + LIBS=$cy_save - fi - if test "$am_cv_lib_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi +case $ax_cv_lib_readline in #( + no) : + as_fn_error $? "missing \"libreadline\"" "$LINENO" 5 ;; #( + *) : + ;; +esac - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : + cy_save=$LIBS + LIBS= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cur_term" >&5 +$as_echo_n "checking for library containing cur_term... " >&6; } +if ${ac_cv_search_cur_term+:} false; then : $as_echo_n "(cached) " >&6 else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -extern +/* 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 -"C" -#endif -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); +extern "C" #endif - +char cur_term (); int main () { - +return cur_term (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" -else - am_cv_proto_iconv_arg1="const" +for ac_lib in '' termcap; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_cur_term=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_cur_term+:} false; then : + break fi +done +if ${ac_cv_search_cur_term+:} false; then : - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: - $am_cv_proto_iconv" >&5 -$as_echo " - $am_cv_proto_iconv" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF +else + ac_cv_search_cur_term=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cur_term" >&5 +$as_echo "$ac_cv_search_cur_term" >&6; } +ac_res=$ac_cv_search_cur_term +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi - fi + LTLIBTERMCAP=$LIBS + LIBS=$cy_save -case $am_cv_func_iconv in #( - yes) : - ;; #( - *) : - as_fn_error $? "missing \"libiconv\"" "$LINENO" 5 ;; -esac -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 @@ -20524,6 +20446,10 @@ else am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20540,6 +20466,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CY_IOS_SIMULATOR_TRUE}" && test -z "${CY_IOS_SIMULATOR_FALSE}"; then + as_fn_error $? "conditional \"CY_IOS_SIMULATOR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CY_EXECUTE_TRUE}" && test -z "${CY_EXECUTE_FALSE}"; then as_fn_error $? "conditional \"CY_EXECUTE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5