@@ -1,7 +1,9 @@

-CXXFLAGS += -fPIC -fno-stack-protector -std=c++11  -g

+CRYPTOPP_NAME=@CRYPTOPP_NAME@

+

+CXXFLAGS += -fPIC -fno-stack-protector -std=c++11  -g -DCRYPTOPP_NAME=$(CRYPTOPP_NAME)

 CFLAGS += -fPIC -fno-stack-protector -g

-LDFLAGS = -Wl,-Bstatic -lcrypto++ -Wl,-Bdynamic -lpam -Wl,--as-needed

-#LDFLAGS = -lcrypto++ -lpam -Wl,--as-needed

+#LDFLAGS = -Wl,-Bstatic -l$(CRYPTOPP_NAME) -Wl,-Bdynamic -lpam -Wl,--as-needed

+LDFLAGS = -lpam -l$(CRYPTOPP_NAME)

 INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o \

                    sys_stdlib.o sys_time.o

@@ -14,10 +16,6 @@ MODULELIB = pam_dual_control.so

 UNAME_S := $(shell uname -s)

-CRYPTOPP_NAME=@CRYPTOPP_NAME@

-

-MYDEFS = @DEFS@

-

 .PHONY: all

 all: .depend dual_control.a dual_control

@@ -46,12 +44,12 @@ distclean: clean

 .depend: $(OBJS:.o=.cc) $(TEST_SOURCES)

 	rm -f ./.depend

-	$(CXX) -std=c++11 -MM $^ > ./.depend;

+	$(CXX) -std=c++11 -MM -DCRYPTOPP_NAME=$(CRYPTOPP_NAME) $^ > ./.depend;

 -include .depend

 %_test.out: %_test.o $(OBJS)

-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ -lcryptopp

+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ -l$(CRYPTOPP_NAME)

 RUN_%: %.out

 	@echo running $<

@@ -197,7 +197,8 @@ test -x / || exit 1"

   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"

+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

+test \$(( 1 + 1 )) = 2 || exit 1"

   if (eval "$as_required") 2>/dev/null; then :

   as_have_required=yes

 else

@@ -585,8 +586,51 @@ PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'

 PACKAGE_URL=''

 ac_unique_file="config.h.in"

+# Factoring default headers for most tests.

+ac_includes_default="\

+#include <stdio.h>

+#ifdef HAVE_SYS_TYPES_H

+# include <sys/types.h>

+#endif

+#ifdef HAVE_SYS_STAT_H

+# include <sys/stat.h>

+#endif

+#ifdef STDC_HEADERS

+# include <stdlib.h>

+# include <stddef.h>

+#else

+# ifdef HAVE_STDLIB_H

+#  include <stdlib.h>

+# endif

+#endif

+#ifdef HAVE_STRING_H

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

+#  include <memory.h>

+# endif

+# include <string.h>

+#endif

+#ifdef HAVE_STRINGS_H

+# include <strings.h>

+#endif

+#ifdef HAVE_INTTYPES_H

+# include <inttypes.h>

+#endif

+#ifdef HAVE_STDINT_H

+# include <stdint.h>

+#endif

+#ifdef HAVE_UNISTD_H

+# include <unistd.h>

+#endif"

+

 ac_subst_vars='LTLIBOBJS

 LIBOBJS

+CRYPTOPP_NAME

+EGREP

+GREP

+CXXCPP

+ac_ct_CXX

+CXXFLAGS

+CXX

 PAM_MODULE_DIRECTORY

 OBJEXT

 EXEEXT

@@ -637,6 +681,7 @@ ac_subst_files=''

 ac_user_opts='

 enable_option_checking

 with_pam_module_directory

+with_cryptopp

 '

       ac_precious_vars='build_alias

 host_alias

@@ -645,7 +690,11 @@ CC

 CFLAGS

 LDFLAGS

 LIBS

-CPPFLAGS'

+CPPFLAGS

+CXX

+CXXFLAGS

+CCC

+CXXCPP'

 # Initialize some variables set by options.

