Mark output from ?debug separate from the result.

[cycript.git] / configure

diff --git a/configure b/configure
index fd56f77975f7baf2ad6c20aabb0ca4dc2f5b1111..fc1f178e8b5188c62b48ffb76c5e273efc282f7b 100755 (executable)
--- a/configure
+++ b/configure
@@ -650,12 +650,12 @@ ac_ct__LIPO
 _LIPO
 SO
 LTFLAGS
 _LIPO
 SO
 LTFLAGS

-LTLIBICONV
-LIBICONV
+LTLIBGCC

 LTLIBTERMCAP
 LTLIBREADLINE
 CY_OBJECTIVEC_FALSE
 CY_OBJECTIVEC_TRUE
 LTLIBTERMCAP
 LTLIBREADLINE
 CY_OBJECTIVEC_FALSE
 CY_OBJECTIVEC_TRUE

+LTOBJECTIVEC

 GNUSTEP_CONFIG
 CY_OBJECTIVEC
 LTLIBFFI
 GNUSTEP_CONFIG
 CY_OBJECTIVEC
 LTLIBFFI


@@ -664,6 +664,9 @@ LIBFFI_CFLAGS
 CY_EXECUTE_FALSE
 CY_EXECUTE_TRUE
 LTLIBAPR
 CY_EXECUTE_FALSE
 CY_EXECUTE_TRUE
 LTLIBAPR

+CY_CONSOLE_FALSE
+CY_CONSOLE_TRUE
+LTJAVASCRIPTCORE

 WEBKIT_LIBS
 WEBKIT_CFLAGS
 CY_EXECUTE
 WEBKIT_LIBS
 WEBKIT_CFLAGS
 CY_EXECUTE


@@ -675,7 +678,6 @@ FLEX
 BISON
 TIME
 GIT
 BISON
 TIME
 GIT

-_BASH

 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG


@@ -708,12 +710,6 @@ build_vendor
 build_cpu
 build
 LIBTOOL
 build_cpu
 build
 LIBTOOL

-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-ac_ct_CC
-CFLAGS
-CC

 ac_ct_AR
 AR
 am__fastdepOBJCXX_FALSE
 ac_ct_AR
 AR
 am__fastdepOBJCXX_FALSE


@@ -725,6 +721,12 @@ OBJCXX
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE

+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE

 am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE


@@ -734,11 +736,14 @@ am__include
 DEPDIR
 OBJEXT
 EXEEXT
 DEPDIR
 OBJEXT
 EXEEXT

-ac_ct_CXX
+ac_ct_CC

 CPPFLAGS
 LDFLAGS
 CPPFLAGS
 LDFLAGS

-CXXFLAGS
-CXX
+CFLAGS
+CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE

 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V


@@ -808,6 +813,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
 ac_user_opts='
 enable_option_checking
 enable_silent_rules

+enable_maintainer_mode

 enable_dependency_tracking
 enable_static
 enable_shared
 enable_dependency_tracking
 enable_static
 enable_shared


@@ -817,23 +823,22 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_javascript
 with_sysroot
 enable_libtool_lock
 enable_javascript

+enable_console

 with_apr
 with_apr

-enable_rpath
-with_libiconv_prefix

 '
       ac_precious_vars='build_alias
 host_alias
 target_alias
 '
       ac_precious_vars='build_alias
 host_alias
 target_alias

-CXX
-CXXFLAGS
+CC
+CFLAGS

 LDFLAGS
 LIBS
 CPPFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS

+CXX
+CXXFLAGS

 CCC
 OBJCXX
 OBJCXXFLAGS
 CCC
 OBJCXX
 OBJCXXFLAGS

-CC
-CFLAGS

 CPP
 CXXCPP
 PKG_CONFIG
 CPP
 CXXCPP
 PKG_CONFIG


@@ -1468,6 +1473,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-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
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking


@@ -1481,7 +1489,7 @@ Optional Features:
                           use a JavaScript runtime (currently the only
                           available option for ENGINE is JavaScriptCore)
                           [default=yes]
                           use a JavaScript runtime (currently the only
                           available option for ENGINE is JavaScriptCore)
                           [default=yes]

-  --disable-rpath         do not hardcode runtime library paths
+  --disable-console       disable console

 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]


@@ -1493,22 +1501,19 @@ Optional Packages:
                         (or the compiler's sysroot if not specified).
   --with-apr=PATH         prefix for installed APR or the full path to
                              apr-config
                         (or the compiler's sysroot if not specified).
   --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:
 
 Some influential environment variables:

-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
+  CC          C compiler command
+  CFLAGS      C compiler flags

   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>

+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags

   OBJCXX      Objective C++ compiler command
   OBJCXXFLAGS Objective C++ compiler flags
   OBJCXX      Objective C++ compiler command
   OBJCXXFLAGS Objective C++ compiler flags

-  CC          C compiler command
-  CFLAGS      C compiler flags

   CPP         C preprocessor
   CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   CPP         C preprocessor
   CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility


@@ -1609,10 +1614,10 @@ fi
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
 ## Autoconf initialization. ##
 ## ------------------------ ##
 

-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
+# ac_fn_c_try_compile LINENO
+# --------------------------

 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 # Try to compile conftest.$ac_ext, and return whether this succeeded.

-ac_fn_cxx_try_compile ()
+ac_fn_c_try_compile ()

 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext


@@ -1632,7 +1637,7 @@ $as_echo "$ac_try_echo"; } >&5
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {

-        test -z "$ac_cxx_werror_flag" ||
+        test -z "$ac_c_werror_flag" ||

         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0


@@ -1645,12 +1650,12 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 

-} # ac_fn_cxx_try_compile
+} # ac_fn_c_try_compile

 
 

-# ac_fn_objcxx_try_compile LINENO
-# -------------------------------
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------

 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 # Try to compile conftest.$ac_ext, and return whether this succeeded.

-ac_fn_objcxx_try_compile ()
+ac_fn_cxx_try_compile ()

 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext


@@ -1670,7 +1675,7 @@ $as_echo "$ac_try_echo"; } >&5
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {

-        test -z "$ac_objcxx_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||

         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0


@@ -1683,12 +1688,12 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 

-} # ac_fn_objcxx_try_compile
+} # ac_fn_cxx_try_compile

 
 

-# ac_fn_c_try_compile LINENO
-# --------------------------
+# ac_fn_objcxx_try_compile LINENO
+# -------------------------------

 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 # Try to compile conftest.$ac_ext, and return whether this succeeded.

