You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2003/05/28 13:08:30 UTC

cvs commit: xml-security/c/src/framework XSECConfig.hpp.in

blautenb    2003/05/28 04:08:29

  Modified:    c/src    configure configure.ac
               c/src/framework XSECConfig.hpp.in
  Log:
  Detect Xerces 2.3 XMLFormatter
  
  Revision  Changes    Path
  1.10      +729 -803  xml-security/c/src/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure	10 May 2003 07:20:49 -0000	1.9
  +++ configure	28 May 2003 11:08:29 -0000	1.10
  @@ -1,6 +1,6 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated by GNU Autoconf 2.57 for XML-Security-C 0.2.0.
  +# Generated by GNU Autoconf 2.53 for XML-Security-C 0.2.0.
   #
   # Report bugs to <be...@ozemail.com.au>.
   #
  @@ -8,6 +8,14 @@
   # Free Software Foundation, Inc.
   # This configure script is free software; the Free Software Foundation
   # gives unlimited permission to copy, distribute and modify it.
  +
  +if expr a : '\(a\)' >/dev/null 2>&1; then
  +  as_expr=expr
  +else
  +  as_expr=false
  +fi
  +
  +
   ## --------------------- ##
   ## M4sh Initialization.  ##
   ## --------------------- ##
  @@ -16,13 +24,11 @@
   if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
     emulate sh
     NULLCMD=:
  -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  -  # is contrary to our usage.  Disable this feature.
  -  alias -g '${1+"$@"}'='"$@"'
   elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
     set -o posix
   fi
   
  +# NLS nuisances.
   # Support unset when possible.
   if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
     as_unset=unset
  @@ -30,42 +36,34 @@
     as_unset=false
   fi
   
  -
  -# Work around bugs in pre-3.0 UWIN ksh.
  -$as_unset ENV MAIL MAILPATH
  -PS1='$ '
  -PS2='> '
  -PS4='+ '
  -
  -# NLS nuisances.
  -for as_var in \
  -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
  -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
  -  LC_TELEPHONE LC_TIME
  -do
  -  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
  -    eval $as_var=C; export $as_var
  -  else
  -    $as_unset $as_var
  -  fi
  -done
  -
  -# Required to use basename.
  -if expr a : '\(a\)' >/dev/null 2>&1; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
  -
  -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
  -  as_basename=basename
  -else
  -  as_basename=false
  -fi
  +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
  +    { $as_unset LANG || test "${LANG+set}" != set; } ||
  +      { LANG=C; export LANG; }
  +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
  +    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
  +      { LC_ALL=C; export LC_ALL; }
  +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
  +    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
  +      { LC_TIME=C; export LC_TIME; }
  +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
  +    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
  +      { LC_CTYPE=C; export LC_CTYPE; }
  +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
  +    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
  +      { LANGUAGE=C; export LANGUAGE; }
  +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
  +    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
  +      { LC_COLLATE=C; export LC_COLLATE; }
  +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
  +    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
  +      { LC_NUMERIC=C; export LC_NUMERIC; }
  +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
  +    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
  +      { LC_MESSAGES=C; export LC_MESSAGES; }
   
   
   # Name of the executable.
  -as_me=`$as_basename "$0" ||
  +as_me=`(basename "$0") 2>/dev/null ||
   $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
   	 X"$0" : 'X\(//\)$' \| \
   	 X"$0" : 'X\(/\)$' \| \
  @@ -76,7 +74,6 @@
     	  /^X\/\(\/\).*/{ s//\1/; q; }
     	  s/.*/./; q'`
   
  -
   # PATH needs CR, and LINENO needs CR and PATH.
   # Avoid depending upon Character Ranges.
   as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  @@ -87,15 +84,15 @@
   
   # The user is always right.
   if test "${PATH_SEPARATOR+set}" != set; then
  -  echo "#! /bin/sh" >conf$$.sh
  -  echo  "exit 0"   >>conf$$.sh
  -  chmod +x conf$$.sh
  -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
  +  echo "#! /bin/sh" >conftest.sh
  +  echo  "exit 0"   >>conftest.sh
  +  chmod +x conftest.sh
  +  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
       PATH_SEPARATOR=';'
     else
       PATH_SEPARATOR=:
     fi
  -  rm -f conf$$.sh
  +  rm -f conftest.sh
   fi
   
   
  @@ -143,8 +140,6 @@
     as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
     test "x$as_lineno_1" != "x$as_lineno_2" &&
     test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
  -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
  -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
   	     CONFIG_SHELL=$as_dir/$as_base
   	     export CONFIG_SHELL
   	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
  @@ -217,12 +212,6 @@
   fi
   rm -f conf$$ conf$$.exe conf$$.file
   
  -if mkdir -p . 2>/dev/null; then
  -  as_mkdir_p=:
  -else
  -  as_mkdir_p=false
  -fi
  -
   as_executable_p="test -f"
   
   # Sed expression to map a string onto a valid CPP name.
  @@ -239,7 +228,7 @@
   IFS=" 	$as_nl"
   
   # CDPATH.
  -$as_unset CDPATH
  +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
   
   
   # Name of the host.
  @@ -253,7 +242,6 @@
   # Initializations.
   #
   ac_default_prefix=/usr/local
  -ac_config_libobj_dir=.
   cross_compiling=no
   subdirs=
   MFLAGS=
  @@ -310,8 +298,6 @@
   # include <unistd.h>
   #endif"
   
  -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S AWK AUTOCONF CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os canon_obj_files transformers_obj_files dsig_obj_files enc_obj_files enc_OpenSSL_obj_files framework_obj_files utils_obj_files utils_unixutils_obj_files lib_obj_files canon_include_files transformers_include_files dsig_include_files enc_include_files enc_OpenSSL_include_files framework_include_files utils_include_files utils_unixutils_include_files lib_include_files platform cxx cc osver cxxflags cppflags cflags ldflags libs transcoder threads bitstobuild cc1 cc4 ln_s install install_data make_shared link objsuffix shlibsuffix package_version package_version_major package_name package_tarname lib_name lib_major_name lib_short_name LIBOBJS LTLIBOBJS'
  -ac_subst_files=''
   
   # Initialize some variables set by options.
   ac_init_help=
  @@ -735,9 +721,6 @@
      { (exit 1); exit 1; }; }
     fi
   fi
  -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
  -  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
  -   { (exit 1); exit 1; }; }
   srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
   ac_env_build_alias_set=${build_alias+set}
   ac_env_build_alias_value=$build_alias
  @@ -779,6 +762,10 @@
   ac_env_CPP_value=$CPP
   ac_cv_env_CPP_set=${CPP+set}
   ac_cv_env_CPP_value=$CPP
  +ac_env_CXXCPP_set=${CXXCPP+set}
  +ac_env_CXXCPP_value=$CXXCPP
  +ac_cv_env_CXXCPP_set=${CXXCPP+set}
  +ac_cv_env_CXXCPP_value=$CXXCPP
   
   #
   # Report the --help message.
  @@ -873,6 +860,7 @@
     CXX         C++ compiler command
     CXXFLAGS    C++ compiler flags
     CPP         C preprocessor
  +  CXXCPP      C++ preprocessor
   
   Use these variables to override the choices made by `configure' or to help
   it to find libraries and programs with nonstandard names/locations.
  @@ -914,7 +902,7 @@
   # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
   # absolute.
   ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
  -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
  +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
   ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
   ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
   
  @@ -941,7 +929,7 @@
   if $ac_init_version; then
     cat <<\_ACEOF
   XML-Security-C configure 0.2.0
  -generated by GNU Autoconf 2.57
  +generated by GNU Autoconf 2.53
   
   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
   Free Software Foundation, Inc.
  @@ -956,7 +944,7 @@
   running configure, to aid debugging if configure makes a mistake.
   
   It was created by XML-Security-C $as_me 0.2.0, which was
  -generated by GNU Autoconf 2.57.  Invocation command line was
  +generated by GNU Autoconf 2.53.  Invocation command line was
   
     $ $0 $@
   
  @@ -1008,54 +996,27 @@
   
   # Keep a trace of the command line.
   # Strip out --no-create and --no-recursion so they do not pile up.
  -# Strip out --silent because we don't want to record it for future runs.
   # Also quote any args containing shell meta-characters.
  -# Make two passes to allow for proper duplicate-argument suppression.
   ac_configure_args=
  -ac_configure_args0=
  -ac_configure_args1=
   ac_sep=
  -ac_must_keep_next=false
  -for ac_pass in 1 2
  +for ac_arg
   do
  -  for ac_arg
  -  do
  -    case $ac_arg in
  -    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
  -    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  -    | -silent | --silent | --silen | --sile | --sil)
  -      continue ;;
  -    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
  -      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
  -    esac
  -    case $ac_pass in
  -    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
  -    2)
  -      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
  -      if test $ac_must_keep_next = true; then
  -        ac_must_keep_next=false # Got value, back to normal.
  -      else
  -        case $ac_arg in
  -          *=* | --config-cache | -C | -disable-* | --disable-* \
  -          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
  -          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
  -          | -with-* | --with-* | -without-* | --without-* | --x)
  -            case "$ac_configure_args0 " in
  -              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
  -            esac
  -            ;;
  -          -* ) ac_must_keep_next=true ;;
  -        esac
  -      fi
  -      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
  -      # Get rid of the leading space.
  -      ac_sep=" "
  -      ;;
  -    esac
  -  done
  +  case $ac_arg in
  +  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
  +  | --no-cr | --no-c | -n ) continue ;;
  +  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
  +  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
  +    continue ;;
  +  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
  +    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
  +  esac
  +  case " $ac_configure_args " in
  +    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
  +    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
  +       ac_sep=" " ;;
  +  esac
  +  # Get rid of the leading space.
   done
  -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
  -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
   
   # When interrupted or exit'd, cleanup temporary files, and complete
   # config.log.  We remove comments because anyway the quotes in there
  @@ -1066,7 +1027,6 @@
     # Save into config.log some information that might help in debugging.
     {
       echo
  -
       cat <<\_ASBOX
   ## ---------------- ##
   ## Cache variables. ##
  @@ -1089,35 +1049,6 @@
       esac;
   }
       echo
  -
  -    cat <<\_ASBOX
  -## ----------------- ##
  -## Output variables. ##
  -## ----------------- ##
  -_ASBOX
  -    echo
  -    for ac_var in $ac_subst_vars
  -    do
  -      eval ac_val=$`echo $ac_var`
  -      echo "$ac_var='"'"'$ac_val'"'"'"
  -    done | sort
  -    echo
  -
  -    if test -n "$ac_subst_files"; then
  -      cat <<\_ASBOX
  -## ------------- ##
  -## Output files. ##
  -## ------------- ##
  -_ASBOX
  -      echo
  -      for ac_var in $ac_subst_files
  -      do
  -	eval ac_val=$`echo $ac_var`
  -        echo "$ac_var='"'"'$ac_val'"'"'"
  -      done | sort
  -      echo
  -    fi
  -
       if test -s confdefs.h; then
         cat <<\_ASBOX
   ## ----------- ##
  @@ -1125,7 +1056,7 @@
   ## ----------- ##
   _ASBOX
         echo
  -      sed "/^$/d" confdefs.h | sort
  +      sed "/^$/d" confdefs.h
         echo
       fi
       test "$ac_signal" != 0 &&
  @@ -1291,7 +1222,6 @@
   
   
   
  -
   # framework is a unique directory in src/ - allows configure to check
   # it is running in the correct directory
   
  @@ -1299,9 +1229,9 @@
   
   # Define the files we wish to generate
   
  -                                                                                                              ac_config_files="$ac_config_files Makefile canon/Makefile transformers/Makefile dsig/Makefile enc/Makefile enc/OpenSSL/Makefile framework/Makefile utils/Makefile utils/unixutils/Makefile tools/Makefile samples/Makefile"
  +ac_config_files="$ac_config_files Makefile canon/Makefile transformers/Makefile dsig/Makefile enc/Makefile enc/OpenSSL/Makefile framework/Makefile utils/Makefile utils/unixutils/Makefile tools/Makefile samples/Makefile"
   
  -          ac_config_headers="$ac_config_headers framework/XSECConfig.hpp"
  +ac_config_headers="$ac_config_headers framework/XSECConfig.hpp"
   
   
   # Get user options
  @@ -1543,7 +1473,9 @@
       # 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+' '}$@"
  +    set dummy "$as_dir/$ac_word" ${1+"$@"}
  +    shift
  +    ac_cv_prog_CC="$@"
     fi
   fi
   fi
  @@ -1648,10 +1580,8 @@
   fi
   
   
  -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: no acceptable C compiler found in \$PATH
  -See \`config.log' for more details." >&2;}
  +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
  +echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
      { (exit 1); exit 1; }; }
   
   # Provide some information about the compiler.
  @@ -1676,12 +1606,14 @@
   
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -1691,7 +1623,7 @@
   }
   _ACEOF
   ac_clean_files_save=$ac_clean_files
  -ac_clean_files="$ac_clean_files a.out a.exe b.out"
  +ac_clean_files="$ac_clean_files a.out a.exe"
   # 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.
  @@ -1710,39 +1642,26 @@
   # Be careful to initialize this variable, since it used to be cached.
   # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
   ac_cv_exeext=
  -# b.out is created by i960 compilers.
  -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
  -do
  -  test -f "$ac_file" || continue
  +for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
  +                ls a.out conftest 2>/dev/null;
  +                ls a.* conftest.* 2>/dev/null`; do
     case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
  -        ;;
  -    conftest.$ac_ext )
  -        # This is the source file.
  -        ;;
  -    [ab].out )
  -        # We found the default executable, but exeext='' is most
  -        # certainly right.
  -        break;;
  -    *.* )
  -        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  -        # FIXME: I believe we export ac_cv_exeext for Libtool,
  -        # but it would be cool to find out if it's true.  Does anybody
  -        # maintain Libtool? --akim.
  -        export ac_cv_exeext
  -        break;;
  -    * )
  -        break;;
  +    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
  +    a.out ) # We found the default executable, but exeext='' is most
  +            # certainly right.
  +            break;;
  +    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  +          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
  +          export ac_cv_exeext
  +          break;;
  +    * ) break;;
     esac
   done
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: C compiler cannot create executables
  -See \`config.log' for more details." >&2;}
  +cat conftest.$ac_ext >&5
  +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
  +echo "$as_me: error: C compiler cannot create executables" >&2;}
      { (exit 77); exit 77; }; }
   fi
   
  @@ -1769,11 +1688,9 @@
   	cross_compiling=yes
       else
   	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
  -If you meant to cross compile, use \`--host'.
  -See \`config.log' for more details." >&5
  +If you meant to cross compile, use \`--host'." >&5
   echo "$as_me: error: cannot run C compiled programs.
  -If you meant to cross compile, use \`--host'.
  -See \`config.log' for more details." >&2;}
  +If you meant to cross compile, use \`--host'." >&2;}
      { (exit 1); exit 1; }; }
       fi
     fi
  @@ -1781,7 +1698,7 @@
   echo "$as_me:$LINENO: result: yes" >&5
   echo "${ECHO_T}yes" >&6
   
  -rm -f a.out a.exe conftest$ac_cv_exeext b.out
  +rm -f a.out a.exe conftest$ac_cv_exeext
   ac_clean_files=$ac_clean_files_save
   # Check the compiler produces executables we can run.  If not, either
   # the compiler is broken, or we cross compile.
  @@ -1801,10 +1718,9 @@
   # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
   # work properly (i.e., refer to `conftest.exe'), while it won't with
   # `rm'.
  -for ac_file in conftest.exe conftest conftest.*; do
  -  test -f "$ac_file" || continue
  +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
     case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
  +    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
       *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
             export ac_cv_exeext
             break;;
  @@ -1812,10 +1728,8 @@
     esac
   done
   else
  -  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  -See \`config.log' for more details." >&2;}
  +  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
  +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
      { (exit 1); exit 1; }; }
   fi
   
  @@ -1833,12 +1747,14 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -1855,19 +1771,16 @@
     (exit $ac_status); }; then
     for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
     case $ac_file in
  -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
  +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
       *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
          break;;
     esac
   done
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: cannot compute suffix of object files: cannot compile
  -See \`config.log' for more details." >&2;}
  +cat conftest.$ac_ext >&5
  +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
  +echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
      { (exit 1); exit 1; }; }
   fi
   
  @@ -1884,12 +1797,14 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -1916,8 +1831,7 @@
     ac_compiler_gnu=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ac_compiler_gnu=no
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -1937,12 +1851,14 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -1966,8 +1882,7 @@
     ac_cv_prog_cc_g=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ac_cv_prog_cc_g=no
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -1989,102 +1904,6 @@
       CFLAGS=
     fi
   fi
  -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
  -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
  -if test "${ac_cv_prog_cc_stdc+set}" = set; then
  -  echo $ECHO_N "(cached) $ECHO_C" >&6
  -else
  -  ac_cv_prog_cc_stdc=no
  -ac_save_CC=$CC
  -cat >conftest.$ac_ext <<_ACEOF
  -#line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdarg.h>
  -#include <stdio.h>
  -#include <sys/types.h>
  -#include <sys/stat.h>
  -/* 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;
  -}
  -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
  -# Don't try gcc -ansi; that turns off useful extensions and
  -# breaks some systems' header files.
  -# AIX			-qlanglvl=ansi
  -# Ultrix and OSF/1	-std1
  -# HP-UX 10.20 and later	-Ae
  -# HP-UX older versions	-Aa -D_HPUX_SOURCE
  -# SVR4			-Xc -D__EXTENSIONS__
  -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  -do
  -  CC="$ac_save_CC $ac_arg"
  -  rm -f conftest.$ac_objext
  -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  -  (eval $ac_compile) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } &&
  -         { ac_try='test -s conftest.$ac_objext'
  -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  -  (eval $ac_try) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  ac_cv_prog_cc_stdc=$ac_arg
  -break
  -else
  -  echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -fi
  -rm -f conftest.$ac_objext
  -done
  -rm -f conftest.$ac_ext conftest.$ac_objext
  -CC=$ac_save_CC
  -
  -fi
  -
  -case "x$ac_cv_prog_cc_stdc" in
  -  x|xno)
  -    echo "$as_me:$LINENO: result: none needed" >&5
  -echo "${ECHO_T}none needed" >&6 ;;
  -  *)
  -    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
  -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
  -    CC="$CC $ac_cv_prog_cc_stdc" ;;
  -esac
  -
   # Some people use a C++ compiler to compile C.  Since we use `exit',
   # in C++ we need to declare it.  In case someone uses the same compiler
   # for both compiling C and C++ we need to have the C++ compiler decide
  @@ -2108,22 +1927,24 @@
     (exit $ac_status); }; }; then
     for ac_declaration in \
      ''\
  +   '#include <stdlib.h>' \
      'extern "C" void std::exit (int) throw (); using std::exit;' \
      'extern "C" void std::exit (int); using std::exit;' \
      'extern "C" void exit (int) throw ();' \
      'extern "C" void exit (int);' \
  -   'void exit (int);' \
  -   '#include <stdlib.h>'
  +   'void exit (int);'
   do
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <stdlib.h>
   $ac_declaration
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2147,19 +1968,20 @@
     :
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   continue
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   $ac_declaration
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2183,8 +2005,7 @@
     break
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
   done
  @@ -2197,8 +2018,7 @@
   
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
  @@ -2327,12 +2147,14 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2359,8 +2181,7 @@
     ac_compiler_gnu=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ac_compiler_gnu=no
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -2380,12 +2201,14 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2409,8 +2232,7 @@
     ac_cv_prog_cxx_g=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ac_cv_prog_cxx_g=no
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -2434,22 +2256,24 @@
   fi
   for ac_declaration in \
      ''\
  +   '#include <stdlib.h>' \
      'extern "C" void std::exit (int) throw (); using std::exit;' \
      'extern "C" void std::exit (int); using std::exit;' \
      'extern "C" void exit (int) throw ();' \
      'extern "C" void exit (int);' \
  -   'void exit (int);' \
  -   '#include <stdlib.h>'
  +   'void exit (int);'
   do
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <stdlib.h>
   $ac_declaration
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2473,19 +2297,20 @@
     :
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   continue
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   $ac_declaration
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  @@ -2509,8 +2334,7 @@
     break
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
   done
  @@ -2753,28 +2577,18 @@
   do
     # Use a header file that comes with gcc, so configuring glibc
     # with a fresh cross-compiler works.
  -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -  # <limits.h> exists even on freestanding compilers.
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp. "Syntax error" is here to catch this case.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  +#include "confdefs.h"
  +#include <assert.h>
                        Syntax error
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -2791,8 +2605,7 @@
     :
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     # Broken: fails on valid input.
   continue
   fi
  @@ -2802,17 +2615,13 @@
     # can be detected and how.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <ac_nonexistent.h>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -2830,8 +2639,7 @@
   continue
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     # Passes both tests.
   ac_preproc_ok=:
   break
  @@ -2860,28 +2668,18 @@
   do
     # Use a header file that comes with gcc, so configuring glibc
     # with a fresh cross-compiler works.
  -  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  -  # <limits.h> exists even on freestanding compilers.
     # On the NeXT, cc -E runs the code through the compiler's parser,
     # not just through cpp. "Syntax error" is here to catch this case.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#ifdef __STDC__
  -# include <limits.h>
  -#else
  -# include <assert.h>
  -#endif
  +#include "confdefs.h"
  +#include <assert.h>
                        Syntax error
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -2898,8 +2696,7 @@
     :
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     # Broken: fails on valid input.
   continue
   fi
  @@ -2909,17 +2706,13 @@
     # can be detected and how.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <ac_nonexistent.h>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -2937,8 +2730,7 @@
   continue
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     # Passes both tests.
   ac_preproc_ok=:
   break
  @@ -2951,10 +2743,8 @@
   if $ac_preproc_ok; then
     :
   else
  -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  -See \`config.log' for more details." >&2;}
  +  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
  +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
      { (exit 1); exit 1; }; }
   fi
   
  @@ -2967,17 +2757,13 @@
   
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -2994,156 +2780,369 @@
     :
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
   
   fi
   rm -f conftest.err conftest.$ac_ext
  +ac_ext=cc
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   
  -# Checks for required libraries
   
  -echo "$as_me:$LINENO: checking for floor in -lm" >&5
  -echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  -if test "${ac_cv_lib_m_floor+set}" = set; then
  +ac_ext=cc
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
  +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
  +if test -z "$CXXCPP"; then
  +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
     echo $ECHO_N "(cached) $ECHO_C" >&6
   else
  -  ac_check_lib_save_LIBS=$LIBS
  -LIBS="-lm  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  +      # Double quotes because CXXCPP needs to be expanded
  +    for CXXCPP in "$CXX -E" "/lib/cpp"
  +    do
  +      ac_preproc_ok=false
  +for ac_cxx_preproc_warn_flag in '' yes
  +do
  +  # Use a header file that comes with gcc, so configuring glibc
  +  # with a fresh cross-compiler works.
  +  # On the NeXT, cc -E runs the code through the compiler's parser,
  +  # not just through cpp. "Syntax error" is here to catch this case.
  +  cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -/* Override any gcc2 internal prototype to avoid an error.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -/* We use char because int might match the return type of a gcc2
  -   builtin and then its argument prototype would still apply.  */
  -char floor ();
  -int
  -main ()
  -{
  -floor ();
  -  ;
  -  return 0;
  -}
  +#include "confdefs.h"
  +#include <assert.h>
  +                     Syntax error
   _ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  -  (eval $ac_link) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } &&
  -         { ac_try='test -s conftest$ac_exeext'
  -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  -  (eval $ac_try) 2>&5
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  ac_cv_lib_m_floor=yes
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
   else
  -  echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -ac_cv_lib_m_floor=no
  -fi
  -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  -LIBS=$ac_check_lib_save_LIBS
  -fi
  -echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  -echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  -if test $ac_cv_lib_m_floor = yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define HAVE_LIBM 1
  -_ACEOF
  -
  -  LIBS="-lm $LIBS"
  -
  +  ac_cpp_err=yes
   fi
  -
  -
  -# Determine the host system and Makefile fragment
  -
  -# Check for required includes
  -echo "$as_me:$LINENO: checking for egrep" >&5
  -echo $ECHO_N "checking for egrep... $ECHO_C" >&6
  -if test "${ac_cv_prog_egrep+set}" = set; then
  -  echo $ECHO_N "(cached) $ECHO_C" >&6
  +if test -z "$ac_cpp_err"; then
  +  :
   else
  -  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
  -    then ac_cv_prog_egrep='grep -E'
  -    else ac_cv_prog_egrep='egrep'
  -    fi
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  # Broken: fails on valid input.
  +continue
   fi
  -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
  -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
  - EGREP=$ac_cv_prog_egrep
  -
  +rm -f conftest.err conftest.$ac_ext
   
  -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  -if test "${ac_cv_header_stdc+set}" = set; then
  -  echo $ECHO_N "(cached) $ECHO_C" >&6
  -else
  +  # OK, works on sane cases.  Now check whether non-existent headers
  +  # can be detected and how.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  +#include "confdefs.h"
  +#include <ac_nonexistent.h>
   _ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -#include <stdlib.h>
  -#include <stdarg.h>
  -#include <string.h>
  -#include <float.h>
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  # Broken: success on invalid input.
  +continue
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  # Passes both tests.
  +ac_preproc_ok=:
  +break
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
  +done
  +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  +rm -f conftest.err conftest.$ac_ext
  +if $ac_preproc_ok; then
  +  break
  +fi
  +
  +    done
  +    ac_cv_prog_CXXCPP=$CXXCPP
  +
  +fi
  +  CXXCPP=$ac_cv_prog_CXXCPP
  +else
  +  ac_cv_prog_CXXCPP=$CXXCPP
  +fi
  +echo "$as_me:$LINENO: result: $CXXCPP" >&5
  +echo "${ECHO_T}$CXXCPP" >&6
  +ac_preproc_ok=false
  +for ac_cxx_preproc_warn_flag in '' yes
  +do
  +  # Use a header file that comes with gcc, so configuring glibc
  +  # with a fresh cross-compiler works.
  +  # On the NeXT, cc -E runs the code through the compiler's parser,
  +  # not just through cpp. "Syntax error" is here to catch this case.
  +  cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +#include <assert.h>
  +                     Syntax error
  +_ACEOF
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  :
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  # Broken: fails on valid input.
  +continue
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
  +  # OK, works on sane cases.  Now check whether non-existent headers
  +  # can be detected and how.
  +  cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +#include <ac_nonexistent.h>
  +_ACEOF
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  # Broken: success on invalid input.
  +continue
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  # Passes both tests.
  +ac_preproc_ok=:
  +break
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
  +done
  +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  +rm -f conftest.err conftest.$ac_ext
  +if $ac_preproc_ok; then
  +  :
  +else
  +  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
  +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
  +   { (exit 1); exit 1; }; }
  +fi
   
  +ac_ext=cc
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  +
  +
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +
  +_ACEOF
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  :
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +
  +fi
  +rm -f conftest.err 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
  +
  +
  +# Checks for required libraries
  +
  +echo "$as_me:$LINENO: checking for floor in -lm" >&5
  +echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  +if test "${ac_cv_lib_m_floor+set}" = set; then
  +  echo $ECHO_N "(cached) $ECHO_C" >&6
  +else
  +  ac_check_lib_save_LIBS=$LIBS
  +LIBS="-lm  $LIBS"
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +
  +/* Override any gcc2 internal prototype to avoid an error.  */
  +#ifdef __cplusplus
  +extern "C"
  +#endif
  +/* We use char because int might match the return type of a gcc2
  +   builtin and then its argument prototype would still apply.  */
  +char floor ();
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
   int
   main ()
   {
  -
  +floor ();
     ;
     return 0;
   }
   _ACEOF
  -rm -f conftest.$ac_objext
  -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  -  (eval $ac_compile) 2>&5
  +rm -f conftest.$ac_objext conftest$ac_exeext
  +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +  (eval $ac_link) 2>&5
     ac_status=$?
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); } &&
  -         { ac_try='test -s conftest.$ac_objext'
  +         { ac_try='test -s conftest$ac_exeext'
     { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     (eval $ac_try) 2>&5
     ac_status=$?
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); }; }; then
  -  ac_cv_header_stdc=yes
  +  ac_cv_lib_m_floor=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  +cat conftest.$ac_ext >&5
  +ac_cv_lib_m_floor=no
  +fi
  +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  +LIBS=$ac_check_lib_save_LIBS
  +fi
  +echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  +echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  +if test $ac_cv_lib_m_floor = yes; then
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_LIBM 1
  +_ACEOF
  +
  +  LIBS="-lm $LIBS"
   
  -ac_cv_header_stdc=no
   fi
  -rm -f conftest.$ac_objext conftest.$ac_ext
  +
  +
  +# Determine the host system and Makefile fragment
  +
  +# Check for required includes
  +echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  +if test "${ac_cv_header_stdc+set}" = set; then
  +  echo $ECHO_N "(cached) $ECHO_C" >&6
  +else
  +  cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +#include <stdlib.h>
  +#include <stdarg.h>
  +#include <string.h>
  +#include <float.h>
  +
  +_ACEOF
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_c_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  ac_cv_header_stdc=yes
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  ac_cv_header_stdc=no
  +fi
  +rm -f conftest.err conftest.$ac_ext
   
   if test $ac_cv_header_stdc = yes; then
     # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <string.h>
   
   _ACEOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "memchr" >/dev/null 2>&1; then
  +  egrep "memchr" >/dev/null 2>&1; then
     :
   else
     ac_cv_header_stdc=no
  @@ -3156,16 +3155,12 @@
     # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <stdlib.h>
   
   _ACEOF
   if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  -  $EGREP "free" >/dev/null 2>&1; then
  +  egrep "free" >/dev/null 2>&1; then
     :
   else
     ac_cv_header_stdc=no
  @@ -3181,18 +3176,13 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <ctype.h>
   #if ((' ' & 0x0FF) == 0x020)
   # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
   # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
   #else
  -# define ISLOWER(c) \
  -                   (('a' <= (c) && (c) <= 'i') \
  +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
                        || ('j' <= (c) && (c) <= 'r') \
                        || ('s' <= (c) && (c) <= 'z'))
   # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
  @@ -3225,12 +3215,11 @@
   else
     echo "$as_me: program exited with status $ac_status" >&5
   echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ( exit $ac_status )
   ac_cv_header_stdc=no
   fi
  -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
   fi
   fi
   fi
  @@ -3265,11 +3254,7 @@
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   $ac_includes_default
   
   #include <$ac_header>
  @@ -3289,8 +3274,7 @@
     eval "$as_ac_Header=yes"
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   eval "$as_ac_Header=no"
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -3326,11 +3310,7 @@
   echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   $ac_includes_default
   #include <$ac_header>
   _ACEOF
  @@ -3349,8 +3329,7 @@
     ac_header_compiler=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ac_header_compiler=no
   fi
   rm -f conftest.$ac_objext conftest.$ac_ext
  @@ -3362,17 +3341,13 @@
   echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <$ac_header>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -3389,8 +3364,7 @@
     ac_header_preproc=yes
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     ac_header_preproc=no
   fi
   rm -f conftest.err conftest.$ac_ext
  @@ -3403,32 +3377,14 @@
       { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
   echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
       { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    (
  -      cat <<\_ASBOX
  -## ------------------------------------ ##
  -## Report this to bug-autoconf@gnu.org. ##
  -## ------------------------------------ ##
  -_ASBOX
  -    ) |
  -      sed "s/^/$as_me: WARNING:     /" >&2
  -    ;;
  +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
     no:yes )
       { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
   echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
       { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
   echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
       { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  -    (
  -      cat <<\_ASBOX
  -## ------------------------------------ ##
  -## Report this to bug-autoconf@gnu.org. ##
  -## ------------------------------------ ##
  -_ASBOX
  -    ) |
  -      sed "s/^/$as_me: WARNING:     /" >&2
  -    ;;
  +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
   esac
   echo "$as_me:$LINENO: checking for $ac_header" >&5
   echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
  @@ -3578,6 +3534,13 @@
   
   # Check for Xerces using XERCESCROOT (override any system version)
   
  +ac_ext=cc
  +ac_cpp='$CXXCPP $CPPFLAGS'
  +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  +
  +
   if test $XERCESCROOT; then
   
     OLDCPPFLAGS=$CPPFLAGS
  @@ -3586,19 +3549,13 @@
     echo "$as_me:$LINENO: checking for Xerces 2.x headers in XERCESCROOT/src" >&5
   echo $ECHO_N "checking for Xerces 2.x headers in XERCESCROOT/src... $ECHO_C" >&6
     if test "$cross_compiling" = yes; then
  -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: cannot run test program while cross compiling
  -See \`config.log' for more details." >&2;}
  +  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
  +echo "$as_me: error: cannot run test program while cross compiling" >&2;}
      { (exit 1); exit 1; }; }
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <xercesc/util/XercesVersion.hpp>
       int main(int argc, char **argv) {
         if (XERCES_VERSION_MAJOR < 2)
  @@ -3625,14 +3582,13 @@
   else
     echo "$as_me: program exited with status $ac_status" >&5
   echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ( exit $ac_status )
   CPPFLAGS=$OLD_CPPFLAGS
       echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
   fi
  -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
   fi
   
   fi
  @@ -3645,19 +3601,13 @@
   echo $ECHO_N "checking for Xerces 2.x headers in system includes... $ECHO_C" >&6
   
     if test "$cross_compiling" = yes; then
  -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  -See \`config.log' for more details." >&5
  -echo "$as_me: error: cannot run test program while cross compiling
  -See \`config.log' for more details." >&2;}
  +  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
  +echo "$as_me: error: cannot run test program while cross compiling" >&2;}
      { (exit 1); exit 1; }; }
   else
     cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <xercesc/util/XercesVersion.hpp>
       int main(int argc, char **argv) {
         if (XERCES_VERSION_MAJOR < 2)
  @@ -3683,17 +3633,77 @@
   else
     echo "$as_me: program exited with status $ac_status" >&5
   echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +cat conftest.$ac_ext >&5
   ( exit $ac_status )
   { { echo "$as_me:$LINENO: error: Xerces 2.0 not found.  Ensure XERCESCROOT points to base directory of Xerces and Xerces 2.0 or later is available" >&5
   echo "$as_me: error: Xerces 2.0 not found.  Ensure XERCESCROOT points to base directory of Xerces and Xerces 2.0 or later is available" >&2;}
      { (exit 1); exit 1; }; }
   fi
  -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  +fi
  +
   fi
   
  +# Find out some properties of the version of Xerces we have
  +
  +echo "$as_me:$LINENO: checking whether Xerces XMLFormatter requires a version" >&5
  +echo $ECHO_N "checking whether Xerces XMLFormatter requires a version... $ECHO_C" >&6
  +
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +#include <xercesc/framework/XMLFormatter.hpp>
  +	#include <xercesc/util/XercesDefs.hpp>
  +	#include <xercesc/util/XMLUniDefs.hpp>
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
  +int
  +main ()
  +{
  +using namespace XERCES_CPP_NAMESPACE;
  +	  XMLCh s_encoding[] = {
  +		chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_8, chNull
  +	  };
  +	  XMLFormatter f(s_encoding,
  +		NULL,
  +		NULL,
  +		XMLFormatter::NoEscapes,
  +		XMLFormatter::UnRep_CharRef);
  +
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +rm -f conftest.$ac_objext
  +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  +  (eval $ac_compile) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } &&
  +         { ac_try='test -s conftest.$ac_objext'
  +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  +  (eval $ac_try) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); }; }; then
  +  echo "$as_me:$LINENO: result: yes" >&5
  +echo "${ECHO_T}yes" >&6
  +	cat >>confdefs.h <<\_ACEOF
  +#define XSEC_XERCES_FORMATTER_REQUIRES_VERSION 1
  +_ACEOF
  +
  +else
  +  echo "$as_me: failed program was:" >&5
  +cat conftest.$ac_ext >&5
  +echo "$as_me:$LINENO: result: no" >&5
  +echo "${ECHO_T}no" >&6
   fi
  +rm -f conftest.$ac_objext conftest.$ac_ext
  +
   
   # Now check for Xalan
   
  @@ -3709,23 +3719,19 @@
   
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <Include/PlatformDefinitions.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); } >/dev/null; then
     if test -s conftest.err; then
  -    ac_cpp_err=$ac_c_preproc_warn_flag
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
     else
       ac_cpp_err=
     fi
  @@ -3739,8 +3745,7 @@
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     CPPFLAGS=$OLD_CPPFLAGS
         echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
  @@ -3755,23 +3760,19 @@
   echo $ECHO_N "checking for Xalan in system includes... $ECHO_C" >&6
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <Include/PlatformDefinitions.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); } >/dev/null; then
     if test -s conftest.err; then
  -    ac_cpp_err=$ac_c_preproc_warn_flag
  +    ac_cpp_err=$ac_cxx_preproc_warn_flag
     else
       ac_cpp_err=
     fi
  @@ -3785,8 +3786,7 @@
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     cat >>confdefs.h <<\_ACEOF
   #define XSEC_NO_XALAN 1
   _ACEOF
  @@ -3811,6 +3811,13 @@
   
   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
  +
  +
   # Check for OpenSSL
   if test $OPENSSL ; then
   
  @@ -3822,17 +3829,13 @@
   
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <openssl/opensslv.h>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -3856,8 +3859,7 @@
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     CPPFLAGS=$OLD_CPPFLAGS
      echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
  @@ -3872,17 +3874,13 @@
   echo $ECHO_N "checking for OpenSSL in system includes... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  +#include "confdefs.h"
   #include <openssl/opensslv.h>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
     ac_status=$?
  -  grep -v '^ *+' conftest.er1 >conftest.err
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
     rm -f conftest.er1
     cat conftest.err >&5
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
  @@ -3906,8 +3904,7 @@
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  +  cat conftest.$ac_ext >&5
     echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
      { { echo "$as_me:$LINENO: error: OpenSSL header files not find.  Please define OPENSSL" >&5
  @@ -4124,7 +4121,7 @@
   # config.status only pays attention to the cache file if you give it
   # the --recheck option to rerun configure.
   #
  -# `ac_cv_env_foo' variables (set or unset) will be overridden when
  +# `ac_cv_env_foo' variables (set or unset) will be overriden when
   # loading this file, other *unset* `ac_cv_foo' will be assigned the
   # following values.
   
  @@ -4159,7 +4156,7 @@
        t end
        /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
        : end' >>confcache
  -if diff $cache_file confcache >/dev/null 2>&1; then :; else
  +if cmp -s $cache_file confcache; then :; else
     if test -w $cache_file; then
       test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
       cat confcache >$cache_file
  @@ -4190,21 +4187,6 @@
   
   DEFS=-DHAVE_CONFIG_H
   
  -ac_libobjs=
  -ac_ltlibobjs=
  -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
  -  # 1. Remove the extension, and $U if already installed.
  -  ac_i=`echo "$ac_i" |
  -         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
  -  # 2. Add them.
  -  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
  -  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
  -done
  -LIBOBJS=$ac_libobjs
  -
  -LTLIBOBJS=$ac_ltlibobjs
  -
  -
   # Define the library directories
   for lib_dir in ${library_l1_src_dirs}
   do
  @@ -4240,12 +4222,11 @@
   # configure, is in config.log if it exists.
   
   debug=false
  -ac_cs_recheck=false
  -ac_cs_silent=false
   SHELL=\${CONFIG_SHELL-$SHELL}
   _ACEOF
   
   cat >>$CONFIG_STATUS <<\_ACEOF
  +
   ## --------------------- ##
   ## M4sh Initialization.  ##
   ## --------------------- ##
  @@ -4254,13 +4235,11 @@
   if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
     emulate sh
     NULLCMD=:
  -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  -  # is contrary to our usage.  Disable this feature.
  -  alias -g '${1+"$@"}'='"$@"'
   elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
     set -o posix
   fi
   
  +# NLS nuisances.
   # Support unset when possible.
   if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
     as_unset=unset
  @@ -4268,42 +4247,34 @@
     as_unset=false
   fi
   
  -
  -# Work around bugs in pre-3.0 UWIN ksh.
  -$as_unset ENV MAIL MAILPATH
  -PS1='$ '
  -PS2='> '
  -PS4='+ '
  -
  -# NLS nuisances.
  -for as_var in \
  -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
  -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
  -  LC_TELEPHONE LC_TIME
  -do
  -  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
  -    eval $as_var=C; export $as_var
  -  else
  -    $as_unset $as_var
  -  fi
  -done
  -
  -# Required to use basename.
  -if expr a : '\(a\)' >/dev/null 2>&1; then
  -  as_expr=expr
  -else
  -  as_expr=false
  -fi
  -
  -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
  -  as_basename=basename
  -else
  -  as_basename=false
  -fi
  +(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
  +    { $as_unset LANG || test "${LANG+set}" != set; } ||
  +      { LANG=C; export LANG; }
  +(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
  +    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
  +      { LC_ALL=C; export LC_ALL; }
  +(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
  +    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
  +      { LC_TIME=C; export LC_TIME; }
  +(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
  +    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
  +      { LC_CTYPE=C; export LC_CTYPE; }
  +(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
  +    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
  +      { LANGUAGE=C; export LANGUAGE; }
  +(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
  +    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
  +      { LC_COLLATE=C; export LC_COLLATE; }
  +(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
  +    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
  +      { LC_NUMERIC=C; export LC_NUMERIC; }
  +(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
  +    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
  +      { LC_MESSAGES=C; export LC_MESSAGES; }
   
   
   # Name of the executable.
  -as_me=`$as_basename "$0" ||
  +as_me=`(basename "$0") 2>/dev/null ||
   $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
   	 X"$0" : 'X\(//\)$' \| \
   	 X"$0" : 'X\(/\)$' \| \
  @@ -4314,7 +4285,6 @@
     	  /^X\/\(\/\).*/{ s//\1/; q; }
     	  s/.*/./; q'`
   
  -
   # PATH needs CR, and LINENO needs CR and PATH.
   # Avoid depending upon Character Ranges.
   as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  @@ -4325,15 +4295,15 @@
   
   # The user is always right.
   if test "${PATH_SEPARATOR+set}" != set; then
  -  echo "#! /bin/sh" >conf$$.sh
  -  echo  "exit 0"   >>conf$$.sh
  -  chmod +x conf$$.sh
  -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
  +  echo "#! /bin/sh" >conftest.sh
  +  echo  "exit 0"   >>conftest.sh
  +  chmod +x conftest.sh
  +  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
       PATH_SEPARATOR=';'
     else
       PATH_SEPARATOR=:
     fi
  -  rm -f conf$$.sh
  +  rm -f conftest.sh
   fi
   
   
  @@ -4382,8 +4352,6 @@
     as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
     test "x$as_lineno_1" != "x$as_lineno_2" &&
     test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
  -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
  -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
   	     CONFIG_SHELL=$as_dir/$as_base
   	     export CONFIG_SHELL
   	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
  @@ -4457,12 +4425,6 @@
   fi
   rm -f conf$$ conf$$.exe conf$$.file
   
  -if mkdir -p . 2>/dev/null; then
  -  as_mkdir_p=:
  -else
  -  as_mkdir_p=false
  -fi
  -
   as_executable_p="test -f"
   
   # Sed expression to map a string onto a valid CPP name.
  @@ -4479,7 +4441,7 @@
   IFS=" 	$as_nl"
   
   # CDPATH.
  -$as_unset CDPATH
  +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
   
   exec 6>&1
   
  @@ -4496,7 +4458,7 @@
   cat >&5 <<_CSEOF
   
   This file was extended by XML-Security-C $as_me 0.2.0, which was
  -generated by GNU Autoconf 2.57.  Invocation command line was
  +generated by GNU Autoconf 2.53.  Invocation command line was
   
     CONFIG_FILES    = $CONFIG_FILES
     CONFIG_HEADERS  = $CONFIG_HEADERS
  @@ -4536,7 +4498,6 @@
   
     -h, --help       print this help, then exit
     -V, --version    print version number, then exit
  -  -q, --quiet      do not print progress messages
     -d, --debug      don't remove temporary files
         --recheck    update $as_me by reconfiguring in the same conditions
     --file=FILE[:TEMPLATE]
  @@ -4556,7 +4517,7 @@
   cat >>$CONFIG_STATUS <<_ACEOF
   ac_cs_version="\\
   XML-Security-C config.status 0.2.0
  -configured by $0, generated by GNU Autoconf 2.57,
  +configured by $0, generated by GNU Autoconf 2.53,
     with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
   
   Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
  @@ -4577,25 +4538,25 @@
     --*=*)
       ac_option=`expr "x$1" : 'x\([^=]*\)='`
       ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
  -    ac_shift=:
  -    ;;
  -  -*)
  -    ac_option=$1
  -    ac_optarg=$2
  -    ac_shift=shift
  +    shift
  +    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
  +    shift
       ;;
  +  -*);;
     *) # This is not an option, so the user has probably given explicit
        # arguments.
  -     ac_option=$1
        ac_need_defaults=false;;
     esac
   
  -  case $ac_option in
  +  case $1 in
     # Handling of the options.
   _ACEOF
  -cat >>$CONFIG_STATUS <<\_ACEOF
  +cat >>$CONFIG_STATUS <<_ACEOF
     -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
  -    ac_cs_recheck=: ;;
  +    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
  +    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
  +_ACEOF
  +cat >>$CONFIG_STATUS <<\_ACEOF
     --version | --vers* | -V )
       echo "$ac_cs_version"; exit 0 ;;
     --he | --h)
  @@ -4610,16 +4571,13 @@
     --debug | --d* | -d )
       debug=: ;;
     --file | --fil | --fi | --f )
  -    $ac_shift
  -    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
  +    shift
  +    CONFIG_FILES="$CONFIG_FILES $1"
       ac_need_defaults=false;;
     --header | --heade | --head | --hea )
  -    $ac_shift
  -    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
  +    shift
  +    CONFIG_HEADERS="$CONFIG_HEADERS $1"
       ac_need_defaults=false;;
  -  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  -  | -silent | --silent | --silen | --sile | --sil | --si | --s)
  -    ac_cs_silent=: ;;
   
     # This is an error.
     -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
  @@ -4634,20 +4592,6 @@
     shift
   done
   
  -ac_configure_extra_args=
  -
  -if $ac_cs_silent; then
  -  exec 6>/dev/null
  -  ac_configure_extra_args="$ac_configure_extra_args --silent"
  -fi
  -
  -_ACEOF
  -cat >>$CONFIG_STATUS <<_ACEOF
  -if \$ac_cs_recheck; then
  -  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
  -  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  -fi
  -
   _ACEOF
   
   
  @@ -4686,9 +4630,6 @@
     test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   fi
   
  -# Have a temporary directory for convenience.  Make it in the build tree
  -# simply because there is no reason to put it here, and in addition,
  -# creating and moving files from /tmp can sometimes cause problems.
   # Create a temporary directory, and hook for its removal unless debugging.
   $debug ||
   {
  @@ -4697,17 +4638,17 @@
   }
   
   # Create a (secure) tmp directory for tmp files.
  -
  +: ${TMPDIR=/tmp}
   {
  -  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
  +  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
     test -n "$tmp" && test -d "$tmp"
   }  ||
   {
  -  tmp=./confstat$$-$RANDOM
  +  tmp=$TMPDIR/cs$$-$RANDOM
     (umask 077 && mkdir $tmp)
   } ||
   {
  -   echo "$me: cannot create a temporary directory in ." >&2
  +   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
      { (exit 1); exit 1; }
   }
   
  @@ -4772,7 +4713,7 @@
   s,@AWK@,$AWK,;t t
   s,@AUTOCONF@,$AUTOCONF,;t t
   s,@CPP@,$CPP,;t t
  -s,@EGREP@,$EGREP,;t t
  +s,@CXXCPP@,$CXXCPP,;t t
   s,@build@,$build,;t t
   s,@build_cpu@,$build_cpu,;t t
   s,@build_vendor@,$build_vendor,;t t
  @@ -4827,8 +4768,6 @@
   s,@lib_name@,$lib_name,;t t
   s,@lib_major_name@,$lib_major_name,;t t
   s,@lib_short_name@,$lib_short_name,;t t
  -s,@LIBOBJS@,$LIBOBJS,;t t
  -s,@LTLIBOBJS@,$LTLIBOBJS,;t t
   CEOF
   
   _ACEOF
  @@ -4899,30 +4838,25 @@
     	  /^X\(\/\/\)$/{ s//\1/; q; }
     	  /^X\(\/\).*/{ s//\1/; q; }
     	  s/.*/./; q'`
  -  { if $as_mkdir_p; then
  -    mkdir -p "$ac_dir"
  -  else
  -    as_dir="$ac_dir"
  -    as_dirs=
  -    while test ! -d "$as_dir"; do
  -      as_dirs="$as_dir $as_dirs"
  -      as_dir=`(dirname "$as_dir") 2>/dev/null ||
  -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  -         X"$as_dir" : 'X\(//\)[^/]' \| \
  -         X"$as_dir" : 'X\(//\)$' \| \
  -         X"$as_dir" : 'X\(/\)' \| \
  -         .     : '\(.\)' 2>/dev/null ||
  -echo X"$as_dir" |
  -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
  -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
  -  	  /^X\(\/\/\)$/{ s//\1/; q; }
  -  	  /^X\(\/\).*/{ s//\1/; q; }
  -  	  s/.*/./; q'`
  -    done
  -    test ! -n "$as_dirs" || mkdir $as_dirs
  -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
  -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
  -   { (exit 1); exit 1; }; }; }
  +  { case "$ac_dir" in
  +  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
  +  *)                      as_incr_dir=.;;
  +esac
  +as_dummy="$ac_dir"
  +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
  +  case $as_mkdir_dir in
  +    # Skip DOS drivespec
  +    ?:) as_incr_dir=$as_mkdir_dir ;;
  +    *)
  +      as_incr_dir=$as_incr_dir/$as_mkdir_dir
  +      test -d "$as_incr_dir" ||
  +        mkdir "$as_incr_dir" ||
  +	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
  +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
  +   { (exit 1); exit 1; }; }
  +    ;;
  +  esac
  +done; }
   
     ac_builddir=.
   
  @@ -4952,7 +4886,7 @@
   # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
   # absolute.
   ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
  -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
  +ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
   ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
   ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
   
  @@ -5142,7 +5076,7 @@
   # Break up conftest.defines because some shells have a limit on the size
   # of here documents, and old seds have small limits too (100 cmds).
   echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
  -echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
  +echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
   echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
   echo '  :' >>$CONFIG_STATUS
   rm -f conftest.tail
  @@ -5166,7 +5100,7 @@
     mv conftest.tail conftest.defines
   done
   rm -f conftest.defines
  -echo '  fi # grep' >>$CONFIG_STATUS
  +echo '  fi # egrep' >>$CONFIG_STATUS
   echo >>$CONFIG_STATUS
   
   # Break up conftest.undefs because some shells have a limit on the size
  @@ -5206,7 +5140,7 @@
     cat $tmp/in >>$tmp/config.h
     rm -f $tmp/in
     if test x"$ac_file" != x-; then
  -    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
  +    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
         { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
   echo "$as_me: $ac_file is unchanged" >&6;}
       else
  @@ -5222,30 +5156,25 @@
     	  /^X\(\/\/\)$/{ s//\1/; q; }
     	  /^X\(\/\).*/{ s//\1/; q; }
     	  s/.*/./; q'`
  -      { if $as_mkdir_p; then
  -    mkdir -p "$ac_dir"
  -  else
  -    as_dir="$ac_dir"
  -    as_dirs=
  -    while test ! -d "$as_dir"; do
  -      as_dirs="$as_dir $as_dirs"
  -      as_dir=`(dirname "$as_dir") 2>/dev/null ||
  -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  -         X"$as_dir" : 'X\(//\)[^/]' \| \
  -         X"$as_dir" : 'X\(//\)$' \| \
  -         X"$as_dir" : 'X\(/\)' \| \
  -         .     : '\(.\)' 2>/dev/null ||
  -echo X"$as_dir" |
  -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
  -  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
  -  	  /^X\(\/\/\)$/{ s//\1/; q; }
  -  	  /^X\(\/\).*/{ s//\1/; q; }
  -  	  s/.*/./; q'`
  -    done
  -    test ! -n "$as_dirs" || mkdir $as_dirs
  -  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
  -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
  -   { (exit 1); exit 1; }; }; }
  +      { case "$ac_dir" in
  +  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
  +  *)                      as_incr_dir=.;;
  +esac
  +as_dummy="$ac_dir"
  +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
  +  case $as_mkdir_dir in
  +    # Skip DOS drivespec
  +    ?:) as_incr_dir=$as_mkdir_dir ;;
  +    *)
  +      as_incr_dir=$as_incr_dir/$as_mkdir_dir
  +      test -d "$as_incr_dir" ||
  +        mkdir "$as_incr_dir" ||
  +	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
  +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
  +   { (exit 1); exit 1; }; }
  +    ;;
  +  esac
  +done; }
   
         rm -f $ac_file
         mv $tmp/config.h $ac_file
  @@ -5275,11 +5204,8 @@
   # need to make the FD available again.
   if test "$no_create" != yes; then
     ac_cs_success=:
  -  ac_config_status_args=
  -  test "$silent" = yes &&
  -    ac_config_status_args="$ac_config_status_args --quiet"
     exec 5>/dev/null
  -  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
  +  $SHELL $CONFIG_STATUS || ac_cs_success=false
     exec 5>>config.log
     # Use ||, not &&, to avoid exiting from the if with $? = 1, which
     # would make configure fail if this is the last instruction.
  
  
  
  1.10      +29 -0     xml-security/c/src/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure.ac,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.ac	10 May 2003 07:20:49 -0000	1.9
  +++ configure.ac	28 May 2003 11:08:29 -0000	1.10
  @@ -146,6 +146,9 @@
   # "cache" the check for gcc -E
   
   AC_TRY_CPP()
  +AC_LANG(C++)
  +AC_TRY_CPP()
  +AC_LANG(C)
   
   # Checks for required libraries
   AC_CHECK_LIB(m, floor)
  @@ -227,6 +230,8 @@
   
   # Check for Xerces using XERCESCROOT (override any system version)
   
  +AC_LANG(C++)
  +
   if test $XERCESCROOT; then
   
     OLDCPPFLAGS=$CPPFLAGS
  @@ -267,6 +272,28 @@
   
   fi
   
  +# Find out some properties of the version of Xerces we have
  +
  +AC_MSG_CHECKING([whether Xerces XMLFormatter requires a version])
  +
  +AC_TRY_COMPILE([#include <xercesc/framework/XMLFormatter.hpp>
  +	#include <xercesc/util/XercesDefs.hpp>
  +	#include <xercesc/util/XMLUniDefs.hpp>],
  +	[using namespace XERCES_CPP_NAMESPACE;
  +	  XMLCh s_encoding[] = {
  +		chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_8, chNull
  +	  };
  +	  XMLFormatter f(s_encoding,
  +		NULL,
  +		NULL, 
  +		XMLFormatter::NoEscapes, 
  +		XMLFormatter::UnRep_CharRef);
  +	],
  +	[AC_MSG_RESULT([yes])]
  +	[AC_DEFINE(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)],
  +	[AC_MSG_RESULT([no])])
  +	
  +
   # Now check for Xalan
   
   if test "$use_xalan" = "yes" ; then
  @@ -307,6 +334,8 @@
     AC_DEFINE(XSEC_NO_XALAN)
   
   fi
  +
  +AC_LANG(C)
   
   # Check for OpenSSL
   if test $OPENSSL ; then
  
  
  
  1.5       +9 -0      xml-security/c/src/framework/XSECConfig.hpp.in
  
  Index: XSECConfig.hpp.in
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECConfig.hpp.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSECConfig.hpp.in	23 Apr 2003 07:30:55 -0000	1.4
  +++ XSECConfig.hpp.in	28 May 2003 11:08:29 -0000	1.5
  @@ -81,6 +81,15 @@
   #undef XSEC_NO_XALAN
   
   /*
  + * Find out the idiosyncracies of the version of Xerces we are using
  + */
  +
  +/* 2.3 and above introduced a version parameter in the XMLFormatter ctor */
  +
  +#undef XSEC_XERCES_FORMATTER_REQUIRES_VERSION
  +
  +
  +/*
    * Define presence of cryptographic providers
    */