@@ -1257,6 +1306,7 @@ Optional Packages:

   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

   --with-pam-module-directory=NAME

         Use NAME as installation directory for PAM modules

+  --with-cryptopp         Build algorithms that need Crypto++ support

 Some influential environment variables:

   CC          C compiler command

@@ -1266,6 +1316,9 @@ Some influential environment variables:

   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

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

@@ -1384,6 +1437,245 @@ fi

   as_fn_set_status $ac_retval

 } # ac_fn_c_try_compile

+

+# ac_fn_cxx_try_compile LINENO

+# ----------------------------

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

+ac_fn_cxx_try_compile ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  rm -f conftest.$ac_objext

+  if { { ac_try="$ac_compile"

+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_compile") 2>conftest.err

+  ac_status=$?

+  if test -s conftest.err; then

+    grep -v '^ *+' conftest.err >conftest.er1

+    cat conftest.er1 >&5

+    mv -f conftest.er1 conftest.err

+  fi

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; } && {

+	 test -z "$ac_cxx_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then :

+  ac_retval=0

+else

+  $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	ac_retval=1

+fi

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+  as_fn_set_status $ac_retval

+

+} # ac_fn_cxx_try_compile

+

+# ac_fn_cxx_try_cpp LINENO

+# ------------------------

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

+ac_fn_cxx_try_cpp ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  if { { ac_try="$ac_cpp conftest.$ac_ext"

+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_cpp conftest.$ac_ext") 2>conftest.err

+  ac_status=$?

+  if test -s conftest.err; then

+    grep -v '^ *+' conftest.err >conftest.er1

+    cat conftest.er1 >&5

+    mv -f conftest.er1 conftest.err

+  fi

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; } > conftest.i && {

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

+	 test ! -s conftest.err

+       }; then :

+  ac_retval=0

+else

+  $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+    ac_retval=1

+fi

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+  as_fn_set_status $ac_retval

+

+} # ac_fn_cxx_try_cpp

+

+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES

+# ---------------------------------------------------------

+# Tests whether HEADER exists, giving a warning if it cannot be compiled using

+# the include files in INCLUDES and setting the cache variable VAR

+# accordingly.

+ac_fn_cxx_check_header_mongrel ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  if eval \${$3+:} false; then :

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

+$as_echo_n "checking for $2... " >&6; }

+if eval \${$3+:} false; then :

+  $as_echo_n "(cached) " >&6

+fi

+eval ac_res=\$$3

+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

+$as_echo "$ac_res" >&6; }

+else

+  # Is the header compilable?

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

+$as_echo_n "checking $2 usability... " >&6; }

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+$4

+#include <$2>

+_ACEOF

+if ac_fn_cxx_try_compile "$LINENO"; then :

+  ac_header_compiler=yes

+else

+  ac_header_compiler=no

+fi

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

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

+$as_echo "$ac_header_compiler" >&6; }

+

+# Is the header present?

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

+$as_echo_n "checking $2 presence... " >&6; }

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <$2>

+_ACEOF

+if ac_fn_cxx_try_cpp "$LINENO"; then :

+  ac_header_preproc=yes

+else

+  ac_header_preproc=no

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

+$as_echo "$ac_header_preproc" >&6; }

+

+# So?  What about this header?

+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((

+  yes:no: )

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

+    ;;

+  no:yes:* )

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5

+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5

+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}

+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

+( $as_echo "## --------------------------------- ##

+## Report this to BUG-REPORT-ADDRESS ##

+## --------------------------------- ##"

+     ) | sed "s/^/$as_me: WARNING:     /" >&2

+    ;;

+esac

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

+$as_echo_n "checking for $2... " >&6; }

+if eval \${$3+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  eval "$3=\$ac_header_compiler"

+fi

+eval ac_res=\$$3

+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

+$as_echo "$ac_res" >&6; }

+fi

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+

+} # ac_fn_cxx_check_header_mongrel

+

+# ac_fn_cxx_try_run LINENO