-ac_fn_c_try_compile ()
+ac_fn_objcxx_try_compile ()

 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext


@@ -1708,7 +1713,7 @@ $as_echo "$ac_try_echo"; } >&5
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {

-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_objcxx_werror_flag" ||

         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0


@@ -1721,7 +1726,7 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 

-} # ac_fn_c_try_compile
+} # ac_fn_objcxx_try_compile

 
 # ac_fn_c_try_link LINENO
 # -----------------------
 
 # ac_fn_c_try_link LINENO
 # -----------------------


@@ -2553,7 +2558,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ac_config_headers="$ac_config_headers config.h"
 
 
 ac_config_headers="$ac_config_headers config.h"
 
 

-am__api_version='1.13'
+am__api_version='1.14'

 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or


@@ -3079,6 +3084,10 @@ mkdir_p='$(MKDIR_P)'
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 

+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+

 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 


@@ -3086,27 +3095,86 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
 

-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
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2

   else
   else

-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+{ $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
+
+
+
+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 "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_CXX+:} false; then :
+if ${ac_cv_prog_CC+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -3115,7 +3183,7 @@ do
   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
   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_CXX="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -3125,32 +3193,28 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 

-    test -n "$CXX" && break
-  done

 fi
 fi

-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -3159,7 +3223,7 @@ do
   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
   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_ac_ct_CXX="$ac_prog"
+    ac_cv_prog_ac_ct_CC="gcc"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -3169,21 +3233,17 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 

-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
+  if test "x$ac_ct_CC" = x; then
+    CC=""

   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)


@@ -3191,75 +3251,281 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac

-    CXX=$ac_ct_CXX
+    CC=$ac_ct_CC

   fi
   fi

+else
+  CC="$ac_cv_prog_CC"

 fi
 
 fi
 

+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2

   fi
   fi

-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }

 done
 done

+  done
+IFS=$as_save_IFS

 
 

-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi

 
 

-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles

 
 

-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; 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_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+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
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $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 $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$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_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$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
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+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_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="$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
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac

 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5


@@ -3309,14 +3575,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error 77 "C++ compiler cannot create executables
+as_fn_error 77 "C compiler cannot create executables

 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext


@@ -3410,7 +3676,7 @@ $as_echo "$ac_try_echo"; } >&5
     else
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     else
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "cannot run C++ compiled programs.
+as_fn_error $? "cannot run C compiled programs.

 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi


@@ -3472,9 +3738,9 @@ fi
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext


@@ -3491,33 +3757,33 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :

   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ac_cv_c_compiler_gnu=$ac_compiler_gnu

 
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }

 if test $ac_compiler_gnu = yes; then
 if test $ac_compiler_gnu = yes; then

-  GXX=yes
+  GCC=yes

 else
 else

-  GXX=
+  GCC=

 fi
 fi

-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"

    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -3529,10 +3795,10 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes

 else
 else

-  CXXFLAGS=""
+  CFLAGS=""

       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -3544,11 +3810,11 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :

 
 else
 
 else

-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-        CXXFLAGS="-g"
+  ac_c_werror_flag=$ac_save_c_werror_flag
+        CFLAGS="-g"

         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -3560,38 +3826,187 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes

 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+   ac_c_werror_flag=$ac_save_c_werror_flag

 fi
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"

   else
   else

-    CXXFLAGS="-g"
+    CFLAGS="-g"

   fi
 else
   fi
 else

-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"

   else
   else

-    CXXFLAGS=
+    CFLAGS=

   fi
 fi
   fi
 fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+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
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi

 ac_ext=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
 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

+

 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"


@@ -3656,11 +4071,11 @@ fi
 
 
 
 
 
 

-depcc="$CXX"  am_compiler_list=
+depcc="$CC"   am_compiler_list=

 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }

-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then


@@ -3683,7 +4098,7 @@ else
   # directory.
   mkdir sub
 
   # directory.
   mkdir sub
 

-  am_cv_CXX_dependencies_compiler_type=none
+  am_cv_CC_dependencies_compiler_type=none

   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi


@@ -3756,7 +4171,7 @@ else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

-        am_cv_CXX_dependencies_compiler_type=$depmode
+        am_cv_CC_dependencies_compiler_type=$depmode

         break
       fi
     fi
         break
       fi
     fi


@@ -3765,42 +4180,46 @@ else
   cd ..
   rm -rf conftest.dir
 else
   cd ..
   rm -rf conftest.dir
 else

-  am_cv_CXX_dependencies_compiler_type=none
+  am_cv_CC_dependencies_compiler_type=none

 fi
 
 fi
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

 
  if
   test "x$enable_dependency_tracking" != xno \
 
  if
   test "x$enable_dependency_tracking" != xno \

-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'

 else
 else

-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=

 fi
 
 
 fi
 
 

-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
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ objc++ objcxx c++ CXX
+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
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$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; }
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$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_OBJCXX+:} false; then :
+if ${ac_cv_prog_CXX+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$OBJCXX"; then
-  ac_cv_prog_OBJCXX="$OBJCXX" # Let the user override the test.
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -3809,7 +4228,7 @@ do
   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
   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_OBJCXX="$ac_tool_prefix$ac_prog"
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -3819,32 +4238,32 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-OBJCXX=$ac_cv_prog_OBJCXX
-if test -n "$OBJCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
-$as_echo "$OBJCXX" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 

-    test -n "$OBJCXX" && break
+    test -n "$CXX" && break

   done
 fi
   done
 fi

-if test -z "$OBJCXX"; then
-  ac_ct_OBJCXX=$OBJCXX
-  for ac_prog in g++ objc++ objcxx c++ CXX
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

 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; }
 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_ac_ct_OBJCXX+:} false; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$ac_ct_OBJCXX"; then
-  ac_cv_prog_ac_ct_OBJCXX="$ac_ct_OBJCXX" # Let the user override the test.
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -3853,7 +4272,7 @@ do
   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
   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_ac_ct_OBJCXX="$ac_prog"
+    ac_cv_prog_ac_ct_CXX="$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -3863,21 +4282,21 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-ac_ct_OBJCXX=$ac_cv_prog_ac_ct_OBJCXX
-if test -n "$ac_ct_OBJCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
-$as_echo "$ac_ct_OBJCXX" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 

-  test -n "$ac_ct_OBJCXX" && break
+  test -n "$ac_ct_CXX" && break

 done
 
 done
 

-  if test "x$ac_ct_OBJCXX" = x; then
-    OBJCXX="g++"
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"

   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)


@@ -3885,12 +4304,14 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac

-    OBJCXX=$ac_ct_OBJCXX
+    CXX=$ac_ct_CXX

   fi
 fi
 
   fi
 fi
 

+  fi
+fi

 # Provide some information about the compiler.
 # Provide some information about the compiler.

-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do


@@ -3914,9 +4335,9 @@ $as_echo "$ac_try_echo"; } >&5
   test $ac_status = 0; }
 done
 
   test $ac_status = 0; }
 done
 

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU Objective C++ compiler... " >&6; }
-if ${ac_cv_objcxx_compiler_gnu+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext


@@ -3933,33 +4354,33 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :

   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-ac_cv_objcxx_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

 
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
-$as_echo "$ac_cv_objcxx_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

 if test $ac_compiler_gnu = yes; then
 if test $ac_compiler_gnu = yes; then

-  GOBJCXX=yes
+  GXX=yes

 else
 else

-  GOBJCXX=
+  GXX=

 fi
 fi

-ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+set}
-ac_save_OBJCXXFLAGS=$OBJCXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
-$as_echo_n "checking whether $OBJCXX accepts -g... " >&6; }
-if ${ac_cv_prog_objcxx_g+:} false; then :
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
-   ac_objcxx_werror_flag=yes
-   ac_cv_prog_objcxx_g=no
-   OBJCXXFLAGS="-g"
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"

    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -3971,10 +4392,10 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_objcxx_try_compile "$LINENO"; then :
-  ac_cv_prog_objcxx_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes

 else
 else

-  OBJCXXFLAGS=""
+  CXXFLAGS=""

       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -3986,11 +4407,11 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :

 
 else
 
 else

-  ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
-        OBJCXXFLAGS="-g"
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+        CXXFLAGS="-g"

         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -4002,31 +4423,31 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_objcxx_try_compile "$LINENO"; then :
-  ac_cv_prog_objcxx_g=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes

 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-   ac_objcxx_werror_flag=$ac_save_objcx_werror_flag
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag

 fi
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
-$as_echo "$ac_cv_prog_objcxx_g" >&6; }
-if test "$ac_test_OBJCXXFLAGS" = set; then
-  OBJCXXFLAGS=$ac_save_OBJCXXFLAGS
-elif test $ac_cv_prog_objcxx_g = yes; then
-  if test "$GOBJCXX" = yes; then
-    OBJCXXFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"

   else
   else

-    OBJCXXFLAGS="-g"
+    CXXFLAGS="-g"

   fi
 else
   fi
 else

-  if test "$GOBJCXX" = yes; then
-    OBJCXXFLAGS="-O2"
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"

   else
   else

-    OBJCXXFLAGS=
+    CXXFLAGS=

   fi
 fi
 ac_ext=c
   fi
 fi
 ac_ext=c


@@ -4035,11 +4456,11 @@ 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
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-depcc="$OBJCXX" am_compiler_list='gcc3 gcc'
+depcc="$CXX"  am_compiler_list=

 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }

-if ${am_cv_OBJCXX_dependencies_compiler_type+:} false; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then


@@ -4062,12 +4483,14 @@ else
   # directory.
   mkdir sub
 
   # directory.
   mkdir sub
 

-  am_cv_OBJCXX_dependencies_compiler_type=none
+  am_cv_CXX_dependencies_compiler_type=none

   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   am__universal=false
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   am__universal=false

-
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac

 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers


@@ -4133,7 +4556,7 @@ else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

-        am_cv_OBJCXX_dependencies_compiler_type=$depmode
+        am_cv_CXX_dependencies_compiler_type=$depmode

         break
       fi
     fi
         break
       fi
     fi


@@ -4142,40 +4565,42 @@ else
   cd ..
   rm -rf conftest.dir
 else
   cd ..
   rm -rf conftest.dir
 else

-  am_cv_OBJCXX_dependencies_compiler_type=none
+  am_cv_CXX_dependencies_compiler_type=none

 fi
 
 fi
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJCXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_OBJCXX_dependencies_compiler_type" >&6; }
-OBJCXXDEPMODE=depmode=$am_cv_OBJCXX_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

 
  if
   test "x$enable_dependency_tracking" != xno \
 
  if
   test "x$enable_dependency_tracking" != xno \

-  && test "$am_cv_OBJCXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepOBJCXX_TRUE=
-  am__fastdepOBJCXX_FALSE='#'
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'

 else
 else

-  am__fastdepOBJCXX_TRUE='#'
-  am__fastdepOBJCXX_FALSE=
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=

 fi
 
 
 fi
 
 

-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
+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

 if test -n "$ac_tool_prefix"; then
 if test -n "$ac_tool_prefix"; then

-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+  for ac_prog in g++ objc++ objcxx c++ CXX
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$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; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_prog_OBJCXX+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  if test -n "$OBJCXX"; then
+  ac_cv_prog_OBJCXX="$OBJCXX" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -4184,7 +4609,7 @@ do
   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
   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_CC="${ac_tool_prefix}gcc"
+    ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -4194,28 +4619,32 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+OBJCXX=$ac_cv_prog_OBJCXX
+if test -n "$OBJCXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
+$as_echo "$OBJCXX" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 

+    test -n "$OBJCXX" && break
+  done

 fi
 fi

-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+if test -z "$OBJCXX"; then
+  ac_ct_OBJCXX=$OBJCXX
+  for ac_prog in g++ objc++ objcxx c++ CXX
+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; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }

-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if ${ac_cv_prog_ac_ct_OBJCXX+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$ac_ct_OBJCXX"; then
+  ac_cv_prog_ac_ct_OBJCXX="$ac_ct_OBJCXX" # Let the user override the test.

 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH


@@ -4224,7 +4653,7 @@ do
   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
   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_ac_ct_CC="gcc"
+    ac_cv_prog_ac_ct_OBJCXX="$ac_prog"

     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi


@@ -4234,17 +4663,21 @@ IFS=$as_save_IFS
 
 fi
 fi
 
 fi
 fi

-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ac_ct_OBJCXX=$ac_cv_prog_ac_ct_OBJCXX
+if test -n "$ac_ct_OBJCXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
+$as_echo "$ac_ct_OBJCXX" >&6; }

 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 