+# ------------------------

+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes

+# that executables *can* be run.

+ac_fn_cxx_try_run ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  if { { ac_try="$ac_link"

+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") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'

+  { { 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_try") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; }; then :

+  ac_retval=0

+else

+  $as_echo "$as_me: program exited with status $ac_status" >&5

+       $as_echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+       ac_retval=$ac_status

+fi

+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+  as_fn_set_status $ac_retval

+

+} # ac_fn_cxx_try_run

+

+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES

+# ---------------------------------------------------------

+# Tests whether HEADER exists and can be compiled using the include files in

+# INCLUDES, setting the cache variable VAR accordingly.

+ac_fn_cxx_check_header_compile ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

+$as_echo_n "checking for $2... " >&6; }

+if eval \${$3+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+$4

+#include <$2>

+_ACEOF

+if ac_fn_cxx_try_compile "$LINENO"; then :

+  eval "$3=yes"

+else

+  eval "$3=no"

+fi

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

+fi

+eval ac_res=\$$3

+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

+$as_echo "$ac_res" >&6; }

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+

+} # ac_fn_cxx_check_header_compile

 cat >config.log <<_ACEOF

 This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

@@ -2551,103 +2843,820 @@ fi

+#check whether to build with crypto++

-ac_config_files="$ac_config_files Makefile"

-

-cat >confcache <<\_ACEOF

-# This file is a shell script that caches the results of configure

-# tests run on this system so they can be shared between configure

-# scripts and configure runs, see configure's option --config-cache.

-# It is not useful on other systems.  If it contains results you don't

-# want to keep, you may remove or edit it.

-#

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

-# loading this file, other *unset* `ac_cv_foo' will be assigned the

-# following values.

-

-_ACEOF

+# Check whether --with-cryptopp was given.

+if test "${with_cryptopp+set}" = set; then :

+  withval=$with_cryptopp; WITH_CRYPTOPP=$withval

+else

+  WITH_CRYPTOPP=yes

+fi

-# The following way of writing the cache mishandles newlines in values,

-# but we know of no workaround that is simple, portable, and efficient.

-# So, we kill variables containing newlines.

-# Ultrix sh set writes to stderr and can't be redirected directly,

-# and sets the high bit in the cache file unless we assign to the vars.

-(

-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do

-    eval ac_val=\$$ac_var

-    case $ac_val in #(

-    *${as_nl}*)

-      case $ac_var in #(

-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

-      esac

-      case $ac_var in #(

-      _ | IFS | as_nl) ;; #(

-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

-      *) { eval $ac_var=; unset $ac_var;} ;;

-      esac ;;

-    esac

-  done

-  (set) 2>&1 |

-    case $as_nl`(ac_space=' '; set) 2>&1` in #(

-    *${as_nl}ac_space=\ *)

-      # `set' does not quote correctly, so add quotes: double-quote

-      # substitution turns \\\\ into \\, and sed turns \\ into \.

-      sed -n \

-	"s/'/'\\\\''/g;

-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

-      ;; #(

-    *)

-      # `set' quotes correctly as required by POSIX, so do not add quotes.

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"

-      ;;

-    esac |

-    sort

-) |

-  sed '

-     /^ac_cv_env_/b end

-     t clear

-     :clear

-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/

-     t end

-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/

-     :end' >>confcache

-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

-  if test -w "$cache_file"; then

-    if test "x$cache_file" != "x/dev/null"; then

-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

-$as_echo "$as_me: updating cache $cache_file" >&6;}

-      if test ! -f "$cache_file" || test -h "$cache_file"; then

-	cat confcache >"$cache_file"

-      else

-        case $cache_file in #(