-  if test "x$ac_ct_CC" = x; then
-    CC=""
+
+  test -n "$ac_ct_OBJCXX" && break
+done
+
+  if test "x$ac_ct_OBJCXX" = x; then
+    OBJCXX="g++"

   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)


@@ -4252,289 +4685,81 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac

-    CC=$ac_ct_CC
+    OBJCXX=$ac_ct_OBJCXX

   fi
   fi

-else
-  CC="$ac_cv_prog_CC"

 fi
 
 fi
 

-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5

   fi
   fi

+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }

 done
 done

-  done
-IFS=$as_save_IFS

 
 

-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU Objective C++ compiler... " >&6; }
+if ${ac_cv_objcxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6

 else
 else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */

 
 

-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; 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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-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
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $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 $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$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_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$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
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-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_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="$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
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif

 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   return 0;
 }
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"; then :

   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_objcxx_compiler_gnu=$ac_compiler_gnu

 
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
+$as_echo "$ac_cv_objcxx_compiler_gnu" >&6; }

 if test $ac_compiler_gnu = yes; then
 if test $ac_compiler_gnu = yes; then

-  GCC=yes
+  GOBJCXX=yes

 else
 else

-  GCC=
+  GOBJCXX=

 fi
 fi

-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+set}
+ac_save_OBJCXXFLAGS=$OBJCXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
+$as_echo_n "checking whether $OBJCXX accepts -g... " >&6; }
+if ${ac_cv_prog_objcxx_g+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   $as_echo_n "(cached) " >&6
 else

-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+  ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
+   ac_objcxx_werror_flag=yes
+   ac_cv_prog_objcxx_g=no
+   OBJCXXFLAGS="-g"

    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -4546,10 +4771,10 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+if ac_fn_objcxx_try_compile "$LINENO"; then :
+  ac_cv_prog_objcxx_g=yes

 else
 else

-  CFLAGS=""
+  OBJCXXFLAGS=""

       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -4561,11 +4786,11 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"; then :

 
 else
 
 else

-  ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
+  ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
+        OBJCXXFLAGS="-g"

         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 


@@ -4577,134 +4802,44 @@ main ()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+if ac_fn_objcxx_try_compile "$LINENO"; then :
+  ac_cv_prog_objcxx_g=yes

 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-   ac_c_werror_flag=$ac_save_c_werror_flag
+   ac_objcxx_werror_flag=$ac_save_objcx_werror_flag

 fi
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
+$as_echo "$ac_cv_prog_objcxx_g" >&6; }
+if test "$ac_test_OBJCXXFLAGS" = set; then
+  OBJCXXFLAGS=$ac_save_OBJCXXFLAGS
+elif test $ac_cv_prog_objcxx_g = yes; then
+  if test "$GOBJCXX" = yes; then
+    OBJCXXFLAGS="-g -O2"

   else
   else

-    CFLAGS="-g"
+    OBJCXXFLAGS="-g"

   fi
 else
   fi
 else

-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
+  if test "$GOBJCXX" = yes; then
+    OBJCXXFLAGS="-O2"

   else
   else

-    CFLAGS=
+    OBJCXXFLAGS=

   fi
 fi
   fi
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-

 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
 
 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
 

-depcc="$CC"   am_compiler_list=
+depcc="$OBJCXX" am_compiler_list='gcc3 gcc'

 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }

-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if ${am_cv_OBJCXX_dependencies_compiler_type+:} false; then :

   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then


@@ -4727,14 +4862,12 @@ else
   # directory.
   mkdir sub
 
   # directory.
   mkdir sub
 

-  am_cv_CC_dependencies_compiler_type=none
+  am_cv_OBJCXX_dependencies_compiler_type=none

   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   am__universal=false
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   am__universal=false

-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
+

 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers


@@ -4800,7 +4933,7 @@ else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

-        am_cv_CC_dependencies_compiler_type=$depmode
+        am_cv_OBJCXX_dependencies_compiler_type=$depmode

         break
       fi
     fi
         break
       fi
     fi


@@ -4809,26 +4942,27 @@ else
   cd ..
   rm -rf conftest.dir
 else
   cd ..
   rm -rf conftest.dir
 else

-  am_cv_CC_dependencies_compiler_type=none
+  am_cv_OBJCXX_dependencies_compiler_type=none

 fi
 
 fi
 fi
 
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJCXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_OBJCXX_dependencies_compiler_type" >&6; }
+OBJCXXDEPMODE=depmode=$am_cv_OBJCXX_dependencies_compiler_type

 
  if
   test "x$enable_dependency_tracking" != xno \
 
  if
   test "x$enable_dependency_tracking" != xno \

-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
+  && test "$am_cv_OBJCXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepOBJCXX_TRUE=
+  am__fastdepOBJCXX_FALSE='#'

 else
 else

-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
+  am__fastdepOBJCXX_TRUE='#'
+  am__fastdepOBJCXX_FALSE=

 fi
 
 
 
 fi
 
 
 

+

 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar lib "link -lib"
   do
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar lib "link -lib"
   do


@@ -4936,7 +5070,13 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
 if ${am_cv_ar_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 if ${am_cv_ar_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else

-  am_cv_ar_interface=ar
+  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
+
+   am_cv_ar_interface=ar

    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int some_variable = 0;
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int some_variable = 0;


@@ -4967,6 +5107,11 @@ if ac_fn_c_try_compile "$LINENO"; then :
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+   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: $am_cv_ar_interface" >&5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5


@@ -15898,47 +16043,6 @@ $as_echo "no" >&6; }
        fi
 fi
 
        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
 # 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


@@ -16438,8 +16542,6 @@ rm -f conftest.y
 
 
 
 
 
 

-
-

 if ${CFLAGS+:} false; then :
   case " $CFLAGS " in
     *"  "*)
 if ${CFLAGS+:} false; then :
   case " $CFLAGS " in
     *"  "*)


@@ -16604,526 +16706,63 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 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 $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
-
-
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $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.  */
 
 /* end confdefs.h.  */
 

+int
+main ()
+{
+
+  ;
+  return 0;
+}

 _ACEOF
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
-  cy_good=1
-else
-  cy_good=0
+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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+done
+CXXFLAGS="$ac_save_CXXFLAGS"

 
 

-    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 $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
-
-
-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++ -Wno-deprecated-declarations" >&5
-$as_echo_n "checking for c++ -Wno-deprecated-declarations... " >&6; }
-
-    cy_save=$CXXFLAGS
-
-  for element in -Wno-deprecated-declarations; do
-    haveit=
-    for x in $CXXFLAGS; 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
-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
-    fi
-  done
-
-
-        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-deprecated-declarations; do
-    haveit=
-    for x in $CXXFLAGS; 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
-      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
-
-
-
-    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"
-  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
-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"
-    fi
-  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-deprecated-declarations; 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"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      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
-
-
-
-
-
-
-    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 $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
-
-
-        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-dangling-else; 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
-
-
-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++ -Wno-dangling-else" >&5
-$as_echo_n "checking for c++ -Wno-dangling-else... " >&6; }
-
-    cy_save=$CXXFLAGS
-
-  for element in -Wno-dangling-else; do
-    haveit=
-    for x in $CXXFLAGS; 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
-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
-    fi
-  done
-
-
-        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
-
-  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
-      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
-
-
-
-    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 $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"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"
-    fi
-  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"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"
-    fi
-  done
-
+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
 else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  CXXFLAGS="$ac_cv_cxxflags_warn_all"

 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
+ ;;
+esac

 
 
 
 
 
 


@@ -17135,12 +16774,12 @@ 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
 
 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-overloaded-virtual" >&5
-$as_echo_n "checking for cc -Wno-overloaded-virtual... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cc -Werror" >&5
+$as_echo_n "checking for cc -Werror... " >&6; }

 
     cy_save=$CFLAGS
 
 
     cy_save=$CFLAGS
 

-  for element in -Wno-overloaded-virtual; do
+  for element in -Werror; do

     haveit=
     for x in $CFLAGS; do
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17179,7 +16818,7 @@ 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; }
 
   { $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
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17221,12 +16860,12 @@ 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_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-overloaded-virtual" >&5
-$as_echo_n "checking for c++ -Wno-overloaded-virtual... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -Werror" >&5
+$as_echo_n "checking for c++ -Werror... " >&6; }

 
     cy_save=$CXXFLAGS
 
 
     cy_save=$CXXFLAGS
 

-  for element in -Wno-overloaded-virtual; do
+  for element in -Werror; do

     haveit=
     for x in $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17265,7 +16904,7 @@ 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; }
 
   { $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 $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17307,12 +16946,12 @@ 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
 
 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; }
+    { $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
 
 
     cy_save=$OBJCXXFLAGS
 

-  for element in -Wno-overloaded-virtual; do
+  for element in -Werror; do

     haveit=
     for x in $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17351,7 +16990,7 @@ 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; }
 
   { $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 $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17389,18 +17028,19 @@ 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
 
     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-parentheses" >&5
-$as_echo_n "checking for cc -Wno-parentheses... " >&6; }
+    { $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
 
 
     cy_save=$CFLAGS
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $CFLAGS; do
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17439,7 +17079,7 @@ 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; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $CFLAGS; do
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17481,12 +17121,12 @@ 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_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; }
+    { $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
 
 
     cy_save=$CXXFLAGS
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17525,7 +17165,7 @@ 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; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17567,12 +17207,12 @@ 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
 
 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; }
+    { $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
 
 
     cy_save=$OBJCXXFLAGS
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17611,7 +17251,7 @@ 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; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 

-  for element in -Wno-parentheses; do
+  for element in -Wno-deprecated-declarations; do

     haveit=
     for x in $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17649,18 +17289,19 @@ 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
 
     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-unneeded-internal-declaration" >&5
-$as_echo_n "checking for cc -Wno-unneeded-internal-declaration... " >&6; }
+    { $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
 
 
     cy_save=$CFLAGS
 

-  for element in -Wno-unneeded-internal-declaration; do
+  for element in -Wno-dangling-else; do

     haveit=
     for x in $CFLAGS; do
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17699,7 +17340,7 @@ 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; }
 
   { $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-dangling-else; do

     haveit=
     for x in $CFLAGS; do
 
     haveit=
     for x in $CFLAGS; do
 


@@ -17741,12 +17382,12 @@ 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_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; }
+    { $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
 
 
     cy_save=$CXXFLAGS
 

-  for element in -Wno-unneeded-internal-declaration; do
+  for element in -Wno-dangling-else; do

     haveit=
     for x in $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17785,7 +17426,7 @@ 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; }
 
   { $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-dangling-else; do

     haveit=
     for x in $CXXFLAGS; do
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -17827,12 +17468,12 @@ 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
 
 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; }
+    { $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
 
 
     cy_save=$OBJCXXFLAGS
 

-  for element in -Wno-unneeded-internal-declaration; do
+  for element in -Wno-dangling-else; do

     haveit=
     for x in $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17871,7 +17512,7 @@ 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; }
 
   { $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-dangling-else; do

     haveit=
     for x in $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -17908,15 +17549,21 @@ 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
+    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 "-arch $cy_arch"; do
+    { $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 -Wno-overloaded-virtual; do

     haveit=
     haveit=

-    for x in $CXXFLAGS; do
+    for x in $CFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -17932,7 +17579,7 @@ $as_echo_n "checking for -arch $cy_arch... " >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
+      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"

     fi
   done
 
     fi
   done
 


@@ -17940,116 +17587,22 @@ $as_echo_n "checking for -arch $cy_arch... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

-int
-main ()
-{
-
-  ;
-  return 0;
-}

 _ACEOF
 _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
   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; }
 
     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"
-  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
-      CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element"
-    fi
-  done
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-done
-
-
-
-
-
-
-
-
-# Check whether --enable-javascript was given.
-if test "${enable_javascript+set}" = set; then :
-  enableval=$enable_javascript;
-    case $enableval in #(
-  yes) :
-
-
-
-
-                       { $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 <JavaScriptCore/JSBase.h>
-
-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
+  for element in -Wno-overloaded-virtual; do

     haveit=
     haveit=

-    for x in $LIBS; do
+    for x in $CFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18065,93 +17618,38 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"

     fi
   done
 
 
     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 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
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi

 
 

-                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
+    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-overloaded-virtual" >&5
+$as_echo_n "checking for c++ -Wno-overloaded-virtual... " >&6; }
+
+    cy_save=$CXXFLAGS
+
+  for element in -Wno-overloaded-virtual; do

     haveit=
     haveit=

-    for x in $CFLAGS; do
+    for x in $CXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18167,12 +17665,28 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"
+      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"

     fi
   done
 
 
     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
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -18195,7 +17709,31 @@ $as_echo "yes" >&6; }
   done
 
 
   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 $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -18218,10 +17756,25 @@ $as_echo "yes" >&6; }
   done
 
 
   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=
     haveit=