-        */* | ?:*)

-	  mv -f confcache "$cache_file"$$ &&

-	  mv -f "$cache_file"$$ "$cache_file" ;; #(

-        *)

-	  mv -f confcache "$cache_file" ;;

-	esac

-      fi

-    fi

+#and check crypto++

+if test "$WITH_CRYPTOPP" = "yes"; then

+	#crypto++ headers are either in include/crypto++ or include/cryptopp,

+	#the information is otherwise unavailable from standard configuration

+	#means. Please report/add more tests if you encounter distros that

+	#place them elsewhere.

+	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

+if test -z "$CXX"; then

+  if test -n "$CCC"; then

+    CXX=$CCC

   else

-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

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

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

+  $as_echo_n "(cached) " >&6

+else

+  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

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

-fi

-rm -f confcache

+done

+  done

+IFS=$as_save_IFS

-test "x$prefix" = xNONE && prefix=$ac_default_prefix

-# Let make expand exec_prefix.

-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

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

+else

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

+$as_echo "no" >&6; }

+fi

-DEFS=-DHAVE_CONFIG_H

-ac_libobjs=

-ac_ltlibobjs=

+    test -n "$CXX" && break

+  done

+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

+{ $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 :

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

+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_CXX="$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_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

+

+

+  test -n "$ac_ct_CXX" && break

+done

+

+  if test "x$ac_ct_CXX" = x; then

+    CXX="g++"

+  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

+    CXX=$ac_ct_CXX

+  fi

+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

+

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

+/* end confdefs.h.  */

+

+int

+main ()

+{

+#ifndef __GNUC__

+       choke me

+#endif

+

+  ;

+  return 0;

+}

+_ACEOF

+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_cv_cxx_compiler_gnu=$ac_compiler_gnu

+

+fi

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

+  GXX=yes

+else

+  GXX=

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

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

+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+int

+main ()

+{

+

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_cxx_try_compile "$LINENO"; then :

+  ac_cv_prog_cxx_g=yes

+else

+  CXXFLAGS=""

+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+int

+main ()

+{

+

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_cxx_try_compile "$LINENO"; then :

+

+else

+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag

+	 CXXFLAGS="-g"

+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+int

+main ()

+{

+

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_cxx_try_compile "$LINENO"; then :

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

+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag

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

+  else

+    CXXFLAGS="-g"

+  fi

+else

+  if test "$GXX" = yes; then

+    CXXFLAGS="-O2"

+  else

+    CXXFLAGS=

+  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

+

+

+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 how to run the C++ preprocessor" >&5

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

+if test -z "$CXXCPP"; then

+  if ${ac_cv_prog_CXXCPP+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

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

+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#ifdef __STDC__

+# include <limits.h>

+#else

+# include <assert.h>

+#endif

+		     Syntax error

+_ACEOF

+if ac_fn_cxx_try_cpp "$LINENO"; then :

+

+else

+  # Broken: fails on valid input.

+continue

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+

+  # OK, works on sane cases.  Now check whether nonexistent headers

+  # can be detected and how.

+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <ac_nonexistent.h>

+_ACEOF

+if ac_fn_cxx_try_cpp "$LINENO"; then :

+  # Broken: success on invalid input.

+continue

+else

+  # Passes both tests.

+ac_preproc_ok=:

+break

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+

+done

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

+rm -f conftest.i 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

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

+$as_echo "$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.

+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#ifdef __STDC__

+# include <limits.h>

+#else

+# include <assert.h>

+#endif

+		     Syntax error

+_ACEOF

+if ac_fn_cxx_try_cpp "$LINENO"; then :

+

+else

+  # Broken: fails on valid input.

+continue

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+

+  # OK, works on sane cases.  Now check whether nonexistent headers

+  # can be detected and how.

+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <ac_nonexistent.h>

+_ACEOF

+if ac_fn_cxx_try_cpp "$LINENO"; then :

+  # Broken: success on invalid input.

+continue

+else

+  # Passes both tests.

+ac_preproc_ok=:

+break

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+

+done

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

+rm -f conftest.i conftest.err conftest.$ac_ext

+if $ac_preproc_ok; then :

+

+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 $? "C++ preprocessor \"$CXXCPP\" fails sanity check

+See \`config.log' for more details" "$LINENO" 5; }

+fi

+