-    for x in $LIBS; do
+    for x in $OBJCXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18237,67 +17790,40 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-fi; if test "x$CY_EXECUTE" = x1; then break; fi
-        done
-
-fi
- ;; #(
-  no) :
-
-            CY_EXECUTE=0
- ;; #(
-  JavaScriptCore) :
-
-
-
-                       { $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
 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 <JavaScriptCore/JSBase.h>
+    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-parentheses" >&5
+$as_echo_n "checking for cc -Wno-parentheses... " >&6; }

 
 

+    cy_save=$CFLAGS

 
 

-  for element in "-framework JavaScriptCore"; do
+  for element in -Wno-parentheses; do

     haveit=
     haveit=

-    for x in $LIBS; do
+    for x in $CFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18313,93 +17839,77 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"

     fi
   done
 
 
     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
 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
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5
-$as_echo_n "checking for WEBKIT... " >&6; }
+    CFLAGS=$cy_save
+    if test "x$cy_good" = x1; then :
+  { $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
-  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-parentheses; 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
 else

-        _pkg_short_errors_supported=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }

 fi
 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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++ -Wno-parentheses" >&5
+$as_echo_n "checking for c++ -Wno-parentheses... " >&6; }

 
 

-  for element in `$PKG_CONFIG --cflags $cy_webkit_pkg`; do
+    cy_save=$CXXFLAGS
+
+  for element in -Wno-parentheses; do

     haveit=
     haveit=

-    for x in $CFLAGS; do
+    for x in $CXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18415,12 +17925,28 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"
+      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"

     fi
   done
 
 
     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
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -18443,7 +17969,31 @@ $as_echo "yes" >&6; }
   done
 
 
   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 $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -18466,10 +18016,25 @@ $as_echo "yes" >&6; }
   done
 
 
   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=
     haveit=

-    for x in $LIBS; do
+    for x in $OBJCXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18485,67 +18050,40 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-fi; if test "x$CY_EXECUTE" = x1; then break; fi
-        done
-
-fi
- ;; #(
-  *) :
-    as_fn_error $? "Unknown JavaScript engine: $enableval" "$LINENO" 5 ;;
-esac
-
-else
-
-
-
-                       { $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
 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 <JavaScriptCore/JSBase.h>
+    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-unneeded-internal-declaration" >&5
+$as_echo_n "checking for cc -Wno-unneeded-internal-declaration... " >&6; }

 
 

+    cy_save=$CFLAGS

 
 

-  for element in "-framework JavaScriptCore"; do
+  for element in -Wno-unneeded-internal-declaration; do

     haveit=
     haveit=

-    for x in $LIBS; do
+    for x in $CFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18561,93 +18099,77 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"

     fi
   done
 
 
     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
 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
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5
-$as_echo_n "checking for WEBKIT... " >&6; }
+    CFLAGS=$cy_save
+    if test "x$cy_good" = x1; then :
+  { $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
-  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-unneeded-internal-declaration; 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
 else

-        _pkg_short_errors_supported=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }

 fi
 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
+
+    { $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=
     haveit=

-    for x in $CFLAGS; do
+    for x in $CXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18663,12 +18185,28 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"
+      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"

     fi
   done
 
 
     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
 
     haveit=
     for x in $CXXFLAGS; do
 


@@ -18691,7 +18229,31 @@ $as_echo "yes" >&6; }
   done
 
 
   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 $OBJCXXFLAGS; do
 
     haveit=
     for x in $OBJCXXFLAGS; do
 


@@ -18714,10 +18276,25 @@ $as_echo "yes" >&6; }
   done
 
 
   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=
     haveit=

-    for x in $LIBS; do
+    for x in $OBJCXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18733,156 +18310,170 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"

     fi
   done
 
 
     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
 
 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

 
 
 
 
 
 

-  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
+for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5
+$as_echo_n "checking for -arch $cy_arch... " >&6; }

 
 

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5
-$as_echo_n "checking for APR... " >&6; }
+    cy_save=$CXXFLAGS

 
 

-# 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 element in "-arch $cy_arch"; do
+    haveit=
+    for x in $CXXFLAGS; do

 
 

-    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"
+  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"

 
 

-          apr_found="yes"
-          break 2
-        fi
-      done
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi

     done
     done

-
-    if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_config="$withval"
-      apr_found="yes"
+    if test -z "$haveit"; then
+      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"

     fi
     fi

+  done

 
 

-            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

 
 

+        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
 else

+  cy_good=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext

 
 

-        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"
+    CXXFLAGS=$cy_save
+    if test "x$cy_good" = x1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }

 
 

-          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"
+  for element in "-arch $cy_arch"; do
+    haveit=
+    for x in $CY_ARCH; do

 
 

-              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"
+  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
       fi

+    done
+    if test -z "$haveit"; then
+      CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element"

     fi
     fi

+  done
+
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+done
+
+
+
+
+
+
+# Check whether --enable-javascript was given.
+if test "${enable_javascript+set}" = set; then :
+  enableval=$enable_javascript;
+    case $enableval in #(
+  yes) :
+
+
+
+
+    cy_save=$LIBS
+    LIBS=

 
 

-fi
+                       { $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.  */

 
 

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5
-$as_echo "$apr_found" >&6; }
+        #include <JavaScriptCore/JSBase.h>

 
 

-case $apr_found in #(
-  yes) :
+int
+main ()
+{

 
 

+        JSEvaluateScript(0, 0, 0, 0, 0, 0);

 
 

-  for element in `$apr_config --includes`; do
-    haveit=
-    for x in $CPPFLAGS; do
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; 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"
+                       ac_cv_framework_JavaScriptCore=yes

 
 

-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
+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 `$apr_config --link-libtool`; do
+
+  for element in "-framework JavaScriptCore"; do

     haveit=
     haveit=

-    for x in $LTLIBAPR; do
+    for x in $LIBS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -18898,85 +18489,49 @@ case $apr_found in #(
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LTLIBAPR="${LTLIBAPR}${LTLIBAPR:+ }$element"
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

- ;; #(
-  *) :
-    as_fn_error $? "missing \"libapr\"" "$LINENO" 5 ;;
-esac
+        CY_EXECUTE=1

 
 
 
 
 
 

- if test "x$CY_EXECUTE" = x1; then
-  CY_EXECUTE_TRUE=
-  CY_EXECUTE_FALSE='#'

 else
 else

-  CY_EXECUTE_TRUE='#'
-  CY_EXECUTE_FALSE=
-fi
-
-
-
-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
-
-
-
-    cy_save=$LIBS
-    LIBS=
-    if test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno; then :

 
 

-
-      LIBFFI_CFLAGS
-              C compiler flags for LIBFFI, overriding pkg-config
-  LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config
+        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do

 
 pkg_failed=no
 
 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" && \
  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
   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
 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" && \
  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
   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
 else
   pkg_failed=yes
 fi


@@ -18996,29 +18551,30 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _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
         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
         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; }
 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
 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; }
 
         { $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=
     haveit=

-    for x in $CFLAGS; do
+    for x in $CPPFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19034,14 +18590,14 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-  for element in `$PKG_CONFIG --cflags libffi`; do
+  for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do

     haveit=
     haveit=

-    for x in $CXXFLAGS; do
+    for x in $LIBS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19057,152 +18613,132 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-  for element in `$PKG_CONFIG --cflags libffi`; 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"
-
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"
-    fi
-  done
-
+fi; if test "x$CY_EXECUTE" = x1; then break; fi
+        done

 
 

+fi
+    LTJAVASCRIPTCORE=$LIBS
+    LIBS=$cy_save

 
 

-  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"
+ ;; #(
+  no) :

 
 

-      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=0
+ ;; #(
+  JavaScriptCore) :

 
 
 
 

-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
   $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.  */
 
 /* 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 <JavaScriptCore/JSBase.h>
+

 int
 main ()
 {
 int
 main ()
 {

-return ffi_call ();
+
+        JSEvaluateScript(0, 0, 0, 0, 0, 0);
+

   ;
   return 0;
 }
 _ACEOF
   ;
   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 :

 
 

-else
-  ac_cv_search_ffi_call=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+                       ac_cv_framework_JavaScriptCore=yes
+
+else
+  ac_cv_framework_JavaScriptCore=no

 fi
 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
 
 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
 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" && \
  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
   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
 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" && \
  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
   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
 else
   pkg_failed=yes
 fi


@@ -19222,29 +18758,30 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _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
         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
         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; }
 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
 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; }
 
         { $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=
     haveit=

-    for x in $CFLAGS; do
+    for x in $CPPFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19260,14 +18797,14 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CFLAGS="${CFLAGS}${CFLAGS:+ }$element"
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-  for element in `$PKG_CONFIG --cflags libffi`; do
+  for element in `$PKG_CONFIG --libs $cy_webkit_pkg`; do

     haveit=
     haveit=

-    for x in $CXXFLAGS; do
+    for x in $LIBS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19283,36 +18820,72 @@ $as_echo "yes" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element"
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-  for element in `$PKG_CONFIG --cflags libffi`; do
-    haveit=
-    for x in $OBJCXXFLAGS; 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
-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$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 <JavaScriptCore/JSBase.h>
+
+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
 
     haveit=
     for x in $LIBS; do
 


@@ -19335,86 +18908,87 @@ $as_echo "yes" >&6; }
   done
 
 
   done
 
 

-fi ;; #(
-  *) :
-     ;;
-esac
-
-fi
-    LTLIBFFI=$LIBS
-    LIBS=$cy_save
-
-
+        CY_EXECUTE=1

 
 

-    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.  */
+else

 
 

-_ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
+        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do

 
 

-        CY_OBJECTIVEC=1
-        { $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
 else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  pkg_failed=yes

 fi
 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
 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 <CoreFoundation/CFBase.h>
-
-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
 else

-  ac_cv_framework_CoreFoundation=no
+        _pkg_short_errors_supported=no

 fi
 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=
     haveit=

-    for x in $LIBS; do
+    for x in $CPPFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19430,54 +19004,12 @@ $as_echo "$ac_cv_framework_CoreFoundation" >&6; }
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"

     fi
   done
 
 
     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 <Foundation/NSObject.h>
-
-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
 
     haveit=
     for x in $LIBS; do
 


@@ -19499,136 +19031,155 @@ $as_echo "$ac_cv_framework_Foundation" >&6; }
     fi
   done
 
     fi
   done
 

-               cat >>confdefs.h <<_ACEOF
-#define HAVE_FRAMEWORK_FOUNDATION 1
-_ACEOF

 
 

+fi; if test "x$CY_EXECUTE" = x1; then break; fi
+        done

 
 fi
 
 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
+fi
+
+
+# Check whether --enable-console was given.
+if test "${enable_console+set}" = set; then :
+  enableval=$enable_console;
+fi
+
+ if test "x$enable_console" != "xno"; then
+  CY_CONSOLE_TRUE=
+  CY_CONSOLE_FALSE='#'

 else
 else

+  CY_CONSOLE_TRUE='#'
+  CY_CONSOLE_FALSE=
+fi

 
 

-               ac_check_framework_save_LIBS=$LIBS
-               LIBS="-framework WebKit  $LIBS"
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */

 
 

-                #include <WebKit/WebScriptObject.h>
+if test -z "$CY_CONSOLE_TRUE"; then :
+
+if test "x$LTLIBAPR" != x; then :

 
 

-int
-main ()
-{
-[[WebScriptObject alloc] init];
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objcxx_try_link "$LINENO"; then :

 
 

-                       ac_cv_framework_WebKit=yes

 
 else
 
 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

 
 

-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 :

 
 

+  apr_found="no"

 
 

-  for element in "-framework WebKit"; do
-    haveit=
-    for x in $LIBS; do
+  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

 
 

-  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"
+  acceptable_majors="1"

 
 

-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      LIBS="${LIBS}${LIBS:+ }$element"
-    fi
+  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
 
   done
 

-               cat >>confdefs.h <<_ACEOF
-#define HAVE_FRAMEWORK_WEBKIT 1
-_ACEOF
+  { $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

 
 

-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

 
 

-else
+    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

 
 

-            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
 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
+        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

 
 

-  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=
     haveit=

-    for x in $OBJCXXFLAGS; do
+    for x in $CPPFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19644,14 +19195,14 @@ done
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element"
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"

     fi
   done
 
 
     fi
   done
 
 

-  for element in `$GNUSTEP_CONFIG --base-libs`; do
+  for element in `$apr_config --link-libtool`; do

     haveit=
     haveit=

-    for x in $LIBS; do
+    for x in $LTLIBAPR; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -19667,105 +19218,37 @@ done
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      LIBS="${LIBS}${LIBS:+ }$element"
+      LTLIBAPR="${LTLIBAPR}${LTLIBAPR:+ }$element"

     fi
   done
 
 
     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
-

  ;; #(
   *) :
  ;; #(
   *) :

-     ;;
-esac

 
 

- if test "x$CY_OBJECTIVEC" = x1; then
-  CY_OBJECTIVEC_TRUE=
-  CY_OBJECTIVEC_FALSE='#'
-else
-  CY_OBJECTIVEC_TRUE='#'
-  CY_OBJECTIVEC_FALSE=
+    as_fn_error $? "missing \"libapr\"" "$LINENO" 5
+ ;;
+esac

 fi
 
 fi
 

+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
 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
 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"
 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"


@@ -19773,82 +19256,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
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF

-
+ break

 fi
 
 done
 
 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 :
+
+
+      LIBFFI_CFLAGS
+              C compiler flags for LIBFFI, overriding pkg-config
+  LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config

 
 

+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
 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

 
 

-      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 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
 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

 
 

-done
+       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
+  done
+
+
+  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
     fi

-  fi
-
-    LTLIBREADLINE=$LIBS
-    LIBS=$cy_save
+  done

 
 
 
 

-case $ax_cv_lib_readline in #(
-  no) :
-    as_fn_error $? "missing \"libreadline\"" "$LINENO" 5 ;; #(
-  *) :
-     ;;
-esac
+fi

 
 

+else

 
 

-    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 "$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
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS


@@ -19861,16 +19405,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

-char cur_term ();
+char ffi_call ();

 int
 main ()
 {
 int
 main ()
 {

-return cur_term ();
+return ffi_call ();

   ;
   return 0;
 }
 _ACEOF
   ;
   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
   if test -z "$ac_lib"; then
     ac_res="none required"
   else


@@ -19878,638 +19422,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 :
     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
 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
   break
 fi
 done

-if ${ac_cv_search_cur_term+:} false; then :
+if ${ac_cv_search_ffi_call+:} false; then :

 
 else
 
 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
 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
 
 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"
   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"
 
   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 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
-      esac
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
   done
     fi
   done

-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi

 
 

-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&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 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
+
+fi ;; #(
+  *) :
+     ;;

 esac
 esac

+

 fi
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&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
 else

-  enable_rpath=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }

 fi
 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
   $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.  */
 
 /* end confdefs.h.  */
 

-#ifdef _LP64
-sixtyfour bits
-#endif
+            #include <CoreFoundation/CFBase.h>

 
 

+int
+main ()
+{
+CFAllocatorGetDefault();
+  ;
+  return 0;
+}

 _ACEOF
 _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
 else

-  gl_cv_solaris_64bit=no
+  ac_cv_framework_CoreFoundation=no

 fi
 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
 
 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 <Foundation/NSObject.h>

 
 

-    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"
 
   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"
 
   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
       fi

+    done
+    if test -z "$haveit"; then
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
     fi

+  done
+
+               cat >>confdefs.h <<_ACEOF
+#define HAVE_FRAMEWORK_FOUNDATION 1
+_ACEOF
+

 
 fi
 
 
 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

 
 

-  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
+            if test "x$GNUSTEP_CONFIG" != x; then :
+
+
+
+  for element in `$GNUSTEP_CONFIG --objc-flags`; do
+    haveit=
+    for x in $OBJCXXFLAGS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -20519,108 +19801,20 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
   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
       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=
     haveit=

-    for x in $CPPFLAGS; do
+    for x in $LIBS; do

 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"
 
   acl_save_prefix="$prefix"
   prefix="$acl_final_prefix"


@@ -20636,294 +19830,250 @@ fi
       fi
     done
     if test -z "$haveit"; then
       fi
     done
     if test -z "$haveit"; then

-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+      LIBS="${LIBS}${LIBS:+ }$element"

     fi
   done
 
 
     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
 
   $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.  */
 
 /* end confdefs.h.  */
 

-#include <stdlib.h>
-#include <iconv.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 ()
 {
 int
 main ()
 {

-iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
+return readline ();

   ;
   return 0;
 }
 _ACEOF
   ;
   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
 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.  */
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 

-#include <stdlib.h>
-#include <iconv.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 ()
 {
 int
 main ()
 {

-iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
+return add_history ();

   ;
   return 0;
 }
 _ACEOF
   ;
   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
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext

-      LIBS="$am_save_LIBS"
-    fi

 
 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 <iconv.h>
-#include <string.h>
-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
 _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
 
 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
   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
   $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.  */
 
 /* end confdefs.h.  */
 

-#include <stdlib.h>
-#include <iconv.h>
-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
 #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
 #endif

-
+char cur_term ();

 int
 main ()
 {
 int
 main ()
 {

-
+return cur_term ();

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-if ac_fn_c_try_compile "$LINENO"; then :
-  am_cv_proto_iconv_arg1=""
+for ac_lib in '' termcap ncurses; 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_exeext
+  if ${ac_cv_search_cur_term+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_cur_term+:} false; then :
+

 else
 else

-  am_cv_proto_iconv_arg1="const"
+  ac_cv_search_cur_term=no

 fi
 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 conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS

 fi
 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"

 
 

-    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; }
+fi

 
 

-cat >>confdefs.h <<_ACEOF
-#define ICONV_CONST $am_cv_proto_iconv_arg1
-_ACEOF
+    LTLIBTERMCAP=$LIBS
+    LIBS=$cy_save

 
 
 
 

-  fi

 
 

-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

 
 
 
 
 
 


@@ -21379,10 +20529,18 @@ else
   am__EXEEXT_FALSE=
 fi
 
   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
 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
 fi

+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 "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5


@@ -21391,8 +20549,8 @@ if test -z "${am__fastdepOBJCXX_TRUE}" && test -z "${am__fastdepOBJCXX_FALSE}";
   as_fn_error $? "conditional \"am__fastdepOBJCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
   as_fn_error $? "conditional \"am__fastdepOBJCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi

-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+if test -z "${CY_CONSOLE_TRUE}" && test -z "${CY_CONSOLE_FALSE}"; then
+  as_fn_error $? "conditional \"CY_CONSOLE\" 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
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CY_EXECUTE_TRUE}" && test -z "${CY_EXECUTE_FALSE}"; then


@@ -23026,7 +22184,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`

-    test -z "am__include" && continue
+    test -z "$am__include" && continue

     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the